diff --git a/.vscode/extensions.json b/.vscode/extensions.json index fe1ca403b..347bc4222 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,3 +1,3 @@ { - "recommendations": ["dbaeumer.vscode-eslint", "lokalise.i18n-ally", "esbenp.prettier-vscode"] + "recommendations": ["dbaeumer.vscode-eslint", "lokalise.i18n-ally", "esbenp.prettier-vscode", "TypeScriptTeam.native-preview"] } diff --git a/package.json b/package.json index 5923db0e2..93b77d225 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "format": "prettier --cache --write .", "lint": "oxlint .", "typecheck:node": "tsgo --noEmit -p tsconfig.node.json --composite false", - "typecheck:web": "vue-tsc --noEmit -p tsconfig.app.json --composite false", + "typecheck:web": "vue-tsgo --project tsconfig.app.tsgo.json", "typecheck": "pnpm run typecheck:node && pnpm run typecheck:web", "start": "electron-vite preview", "dev": "cross-env VITE_ENABLE_PLAYGROUND=true electron-vite dev --watch", @@ -180,7 +180,7 @@ "vue-i18n": "^11.2.7", "vue-router": "4", "vue-sonner": "^2.0.9", - "vue-tsc": "^2.2.12", + "vue-tsgo": "0.0.1-yggdrasill.11", "vue-virtual-scroller": "^2.0.0-beta.8", "vuedraggable": "^4.1.0", "yaml": "^2.8.2", diff --git a/tsconfig.app.json b/tsconfig.app.json index e855bf9fa..dd4a4c0d5 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -23,22 +23,24 @@ "src/renderer/settings/**/*.vue" ], "compilerOptions": { - "composite": true, - "baseUrl": ".", "module": "esnext", + "composite": false, + "declaration": false, + "emitDeclarationOnly": false, + "noEmit": true, "paths": { "@/*": [ - "src/renderer/src/*" + "./src/renderer/src/*" ], "@shell/*": [ - "src/renderer/shell/*" + "./src/renderer/shell/*" ], "@shared/*": [ - "src/shared/*" + "./src/shared/*" ], "@shadcn/*": [ - "src/shadcn/*" + "./src/shadcn/*" ] } } -} \ No newline at end of file +} diff --git a/tsconfig.app.tsgo.json b/tsconfig.app.tsgo.json new file mode 100644 index 000000000..dd4a4c0d5 --- /dev/null +++ b/tsconfig.app.tsgo.json @@ -0,0 +1,46 @@ +{ + "extends": "@electron-toolkit/tsconfig/tsconfig.web.json", + "include": [ + "src/renderer/src/env.d.ts", + "src/renderer/src/**/*", + "src/renderer/src/**/*.vue", + "src/renderer/src/assets/**/*", + "src/renderer/shell/env.d.ts", + "src/renderer/shell/**/*", + "src/renderer/shell/**/*.vue", + "src/renderer/shell/assets/**/*", + "src/renderer/floating/env.d.ts", + "src/renderer/floating/**/*", + "src/renderer/floating/**/*.vue", + "src/renderer/floating/assets/**/*", + "src/renderer/splash/**/*", + "src/renderer/splash/**/*.vue", + "src/renderer/splash/assets/**/*", + "src/preload/*.d.ts", + "src/shared/**/*", + "src/shadcn/**/*", + "src/renderer/settings/**/*", + "src/renderer/settings/**/*.vue" + ], + "compilerOptions": { + "module": "esnext", + "composite": false, + "declaration": false, + "emitDeclarationOnly": false, + "noEmit": true, + "paths": { + "@/*": [ + "./src/renderer/src/*" + ], + "@shell/*": [ + "./src/renderer/shell/*" + ], + "@shared/*": [ + "./src/shared/*" + ], + "@shadcn/*": [ + "./src/shadcn/*" + ] + } + } +}