Initialize experimental Node.js Streams support

vercel · Apr 24, 2024 · fbc198c · fbc198c
1 parent e078fd1
commit fbc198c
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 14 deletions.
diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -33,7 +33,7 @@ import {
   continueStaticPrerender,
   continueDynamicHTMLResume,
   continueDynamicDataResume,
-} from '../stream-utils/node-web-streams-helper'
+} from '../stream-utils'
 import { canSegmentBeOverridden } from '../../client/components/match-segments'
 import { stripInternalQueries } from '../internal-utils'
 import {

diff --git a/packages/next/src/server/app-render/encryption.ts b/packages/next/src/server/app-render/encryption.ts
@@ -12,7 +12,7 @@ import {
   encodeReply,
 } from 'react-server-dom-webpack/client.edge'
 
-import { streamToString } from '../stream-utils/node-web-streams-helper'
+import { streamToString } from '../stream-utils'
 import {
   arrayBufferToString,
   decrypt,

diff --git a/packages/next/src/server/app-render/make-get-server-inserted-html.tsx b/packages/next/src/server/app-render/make-get-server-inserted-html.tsx
@@ -6,7 +6,7 @@ import {
   getRedirectStatusCodeFromError,
 } from '../../client/components/redirect'
 import { renderToReadableStream } from 'react-dom/server.edge'
-import { streamToString } from '../stream-utils/node-web-streams-helper'
+import { streamToString } from '../stream-utils'
 import { RedirectStatusCode } from '../../client/components/redirect-status-code'
 import { addPathPrefix } from '../../shared/lib/router/utils/add-path-prefix'
 

diff --git a/packages/next/src/server/app-render/render-to-string.tsx b/packages/next/src/server/app-render/render-to-string.tsx
@@ -1,4 +1,4 @@
-import { streamToString } from '../stream-utils/node-web-streams-helper'
+import { streamToString } from '../stream-utils'
 import { AppRenderSpan } from '../lib/trace/constants'
 import { getTracer } from '../lib/trace/tracer'
 

diff --git a/packages/next/src/server/render-result.ts b/packages/next/src/server/render-result.ts
@@ -2,11 +2,7 @@ import type { OutgoingHttpHeaders, ServerResponse } from 'http'
 import type { Revalidate } from './lib/revalidate'
 import type { FetchMetrics } from './base-http'
 
-import {
-  chainStreams,
-  streamFromString,
-  streamToString,
-} from './stream-utils/node-web-streams-helper'
+import { chainStreams, streamFromString, streamToString } from './stream-utils'
 import { isAbortError, pipeToNodeResponse } from './pipe-readable'
 
 type ContentTypeOption = string | undefined

diff --git a/packages/next/src/server/render.tsx b/packages/next/src/server/render.tsx
@@ -31,7 +31,7 @@ import type {
   SizeLimit,
 } from '../types'
 import type { UnwrapPromise } from '../lib/coalesced-function'
-import type { ReactReadableStream } from './stream-utils/node-web-streams-helper'
+import type { ReactReadableStream } from './stream-utils'
 import type { ClientReferenceManifest } from '../build/webpack/plugins/flight-manifest-plugin'
 import type { NextFontManifest } from '../build/webpack/plugins/next-font-manifest-plugin'
 import type { PagesModule } from './future/route-modules/pages/module'
@@ -80,10 +80,7 @@ import { getRequestMeta } from './request-meta'
 import { allowedStatusCodes, getRedirectStatus } from '../lib/redirect-status'
 import RenderResult, { type PagesRenderResultMetadata } from './render-result'
 import isError from '../lib/is-error'
-import {
-  streamToString,
-  renderToInitialFizzStream,
-} from './stream-utils/node-web-streams-helper'
+import { streamToString, renderToInitialFizzStream } from './stream-utils'
 import { ImageConfigContext } from '../shared/lib/image-config-context.shared-runtime'
 import stripAnsi from 'next/dist/compiled/strip-ansi'
 import { stripInternalQueries } from './internal-utils'

diff --git a/packages/next/src/server/stream-utils/index.d.ts b/packages/next/src/server/stream-utils/index.d.ts
@@ -0,0 +1 @@
+export * from './stream-utils.edge'
diff --git a/packages/next/src/server/stream-utils/index.js b/packages/next/src/server/stream-utils/index.js
@@ -0,0 +1,8 @@
+if (
+  process.env.NEXT_RUNTIME === 'nodejs' &&
+  process.env.EXPERIMENTAL_NODE_STREAMS_SUPPORT
+) {
+  module.exports = require('next/dist/server/stream-utils/stream-utils.edge.js')
+} else {
+  module.exports = require('next/dist/server/stream-utils/stream-utils.node.js')
+}
diff --git a/...r/stream-utils/node-web-streams-helper.ts → .../server/stream-utils/stream-utils.edge.ts b/...r/stream-utils/node-web-streams-helper.ts → .../server/stream-utils/stream-utils.edge.ts
diff --git a/packages/next/src/server/stream-utils/stream-utils.node.ts b/packages/next/src/server/stream-utils/stream-utils.node.ts
@@ -0,0 +1,6 @@
+/**
+ * By default, this file exports the methods from streams-utils.edge since all of those are based on Node.js web streams.
+ * This file will then be an incremental re-implementation of all of those methods into Node.js only versions (based on proper Node.js Streams).
+ */
+
+export * from './stream-utils.edge'