Upgrade TypeScript to v5.5.2

package.json

@@ -236,7 +236,7 @@
     "tree-kill": "1.2.2",
     "tsec": "0.2.1",
     "turbo": "2.0.6-canary.0",
-    "typescript": "5.4.5",
+    "typescript": "5.5.2",
     "unfetch": "4.2.0",
     "wait-port": "0.2.2",
     "webpack": "5.90.0",

packages/next/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="./types/global" />
+/// <reference types="./types/compiled" />
 /// <reference path="./dist/styled-jsx/types/index.d.ts" />
 /// <reference path="./amp.d.ts" />
 /// <reference path="./app.d.ts" />

packages/next/package.json

@@ -321,7 +321,7 @@
     "util": "0.12.4",
     "vm-browserify": "1.1.2",
     "watchpack": "2.4.0",
-    "web-vitals": "3.0.0",
+    "web-vitals": "4.2.1",
     "webpack": "5.90.0",
     "webpack-sources1": "npm:[email protected]",
     "webpack-sources3": "npm:[email protected]",

packages/next/src/server/app-render/action-handler.ts

@@ -182,7 +182,7 @@ async function createForwardedActionResponse(
   const fetchUrl = new URL(`${origin}${basePath}${workerPathname}`)
 
   try {
-    let body: BodyInit | AsyncIterable<any> | undefined
+    let body: BodyInit | ReadableStream<Uint8Array> | undefined
     if (
       // The type check here ensures that `req` is correctly typed, and the
       // environment variable check provides dead code elimination.

packages/next/src/server/stream-utils/node-web-streams-helper.ts

@@ -87,9 +87,8 @@ export async function streamToBuffer(
 ): Promise<Buffer> {
   const buffers: Buffer[] = []
 
-  // @ts-expect-error TypeScript gets this wrong (https://nodejs.org/api/webstreams.html#async-iteration)
   for await (const chunk of stream) {
-    buffers.push(chunk)
+    buffers.push(Buffer.from(chunk))
   }
 
   return Buffer.concat(buffers)
@@ -101,7 +100,6 @@ export async function streamToString(
   const decoder = new TextDecoder('utf-8', { fatal: true })
   let string = ''
 
-  // @ts-expect-error TypeScript gets this wrong (https://nodejs.org/api/webstreams.html#async-iteration)
   for await (const chunk of stream) {
     string += decoder.decode(chunk, { stream: true })
   }

packages/next/src/types.ts

@@ -1,8 +1,8 @@
-/// <reference types="node" />
-/// <reference types="react" />
-/// <reference types="react/experimental" />
-/// <reference types="react-dom" />
-/// <reference types="react-dom/experimental" />
+/// <reference types="node" preserve="true" />
+/// <reference types="react" preserve="true" />
+/// <reference types="react/experimental" preserve="true" />
+/// <reference types="react-dom" preserve="true" />
+/// <reference types="react-dom/experimental" preserve="true" />
 
 import type { Agent as HttpAgent } from 'http'
 import type { Agent as HttpsAgent } from 'https'

packages/next/taskfile.js

@@ -2589,10 +2589,7 @@ export async function diagnostics(task, opts) {
 }
 
 export async function build(task, opts) {
-  await task.serial(
-    ['precompile', 'compile', 'generate_types', 'rewrite_compiled_references'],
-    opts
-  )
+  await task.serial(['precompile', 'compile', 'generate_types'], opts)
 }
 
 export async function generate_types(task, opts) {
@@ -2601,37 +2598,6 @@ export async function generate_types(task, opts) {
   })
 }
 
-/**
- * TypeScript will emit references to the compiled types used to type the implementation.
- * The declarations however don't need such detailed types.
- * We rewrite the references to reference a more lightweight solution instead.
- * @param {import('taskr').Task} task
- */
-export async function rewrite_compiled_references(task, opts) {
-  const declarationDirectory = join(__dirname, 'dist')
-  const declarationFiles = glob.sync('**/*.d.ts', { cwd: declarationDirectory })
-
-  for (const declarationFile of declarationFiles) {
-    const content = await fs.readFile(
-      join(declarationDirectory, declarationFile),
-      'utf8'
-    )
-    // Rewrite
-    // /// <reference path="../../../../types/$$compiled.internal.d.ts" />
-    // to
-    // /// <reference path="../../../../types/compiled.d.ts" />
-    if (content.indexOf('/types/$$compiled.internal.d.ts" />') !== -1) {
-      await fs.writeFile(
-        join(declarationDirectory, declarationFile),
-        content.replace(
-          /\/types\/\$\$compiled\.internal\.d\.ts" \/>/g,
-          '/types/compiled.d.ts" />'
-        )
-      )
-    }
-  }
-}
-
 export default async function (task) {
   const opts = { dev: true }
   await task.clear('dist')

packages/next/tsconfig.json

@@ -2,13 +2,13 @@
   "extends": "../../tsconfig-tsec.json",
   "compilerOptions": {
     "strict": true,
-    "module": "esnext",
-    "target": "ES2017",
+    "stripInternal": true,
     "esModuleInterop": true,
-    "moduleResolution": "node",
+    "verbatimModuleSyntax": true,
     "jsx": "react-jsx",
-    "stripInternal": true,
-    "verbatimModuleSyntax": true
+    "module": "ESNext",
+    "target": "ES2018",
+    "moduleResolution": "node"
   },
   "exclude": [
     "dist",

packages/next/types.d.ts

@@ -1,9 +1,2 @@
-// Triple slash directives are copied from src/types.ts.
-// TypeScript currently does not preserve the tripple-slash directives.
-// Once https://github.com/microsoft/TypeScript/pull/57681 is released, we can remove the triple slash directives here.
-/// <reference types="react" />
-/// <reference types="react/experimental" />
-/// <reference types="react-dom" />
-/// <reference types="react-dom/experimental" />
 export * from './dist/types'
 export { default } from './dist/types'