Merge branch 'canary' into ci/update-e2e-concurrency

vercel · Oct 20, 2023 · 6917cc6 · 6917cc6
2 parents 0a3c318 + f9bd6f7
commit 6917cc6
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 138 deletions.
diff --git a/packages/next/src/export/worker.ts b/packages/next/src/export/worker.ts
@@ -7,7 +7,6 @@ import type {
   WorkerRenderOpts,
 } from './types'
 
-import '../server/node-polyfill-web-streams'
 import '../server/node-environment'
 
 process.env.NEXT_IS_EXPORT_WORKER = 'true'

diff --git a/packages/next/src/server/app-render/action-handler.ts b/packages/next/src/server/app-render/action-handler.ts
@@ -40,27 +40,8 @@ import type { AppRenderContext, GenerateFlight } from './app-render'
 
 function nodeToWebReadableStream(nodeReadable: import('stream').Readable) {
   if (process.env.NEXT_RUNTIME !== 'edge') {
-    const { Readable } = require('stream')
-    if ('toWeb' in Readable && typeof Readable.toWeb === 'function') {
-      return Readable.toWeb(nodeReadable)
-    }
-
-    const iterator = nodeReadable[Symbol.asyncIterator]()
-
-    return new ReadableStream({
-      pull: async (controller) => {
-        const { value, done } = await iterator.next()
-
-        if (done) {
-          controller.close()
-        } else {
-          controller.enqueue(value)
-        }
-      },
-      cancel: () => {
-        iterator.return?.()
-      },
-    })
+    const { Readable } = require('stream') as typeof import('stream')
+    return Readable.toWeb(nodeReadable) as ReadableStream
   } else {
     throw new Error('Invalid runtime')
   }

diff --git a/packages/next/src/server/lib/incremental-cache/index.ts b/packages/next/src/server/lib/incremental-cache/index.ts
@@ -9,8 +9,6 @@ import FileSystemCache from './file-system-cache'
 import path from '../../../shared/lib/isomorphic/path'
 import { normalizePagePath } from '../../../shared/lib/page-path/normalize-page-path'
 
-import '../../node-polyfill-web-streams'
-
 import {
   CACHE_ONE_YEAR,
   NEXT_CACHE_REVALIDATED_TAGS_HEADER,

diff --git a/packages/next/src/server/lib/router-utils/resolve-routes.ts b/packages/next/src/server/lib/router-utils/resolve-routes.ts
@@ -35,8 +35,6 @@ import {
 } from '../../../shared/lib/router/utils/prepare-destination'
 import { createRequestResponseMocks } from '../mock-request'
 
-import '../../node-polyfill-web-streams'
-
 const debug = setupDebug('next:router-server:resolve-routes')
 
 export function getResolveRoutes(

diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
@@ -1,6 +1,5 @@
 import './node-environment'
 import './require-hook'
-import './node-polyfill-web-streams'
 import './node-polyfill-crypto'
 
 import type { TLSSocket } from 'tls'

diff --git a/packages/next/src/server/node-polyfill-web-streams.ts b/packages/next/src/server/node-polyfill-web-streams.ts
diff --git a/packages/next/src/server/pipe-readable.ts b/packages/next/src/server/pipe-readable.ts
@@ -1,7 +1,5 @@
 import type { ServerResponse } from 'node:http'
 
-import './node-polyfill-web-streams'
-
 import {
   ResponseAbortedName,
   createAbortController,

diff --git a/packages/next/src/server/render.tsx b/packages/next/src/server/render.tsx
@@ -113,8 +113,6 @@ let postProcessHTML: typeof import('./post-process').postProcessHTML
 
 const DOCTYPE = '<!DOCTYPE html>'
 
-import './node-polyfill-web-streams'
-
 if (process.env.NEXT_RUNTIME !== 'edge') {
   tryGetPreviewData =
     require('./api-utils/node/try-get-preview-data').tryGetPreviewData

diff --git a/packages/next/src/server/stream-utils/node-web-streams-helper.ts b/packages/next/src/server/stream-utils/node-web-streams-helper.ts
@@ -1,7 +1,5 @@
 import type { FlightRouterState } from '../app-render/types'
 
-import '../node-polyfill-web-streams'
-
 import { nonNullable } from '../../lib/non-nullable'
 import { getTracer } from '../lib/trace/tracer'
 import { AppRenderSpan } from '../lib/trace/constants'

diff --git a/test/__mocks__/node-polyfill-web-streams.js b/test/__mocks__/node-polyfill-web-streams.js
diff --git a/test/lib/mocks-require-hook.js b/test/lib/mocks-require-hook.js
diff --git a/test/lib/next-test-utils.ts b/test/lib/next-test-utils.ts
@@ -49,13 +49,7 @@ export function initNextServerScript(
   return new Promise((resolve, reject) => {
     const instance = spawn(
       'node',
-      [
-        ...((opts && opts.nodeArgs) || []),
-        '-r',
-        require.resolve('./mocks-require-hook'),
-        '--no-deprecation',
-        scriptPath,
-      ],
+      [...((opts && opts.nodeArgs) || []), '--no-deprecation', scriptPath],
       {
         env,
         cwd: opts && opts.cwd,
@@ -225,14 +219,7 @@ export function runNextCommand(
     console.log(`Running command "next ${argv.join(' ')}"`)
     const instance = spawn(
       'node',
-      [
-        ...(options.nodeArgs || []),
-        '-r',
-        require.resolve('./mocks-require-hook'),
-        '--no-deprecation',
-        nextBin,
-        ...argv,
-      ],
+      [...(options.nodeArgs || []), '--no-deprecation', nextBin, ...argv],
       {
         ...options.spawnOptions,
         cwd,
@@ -354,14 +341,7 @@ export function runNextCommandDev(
   return new Promise((resolve, reject) => {
     const instance = spawn(
       'node',
-      [
-        ...nodeArgs,
-        '-r',
-        require.resolve('./mocks-require-hook'),
-        '--no-deprecation',
-        nextBin,
-        ...argv,
-      ],
+      [...nodeArgs, '--no-deprecation', nextBin, ...argv],
       {
         cwd,
         env,