Update @types/node to 14.14.31 (vercel#41634)

This PR updates `@types/node` to `14.14.31`. The most important type is that `ParsedUrlQuery` can hold `undefined` so we are updating the code here to explicitly handle those cases. Aside from it we are adding a global definition taken from NodeJS for `AsyncLocalStorage` that we export in `server.d.ts`
shuding · Oct 23, 2022 · 65ae857 · 65ae857
1 parent 52b8c6a
commit 65ae857
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 64 deletions.
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "@types/html-validator": "5.0.3",
     "@types/http-proxy": "1.17.3",
     "@types/jest": "24.0.13",
-    "@types/node": "13.11.0",
+    "@types/node": "14.14.31",
     "@types/node-fetch": "2.6.1",
     "@types/react": "16.9.17",
     "@types/react-dom": "16.9.4",

diff --git a/packages/next/build/webpack/loaders/next-serverless-loader/utils.ts b/packages/next/build/webpack/loaders/next-serverless-loader/utils.ts
@@ -108,19 +108,19 @@ export function interpolateDynamicPath(
 
     if (paramIdx > -1) {
       let paramValue: string
+      const value = params[param]
 
-      if (Array.isArray(params[param])) {
-        paramValue = (params[param] as string[])
-          .map((v) => v && encodeURIComponent(v))
-          .join('/')
+      if (Array.isArray(value)) {
+        paramValue = value.map((v) => v && encodeURIComponent(v)).join('/')
+      } else if (value) {
+        paramValue = encodeURIComponent(value)
       } else {
-        paramValue =
-          params[param] && encodeURIComponent(params[param] as string)
+        paramValue = ''
       }
 
       pathname =
         pathname.slice(0, paramIdx) +
-        (paramValue || '') +
+        paramValue +
         pathname.slice(paramIdx + builtParam.length)
     }
   }
@@ -293,7 +293,7 @@ export function getUtils({
 
               // favor named matches if available
               const routeKeyNames = Object.keys(routeKeys || {})
-              const filterLocaleItem = (val: string | string[]) => {
+              const filterLocaleItem = (val: string | string[] | undefined) => {
                 if (i18n) {
                   // locale items can be included in route-matches
                   // for fallback SSG pages so ensure they are
@@ -604,7 +604,7 @@ export function getUtils({
       ),
     interpolateDynamicPath: (
       pathname: string,
-      params: Record<string, string | string[]>
+      params: Record<string, undefined | string | string[]>
     ) => interpolateDynamicPath(pathname, params, defaultRouteRegex),
   }
 }
diff --git a/packages/next/compiled/ora/index.js b/packages/next/compiled/ora/index.js
diff --git a/packages/next/export/worker.ts b/packages/next/export/worker.ts
@@ -324,7 +324,7 @@ export default async function exportPage({
           results.fromBuildExportRevalidate = revalidate
 
           if (revalidate !== 0) {
-            await promises.writeFile(htmlFilepath, html, 'utf8')
+            await promises.writeFile(htmlFilepath, html ?? '', 'utf8')
             await promises.writeFile(
               htmlFilepath.replace(/\.html$/, '.rsc'),
               flightData

diff --git a/packages/next/lib/worker.ts b/packages/next/lib/worker.ts
@@ -44,7 +44,7 @@ export class Worker {
       })
     }
 
-    let hangingTimer: number | false = false
+    let hangingTimer: NodeJS.Timeout | false = false
 
     const onActivity = () => {
       if (hangingTimer) clearTimeout(hangingTimer)

diff --git a/packages/next/server.d.ts b/packages/next/server.d.ts
@@ -1,3 +1,9 @@
+import type { AsyncLocalStorage as NodeAsyncLocalStorage } from 'async_hooks'
+
+declare global {
+  var AsyncLocalStorage: typeof NodeAsyncLocalStorage
+}
+
 export { NextFetchEvent } from 'next/dist/server/web/spec-extension/fetch-event'
 export { NextRequest } from 'next/dist/server/web/spec-extension/request'
 export { NextResponse } from 'next/dist/server/web/spec-extension/response'

diff --git a/packages/next/server/server-route-utils.ts b/packages/next/server/server-route-utils.ts
@@ -103,14 +103,13 @@ export const createHeaderRoute = ({
 // values from rewrites/redirects
 export const stringifyQuery = (req: BaseNextRequest, query: ParsedUrlQuery) => {
   const initialQuery = getRequestMeta(req, '__NEXT_INIT_QUERY') || {}
-  const initialQueryValues: Array<string | string[]> =
-    Object.values(initialQuery)
+  const initialQueryValues = Object.values(initialQuery)
 
   return stringifyQs(query, undefined, undefined, {
     encodeURIComponent(value) {
       if (
         value in initialQuery ||
-        initialQueryValues.some((initialQueryVal: string | string[]) => {
+        initialQueryValues.some((initialQueryVal) => {
           // `value` always refers to a query value, even if it's nested in an array
           return Array.isArray(initialQueryVal)
             ? initialQueryVal.includes(value)

diff --git a/packages/next/shared/lib/router/utils/prepare-destination.ts b/packages/next/shared/lib/router/utils/prepare-destination.ts
@@ -197,7 +197,7 @@ export function prepareDestination(args: {
       destQuery[key] = strOrArray.map((value) =>
         compileNonPath(unescapeSegments(value), args.params)
       )
-    } else {
+    } else if (typeof strOrArray === 'string') {
       destQuery[key] = compileNonPath(unescapeSegments(strOrArray), args.params)
     }
   }

diff --git a/packages/next/shared/lib/router/utils/querystring.ts b/packages/next/shared/lib/router/utils/querystring.ts
@@ -16,7 +16,7 @@ export function searchParamsToUrlQuery(
   return query
 }
 
-function stringifyUrlQueryParam(param: string): string {
+function stringifyUrlQueryParam(param: unknown): string {
   if (
     typeof param === 'string' ||
     (typeof param === 'number' && !isNaN(param)) ||

diff --git a/packages/next/trace/report/to-json.ts b/packages/next/trace/report/to-json.ts
@@ -55,7 +55,7 @@ let batch: ReturnType<typeof batcher> | undefined
 
 const writeStreamOptions = {
   flags: 'a',
-  encoding: 'utf8',
+  encoding: 'utf8' as const,
 }
 class RotatingWriteStream {
   file: string