diff --git a/package.json b/package.json index d7988c786af75c..0f4075608f42b8 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "simple-git-hooks": "^2.8.1", "tslib": "^2.4.1", "tsx": "^3.12.1", - "typescript": "^4.6.4", + "typescript": "^4.9.3", "unbuild": "^0.9.4", "vite": "workspace:*", "vitepress": "^1.0.0-alpha.29", diff --git a/packages/create-vite/template-lit-ts/package.json b/packages/create-vite/template-lit-ts/package.json index 5fdfb4ac2d4ec4..eabef6196db084 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.4.1" }, "devDependencies": { - "typescript": "^4.6.4", + "typescript": "^4.9.3", "vite": "^3.2.4" } } diff --git a/packages/create-vite/template-preact-ts/package.json b/packages/create-vite/template-preact-ts/package.json index f3379cbff4ab5e..865278d940162a 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.4.0", - "typescript": "^4.6.4", + "typescript": "^4.9.3", "vite": "^3.2.4" } } diff --git a/packages/create-vite/template-react-ts/package.json b/packages/create-vite/template-react-ts/package.json index 416319d9f81005..2e08ad727123de 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.26", "@types/react-dom": "^18.0.9", "@vitejs/plugin-react": "^3.0.0-alpha.2", - "typescript": "^4.6.4", + "typescript": "^4.9.3", "vite": "^3.2.4" } } diff --git a/packages/create-vite/template-svelte-ts/package.json b/packages/create-vite/template-svelte-ts/package.json index 87796d3186b1c4..ba6a1300d0b228 100644 --- a/packages/create-vite/template-svelte-ts/package.json +++ b/packages/create-vite/template-svelte-ts/package.json @@ -16,7 +16,7 @@ "svelte-check": "^2.10.0", "svelte-preprocess": "^4.10.7", "tslib": "^2.4.1", - "typescript": "^4.6.4", + "typescript": "^4.9.3", "vite": "^3.2.4" } } diff --git a/packages/create-vite/template-vanilla-ts/package.json b/packages/create-vite/template-vanilla-ts/package.json index 35fe00aff04f46..e149a84d2cdd94 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.6.4", + "typescript": "^4.9.3", "vite": "^3.2.4" } } diff --git a/packages/create-vite/template-vue-ts/package.json b/packages/create-vite/template-vue-ts/package.json index 202964b0a254d9..d1ea63e2c53463 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.0.0-alpha.2", - "typescript": "^4.6.4", + "typescript": "^4.9.3", "vite": "^3.2.4", "vue-tsc": "^1.0.11" } diff --git a/packages/vite/src/client/client.ts b/packages/vite/src/client/client.ts index 6935b8e5c3dbaf..b010298116d25e 100644 --- a/packages/vite/src/client/client.ts +++ b/packages/vite/src/client/client.ts @@ -358,12 +358,9 @@ export function updateStyle(id: string, content: string): void { if (!style) { style = new CSSStyleSheet() - // @ts-expect-error: using experimental API style.replaceSync(content) - // @ts-expect-error: using experimental API document.adoptedStyleSheets = [...document.adoptedStyleSheets, style] } else { - // @ts-expect-error: using experimental API style.replaceSync(content) } } else { @@ -389,7 +386,6 @@ export function removeStyle(id: string): void { const style = sheetsMap.get(id) if (style) { if (style instanceof CSSStyleSheet) { - // @ts-expect-error: using experimental API document.adoptedStyleSheets = document.adoptedStyleSheets.filter( (s: CSSStyleSheet) => s !== style, ) diff --git a/packages/vite/src/node/__tests__/build.spec.ts b/packages/vite/src/node/__tests__/build.spec.ts index 67cdcdfe60075b..a77ef0d67b410b 100644 --- a/packages/vite/src/node/__tests__/build.spec.ts +++ b/packages/vite/src/node/__tests__/build.spec.ts @@ -421,7 +421,6 @@ describe('resolveBuildOutputs', () => { }) test('array outputs: should ignore build.lib.formats', () => { - // @ts-expect-error mock Logger const log = { warn: vi.fn() } as Logger expect( resolveBuildOutputs( diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index 2fbc35793b395a..9fab5281602e1f 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -1737,7 +1737,7 @@ const less: StylePreprocessor = async (source, root, options, resolvers) => { // normalize error info const normalizedError: RollupError = new Error( `[less] ${error.message || error.type}`, - ) + ) as RollupError normalizedError.loc = { file: error.filename || options.filename, line: error.line, diff --git a/packages/vite/src/node/plugins/index.ts b/packages/vite/src/node/plugins/index.ts index 43d5b5eeecb027..1dbd8bf90b95fc 100644 --- a/packages/vite/src/node/plugins/index.ts +++ b/packages/vite/src/node/plugins/index.ts @@ -121,8 +121,9 @@ export function createPluginHookUtils( return plugins .map((p) => { const hook = p[hookName]! - // @ts-expect-error cast - return 'handler' in hook ? hook.handler : hook + return typeof hook === 'object' && 'handler' in hook + ? hook.handler + : hook }) .filter(Boolean) } diff --git a/packages/vite/src/node/server/pluginContainer.ts b/packages/vite/src/node/server/pluginContainer.ts index b6eb4e5904c888..5bed7121b877e2 100644 --- a/packages/vite/src/node/server/pluginContainer.ts +++ b/packages/vite/src/node/server/pluginContainer.ts @@ -201,6 +201,7 @@ export async function createPluginContainer( for (const plugin of getSortedPlugins(hookName)) { const hook = plugin[hookName] if (!hook) continue + // @ts-expect-error const handler: Function = 'handler' in hook ? hook.handler : hook if ((hook as { sequential?: boolean }).sequential) { await Promise.all(parallelPromises) diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts index c500462fd56671..2aeaf0691b39cb 100644 --- a/packages/vite/src/node/utils.ts +++ b/packages/vite/src/node/utils.ts @@ -646,7 +646,7 @@ function splitSrcSetDescriptor(srcs: string): ImageCandidate[] { return splitSrcSet(srcs) .map((s) => { const src = s.replace(escapedSpaceCharacters, ' ').trim() - const [url] = imageSetUrlRE.exec(src) || [] + const [url] = imageSetUrlRE.exec(src) || [''] return { url, @@ -884,6 +884,7 @@ export async function resolveServerUrls( // Node < v18 ((typeof detail.family === 'string' && detail.family === 'IPv4') || // Node >= v18 + // @ts-expect-error (typeof detail.family === 'number' && detail.family === 4)), ) .forEach((detail) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4802e8027fc290..bc6e5da39c3241 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -64,7 +64,7 @@ importers: simple-git-hooks: ^2.8.1 tslib: ^2.4.1 tsx: ^3.12.1 - typescript: ^4.6.4 + typescript: ^4.9.3 unbuild: ^0.9.4 vite: workspace:* vitepress: ^1.0.0-alpha.29 @@ -73,7 +73,7 @@ importers: devDependencies: '@babel/types': 7.20.5 '@microsoft/api-extractor': 7.33.6 - '@rollup/plugin-typescript': 10.0.1_4rqeiu52ahqktllsni6g3hsqi4 + '@rollup/plugin-typescript': 10.0.1_oppo65ix4bcss3dqbddwor3cly '@types/babel__core': 7.1.20 '@types/babel__standalone': 7.1.4 '@types/convert-source-map': 1.5.2 @@ -93,8 +93,8 @@ importers: '@types/semver': 7.3.13 '@types/stylus': 0.48.38 '@types/ws': 8.5.3 - '@typescript-eslint/eslint-plugin': 5.45.0_ztdki63icyzft2wgp7jrxjlt7u - '@typescript-eslint/parser': 5.45.0_x7iytnlsncag3ywnbwokfm3b6m + '@typescript-eslint/eslint-plugin': 5.45.0_yjegg5cyoezm3fzsmuszzhetym + '@typescript-eslint/parser': 5.45.0_s5ps7njkmjlaqajutnox5ntcla conventional-changelog-cli: 2.2.2 esbuild: 0.15.11 eslint: 8.29.0 @@ -121,7 +121,7 @@ importers: simple-git-hooks: 2.8.1 tslib: 2.4.1 tsx: 3.12.1 - typescript: 4.6.4 + typescript: 4.9.3 unbuild: 0.9.4 vite: link:packages/vite vitepress: 1.0.0-alpha.29 @@ -1830,7 +1830,7 @@ packages: rollup: 3.6.0 dev: true - /@rollup/plugin-typescript/10.0.1_4rqeiu52ahqktllsni6g3hsqi4: + /@rollup/plugin-typescript/10.0.1_oppo65ix4bcss3dqbddwor3cly: resolution: {integrity: sha512-wBykxRLlX7EzL8BmUqMqk5zpx2onnmRMSw/l9M1sVfkJvdwfxogZQVNUM9gVMJbjRLDR5H6U0OMOrlDGmIV45A==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1847,7 +1847,7 @@ packages: resolve: 1.22.1 rollup: 3.6.0 tslib: 2.4.1 - typescript: 4.6.4 + typescript: 4.9.3 dev: true /@rollup/plugin-typescript/10.0.1_rollup@3.6.0+tslib@2.4.1: @@ -2114,7 +2114,7 @@ packages: '@types/node': 18.11.10 dev: true - /@typescript-eslint/eslint-plugin/5.45.0_ztdki63icyzft2wgp7jrxjlt7u: + /@typescript-eslint/eslint-plugin/5.45.0_yjegg5cyoezm3fzsmuszzhetym: resolution: {integrity: sha512-CXXHNlf0oL+Yg021cxgOdMHNTXD17rHkq7iW6RFHoybdFgQBjU3yIXhhcPpGwr1CjZlo6ET8C6tzX5juQoXeGA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2125,23 +2125,23 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.45.0_x7iytnlsncag3ywnbwokfm3b6m + '@typescript-eslint/parser': 5.45.0_s5ps7njkmjlaqajutnox5ntcla '@typescript-eslint/scope-manager': 5.45.0 - '@typescript-eslint/type-utils': 5.45.0_x7iytnlsncag3ywnbwokfm3b6m - '@typescript-eslint/utils': 5.45.0_x7iytnlsncag3ywnbwokfm3b6m + '@typescript-eslint/type-utils': 5.45.0_s5ps7njkmjlaqajutnox5ntcla + '@typescript-eslint/utils': 5.45.0_s5ps7njkmjlaqajutnox5ntcla debug: 4.3.4 eslint: 8.29.0 ignore: 5.2.0 natural-compare-lite: 1.4.0 regexpp: 3.2.0 semver: 7.3.8 - tsutils: 3.21.0_typescript@4.6.4 - typescript: 4.6.4 + tsutils: 3.21.0_typescript@4.9.3 + typescript: 4.9.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser/5.45.0_x7iytnlsncag3ywnbwokfm3b6m: + /@typescript-eslint/parser/5.45.0_s5ps7njkmjlaqajutnox5ntcla: resolution: {integrity: sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2153,10 +2153,10 @@ packages: dependencies: '@typescript-eslint/scope-manager': 5.45.0 '@typescript-eslint/types': 5.45.0 - '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.6.4 + '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.9.3 debug: 4.3.4 eslint: 8.29.0 - typescript: 4.6.4 + typescript: 4.9.3 transitivePeerDependencies: - supports-color dev: true @@ -2169,7 +2169,7 @@ packages: '@typescript-eslint/visitor-keys': 5.45.0 dev: true - /@typescript-eslint/type-utils/5.45.0_x7iytnlsncag3ywnbwokfm3b6m: + /@typescript-eslint/type-utils/5.45.0_s5ps7njkmjlaqajutnox5ntcla: resolution: {integrity: sha512-DY7BXVFSIGRGFZ574hTEyLPRiQIvI/9oGcN8t1A7f6zIs6ftbrU0nhyV26ZW//6f85avkwrLag424n+fkuoJ1Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2179,12 +2179,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.6.4 - '@typescript-eslint/utils': 5.45.0_x7iytnlsncag3ywnbwokfm3b6m + '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.9.3 + '@typescript-eslint/utils': 5.45.0_s5ps7njkmjlaqajutnox5ntcla debug: 4.3.4 eslint: 8.29.0 - tsutils: 3.21.0_typescript@4.6.4 - typescript: 4.6.4 + tsutils: 3.21.0_typescript@4.9.3 + typescript: 4.9.3 transitivePeerDependencies: - supports-color dev: true @@ -2194,7 +2194,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.45.0_typescript@4.6.4: + /@typescript-eslint/typescript-estree/5.45.0_typescript@4.9.3: resolution: {integrity: sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2209,13 +2209,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.3.8 - tsutils: 3.21.0_typescript@4.6.4 - typescript: 4.6.4 + tsutils: 3.21.0_typescript@4.9.3 + typescript: 4.9.3 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils/5.45.0_x7iytnlsncag3ywnbwokfm3b6m: + /@typescript-eslint/utils/5.45.0_s5ps7njkmjlaqajutnox5ntcla: resolution: {integrity: sha512-OUg2JvsVI1oIee/SwiejTot2OxwU8a7UfTFMOdlhD2y+Hl6memUSL4s98bpUTo8EpVEr0lmwlU7JSu/p2QpSvA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2225,7 +2225,7 @@ packages: '@types/semver': 7.3.13 '@typescript-eslint/scope-manager': 5.45.0 '@typescript-eslint/types': 5.45.0 - '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.6.4 + '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.9.3 eslint: 8.29.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.29.0 @@ -4296,7 +4296,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.45.0_x7iytnlsncag3ywnbwokfm3b6m + '@typescript-eslint/parser': 5.45.0_s5ps7njkmjlaqajutnox5ntcla debug: 3.2.7 eslint-import-resolver-node: 0.3.6 find-up: 2.1.0 @@ -4325,7 +4325,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.45.0_x7iytnlsncag3ywnbwokfm3b6m + '@typescript-eslint/parser': 5.45.0_s5ps7njkmjlaqajutnox5ntcla array-includes: 3.1.5 array.prototype.flat: 1.3.0 debug: 2.6.9 @@ -5976,7 +5976,7 @@ packages: engines: {node: '>=10'} hasBin: true - /mkdist/0.3.13_typescript@4.8.4: + /mkdist/0.3.13_typescript@4.9.3: resolution: {integrity: sha512-+eCPpkr8l2X630y5PIlkts2tzYEsb+aGIgXdrQv9ZGtWE2bLlD6kVIFfI6FJwFpjjw4dPPyorxQc6Uhm/oXlvg==} hasBin: true peerDependencies: @@ -5992,7 +5992,7 @@ packages: jiti: 1.16.0 mri: 1.2.0 pathe: 0.2.0 - typescript: 4.8.4 + typescript: 4.9.3 dev: true /mlly/0.5.17: @@ -7149,7 +7149,7 @@ packages: dependencies: glob: 7.2.0 - /rollup-plugin-dts/5.0.0_pwnjjsmhcjjaj4eyn3pn3rtipm: + /rollup-plugin-dts/5.0.0_b62htvnbshcybhtkm3m3gan63e: resolution: {integrity: sha512-OO8ayCvuJCKaQSShyVTARxGurVVk4ulzbuvz+0zFd1f93vlnWFU5pBMT7HFeS6uj7MvvZLx4kUAarGATSU1+Ng==} engines: {node: '>=v14'} peerDependencies: @@ -7158,7 +7158,7 @@ packages: dependencies: magic-string: 0.26.7 rollup: 3.6.0 - typescript: 4.8.4 + typescript: 4.9.3 optionalDependencies: '@babel/code-frame': 7.18.6 dev: true @@ -7922,14 +7922,14 @@ packages: resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==} dev: true - /tsutils/3.21.0_typescript@4.6.4: + /tsutils/3.21.0_typescript@4.9.3: 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.6.4 + typescript: 4.9.3 dev: true /tsx/3.12.1: @@ -8007,6 +8007,12 @@ packages: hasBin: true dev: true + /typescript/4.9.3: + resolution: {integrity: sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==} + engines: {node: '>=4.2.0'} + hasBin: true + dev: true + /typeson-registry/1.0.0-alpha.39: resolution: {integrity: sha512-NeGDEquhw+yfwNhguLPcZ9Oj0fzbADiX4R0WxvoY8nGhy98IbzQy1sezjoEFWOywOboj/DWehI+/aUlRVrJnnw==} engines: {node: '>=10.0.0'} @@ -8069,7 +8075,7 @@ packages: jiti: 1.16.0 magic-string: 0.26.7 mkdirp: 1.0.4 - mkdist: 0.3.13_typescript@4.8.4 + mkdist: 0.3.13_typescript@4.9.3 mlly: 0.5.17 mri: 1.2.0 pathe: 0.3.9 @@ -8077,9 +8083,9 @@ packages: pretty-bytes: 6.0.0 rimraf: 3.0.2 rollup: 3.6.0 - rollup-plugin-dts: 5.0.0_pwnjjsmhcjjaj4eyn3pn3rtipm + rollup-plugin-dts: 5.0.0_b62htvnbshcybhtkm3m3gan63e scule: 0.3.2 - typescript: 4.8.4 + typescript: 4.9.3 untyped: 0.5.0 transitivePeerDependencies: - supports-color