From 27bd09a80b55fc2f02ed369743f9949377d4d87b Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Fri, 19 Aug 2022 16:35:36 +0200 Subject: [PATCH 1/3] [fix] add test folder to includes Also add some notes to tsconfig/jsonfig Fixes #5833 --- .changeset/hot-lions-cough.md | 5 +++++ .changeset/warm-pots-melt.md | 5 +++++ packages/create-svelte/shared/+checkjs/jsconfig.json | 4 ++++ packages/create-svelte/shared/+typescript/tsconfig.json | 4 ++++ packages/kit/src/core/sync/write_tsconfig.js | 6 ++++++ 5 files changed, 24 insertions(+) create mode 100644 .changeset/hot-lions-cough.md create mode 100644 .changeset/warm-pots-melt.md diff --git a/.changeset/hot-lions-cough.md b/.changeset/hot-lions-cough.md new file mode 100644 index 000000000000..65b0719b9c87 --- /dev/null +++ b/.changeset/hot-lions-cough.md @@ -0,0 +1,5 @@ +--- +'create-svelte': patch +--- + +Add notes about includes/excludes and path aliases diff --git a/.changeset/warm-pots-melt.md b/.changeset/warm-pots-melt.md new file mode 100644 index 000000000000..e38ea295c8d3 --- /dev/null +++ b/.changeset/warm-pots-melt.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +Add test folder to generated tsconfig diff --git a/packages/create-svelte/shared/+checkjs/jsconfig.json b/packages/create-svelte/shared/+checkjs/jsconfig.json index 0f47472f79f8..fe45e13fdd06 100644 --- a/packages/create-svelte/shared/+checkjs/jsconfig.json +++ b/packages/create-svelte/shared/+checkjs/jsconfig.json @@ -10,4 +10,8 @@ "sourceMap": true, "strict": true } + // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias and https://kit.svelte.dev/docs/configuration#files + // + // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes + // from the referenced tsconfig.json - TypeScript does not merge them in } diff --git a/packages/create-svelte/shared/+typescript/tsconfig.json b/packages/create-svelte/shared/+typescript/tsconfig.json index 0f47472f79f8..fe45e13fdd06 100644 --- a/packages/create-svelte/shared/+typescript/tsconfig.json +++ b/packages/create-svelte/shared/+typescript/tsconfig.json @@ -10,4 +10,8 @@ "sourceMap": true, "strict": true } + // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias and https://kit.svelte.dev/docs/configuration#files + // + // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes + // from the referenced tsconfig.json - TypeScript does not merge them in } diff --git a/packages/kit/src/core/sync/write_tsconfig.js b/packages/kit/src/core/sync/write_tsconfig.js index 4bee748ddf67..04260cbbca14 100644 --- a/packages/kit/src/core/sync/write_tsconfig.js +++ b/packages/kit/src/core/sync/write_tsconfig.js @@ -53,6 +53,12 @@ export function write_tsconfig(config, cwd = process.cwd()) { include.push(config_relative(`${relative}/**/*.ts`)); include.push(config_relative(`${relative}/**/*.svelte`)); } + // Test folder is a special case - we advocate putting tests in a top-level test folder + // and it's not configurable (should we make it?) + const test_folder = project_relative('test'); + include.push(config_relative(`${test_folder}/**/*.js`)); + include.push(config_relative(`${test_folder}/**/*.ts`)); + include.push(config_relative(`${test_folder}/**/*.svelte`)); write_if_changed( out, From 2503d2c061ad005f37e4857c957cf28d5dded032 Mon Sep 17 00:00:00 2001 From: Simon H <5968653+dummdidumm@users.noreply.github.com> Date: Fri, 19 Aug 2022 20:24:46 +0200 Subject: [PATCH 2/3] Update packages/create-svelte/shared/+typescript/tsconfig.json Co-authored-by: Ben McCann <322311+benmccann@users.noreply.github.com> --- packages/create-svelte/shared/+typescript/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-svelte/shared/+typescript/tsconfig.json b/packages/create-svelte/shared/+typescript/tsconfig.json index fe45e13fdd06..6ae0c8c44d08 100644 --- a/packages/create-svelte/shared/+typescript/tsconfig.json +++ b/packages/create-svelte/shared/+typescript/tsconfig.json @@ -10,7 +10,7 @@ "sourceMap": true, "strict": true } - // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias and https://kit.svelte.dev/docs/configuration#files + // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias // // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes // from the referenced tsconfig.json - TypeScript does not merge them in From 8edf9ded0de27921b6de26ab2fa1db55d7699c20 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 20 Aug 2022 13:48:19 -0400 Subject: [PATCH 3/3] Update packages/kit/src/core/sync/write_tsconfig.js Co-authored-by: Dominik G. --- packages/kit/src/core/sync/write_tsconfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kit/src/core/sync/write_tsconfig.js b/packages/kit/src/core/sync/write_tsconfig.js index 04260cbbca14..95d787c347b5 100644 --- a/packages/kit/src/core/sync/write_tsconfig.js +++ b/packages/kit/src/core/sync/write_tsconfig.js @@ -55,7 +55,7 @@ export function write_tsconfig(config, cwd = process.cwd()) { } // Test folder is a special case - we advocate putting tests in a top-level test folder // and it's not configurable (should we make it?) - const test_folder = project_relative('test'); + const test_folder = project_relative('tests'); include.push(config_relative(`${test_folder}/**/*.js`)); include.push(config_relative(`${test_folder}/**/*.ts`)); include.push(config_relative(`${test_folder}/**/*.svelte`));