From bc7bee87de1769967343e35c49984f4bcb608726 Mon Sep 17 00:00:00 2001 From: Haoqun Jiang Date: Tue, 8 Mar 2022 21:13:34 +0800 Subject: [PATCH] fix: only add vitest type when it is chosen --- template/config/typescript/tsconfig.json | 20 ------------------- .../tsconfig/base/tsconfig.vite-config.json | 2 +- .../tsconfig/vitest/tsconfig.vite-config.json | 8 ++++++++ 3 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 template/config/typescript/tsconfig.json create mode 100644 template/tsconfig/vitest/tsconfig.vite-config.json diff --git a/template/config/typescript/tsconfig.json b/template/config/typescript/tsconfig.json deleted file mode 100644 index ca1e1ee6..00000000 --- a/template/config/typescript/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "target": "esnext", - "useDefineForClassFields": true, - "module": "esnext", - "moduleResolution": "node", - "isolatedModules": true, - "strict": true, - "jsx": "preserve", - "sourceMap": true, - "resolveJsonModule": true, - "esModuleInterop": true, - "paths": { - "@/*": ["./src/*"] - }, - "lib": ["esnext", "dom", "dom.iterable", "scripthost"], - "skipLibCheck": true - }, - "include": ["vite.config.*", "env.d.ts", "src/**/*", "src/**/*.vue"] -} diff --git a/template/tsconfig/base/tsconfig.vite-config.json b/template/tsconfig/base/tsconfig.vite-config.json index d20d8726..93fe5846 100644 --- a/template/tsconfig/base/tsconfig.vite-config.json +++ b/template/tsconfig/base/tsconfig.vite-config.json @@ -3,6 +3,6 @@ "include": ["vite.config.*"], "compilerOptions": { "composite": true, - "types": ["node", "vitest"] + "types": ["node"] } } diff --git a/template/tsconfig/vitest/tsconfig.vite-config.json b/template/tsconfig/vitest/tsconfig.vite-config.json new file mode 100644 index 00000000..d20d8726 --- /dev/null +++ b/template/tsconfig/vitest/tsconfig.vite-config.json @@ -0,0 +1,8 @@ +{ + "extends": "@vue/tsconfig/tsconfig.node.json", + "include": ["vite.config.*"], + "compilerOptions": { + "composite": true, + "types": ["node", "vitest"] + } +} -- 2.39.5