From bf28a0c795a5b53ca7e9fab3dd2c12c5610ca491 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Tue, 11 Jun 2024 17:54:28 +0200 Subject: [PATCH] fix(ts): align with create-vue setup --- frontend/{cypress.config.js => cypress.config.ts} | 0 frontend/cypress/e2e/tsconfig.json | 1 - frontend/tsconfig.app.json | 2 +- frontend/tsconfig.config.json | 5 +++++ frontend/tsconfig.json | 5 ++++- frontend/tsconfig.vitest.json | 2 ++ frontend/vite.config.ts | 2 ++ 7 files changed, 14 insertions(+), 3 deletions(-) rename frontend/{cypress.config.js => cypress.config.ts} (100%) diff --git a/frontend/cypress.config.js b/frontend/cypress.config.ts similarity index 100% rename from frontend/cypress.config.js rename to frontend/cypress.config.ts diff --git a/frontend/cypress/e2e/tsconfig.json b/frontend/cypress/e2e/tsconfig.json index d02fe86e7..71099d125 100644 --- a/frontend/cypress/e2e/tsconfig.json +++ b/frontend/cypress/e2e/tsconfig.json @@ -7,6 +7,5 @@ "target": "ES2015", "lib": ["ESNext", "dom"], "types": ["cypress"], - "ignoreDeprecations": "5.0" } } diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json index 625ccc212..ef6309286 100644 --- a/frontend/tsconfig.app.json +++ b/frontend/tsconfig.app.json @@ -4,6 +4,7 @@ "exclude": ["src/**/__tests__/*"], "compilerOptions": { "composite": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", "baseUrl": ".", "lib": ["ESNext", "DOM", "WebWorker"], @@ -18,6 +19,5 @@ // https://github.com/ikenfin/vite-plugin-sentry#typescript "vite-plugin-sentry/client" ], - "ignoreDeprecations": "5.0" } } \ No newline at end of file diff --git a/frontend/tsconfig.config.json b/frontend/tsconfig.config.json index 10d9bbbec..1f9acbd23 100644 --- a/frontend/tsconfig.config.json +++ b/frontend/tsconfig.config.json @@ -6,6 +6,11 @@ "include": ["vite.config.*", "vitest.config.*", "cypress.config.*"], "compilerOptions": { "composite": true, + "noEmit": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.config.tsbuildinfo", + + "module": "ESNext", + "moduleResolution": "Bundler", "types": ["node"] } } \ No newline at end of file diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 31f90037c..223bcc9b6 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -10,5 +10,8 @@ { "path": "./tsconfig.vitest.json" } - ] + ], + "compilerOptions": { + "module": "NodeNext" + } } diff --git a/frontend/tsconfig.vitest.json b/frontend/tsconfig.vitest.json index eb35a1187..67f38a6eb 100644 --- a/frontend/tsconfig.vitest.json +++ b/frontend/tsconfig.vitest.json @@ -3,6 +3,8 @@ "exclude": [], "compilerOptions": { "composite": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.vitest.tsbuildinfo", + "lib": [], "types": ["node"] } diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index f80f7a65a..16f5fd025 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -1,5 +1,6 @@ /// import {defineConfig, type PluginOption, loadEnv} from 'vite' +import {configDefaults} from 'vitest/config' import vue from '@vitejs/plugin-vue' import legacyFn from '@vitejs/plugin-legacy' import {URL, fileURLToPath} from 'node:url' @@ -87,6 +88,7 @@ export default defineConfig(({mode}) => { // https://vitest.dev/config/ test: { environment: 'happy-dom', + exclude: [...configDefaults.exclude, 'e2e/**'], 'vitest.commandLine': 'pnpm test:unit', }, css: {