From e05437f2159c9e3c13052b479ca2788441f567ae Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 2 Mar 2022 20:49:07 -0800 Subject: [PATCH 1/5] Upgrade to TypeScript 4.6 --- .changeset/polite-laws-cheat.md | 7 + package.json | 2 +- packages/adapter-cloudflare/tsconfig.json | 2 +- .../shared/+typescript/package.json | 2 +- .../templates/default/package.json | 2 +- packages/create-svelte/tsconfig.json | 2 +- packages/kit/package.json | 12 +- packages/kit/src/core/tsconfig.js | 6 +- .../test/fixtures/assets/jsconfig.json | 4 +- packages/kit/test/apps/amp/package.json | 2 +- packages/kit/test/apps/amp/tsconfig.json | 4 +- packages/kit/test/apps/basics/package.json | 2 +- packages/kit/test/apps/options-2/package.json | 2 +- packages/kit/test/apps/options/package.json | 2 +- .../kit/test/prerendering/basics/package.json | 2 +- .../test/prerendering/options/package.json | 2 +- pnpm-lock.yaml | 225 ++++++++---------- 17 files changed, 135 insertions(+), 145 deletions(-) create mode 100644 .changeset/polite-laws-cheat.md diff --git a/.changeset/polite-laws-cheat.md b/.changeset/polite-laws-cheat.md new file mode 100644 index 000000000000..b3b387e2bf78 --- /dev/null +++ b/.changeset/polite-laws-cheat.md @@ -0,0 +1,7 @@ +--- +'create-svelte': patch +'default-template': patch +'@sveltejs/kit': patch +--- + +Upgrade to TypeScript 4.6 diff --git a/package.json b/package.json index 4e098bf19c2b..bfcee1b74640 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "playwright-chromium": "^1.19.1", "prettier": "^2.5.0", "rollup": "^2.60.2", - "typescript": "~4.5.5" + "typescript": "~4.6.2" }, "type": "module" } diff --git a/packages/adapter-cloudflare/tsconfig.json b/packages/adapter-cloudflare/tsconfig.json index dab7ee9050dc..f9bf8e7cb2be 100644 --- a/packages/adapter-cloudflare/tsconfig.json +++ b/packages/adapter-cloudflare/tsconfig.json @@ -9,5 +9,5 @@ "moduleResolution": "node", "allowSyntheticDefaultImports": true }, - "include": ["index.js", "files"] + "include": ["./index.js", "./files"] } diff --git a/packages/create-svelte/shared/+typescript/package.json b/packages/create-svelte/shared/+typescript/package.json index 0f7aa043383a..470dd71aa3b6 100644 --- a/packages/create-svelte/shared/+typescript/package.json +++ b/packages/create-svelte/shared/+typescript/package.json @@ -4,7 +4,7 @@ "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch" }, "devDependencies": { - "typescript": "~4.5.4", + "typescript": "~4.6.2", "tslib": "^2.3.1", "svelte-check": "^2.2.6", "svelte-preprocess": "^4.10.1" diff --git a/packages/create-svelte/templates/default/package.json b/packages/create-svelte/templates/default/package.json index 7a1a4383c903..765ab717112f 100644 --- a/packages/create-svelte/templates/default/package.json +++ b/packages/create-svelte/templates/default/package.json @@ -13,7 +13,7 @@ "@sveltejs/kit": "workspace:*", "svelte": "^3.44.0", "svelte-preprocess": "^4.9.8", - "typescript": "~4.5.5" + "typescript": "~4.6.2" }, "type": "module", "dependencies": { diff --git a/packages/create-svelte/tsconfig.json b/packages/create-svelte/tsconfig.json index 28c25ce5e6d4..83b0d9ea9f79 100644 --- a/packages/create-svelte/tsconfig.json +++ b/packages/create-svelte/tsconfig.json @@ -9,5 +9,5 @@ "moduleResolution": "node", "allowSyntheticDefaultImports": true }, - "include": ["scripts/**/*", "index.js", "bin.js", "utils.js"] + "include": ["./scripts/**/*", "./index.js", "./bin.js", "./utils.js"] } diff --git a/packages/kit/package.json b/packages/kit/package.json index 7bfb95e41d6f..a5e7fe20e5e3 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -62,13 +62,13 @@ "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format", "check": "tsc && npm run check:integration && npm run check:prerendering", "check:integration": "npm run check:integration:amp && npm run check:integration:basics && npm run check:integration:options && npm run check:integration:options-2", - "check:integration:amp": "cd test/apps/amp && pnpm check", - "check:integration:basics": "cd test/apps/basics && pnpm check", - "check:integration:options": "cd test/apps/options && pnpm check", - "check:integration:options-2": "cd test/apps/options-2 && pnpm check", + "check:integration:amp": "cd test/apps/amp && pnpm build && pnpm check", + "check:integration:basics": "cd test/apps/basics && pnpm build && pnpm check", + "check:integration:options": "cd test/apps/options && pnpm build && pnpm check", + "check:integration:options-2": "cd test/apps/options-2 && pnpm build && pnpm check", "check:prerendering": "npm run check:prerendering:basics && npm run check:prerendering:options", - "check:prerendering:basics": "cd test/prerendering/basics && pnpm check", - "check:prerendering:options": "cd test/prerendering/options && pnpm check", + "check:prerendering:basics": "cd test/prerendering/basics && pnpm build && pnpm check", + "check:prerendering:options": "cd test/prerendering/options && pnpm build && pnpm check", "format": "npm run check-format -- --write", "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore", "prepublishOnly": "npm run build", diff --git a/packages/kit/src/core/tsconfig.js b/packages/kit/src/core/tsconfig.js index 5ecd6ee9f265..42f268cb316f 100644 --- a/packages/kit/src/core/tsconfig.js +++ b/packages/kit/src/core/tsconfig.js @@ -29,9 +29,9 @@ export function generate_tsconfig(config) { /** @type {string[]} */ const include = []; dirs.forEach((dir) => { - include.push(config_relative(`${dir}/**/*.js`)); - include.push(config_relative(`${dir}/**/*.ts`)); - include.push(config_relative(`${dir}/**/*.svelte`)); + include.push(config_relative(`./${dir}/**/*.js`)); + include.push(config_relative(`./${dir}/**/*.ts`)); + include.push(config_relative(`./${dir}/**/*.svelte`)); }); fs.writeFileSync( diff --git a/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json b/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json index 92575debb461..ac8f55354434 100644 --- a/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json +++ b/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json @@ -3,8 +3,8 @@ "checkJs": true, "baseUrl": ".", "paths": { - "$lib/*": ["src/lib/*"] + "$lib/*": ["./src/lib/*"] } }, - "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"] + "include": ["./src/**/*.d.ts", "./src/**/*.js", "./src/**/*.svelte"] } diff --git a/packages/kit/test/apps/amp/package.json b/packages/kit/test/apps/amp/package.json index 4c2c6ce4b247..f610279d5a73 100644 --- a/packages/kit/test/apps/amp/package.json +++ b/packages/kit/test/apps/amp/package.json @@ -16,7 +16,7 @@ "cross-env": "^7.0.3", "svelte": "^3.43.0", "svelte-check": "^2.2.10", - "typescript": "~4.5.5" + "typescript": "~4.6.2" }, "type": "module" } diff --git a/packages/kit/test/apps/amp/tsconfig.json b/packages/kit/test/apps/amp/tsconfig.json index 86714a0915e0..267fe160a78e 100644 --- a/packages/kit/test/apps/amp/tsconfig.json +++ b/packages/kit/test/apps/amp/tsconfig.json @@ -2,8 +2,8 @@ "compilerOptions": { "noEmit": true, "paths": { - "$lib": ["src/lib"], - "$lib/*": ["src/lib/*"], + "$lib": ["./src/lib"], + "$lib/*": ["./src/lib/*"], "types": ["../../../types/internal"] } }, diff --git a/packages/kit/test/apps/basics/package.json b/packages/kit/test/apps/basics/package.json index 943cfec7ffbf..1fa1c6cf360a 100644 --- a/packages/kit/test/apps/basics/package.json +++ b/packages/kit/test/apps/basics/package.json @@ -16,7 +16,7 @@ "cross-env": "^7.0.3", "svelte": "^3.43.0", "svelte-check": "^2.2.10", - "typescript": "~4.5.5" + "typescript": "~4.6.2" }, "type": "module" } diff --git a/packages/kit/test/apps/options-2/package.json b/packages/kit/test/apps/options-2/package.json index 8311aa95052d..9eac43fce534 100644 --- a/packages/kit/test/apps/options-2/package.json +++ b/packages/kit/test/apps/options-2/package.json @@ -17,7 +17,7 @@ "cross-env": "^7.0.3", "svelte": "^3.43.0", "svelte-check": "^2.2.10", - "typescript": "~4.5.5" + "typescript": "~4.6.2" }, "type": "module" } diff --git a/packages/kit/test/apps/options/package.json b/packages/kit/test/apps/options/package.json index b56c52441e12..128373613e02 100644 --- a/packages/kit/test/apps/options/package.json +++ b/packages/kit/test/apps/options/package.json @@ -16,7 +16,7 @@ "cross-env": "^7.0.3", "svelte": "^3.43.0", "svelte-check": "^2.2.10", - "typescript": "~4.5.5" + "typescript": "~4.6.2" }, "type": "module" } diff --git a/packages/kit/test/prerendering/basics/package.json b/packages/kit/test/prerendering/basics/package.json index 4d0dcc7edb42..6fa75d9a5e65 100644 --- a/packages/kit/test/prerendering/basics/package.json +++ b/packages/kit/test/prerendering/basics/package.json @@ -13,7 +13,7 @@ "@sveltejs/kit": "workspace:*", "svelte": "^3.43.0", "svelte-check": "^2.2.10", - "typescript": "~4.5.5", + "typescript": "~4.6.2", "uvu": "^0.5.2" }, "type": "module" diff --git a/packages/kit/test/prerendering/options/package.json b/packages/kit/test/prerendering/options/package.json index 4c8a1b2bbf51..b4d3f986b272 100644 --- a/packages/kit/test/prerendering/options/package.json +++ b/packages/kit/test/prerendering/options/package.json @@ -13,7 +13,7 @@ "@sveltejs/kit": "workspace:*", "svelte": "^3.43.0", "svelte-check": "^2.2.10", - "typescript": "~4.5.5", + "typescript": "~4.6.2", "uvu": "^0.5.2" }, "type": "module" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0b1ee2af581c..d87d7db74f50 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,16 +19,16 @@ importers: playwright-chromium: ^1.19.1 prettier: ^2.5.0 rollup: ^2.60.2 - typescript: ~4.5.5 + typescript: ~4.6.2 devDependencies: '@changesets/cli': 2.18.1 '@rollup/plugin-commonjs': 21.0.1_rollup@2.60.2 '@rollup/plugin-json': 4.1.0_rollup@2.60.2 '@rollup/plugin-node-resolve': 13.0.6_rollup@2.60.2 - '@sveltejs/eslint-config': github.com/sveltejs/eslint-config/9a7d728e03ac433e5856a6e06775c17ee986d641_a447525fbf09647ead76db7292af4049 + '@sveltejs/eslint-config': github.com/sveltejs/eslint-config/9a7d728e03ac433e5856a6e06775c17ee986d641_69bc842e7e8ce444447ce4aad7520a79 '@svitejs/changesets-changelog-github-compact': 0.1.1 - '@typescript-eslint/eslint-plugin': 5.5.0_f60175165d08edf988b5aad85994517a - '@typescript-eslint/parser': 5.5.0_eslint@8.3.0+typescript@4.5.5 + '@typescript-eslint/eslint-plugin': 5.5.0_399057d0d4da33caa499d36b7c87455b + '@typescript-eslint/parser': 5.5.0_eslint@8.3.0+typescript@4.6.2 action-deploy-docs: github.com/sveltejs/action-deploy-docs/4b34fbdb9caf29ad769ec1dfc955bd1c61755f91 eslint: 8.3.0 eslint-plugin-import: 2.25.3_eslint@8.3.0 @@ -36,7 +36,7 @@ importers: playwright-chromium: 1.19.1 prettier: 2.5.0 rollup: 2.60.2 - typescript: 4.5.5 + typescript: 4.6.2 .github/actions/env: specifiers: @@ -163,18 +163,6 @@ importers: svelte: 3.44.2 uvu: 0.5.2 - packages/adapter-static/test/apps/spa: - specifiers: - '@sveltejs/adapter-node': next - '@sveltejs/kit': next - sirv-cli: ^2.0.2 - svelte: ^3.43.0 - devDependencies: - '@sveltejs/adapter-node': 1.0.0-next.70 - '@sveltejs/kit': 1.0.0-next.288_svelte@3.44.2 - sirv-cli: 2.0.2 - svelte: 3.44.2 - packages/adapter-vercel: specifiers: '@sveltejs/kit': workspace:* @@ -212,7 +200,7 @@ importers: prettier-plugin-svelte: 2.5.0_prettier@2.5.0+svelte@3.44.2 sucrase: 3.20.3 svelte: 3.44.2 - svelte-preprocess: 4.9.8_svelte@3.44.2+typescript@4.5.5 + svelte-preprocess: 4.9.8_svelte@3.44.2+typescript@4.6.2 tiny-glob: 0.2.9 packages/create-svelte/templates/default: @@ -224,7 +212,7 @@ importers: cookie: ^0.4.1 svelte: ^3.44.0 svelte-preprocess: ^4.9.8 - typescript: ~4.5.5 + typescript: ~4.6.2 dependencies: '@fontsource/fira-mono': 4.5.0 '@lukeed/uuid': 2.0.0 @@ -233,8 +221,8 @@ importers: '@sveltejs/adapter-auto': link:../../../adapter-auto '@sveltejs/kit': link:../../../kit svelte: 3.44.2 - svelte-preprocess: 4.9.8_svelte@3.44.2+typescript@4.5.5 - typescript: 4.5.5 + svelte-preprocess: 4.9.8_svelte@3.44.2+typescript@4.6.2 + typescript: 4.6.2 packages/kit: specifiers: @@ -298,8 +286,8 @@ importers: sirv: 2.0.0 svelte: 3.44.2 svelte-check: 2.2.10_svelte@3.44.2 - svelte-preprocess: 4.9.8_svelte@3.44.2+typescript@4.5.5 - svelte2tsx: 0.5.0_svelte@3.44.2+typescript@4.5.5 + svelte-preprocess: 4.9.8_svelte@3.44.2+typescript@4.6.2 + svelte2tsx: 0.5.0_svelte@3.44.2+typescript@4.6.2 tiny-glob: 0.2.9 uvu: 0.5.2 @@ -309,13 +297,13 @@ importers: cross-env: ^7.0.3 svelte: ^3.43.0 svelte-check: ^2.2.10 - typescript: ~4.5.5 + typescript: ~4.6.2 devDependencies: '@sveltejs/kit': link:../../.. cross-env: 7.0.3 svelte: 3.44.2 svelte-check: 2.2.10_svelte@3.44.2 - typescript: 4.5.5 + typescript: 4.6.2 packages/kit/test/apps/basics: specifiers: @@ -323,13 +311,13 @@ importers: cross-env: ^7.0.3 svelte: ^3.43.0 svelte-check: ^2.2.10 - typescript: ~4.5.5 + typescript: ~4.6.2 devDependencies: '@sveltejs/kit': link:../../.. cross-env: 7.0.3 svelte: 3.44.2 svelte-check: 2.2.10_svelte@3.44.2 - typescript: 4.5.5 + typescript: 4.6.2 packages/kit/test/apps/options: specifiers: @@ -337,13 +325,13 @@ importers: cross-env: ^7.0.3 svelte: ^3.43.0 svelte-check: ^2.2.10 - typescript: ~4.5.5 + typescript: ~4.6.2 devDependencies: '@sveltejs/kit': link:../../.. cross-env: 7.0.3 svelte: 3.44.2 svelte-check: 2.2.10_svelte@3.44.2 - typescript: 4.5.5 + typescript: 4.6.2 packages/kit/test/apps/options-2: specifiers: @@ -352,27 +340,27 @@ importers: cross-env: ^7.0.3 svelte: ^3.43.0 svelte-check: ^2.2.10 - typescript: ~4.5.5 + typescript: ~4.6.2 devDependencies: '@sveltejs/adapter-node': link:../../../../adapter-node '@sveltejs/kit': link:../../.. cross-env: 7.0.3 svelte: 3.44.2 svelte-check: 2.2.10_svelte@3.44.2 - typescript: 4.5.5 + typescript: 4.6.2 packages/kit/test/prerendering/basics: specifiers: '@sveltejs/kit': workspace:* svelte: ^3.43.0 svelte-check: ^2.2.10 - typescript: ~4.5.5 + typescript: ~4.6.2 uvu: ^0.5.2 devDependencies: '@sveltejs/kit': link:../../.. svelte: 3.44.2 svelte-check: 2.2.10_svelte@3.44.2 - typescript: 4.5.5 + typescript: 4.6.2 uvu: 0.5.2 packages/kit/test/prerendering/options: @@ -380,13 +368,13 @@ importers: '@sveltejs/kit': workspace:* svelte: ^3.43.0 svelte-check: ^2.2.10 - typescript: ~4.5.5 + typescript: ~4.6.2 uvu: ^0.5.2 devDependencies: '@sveltejs/kit': link:../../.. svelte: 3.44.2 svelte-check: 2.2.10_svelte@3.44.2 - typescript: 4.5.5 + typescript: 4.6.2 uvu: 0.5.2 sites/kit.svelte.dev: @@ -1556,31 +1544,6 @@ packages: estree-walker: 2.0.2 picomatch: 2.3.0 - /@sveltejs/adapter-node/1.0.0-next.70: - resolution: {integrity: sha512-9EtqSTxVOipESyPQH8uVdkl+iSqsq3oRKS3RZoE2vAG9I849MuTTxr1g9L4kALbXaklsYRztwhmrLpTdcSM4vA==} - dependencies: - tiny-glob: 0.2.9 - dev: true - - /@sveltejs/kit/1.0.0-next.288_svelte@3.44.2: - resolution: {integrity: sha512-6ky4CUFNGKoU1QV+fY2LOIB7atHdUCIMRx3pX21B2g9yZzQzkot0zHBrMMBSKF0/4Wx19PLEWrlGxlhakYmi8Q==} - engines: {node: '>=14.13'} - hasBin: true - peerDependencies: - svelte: ^3.44.0 - dependencies: - '@sveltejs/vite-plugin-svelte': 1.0.0-next.32_svelte@3.44.2+vite@2.8.0 - sade: 1.7.4 - svelte: 3.44.2 - vite: 2.8.0 - transitivePeerDependencies: - - diff-match-patch - - less - - sass - - stylus - - supports-color - dev: true - /@sveltejs/site-kit/2.0.3: resolution: {integrity: sha512-l5fst4LmQOpvnqkpOagTE6yHqj5cm3xHnlFKLCYLMuvDENHUKhhYTX71oeRZhyboMZ2DO3gGhzlj3R6iP+TdLA==} dependencies: @@ -1608,6 +1571,7 @@ packages: vite: 2.8.0 transitivePeerDependencies: - supports-color + dev: false /@svitejs/changesets-changelog-github-compact/0.1.1: resolution: {integrity: sha512-eBi211CfmKtkxB6tINicaDPBMbolswPbaAy7kCx+uUFL/LxztLm9cB+7jP54TgCrv+mMz8vSJWIs/baH63PjsA==} @@ -1814,7 +1778,7 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin/5.5.0_f60175165d08edf988b5aad85994517a: + /@typescript-eslint/eslint-plugin/5.5.0_399057d0d4da33caa499d36b7c87455b: resolution: {integrity: sha512-4bV6fulqbuaO9UMXU0Ia0o6z6if+kmMRW8rMRyfqXj/eGrZZRGedS4n0adeGNnjr8LKAM495hrQ7Tea52UWmQA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1825,8 +1789,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/experimental-utils': 5.5.0_eslint@8.3.0+typescript@4.5.5 - '@typescript-eslint/parser': 5.5.0_eslint@8.3.0+typescript@4.5.5 + '@typescript-eslint/experimental-utils': 5.5.0_eslint@8.3.0+typescript@4.6.2 + '@typescript-eslint/parser': 5.5.0_eslint@8.3.0+typescript@4.6.2 '@typescript-eslint/scope-manager': 5.5.0 debug: 4.3.3 eslint: 8.3.0 @@ -1834,13 +1798,13 @@ packages: ignore: 5.1.9 regexpp: 3.2.0 semver: 7.3.5 - tsutils: 3.21.0_typescript@4.5.5 - typescript: 4.5.5 + tsutils: 3.21.0_typescript@4.6.2 + typescript: 4.6.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/experimental-utils/5.5.0_eslint@8.3.0+typescript@4.5.5: + /@typescript-eslint/experimental-utils/5.5.0_eslint@8.3.0+typescript@4.6.2: resolution: {integrity: sha512-kjWeeVU+4lQ1SLYErRKV5yDXbWDPkpbzTUUlfAUifPYvpX0qZlrcCZ96/6oWxt3QxtK5WVhXz+KsnwW9cIW+3A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1849,7 +1813,7 @@ packages: '@types/json-schema': 7.0.9 '@typescript-eslint/scope-manager': 5.5.0 '@typescript-eslint/types': 5.5.0 - '@typescript-eslint/typescript-estree': 5.5.0_typescript@4.5.5 + '@typescript-eslint/typescript-estree': 5.5.0_typescript@4.6.2 eslint: 8.3.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.3.0 @@ -1858,7 +1822,7 @@ packages: - typescript dev: true - /@typescript-eslint/parser/5.5.0_eslint@8.3.0+typescript@4.5.5: + /@typescript-eslint/parser/5.5.0_eslint@8.3.0+typescript@4.6.2: resolution: {integrity: sha512-JsXBU+kgQOAgzUn2jPrLA+Rd0Y1dswOlX3hp8MuRO1hQDs6xgHtbCXEiAu7bz5hyVURxbXcA2draasMbNqrhmg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1870,10 +1834,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.5.0 '@typescript-eslint/types': 5.5.0 - '@typescript-eslint/typescript-estree': 5.5.0_typescript@4.5.5 + '@typescript-eslint/typescript-estree': 5.5.0_typescript@4.6.2 debug: 4.3.3 eslint: 8.3.0 - typescript: 4.5.5 + typescript: 4.6.2 transitivePeerDependencies: - supports-color dev: true @@ -1891,7 +1855,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.5.0_typescript@4.5.5: + /@typescript-eslint/typescript-estree/5.5.0_typescript@4.6.2: resolution: {integrity: sha512-pVn8btYUiYrjonhMAO0yG8lm7RApzy2L4RC7Td/mC/qFkyf6vRbGyZozoA94+w6D2Y2GRqpMoCWcwx/EUOzyoQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1906,8 +1870,8 @@ packages: globby: 11.0.4 is-glob: 4.0.3 semver: 7.3.5 - tsutils: 3.21.0_typescript@4.5.5 - typescript: 4.5.5 + tsutils: 3.21.0_typescript@4.6.2 + typescript: 4.6.2 transitivePeerDependencies: - supports-color dev: true @@ -2458,11 +2422,6 @@ packages: resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=} dev: true - /console-clear/1.1.1: - resolution: {integrity: sha512-pMD+MVR538ipqkG5JXeOEbKWS5um1H4LUUccUQG68qpeqBYbzYy79Gh55jkd2TtPdRfUaLWdv6LPP//5Zt0aPQ==} - engines: {node: '>=4'} - dev: true - /console-control-strings/1.1.0: resolution: {integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=} dev: true @@ -3391,11 +3350,6 @@ packages: has-symbols: 1.0.2 dev: true - /get-port/3.2.0: - resolution: {integrity: sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=} - engines: {node: '>=4'} - dev: true - /get-stream/3.0.0: resolution: {integrity: sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=} engines: {node: '>=4'} @@ -4041,11 +3995,6 @@ packages: strip-bom: 3.0.0 dev: true - /local-access/1.1.0: - resolution: {integrity: sha512-XfegD5pyTAfb+GY6chk283Ox5z8WexG56OvM06RWLpAc/UHozO8X6xAxEkIitZOtsSMM1Yr3DkHgW5W+onLhCw==} - engines: {node: '>=6'} - dev: true - /locate-character/2.0.5: resolution: {integrity: sha512-n2GmejDXtOPBAZdIiEFy5dJ5N38xBCXLNOtw2WpB9kGh6pnrEuKlwYI+Tkpofc4wDtVXHtoAOJaMRlYG/oYaxg==} dev: true @@ -5110,6 +5059,7 @@ packages: /require-relative/0.8.7: resolution: {integrity: sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=} + dev: false /reselect/4.1.5: resolution: {integrity: sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==} @@ -5211,11 +5161,6 @@ packages: node-forge: 1.2.0 dev: true - /semiver/1.1.0: - resolution: {integrity: sha512-QNI2ChmuioGC1/xjyYwyZYADILWyW6AmS1UH6gDj/SFUUUS4MBAWs/7mxnkRPc/F4iHezDP+O8t0dO8WHiEOdg==} - engines: {node: '>=6'} - dev: true - /semver/5.7.1: resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} hasBin: true @@ -5330,21 +5275,6 @@ packages: is-arrayish: 0.3.2 dev: true - /sirv-cli/2.0.2: - resolution: {integrity: sha512-OtSJDwxsF1NWHc7ps3Sa0s+dPtP15iQNJzfKVz+MxkEo3z72mCD+yu30ct79rPr0CaV1HXSOBp+MIY5uIhHZ1A==} - engines: {node: '>= 10'} - hasBin: true - dependencies: - console-clear: 1.1.1 - get-port: 3.2.0 - kleur: 4.1.4 - local-access: 1.1.0 - sade: 1.7.4 - semiver: 1.1.0 - sirv: 2.0.0 - tinydate: 1.3.0 - dev: true - /sirv/2.0.0: resolution: {integrity: sha512-TT+4+zSM9LR8soWT5/4gOYHfB5a5XEOSV2LtmBRN5MUxi8kh7BSRGuoRYjeBaqhR4w+yx+k6t0OibDNgoLfF7w==} engines: {node: '>= 10'} @@ -5644,6 +5574,7 @@ packages: svelte: '>=3.19.0' dependencies: svelte: 3.44.2 + dev: false /svelte-preprocess/4.9.8_svelte@3.44.2+typescript@4.5.5: resolution: {integrity: sha512-EQS/oRZzMtYdAprppZxY3HcysKh11w54MgA63ybtL+TAZ4hVqYOnhw41JVJjWN9dhPnNjjLzvbZ2tMhTsla1Og==} @@ -5696,12 +5627,63 @@ packages: typescript: 4.5.5 dev: true + /svelte-preprocess/4.9.8_svelte@3.44.2+typescript@4.6.2: + resolution: {integrity: sha512-EQS/oRZzMtYdAprppZxY3HcysKh11w54MgA63ybtL+TAZ4hVqYOnhw41JVJjWN9dhPnNjjLzvbZ2tMhTsla1Og==} + engines: {node: '>= 9.11.2'} + requiresBuild: true + peerDependencies: + '@babel/core': ^7.10.2 + coffeescript: ^2.5.1 + less: ^3.11.3 + node-sass: '*' + postcss: ^7 || ^8 + postcss-load-config: ^2.1.0 || ^3.0.0 + pug: ^3.0.0 + sass: ^1.26.8 + stylus: ^0.54.7 + sugarss: ^2.0.0 + svelte: ^3.23.0 + typescript: ^3.9.5 || ^4.0.0 + peerDependenciesMeta: + '@babel/core': + optional: true + coffeescript: + optional: true + less: + optional: true + node-sass: + optional: true + postcss: + optional: true + postcss-load-config: + optional: true + pug: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + typescript: + optional: true + dependencies: + '@types/pug': 2.0.5 + '@types/sass': 1.43.1 + detect-indent: 6.1.0 + magic-string: 0.25.7 + sorcery: 0.10.0 + strip-indent: 3.0.0 + svelte: 3.44.2 + typescript: 4.6.2 + dev: true + /svelte/3.44.2: resolution: {integrity: sha512-jrZhZtmH3ZMweXg1Q15onb8QlWD+a5T5Oca4C1jYvSURp2oD35h4A5TV6t6MEa93K4LlX6BkafZPdQoFjw/ylA==} engines: {node: '>= 8'} dev: true - /svelte2tsx/0.5.0_svelte@3.44.2+typescript@4.5.5: + /svelte2tsx/0.5.0_svelte@3.44.2+typescript@4.6.2: resolution: {integrity: sha512-pgMMPzPylwzb/XTLXZQ0y6LUlYzVTep4537NJzHNyTbML864pfVS27iVFOgUK7XmKLyuIdG7tgweUZTsIwgKHw==} peerDependencies: svelte: ^3.24 @@ -5710,7 +5692,7 @@ packages: dedent-js: 1.0.1 pascal-case: 3.1.2 svelte: 3.44.2 - typescript: 4.5.5 + typescript: 4.6.2 dev: true /tar-fs/2.1.1: @@ -5777,11 +5759,6 @@ packages: globalyzer: 0.1.0 globrex: 0.1.2 - /tinydate/1.3.0: - resolution: {integrity: sha512-7cR8rLy2QhYHpsBDBVYnnWXm8uRTr38RoZakFSW7Bs7PzfMPNZthuMLkwqZv7MTu8lhQ91cOFYS5a7iFj2oR3w==} - engines: {node: '>=4'} - dev: true - /tmp/0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} @@ -5843,14 +5820,14 @@ packages: resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==} dev: true - /tsutils/3.21.0_typescript@4.5.5: + /tsutils/3.21.0_typescript@4.6.2: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 4.5.5 + typescript: 4.6.2 dev: true /tty-table/2.8.13: @@ -5910,6 +5887,12 @@ packages: hasBin: true dev: true + /typescript/4.6.2: + resolution: {integrity: sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==} + engines: {node: '>=4.2.0'} + hasBin: true + dev: true + /unbox-primitive/1.0.1: resolution: {integrity: sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==} dependencies: @@ -6235,7 +6218,7 @@ packages: - supports-color dev: true - github.com/sveltejs/eslint-config/9a7d728e03ac433e5856a6e06775c17ee986d641_a447525fbf09647ead76db7292af4049: + github.com/sveltejs/eslint-config/9a7d728e03ac433e5856a6e06775c17ee986d641_69bc842e7e8ce444447ce4aad7520a79: resolution: {tarball: https://codeload.github.com/sveltejs/eslint-config/tar.gz/9a7d728e03ac433e5856a6e06775c17ee986d641} id: github.com/sveltejs/eslint-config/9a7d728e03ac433e5856a6e06775c17ee986d641 name: '@sveltejs/eslint-config' @@ -6249,10 +6232,10 @@ packages: eslint-plugin-svelte3: '>= 2' typescript: '>= 3' dependencies: - '@typescript-eslint/eslint-plugin': 5.5.0_f60175165d08edf988b5aad85994517a - '@typescript-eslint/parser': 5.5.0_eslint@8.3.0+typescript@4.5.5 + '@typescript-eslint/eslint-plugin': 5.5.0_399057d0d4da33caa499d36b7c87455b + '@typescript-eslint/parser': 5.5.0_eslint@8.3.0+typescript@4.6.2 eslint: 8.3.0 eslint-plugin-import: 2.25.3_eslint@8.3.0 eslint-plugin-svelte3: 3.2.1_eslint@8.3.0 - typescript: 4.5.5 + typescript: 4.6.2 dev: true From fd728fcbf879d6a0e535de63fc33fecd1e1e5a7d Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 3 Mar 2022 08:03:19 -0500 Subject: [PATCH 2/5] Update .changeset/polite-laws-cheat.md Co-authored-by: Ignatius Bagus --- .changeset/polite-laws-cheat.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.changeset/polite-laws-cheat.md b/.changeset/polite-laws-cheat.md index b3b387e2bf78..c20a6bac17ee 100644 --- a/.changeset/polite-laws-cheat.md +++ b/.changeset/polite-laws-cheat.md @@ -1,6 +1,5 @@ --- 'create-svelte': patch -'default-template': patch '@sveltejs/kit': patch --- From ddc36e4fbfd3943c82ee5ed48f9e3724e2429539 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Thu, 3 Mar 2022 07:54:55 -0800 Subject: [PATCH 3/5] remove unnecessary path prefixes --- packages/kit/src/core/tsconfig.js | 6 +++--- .../kit/src/packaging/test/fixtures/assets/jsconfig.json | 2 +- packages/kit/test/apps/amp/tsconfig.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/kit/src/core/tsconfig.js b/packages/kit/src/core/tsconfig.js index 42f268cb316f..5ecd6ee9f265 100644 --- a/packages/kit/src/core/tsconfig.js +++ b/packages/kit/src/core/tsconfig.js @@ -29,9 +29,9 @@ export function generate_tsconfig(config) { /** @type {string[]} */ const include = []; dirs.forEach((dir) => { - include.push(config_relative(`./${dir}/**/*.js`)); - include.push(config_relative(`./${dir}/**/*.ts`)); - include.push(config_relative(`./${dir}/**/*.svelte`)); + include.push(config_relative(`${dir}/**/*.js`)); + include.push(config_relative(`${dir}/**/*.ts`)); + include.push(config_relative(`${dir}/**/*.svelte`)); }); fs.writeFileSync( diff --git a/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json b/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json index ac8f55354434..f29fde21bafc 100644 --- a/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json +++ b/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json @@ -6,5 +6,5 @@ "$lib/*": ["./src/lib/*"] } }, - "include": ["./src/**/*.d.ts", "./src/**/*.js", "./src/**/*.svelte"] + "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"] } diff --git a/packages/kit/test/apps/amp/tsconfig.json b/packages/kit/test/apps/amp/tsconfig.json index 267fe160a78e..86714a0915e0 100644 --- a/packages/kit/test/apps/amp/tsconfig.json +++ b/packages/kit/test/apps/amp/tsconfig.json @@ -2,8 +2,8 @@ "compilerOptions": { "noEmit": true, "paths": { - "$lib": ["./src/lib"], - "$lib/*": ["./src/lib/*"], + "$lib": ["src/lib"], + "$lib/*": ["src/lib/*"], "types": ["../../../types/internal"] } }, From f32d99b5d05e593a4bbf1b1abfd5b7ca69984524 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Thu, 3 Mar 2022 08:11:16 -0800 Subject: [PATCH 4/5] remove one more prefix --- packages/kit/src/packaging/test/fixtures/assets/jsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json b/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json index f29fde21bafc..92575debb461 100644 --- a/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json +++ b/packages/kit/src/packaging/test/fixtures/assets/jsconfig.json @@ -3,7 +3,7 @@ "checkJs": true, "baseUrl": ".", "paths": { - "$lib/*": ["./src/lib/*"] + "$lib/*": ["src/lib/*"] } }, "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"] From 23d18e36dcc0fb2d62a048f610ac61422187144e Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Thu, 3 Mar 2022 12:29:22 -0800 Subject: [PATCH 5/5] use sync --- packages/kit/package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/kit/package.json b/packages/kit/package.json index 74b136db716c..8aa270c68b4e 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -62,13 +62,13 @@ "lint": "eslint --ignore-path .gitignore --ignore-pattern \"src/packaging/test/**\" \"{src,test}/**/*.{ts,mjs,js,svelte}\" && npm run check-format", "check": "tsc && npm run check:integration && npm run check:prerendering", "check:integration": "npm run check:integration:amp && npm run check:integration:basics && npm run check:integration:options && npm run check:integration:options-2", - "check:integration:amp": "cd test/apps/amp && pnpm build && pnpm check", - "check:integration:basics": "cd test/apps/basics && pnpm build && pnpm check", - "check:integration:options": "cd test/apps/options && pnpm build && pnpm check", - "check:integration:options-2": "cd test/apps/options-2 && pnpm build && pnpm check", + "check:integration:amp": "cd test/apps/amp && pnpm sync && pnpm check", + "check:integration:basics": "cd test/apps/basics && pnpm sync && pnpm check", + "check:integration:options": "cd test/apps/options && pnpm sync && pnpm check", + "check:integration:options-2": "cd test/apps/options-2 && pnpm sync && pnpm check", "check:prerendering": "npm run check:prerendering:basics && npm run check:prerendering:options", - "check:prerendering:basics": "cd test/prerendering/basics && pnpm build && pnpm check", - "check:prerendering:options": "cd test/prerendering/options && pnpm build && pnpm check", + "check:prerendering:basics": "cd test/prerendering/basics && pnpm sync && pnpm check", + "check:prerendering:options": "cd test/prerendering/options && pnpm sync && pnpm check", "format": "npm run check-format -- --write", "check-format": "prettier --check . --config ../../.prettierrc --ignore-path .gitignore", "prepublishOnly": "npm run build",