chore(deps): typescript 4.9 (#11229)

Co-authored-by: bluwy <bjornlu.dev@gmail.com>
vitejs · Dec 7, 2022 · 6b4c4e2 · 6b4c4e2
1 parent d135b11
commit 6b4c4e2
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 53 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) => {