From 31360fc0ec1383c87192de6c35f3d605f974723b Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Mar 2023 06:40:13 -0400 Subject: [PATCH 01/10] chore(deps): update typescript to 5.0 --- package.json | 2 +- .../create-vite/template-lit-ts/package.json | 2 +- .../template-preact-ts/package.json | 2 +- .../template-react-ts/package.json | 2 +- .../template-svelte-ts/package.json | 2 +- .../template-vanilla-ts/package.json | 2 +- .../create-vite/template-vue-ts/package.json | 2 +- pnpm-lock.yaml | 82 +++++++++---------- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 7cdd7149ec2c01..371367b8873825 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "simple-git-hooks": "^2.8.1", "tslib": "^2.5.0", "tsx": "^3.12.3", - "typescript": "^4.9.3", + "typescript": "^5.0.2", "unbuild": "^1.1.2", "vite": "workspace:*", "vitepress": "^1.0.0-alpha.49", diff --git a/packages/create-vite/template-lit-ts/package.json b/packages/create-vite/template-lit-ts/package.json index 90472689e40891..f03ef9ce12cae0 100644 --- a/packages/create-vite/template-lit-ts/package.json +++ b/packages/create-vite/template-lit-ts/package.json @@ -20,7 +20,7 @@ "lit": "^2.6.1" }, "devDependencies": { - "typescript": "^4.9.3", + "typescript": "^5.0.2", "vite": "^4.2.0" } } diff --git a/packages/create-vite/template-preact-ts/package.json b/packages/create-vite/template-preact-ts/package.json index c077e8826aa894..d01991df5d2a79 100644 --- a/packages/create-vite/template-preact-ts/package.json +++ b/packages/create-vite/template-preact-ts/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "@preact/preset-vite": "^2.5.0", - "typescript": "^4.9.3", + "typescript": "^5.0.2", "vite": "^4.2.0" } } diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json index 046d3a2cba8c69..1ae5d063c73f0d 100644 --- a/packages/create-vite/template-react-ts/package.json +++ b/packages/create-vite/template-react-ts/package.json @@ -16,7 +16,7 @@ "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", "@vitejs/plugin-react": "^3.1.0", - "typescript": "^4.9.3", + "typescript": "^5.0.2", "vite": "^4.2.0" } } diff --git a/packages/create-vite/template-svelte-ts/package.json b/packages/create-vite/template-svelte-ts/package.json index 70070a703a3266..f720373d9a20d4 100644 --- a/packages/create-vite/template-svelte-ts/package.json +++ b/packages/create-vite/template-svelte-ts/package.json @@ -15,7 +15,7 @@ "svelte": "^3.55.1", "svelte-check": "^2.10.3", "tslib": "^2.5.0", - "typescript": "^4.9.3", + "typescript": "^5.0.2", "vite": "^4.2.0" } } diff --git a/packages/create-vite/template-vanilla-ts/package.json b/packages/create-vite/template-vanilla-ts/package.json index c23eef8e5a9902..27faf90d5750dc 100644 --- a/packages/create-vite/template-vanilla-ts/package.json +++ b/packages/create-vite/template-vanilla-ts/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "devDependencies": { - "typescript": "^4.9.3", + "typescript": "^5.0.2", "vite": "^4.2.0" } } diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json index b3adc619dd6632..0f80a4f0630cc9 100644 --- a/packages/create-vite/template-vue-ts/package.json +++ b/packages/create-vite/template-vue-ts/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "@vitejs/plugin-vue": "^4.1.0", - "typescript": "^4.9.3", + "typescript": "^5.0.2", "vite": "^4.2.0", "vue-tsc": "^1.2.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index af77b56d9db759..a8e1b4ee9411d6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,7 +65,7 @@ importers: simple-git-hooks: ^2.8.1 tslib: ^2.5.0 tsx: ^3.12.3 - typescript: ^4.9.3 + typescript: ^5.0.2 unbuild: ^1.1.2 vite: workspace:* vitepress: ^1.0.0-alpha.49 @@ -74,7 +74,7 @@ importers: devDependencies: '@babel/types': 7.21.2 '@microsoft/api-extractor': 7.34.4_@types+node@18.14.6 - '@rollup/plugin-typescript': 11.0.0_4q7j355ysiiqioek4f6ex367by + '@rollup/plugin-typescript': 11.0.0_taeyxmvmc26umlo2so2an3i7iy '@types/babel__core': 7.20.0 '@types/babel__standalone': 7.1.4 '@types/convert-source-map': 2.0.0 @@ -95,8 +95,8 @@ importers: '@types/semver': 7.3.13 '@types/stylus': 0.48.38 '@types/ws': 8.5.4 - '@typescript-eslint/eslint-plugin': 5.54.1_wksqd6slyeef3jhfios3wgdgjy - '@typescript-eslint/parser': 5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy + '@typescript-eslint/eslint-plugin': 5.54.1_ptmzjahj2lzv7vrsfzwjsq4mpu + '@typescript-eslint/parser': 5.54.1_byynos7ffx3cepxtk6gvolkky4 conventional-changelog-cli: 2.2.2 eslint: 8.35.0 eslint-define-config: 1.15.0 @@ -120,7 +120,7 @@ importers: simple-git-hooks: 2.8.1 tslib: 2.5.0 tsx: 3.12.3 - typescript: 4.9.3 + typescript: 5.0.2 unbuild: 1.1.2 vite: link:packages/vite vitepress: 1.0.0-alpha.49 @@ -3243,7 +3243,7 @@ packages: rollup: 3.18.0 dev: true - /@rollup/plugin-typescript/11.0.0_4q7j355ysiiqioek4f6ex367by: + /@rollup/plugin-typescript/11.0.0_rollup@3.18.0+tslib@2.5.0: resolution: {integrity: sha512-goPyCWBiimk1iJgSTgsehFD5OOFHiAknrRJjqFCudcW8JtWiBlK284Xnn4flqMqg6YAjVG/EE+3aVzrL5qNSzQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -3260,10 +3260,9 @@ packages: resolve: 1.22.1 rollup: 3.18.0 tslib: 2.5.0 - typescript: 4.9.3 dev: true - /@rollup/plugin-typescript/11.0.0_rollup@3.18.0+tslib@2.5.0: + /@rollup/plugin-typescript/11.0.0_taeyxmvmc26umlo2so2an3i7iy: resolution: {integrity: sha512-goPyCWBiimk1iJgSTgsehFD5OOFHiAknrRJjqFCudcW8JtWiBlK284Xnn4flqMqg6YAjVG/EE+3aVzrL5qNSzQ==} engines: {node: '>=14.0.0'} peerDependencies: @@ -3280,6 +3279,7 @@ packages: resolve: 1.22.1 rollup: 3.18.0 tslib: 2.5.0 + typescript: 5.0.2 dev: true /@rollup/pluginutils/5.0.2_rollup@3.18.0: @@ -3532,7 +3532,7 @@ packages: '@types/node': 18.14.6 dev: true - /@typescript-eslint/eslint-plugin/5.54.1_wksqd6slyeef3jhfios3wgdgjy: + /@typescript-eslint/eslint-plugin/5.54.1_ptmzjahj2lzv7vrsfzwjsq4mpu: resolution: {integrity: sha512-a2RQAkosH3d3ZIV08s3DcL/mcGc2M/UC528VkPULFxR9VnVPT8pBu0IyBAJJmVsCmhVfwQX1v6q+QGnmSe1bew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3543,10 +3543,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy + '@typescript-eslint/parser': 5.54.1_byynos7ffx3cepxtk6gvolkky4 '@typescript-eslint/scope-manager': 5.54.1 - '@typescript-eslint/type-utils': 5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy - '@typescript-eslint/utils': 5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy + '@typescript-eslint/type-utils': 5.54.1_byynos7ffx3cepxtk6gvolkky4 + '@typescript-eslint/utils': 5.54.1_byynos7ffx3cepxtk6gvolkky4 debug: 4.3.4 eslint: 8.35.0 grapheme-splitter: 1.0.4 @@ -3554,13 +3554,13 @@ packages: natural-compare-lite: 1.4.0 regexpp: 3.2.0 semver: 7.3.8 - tsutils: 3.21.0_typescript@4.9.3 - typescript: 4.9.3 + tsutils: 3.21.0_typescript@5.0.2 + typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser/5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy: + /@typescript-eslint/parser/5.54.1_byynos7ffx3cepxtk6gvolkky4: resolution: {integrity: sha512-8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3572,10 +3572,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.54.1 '@typescript-eslint/types': 5.54.1 - '@typescript-eslint/typescript-estree': 5.54.1_typescript@4.9.3 + '@typescript-eslint/typescript-estree': 5.54.1_typescript@5.0.2 debug: 4.3.4 eslint: 8.35.0 - typescript: 4.9.3 + typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true @@ -3588,7 +3588,7 @@ packages: '@typescript-eslint/visitor-keys': 5.54.1 dev: true - /@typescript-eslint/type-utils/5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy: + /@typescript-eslint/type-utils/5.54.1_byynos7ffx3cepxtk6gvolkky4: resolution: {integrity: sha512-WREHsTz0GqVYLIbzIZYbmUUr95DKEKIXZNH57W3s+4bVnuF1TKe2jH8ZNH8rO1CeMY3U4j4UQeqPNkHMiGem3g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3598,12 +3598,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.54.1_typescript@4.9.3 - '@typescript-eslint/utils': 5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy + '@typescript-eslint/typescript-estree': 5.54.1_typescript@5.0.2 + '@typescript-eslint/utils': 5.54.1_byynos7ffx3cepxtk6gvolkky4 debug: 4.3.4 eslint: 8.35.0 - tsutils: 3.21.0_typescript@4.9.3 - typescript: 4.9.3 + tsutils: 3.21.0_typescript@5.0.2 + typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true @@ -3613,7 +3613,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.54.1_typescript@4.9.3: + /@typescript-eslint/typescript-estree/5.54.1_typescript@5.0.2: resolution: {integrity: sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3628,13 +3628,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0_typescript@4.9.3 - typescript: 4.9.3 + tsutils: 3.21.0_typescript@5.0.2 + typescript: 5.0.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils/5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy: + /@typescript-eslint/utils/5.54.1_byynos7ffx3cepxtk6gvolkky4: resolution: {integrity: sha512-IY5dyQM8XD1zfDe5X8jegX6r2EVU5o/WJnLu/znLPWCBF7KNGC+adacXnt5jEYS9JixDcoccI6CvE4RCjHMzCQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3644,7 +3644,7 @@ packages: '@types/semver': 7.3.13 '@typescript-eslint/scope-manager': 5.54.1 '@typescript-eslint/types': 5.54.1 - '@typescript-eslint/typescript-estree': 5.54.1_typescript@4.9.3 + '@typescript-eslint/typescript-estree': 5.54.1_typescript@5.0.2 eslint: 8.35.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.35.0 @@ -5491,7 +5491,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy + '@typescript-eslint/parser': 5.54.1_byynos7ffx3cepxtk6gvolkky4 debug: 3.2.7 eslint: 8.35.0 eslint-import-resolver-node: 0.3.7 @@ -5520,7 +5520,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.54.1_xuldgrnu4vn5qn4xqhn42sfwvy + '@typescript-eslint/parser': 5.54.1_byynos7ffx3cepxtk6gvolkky4 array-includes: 3.1.6 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 @@ -8516,14 +8516,14 @@ packages: hasBin: true dev: true - /rollup-plugin-dts/5.2.0_fn2onl6nbsljlgjr3jlzr6w7we: - resolution: {integrity: sha512-B68T/haEu2MKcz4kNUhXB8/h5sq4gpplHAJIYNHbh8cp4ZkvzDvNca/11KQdFrB9ZeKucegQIotzo5T0JUtM8w==} + /rollup-plugin-dts/5.3.0_fn2onl6nbsljlgjr3jlzr6w7we: + resolution: {integrity: sha512-8FXp0ZkyZj1iU5klkIJYLjIq/YZSwBoERu33QBDxm/1yw5UU4txrEtcmMkrq+ZiKu3Q4qvPCNqc3ovX6rjqzbQ==} engines: {node: '>=v14'} peerDependencies: rollup: ^3.0.0 - typescript: ^4.1 + typescript: ^4.1 || ^5.0 dependencies: - magic-string: 0.29.0 + magic-string: 0.30.0 rollup: 3.18.0 typescript: 4.9.5 optionalDependencies: @@ -9311,14 +9311,14 @@ packages: resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==} dev: true - /tsutils/3.21.0_typescript@4.9.3: + /tsutils/3.21.0_typescript@5.0.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.9.3 + typescript: 5.0.2 dev: true /tsx/3.12.3: @@ -9404,15 +9404,15 @@ packages: hasBin: true dev: true - /typescript/4.9.3: - resolution: {integrity: sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==} + /typescript/4.9.5: + resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} engines: {node: '>=4.2.0'} hasBin: true dev: true - /typescript/4.9.5: - resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} - engines: {node: '>=4.2.0'} + /typescript/5.0.2: + resolution: {integrity: sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==} + engines: {node: '>=12.20'} hasBin: true dev: true @@ -9480,7 +9480,7 @@ packages: pkg-types: 1.0.2 pretty-bytes: 6.1.0 rollup: 3.18.0 - rollup-plugin-dts: 5.2.0_fn2onl6nbsljlgjr3jlzr6w7we + rollup-plugin-dts: 5.3.0_fn2onl6nbsljlgjr3jlzr6w7we scule: 1.0.0 typescript: 4.9.5 untyped: 1.2.2 From 495bda873cd6a869bfc35b798fb2ebeb21079f6b Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Mar 2023 06:45:33 -0400 Subject: [PATCH 02/10] fix(types): use `--moduleResolution bundler` --- packages/create-vite/template-lit-ts/tsconfig.json | 2 +- packages/create-vite/template-lit-ts/tsconfig.node.json | 2 +- packages/create-vite/template-preact-ts/tsconfig.json | 2 +- packages/create-vite/template-preact-ts/tsconfig.node.json | 2 +- packages/create-vite/template-react-ts/tsconfig.json | 2 +- packages/create-vite/template-react-ts/tsconfig.node.json | 2 +- packages/create-vite/template-svelte-ts/tsconfig.node.json | 2 +- packages/create-vite/template-svelte/jsconfig.json | 2 +- packages/create-vite/template-vanilla-ts/tsconfig.json | 2 +- packages/create-vite/template-vue-ts/tsconfig.json | 2 +- packages/create-vite/template-vue-ts/tsconfig.node.json | 2 +- packages/create-vite/tsconfig.json | 2 +- packages/plugin-legacy/tsconfig.json | 2 +- packages/vite/tsconfig.base.json | 2 +- playground/hmr/tsconfig.json | 2 +- playground/tsconfig-json-load-error/tsconfig.json | 2 +- playground/tsconfig-json/nested/tsconfig.json | 2 +- playground/tsconfig-json/tsconfig.json | 2 +- playground/tsconfig.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/create-vite/template-lit-ts/tsconfig.json b/packages/create-vite/template-lit-ts/tsconfig.json index b080b2b2cd41a7..be3670f8b10a2c 100644 --- a/packages/create-vite/template-lit-ts/tsconfig.json +++ b/packages/create-vite/template-lit-ts/tsconfig.json @@ -10,7 +10,7 @@ "noUnusedParameters": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, - "moduleResolution": "Node", + "moduleResolution": "bundler", "isolatedModules": true, "allowSyntheticDefaultImports": true, "experimentalDecorators": true, diff --git a/packages/create-vite/template-lit-ts/tsconfig.node.json b/packages/create-vite/template-lit-ts/tsconfig.node.json index 9d31e2aed93c87..a535f7d4d20b7d 100644 --- a/packages/create-vite/template-lit-ts/tsconfig.node.json +++ b/packages/create-vite/template-lit-ts/tsconfig.node.json @@ -2,7 +2,7 @@ "compilerOptions": { "composite": true, "module": "ESNext", - "moduleResolution": "Node", + "moduleResolution": "bundler", "allowSyntheticDefaultImports": true }, "include": ["vite.config.ts"] diff --git a/packages/create-vite/template-preact-ts/tsconfig.json b/packages/create-vite/template-preact-ts/tsconfig.json index 9c1b1e0aa6f1df..9859ee697cf526 100644 --- a/packages/create-vite/template-preact-ts/tsconfig.json +++ b/packages/create-vite/template-preact-ts/tsconfig.json @@ -10,7 +10,7 @@ "strict": true, "forceConsistentCasingInFileNames": true, "module": "ESNext", - "moduleResolution": "Node", + "moduleResolution": "bundler", "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, diff --git a/packages/create-vite/template-preact-ts/tsconfig.node.json b/packages/create-vite/template-preact-ts/tsconfig.node.json index 9d31e2aed93c87..a535f7d4d20b7d 100644 --- a/packages/create-vite/template-preact-ts/tsconfig.node.json +++ b/packages/create-vite/template-preact-ts/tsconfig.node.json @@ -2,7 +2,7 @@ "compilerOptions": { "composite": true, "module": "ESNext", - "moduleResolution": "Node", + "moduleResolution": "bundler", "allowSyntheticDefaultImports": true }, "include": ["vite.config.ts"] diff --git a/packages/create-vite/template-react-ts/tsconfig.json b/packages/create-vite/template-react-ts/tsconfig.json index 3d0a51a86e2024..14652d0126f380 100644 --- a/packages/create-vite/template-react-ts/tsconfig.json +++ b/packages/create-vite/template-react-ts/tsconfig.json @@ -10,7 +10,7 @@ "strict": true, "forceConsistentCasingInFileNames": true, "module": "ESNext", - "moduleResolution": "Node", + "moduleResolution": "bundler", "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, diff --git a/packages/create-vite/template-react-ts/tsconfig.node.json b/packages/create-vite/template-react-ts/tsconfig.node.json index 9d31e2aed93c87..a535f7d4d20b7d 100644 --- a/packages/create-vite/template-react-ts/tsconfig.node.json +++ b/packages/create-vite/template-react-ts/tsconfig.node.json @@ -2,7 +2,7 @@ "compilerOptions": { "composite": true, "module": "ESNext", - "moduleResolution": "Node", + "moduleResolution": "bundler", "allowSyntheticDefaultImports": true }, "include": ["vite.config.ts"] diff --git a/packages/create-vite/template-svelte-ts/tsconfig.node.json b/packages/create-vite/template-svelte-ts/tsconfig.node.json index 65dbdb96ae5dcf..28c03f42c4565b 100644 --- a/packages/create-vite/template-svelte-ts/tsconfig.node.json +++ b/packages/create-vite/template-svelte-ts/tsconfig.node.json @@ -2,7 +2,7 @@ "compilerOptions": { "composite": true, "module": "ESNext", - "moduleResolution": "Node" + "moduleResolution": "bundler" }, "include": ["vite.config.ts"] } diff --git a/packages/create-vite/template-svelte/jsconfig.json b/packages/create-vite/template-svelte/jsconfig.json index e596c582326d98..9aae19ac733b3f 100644 --- a/packages/create-vite/template-svelte/jsconfig.json +++ b/packages/create-vite/template-svelte/jsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "moduleResolution": "Node", + "moduleResolution": "bundler", "target": "ESNext", "module": "ESNext", /** diff --git a/packages/create-vite/template-vanilla-ts/tsconfig.json b/packages/create-vite/template-vanilla-ts/tsconfig.json index eac16d14a6f2e2..08fa7f8a928ed9 100644 --- a/packages/create-vite/template-vanilla-ts/tsconfig.json +++ b/packages/create-vite/template-vanilla-ts/tsconfig.json @@ -4,7 +4,7 @@ "useDefineForClassFields": true, "module": "ESNext", "lib": ["ESNext", "DOM"], - "moduleResolution": "Node", + "moduleResolution": "bundler", "strict": true, "resolveJsonModule": true, "isolatedModules": true, diff --git a/packages/create-vite/template-vue-ts/tsconfig.json b/packages/create-vite/template-vue-ts/tsconfig.json index b557c4047cac64..ffb2e9b4969404 100644 --- a/packages/create-vite/template-vue-ts/tsconfig.json +++ b/packages/create-vite/template-vue-ts/tsconfig.json @@ -3,7 +3,7 @@ "target": "ESNext", "useDefineForClassFields": true, "module": "ESNext", - "moduleResolution": "Node", + "moduleResolution": "bundler", "strict": true, "jsx": "preserve", "resolveJsonModule": true, diff --git a/packages/create-vite/template-vue-ts/tsconfig.node.json b/packages/create-vite/template-vue-ts/tsconfig.node.json index 9d31e2aed93c87..a535f7d4d20b7d 100644 --- a/packages/create-vite/template-vue-ts/tsconfig.node.json +++ b/packages/create-vite/template-vue-ts/tsconfig.node.json @@ -2,7 +2,7 @@ "compilerOptions": { "composite": true, "module": "ESNext", - "moduleResolution": "Node", + "moduleResolution": "bundler", "allowSyntheticDefaultImports": true }, "include": ["vite.config.ts"] diff --git a/packages/create-vite/tsconfig.json b/packages/create-vite/tsconfig.json index 3a66e6179b5f97..65fffe74592b9b 100644 --- a/packages/create-vite/tsconfig.json +++ b/packages/create-vite/tsconfig.json @@ -4,7 +4,7 @@ "outDir": "dist", "target": "ES2020", "module": "ES2020", - "moduleResolution": "Node", + "moduleResolution": "bundler", "strict": true, "skipLibCheck": true, "declaration": false, diff --git a/packages/plugin-legacy/tsconfig.json b/packages/plugin-legacy/tsconfig.json index bd94458fe2dc28..1568027402c01d 100644 --- a/packages/plugin-legacy/tsconfig.json +++ b/packages/plugin-legacy/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "dist", "target": "ES2020", "module": "ES2020", - "moduleResolution": "Node", + "moduleResolution": "bundler", "strict": true, "declaration": true, "sourceMap": true, diff --git a/packages/vite/tsconfig.base.json b/packages/vite/tsconfig.base.json index 37eb865185662d..7b3e7cfeebf2b2 100644 --- a/packages/vite/tsconfig.base.json +++ b/packages/vite/tsconfig.base.json @@ -2,7 +2,7 @@ "compilerOptions": { "target": "ES2020", "module": "ESNext", - "moduleResolution": "node", + "moduleResolution": "bundler", "strict": true, "declaration": true, "noImplicitOverride": true, diff --git a/playground/hmr/tsconfig.json b/playground/hmr/tsconfig.json index b9fb7448b41d60..ca98b7ce20a3ca 100644 --- a/playground/hmr/tsconfig.json +++ b/playground/hmr/tsconfig.json @@ -8,7 +8,7 @@ "outDir": "dist", "allowJs": true, "esModuleInterop": true, - "moduleResolution": "Node", + "moduleResolution": "bundler", "baseUrl": ".", "jsx": "preserve", "types": ["vite/client", "node"] diff --git a/playground/tsconfig-json-load-error/tsconfig.json b/playground/tsconfig-json-load-error/tsconfig.json index e91cdec493e28f..f15aff13b3bc35 100644 --- a/playground/tsconfig-json-load-error/tsconfig.json +++ b/playground/tsconfig-json-load-error/tsconfig.json @@ -3,7 +3,7 @@ "target": "ESNext", "module": "ESNext", "lib": ["ESNext", "DOM"], - "moduleResolution": "Node", + "moduleResolution": "bundler", "strict": true, "sourceMap": true, "resolveJsonModule": true, diff --git a/playground/tsconfig-json/nested/tsconfig.json b/playground/tsconfig-json/nested/tsconfig.json index 23b6b8779f649a..9d7016bdfc7b9e 100644 --- a/playground/tsconfig-json/nested/tsconfig.json +++ b/playground/tsconfig-json/nested/tsconfig.json @@ -5,7 +5,7 @@ "target": "ESNext", "module": "ESNext", "lib": ["ESNext", "DOM"], - "moduleResolution": "Node", + "moduleResolution": "bundler", "strict": true, "sourceMap": true, "resolveJsonModule": true, diff --git a/playground/tsconfig-json/tsconfig.json b/playground/tsconfig-json/tsconfig.json index e91cdec493e28f..f15aff13b3bc35 100644 --- a/playground/tsconfig-json/tsconfig.json +++ b/playground/tsconfig-json/tsconfig.json @@ -3,7 +3,7 @@ "target": "ESNext", "module": "ESNext", "lib": ["ESNext", "DOM"], - "moduleResolution": "Node", + "moduleResolution": "bundler", "strict": true, "sourceMap": true, "resolveJsonModule": true, diff --git a/playground/tsconfig.json b/playground/tsconfig.json index faef2fc5dfa7ed..ff409529cce345 100644 --- a/playground/tsconfig.json +++ b/playground/tsconfig.json @@ -10,7 +10,7 @@ "allowJs": true, "esModuleInterop": true, "resolveJsonModule": true, - "moduleResolution": "Node", + "moduleResolution": "bundler", "skipLibCheck": true, "noUnusedLocals": true, "jsx": "preserve", From 797c86cc3d02f46424c08dd016e6e88927ba95ca Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Mar 2023 07:13:45 -0400 Subject: [PATCH 03/10] fix(types): use standard decorators --- packages/create-vite/template-lit-ts/tsconfig.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/create-vite/template-lit-ts/tsconfig.json b/packages/create-vite/template-lit-ts/tsconfig.json index be3670f8b10a2c..3310f0a43f57c4 100644 --- a/packages/create-vite/template-lit-ts/tsconfig.json +++ b/packages/create-vite/template-lit-ts/tsconfig.json @@ -13,7 +13,6 @@ "moduleResolution": "bundler", "isolatedModules": true, "allowSyntheticDefaultImports": true, - "experimentalDecorators": true, "forceConsistentCasingInFileNames": true, "useDefineForClassFields": false, "skipLibCheck": true From e0264382e487ae826fb43441c81c46c2229e95fb Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Mar 2023 07:15:11 -0400 Subject: [PATCH 04/10] fix(types): use `--verbatimModuleSyntax` --- packages/create-vite/template-svelte/jsconfig.json | 2 +- playground/tsconfig-json-load-error/tsconfig.json | 2 +- playground/tsconfig-json/tsconfig.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create-vite/template-svelte/jsconfig.json b/packages/create-vite/template-svelte/jsconfig.json index 9aae19ac733b3f..714758933a2067 100644 --- a/packages/create-vite/template-svelte/jsconfig.json +++ b/packages/create-vite/template-svelte/jsconfig.json @@ -8,7 +8,7 @@ * a value or a type, so tell TypeScript to enforce using * `import type` instead of `import` for Types. */ - "importsNotUsedAsValues": "error", + "verbatimModuleSyntax": true, "isolatedModules": true, "resolveJsonModule": true, /** diff --git a/playground/tsconfig-json-load-error/tsconfig.json b/playground/tsconfig-json-load-error/tsconfig.json index f15aff13b3bc35..3439b3583174de 100644 --- a/playground/tsconfig-json-load-error/tsconfig.json +++ b/playground/tsconfig-json-load-error/tsconfig.json @@ -14,7 +14,7 @@ "noImplicitReturns": true, "useDefineForClassFields": true, - "importsNotUsedAsValues": "preserve" + "verbatimModuleSyntax": true }, "include": ["./src"] } diff --git a/playground/tsconfig-json/tsconfig.json b/playground/tsconfig-json/tsconfig.json index f15aff13b3bc35..3439b3583174de 100644 --- a/playground/tsconfig-json/tsconfig.json +++ b/playground/tsconfig-json/tsconfig.json @@ -14,7 +14,7 @@ "noImplicitReturns": true, "useDefineForClassFields": true, - "importsNotUsedAsValues": "preserve" + "verbatimModuleSyntax": true }, "include": ["./src"] } From 330154b01c9715aa530ae337ec0fec50f90dce85 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Mar 2023 07:16:49 -0400 Subject: [PATCH 05/10] chore(types): use new default flag `--forceConsistentCasingInFileNames` is no longer necessary --- packages/create-vite/template-lit-ts/tsconfig.json | 1 - packages/create-vite/template-preact-ts/tsconfig.json | 1 - packages/create-vite/template-react-ts/tsconfig.json | 1 - packages/create-vite/template-svelte/jsconfig.json | 1 - scripts/tsconfig.json | 3 +-- 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/create-vite/template-lit-ts/tsconfig.json b/packages/create-vite/template-lit-ts/tsconfig.json index 3310f0a43f57c4..29cdf0855ca3cb 100644 --- a/packages/create-vite/template-lit-ts/tsconfig.json +++ b/packages/create-vite/template-lit-ts/tsconfig.json @@ -13,7 +13,6 @@ "moduleResolution": "bundler", "isolatedModules": true, "allowSyntheticDefaultImports": true, - "forceConsistentCasingInFileNames": true, "useDefineForClassFields": false, "skipLibCheck": true }, diff --git a/packages/create-vite/template-preact-ts/tsconfig.json b/packages/create-vite/template-preact-ts/tsconfig.json index 9859ee697cf526..cfc4dec8c13935 100644 --- a/packages/create-vite/template-preact-ts/tsconfig.json +++ b/packages/create-vite/template-preact-ts/tsconfig.json @@ -8,7 +8,6 @@ "esModuleInterop": false, "allowSyntheticDefaultImports": true, "strict": true, - "forceConsistentCasingInFileNames": true, "module": "ESNext", "moduleResolution": "bundler", "resolveJsonModule": true, diff --git a/packages/create-vite/template-react-ts/tsconfig.json b/packages/create-vite/template-react-ts/tsconfig.json index 14652d0126f380..d0a38be3ee33ba 100644 --- a/packages/create-vite/template-react-ts/tsconfig.json +++ b/packages/create-vite/template-react-ts/tsconfig.json @@ -8,7 +8,6 @@ "esModuleInterop": false, "allowSyntheticDefaultImports": true, "strict": true, - "forceConsistentCasingInFileNames": true, "module": "ESNext", "moduleResolution": "bundler", "resolveJsonModule": true, diff --git a/packages/create-vite/template-svelte/jsconfig.json b/packages/create-vite/template-svelte/jsconfig.json index 714758933a2067..5696a2de74a0cd 100644 --- a/packages/create-vite/template-svelte/jsconfig.json +++ b/packages/create-vite/template-svelte/jsconfig.json @@ -18,7 +18,6 @@ "sourceMap": true, "esModuleInterop": true, "skipLibCheck": true, - "forceConsistentCasingInFileNames": true, /** * Typecheck JS in `.svelte` and `.js` files by default. * Disable this if you'd like to use dynamic types. diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json index 3c25c197e231b4..06fd68cfc95572 100644 --- a/scripts/tsconfig.json +++ b/scripts/tsconfig.json @@ -8,7 +8,6 @@ "strict": true, "esModuleInterop": true, "skipLibCheck": true, - "noUnusedLocals": true, - "forceConsistentCasingInFileNames": true + "noUnusedLocals": true } } From 8d03a8edb11c37b271ec604341472382b87eb0fc Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Mar 2023 10:42:26 -0400 Subject: [PATCH 06/10] fix(types): revert `--moduleResolution bundler` --- packages/vite/tsconfig.base.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/tsconfig.base.json b/packages/vite/tsconfig.base.json index 7b3e7cfeebf2b2..37eb865185662d 100644 --- a/packages/vite/tsconfig.base.json +++ b/packages/vite/tsconfig.base.json @@ -2,7 +2,7 @@ "compilerOptions": { "target": "ES2020", "module": "ESNext", - "moduleResolution": "bundler", + "moduleResolution": "node", "strict": true, "declaration": true, "noImplicitOverride": true, From 7b7ab8fc977e92e51da06584e263ded3a5b07597 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Mar 2023 11:16:12 -0400 Subject: [PATCH 07/10] fix: `Unused '@ts-expect-error' directive.` errors --- packages/plugin-legacy/src/index.ts | 3 --- packages/vite/src/node/server/pluginContainer.ts | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/plugin-legacy/src/index.ts b/packages/plugin-legacy/src/index.ts index 84453271e65736..4cfa5532d489a9 100644 --- a/packages/plugin-legacy/src/index.ts +++ b/packages/plugin-legacy/src/index.ts @@ -397,16 +397,13 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] { return null } - // @ts-expect-error avoid esbuild transform on legacy chunks since it produces // legacy-unsafe code - e.g. rewriting object properties into shorthands opts.__vite_skip_esbuild__ = true - // @ts-expect-error force terser for legacy chunks. This only takes effect if // minification isn't disabled, because that leaves out the terser plugin // entirely. opts.__vite_force_terser__ = true - // @ts-expect-error In the `generateBundle` hook, // we'll delete the assets from the legacy bundle to avoid emitting duplicate assets. // But that's still a waste of computing resource. // So we add this flag to avoid emitting the asset in the first place whenever possible. diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts index bb28767f414b0b..ce819ddb3537d2 100644 --- a/packages/vite/src/node/server/pluginContainer.ts +++ b/packages/vite/src/node/server/pluginContainer.ts @@ -201,7 +201,8 @@ export async function createPluginContainer( for (const plugin of getSortedPlugins(hookName)) { const hook = plugin[hookName] if (!hook) continue - // @ts-expect-error hook is not a primitive + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore hook is not a primitive const handler: Function = 'handler' in hook ? hook.handler : hook if ((hook as { sequential?: boolean }).sequential) { await Promise.all(parallelPromises) From e430c4149cd8c040cdb424b6f10c715185572ca1 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Sun, 19 Mar 2023 11:23:42 -0400 Subject: [PATCH 08/10] fix(types): revert `--moduleResolution bundler` --- packages/plugin-legacy/src/index.ts | 3 +++ packages/plugin-legacy/tsconfig.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/plugin-legacy/src/index.ts b/packages/plugin-legacy/src/index.ts index 4cfa5532d489a9..84453271e65736 100644 --- a/packages/plugin-legacy/src/index.ts +++ b/packages/plugin-legacy/src/index.ts @@ -397,13 +397,16 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] { return null } + // @ts-expect-error avoid esbuild transform on legacy chunks since it produces // legacy-unsafe code - e.g. rewriting object properties into shorthands opts.__vite_skip_esbuild__ = true + // @ts-expect-error force terser for legacy chunks. This only takes effect if // minification isn't disabled, because that leaves out the terser plugin // entirely. opts.__vite_force_terser__ = true + // @ts-expect-error In the `generateBundle` hook, // we'll delete the assets from the legacy bundle to avoid emitting duplicate assets. // But that's still a waste of computing resource. // So we add this flag to avoid emitting the asset in the first place whenever possible. diff --git a/packages/plugin-legacy/tsconfig.json b/packages/plugin-legacy/tsconfig.json index 1568027402c01d..bd94458fe2dc28 100644 --- a/packages/plugin-legacy/tsconfig.json +++ b/packages/plugin-legacy/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "dist", "target": "ES2020", "module": "ES2020", - "moduleResolution": "bundler", + "moduleResolution": "Node", "strict": true, "declaration": true, "sourceMap": true, From 224387d1791826bff09e40e3bb5b7da35a7f8343 Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Mon, 20 Mar 2023 03:03:11 -0400 Subject: [PATCH 09/10] chore(deps): update prettier for typescript 5.0 --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 371367b8873825..a2ae5066bd3c4c 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "npm-run-all": "^4.1.5", "picocolors": "^1.0.0", "playwright-chromium": "^1.31.2", - "prettier": "2.8.4", + "prettier": "2.8.5", "prompts": "^2.4.2", "resolve": "^1.22.1", "rimraf": "^4.1.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a8e1b4ee9411d6..e9c54c7ea1bcb3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,7 +56,7 @@ importers: npm-run-all: ^4.1.5 picocolors: ^1.0.0 playwright-chromium: ^1.31.2 - prettier: 2.8.4 + prettier: 2.8.5 prompts: ^2.4.2 resolve: ^1.22.1 rimraf: ^4.1.2 @@ -111,7 +111,7 @@ importers: npm-run-all: 4.1.5 picocolors: 1.0.0 playwright-chromium: 1.31.2 - prettier: 2.8.4 + prettier: 2.8.5 prompts: 2.4.2 resolve: 1.22.1 rimraf: 4.1.2 @@ -8055,8 +8055,8 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier/2.8.4: - resolution: {integrity: sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==} + /prettier/2.8.5: + resolution: {integrity: sha512-3gzuxrHbKUePRBB4ZeU08VNkUcqEHaUaouNt0m7LGP4Hti/NuB07C7PPTM/LkWqXoJYJn2McEo5+kxPNrtQkLQ==} engines: {node: '>=10.13.0'} hasBin: true dev: true From 87796f9c05b971d6cfc31d53cc8e0da03beaa9db Mon Sep 17 00:00:00 2001 From: Nick McCurdy Date: Mon, 20 Mar 2023 05:28:04 -0400 Subject: [PATCH 10/10] fix(types): revert `--verbatimModuleSyntax` --- playground/tsconfig-json-load-error/tsconfig.json | 2 +- playground/tsconfig-json/tsconfig.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playground/tsconfig-json-load-error/tsconfig.json b/playground/tsconfig-json-load-error/tsconfig.json index 3439b3583174de..f15aff13b3bc35 100644 --- a/playground/tsconfig-json-load-error/tsconfig.json +++ b/playground/tsconfig-json-load-error/tsconfig.json @@ -14,7 +14,7 @@ "noImplicitReturns": true, "useDefineForClassFields": true, - "verbatimModuleSyntax": true + "importsNotUsedAsValues": "preserve" }, "include": ["./src"] } diff --git a/playground/tsconfig-json/tsconfig.json b/playground/tsconfig-json/tsconfig.json index 3439b3583174de..f15aff13b3bc35 100644 --- a/playground/tsconfig-json/tsconfig.json +++ b/playground/tsconfig-json/tsconfig.json @@ -14,7 +14,7 @@ "noImplicitReturns": true, "useDefineForClassFields": true, - "verbatimModuleSyntax": true + "importsNotUsedAsValues": "preserve" }, "include": ["./src"] }