From 5a14b6955a611eacb3b3f396654a9941d4aa9169 Mon Sep 17 00:00:00 2001 From: Puru Vijay Date: Tue, 31 Jan 2023 14:42:52 +0530 Subject: [PATCH] Use tsconfig instead of jsconfig --- .../{jsconfig.json => tsconfig.json} | 0 sites/svelte.dev/vite.config.js | 71 +++++++++++-------- tsconfig.json | 5 +- 3 files changed, 43 insertions(+), 33 deletions(-) rename sites/svelte.dev/{jsconfig.json => tsconfig.json} (100%) diff --git a/sites/svelte.dev/jsconfig.json b/sites/svelte.dev/tsconfig.json similarity index 100% rename from sites/svelte.dev/jsconfig.json rename to sites/svelte.dev/tsconfig.json diff --git a/sites/svelte.dev/vite.config.js b/sites/svelte.dev/vite.config.js index 34aee0dd37..742f38e995 100644 --- a/sites/svelte.dev/vite.config.js +++ b/sites/svelte.dev/vite.config.js @@ -1,54 +1,63 @@ -import * as fs from 'fs'; -import { sveltekit } from '@sveltejs/kit/vite'; -import { imagetools } from 'vite-imagetools'; +import * as fs from "fs"; +import { sveltekit } from "@sveltejs/kit/vite"; +import { imagetools } from "vite-imagetools"; process.env.VITE_API_BASE = process.env.DOCS_PREVIEW - ? 'http://localhost:8787' - : 'https://api.svelte.dev'; + ? "http://localhost:8787" + : "https://api.svelte.dev"; +/** + * @param {string[]} ext + * @returns {import('vite').Plugin} + */ function raw(ext) { return { - name: 'vite-plugin-raw', + name: "vite-plugin-raw", transform(_, id) { if (ext.some((e) => id.endsWith(e))) { const buffer = fs.readFileSync(id); return { code: `export default ${JSON.stringify(buffer)}`, map: null }; } - } + }, }; } /** @type {import('vite').UserConfig} */ const config = { - logLevel: 'info', - plugins: [raw(['.ttf']), imagetools(), sveltekit()], + logLevel: "info", + plugins: [raw([".ttf"]), imagetools(), sveltekit()], + esbuild: { + loader: { + html: "text", + }, + }, optimizeDeps: { include: [ - 'codemirror', - 'codemirror/mode/javascript/javascript.js', - 'codemirror/mode/handlebars/handlebars.js', - 'codemirror/mode/htmlmixed/htmlmixed.js', - 'codemirror/mode/xml/xml.js', - 'codemirror/mode/css/css.js', - 'codemirror/mode/markdown/markdown.js', - 'codemirror/addon/edit/closebrackets.js', - 'codemirror/addon/edit/closetag.js', - 'codemirror/addon/edit/continuelist.js', - 'codemirror/addon/comment/comment.js', - 'codemirror/addon/fold/foldcode.js', - 'codemirror/addon/fold/foldgutter.js', - 'codemirror/addon/fold/brace-fold.js', - 'codemirror/addon/fold/xml-fold.js', - 'codemirror/addon/fold/indent-fold.js', - 'codemirror/addon/fold/markdown-fold.js', - 'codemirror/addon/fold/comment-fold.js' - ] + "codemirror", + "codemirror/mode/javascript/javascript.js", + "codemirror/mode/handlebars/handlebars.js", + "codemirror/mode/htmlmixed/htmlmixed.js", + "codemirror/mode/xml/xml.js", + "codemirror/mode/css/css.js", + "codemirror/mode/markdown/markdown.js", + "codemirror/addon/edit/closebrackets.js", + "codemirror/addon/edit/closetag.js", + "codemirror/addon/edit/continuelist.js", + "codemirror/addon/comment/comment.js", + "codemirror/addon/fold/foldcode.js", + "codemirror/addon/fold/foldgutter.js", + "codemirror/addon/fold/brace-fold.js", + "codemirror/addon/fold/xml-fold.js", + "codemirror/addon/fold/indent-fold.js", + "codemirror/addon/fold/markdown-fold.js", + "codemirror/addon/fold/comment-fold.js", + ], }, server: { fs: { - strict: false - } - } + strict: false, + }, + }, }; export default config; diff --git a/tsconfig.json b/tsconfig.json index ed1b0afc3a..f2e055a2a9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,9 @@ { - "include": ["src/**/*.{js,ts}"], - "exclude": ["sites/**/*"], + "include": [], "compilerOptions": { + "rootDir": "src", + // target node v8+ (https://node.green/) // the only missing feature is Array.prototype.values "lib": ["es2017"],