From 223b9e9c102ef344f18d40be927805d749a654e0 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Thu, 16 Mar 2023 12:23:01 +0100 Subject: [PATCH 1/2] build(sveltekit): Fix vite types being included in build output --- packages/sveltekit/.eslintrc.js | 6 ++++++ packages/sveltekit/tsconfig.json | 2 +- packages/sveltekit/tsconfig.test.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/sveltekit/.eslintrc.js b/packages/sveltekit/.eslintrc.js index 8fcc9ae58f9a..c3ca0faa363b 100644 --- a/packages/sveltekit/.eslintrc.js +++ b/packages/sveltekit/.eslintrc.js @@ -11,6 +11,12 @@ module.exports = { 'import/no-unresolved': 'off', }, }, + { + files: ['vite.config.ts'], + parserOptions: { + project: ['tsconfig.test.json'], + }, + }, ], extends: ['../../.eslintrc.js'], }; diff --git a/packages/sveltekit/tsconfig.json b/packages/sveltekit/tsconfig.json index 5282294db1db..bf45a09f2d71 100644 --- a/packages/sveltekit/tsconfig.json +++ b/packages/sveltekit/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*", "vite.config.ts"], + "include": ["src/**/*"], "compilerOptions": { // package-specific options diff --git a/packages/sveltekit/tsconfig.test.json b/packages/sveltekit/tsconfig.test.json index ef8fa4c5130d..3fbe012384ee 100644 --- a/packages/sveltekit/tsconfig.test.json +++ b/packages/sveltekit/tsconfig.test.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", - "include": ["test/**/*"], + "include": ["test/**/*", "vite.config.ts"], "compilerOptions": { // should include all types from `./tsconfig.json` plus types for all test frameworks used From c7b2218a5f70da0e9fc9a8351dd9c063e9380f2b Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Thu, 16 Mar 2023 12:23:38 +0100 Subject: [PATCH 2/2] don't run vitest in watch-mode for `yarn test:unit` --- packages/sveltekit/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json index 51e7c01b35d8..b1248af13f91 100644 --- a/packages/sveltekit/package.json +++ b/packages/sveltekit/package.json @@ -63,7 +63,7 @@ "lint:eslint": "eslint . --format stylish", "lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"", "test": "yarn test:unit", - "test:unit": "vitest", + "test:unit": "vitest run", "test:watch": "vitest --watch" }, "volta": {