Use the global web type

vercel · Feb 14, 2022 · 04177b8 · 04177b8
1 parent ab61023
commit 04177b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
@@ -8,7 +8,7 @@ import type { ParsedNextUrl } from '../shared/lib/router/utils/parse-next-url'
 import type { PrerenderManifest } from '../build'
 import type { Rewrite } from '../lib/load-custom-routes'
 import type { BaseNextRequest, BaseNextResponse } from './base-http'
-import type { ReadableStream } from 'next/dist/compiled/web-streams-polyfill/ponyfill'
+import type { ReadableStream as ReadableStreamPolyfill } from 'next/dist/compiled/web-streams-polyfill/ponyfill'
 import { TransformStream } from 'next/dist/compiled/web-streams-polyfill/ponyfill'
 
 import { execOnce } from '../shared/lib/utils'
@@ -1273,7 +1273,7 @@ export default class NextNodeServer extends BaseServer {
             },
             url: url,
             page: page,
-            body: currentBody,
+            body: currentBody as unknown as ReadableStream<Uint8Array>,
           },
           useCache: !this.nextConfig.experimental.runtime,
           onWarning: (warning: Error) => {
@@ -1352,7 +1352,7 @@ export default class NextNodeServer extends BaseServer {
  */
 function requestToBodyStream(
   request: IncomingMessage
-): ReadableStream<Uint8Array> {
+): ReadableStreamPolyfill<Uint8Array> {
   const transform = new TransformStream<Uint8Array, Uint8Array>({
     start(controller) {
       request.on('data', (chunk) => controller.enqueue(chunk))
@@ -1368,8 +1368,8 @@ function requestToBodyStream(
  * A simple utility to take an original stream and have
  * an API to duplicate it without closing it or mutate any variables
  */
-function teeableStream<T>(originalStream: ReadableStream<T>): {
-  duplicate(): ReadableStream<T>
+function teeableStream<T>(originalStream: ReadableStreamPolyfill<T>): {
+  duplicate(): ReadableStreamPolyfill<T>
 } {
   return {
     duplicate() {

diff --git a/packages/next/server/web/adapter.ts b/packages/next/server/web/adapter.ts
@@ -16,7 +16,7 @@ export async function adapter(params: {
     page: params.page,
     input: params.request.url,
     init: {
-      body: params.request.body as unknown as ReadableStream<Uint8Array>,
+      body: params.request.body,
       geo: params.request.geo,
       headers: fromNodeHeaders(params.request.headers),
       ip: params.request.ip,

diff --git a/packages/next/server/web/types.ts b/packages/next/server/web/types.ts
@@ -1,5 +1,4 @@
 import type { I18NConfig } from '../config-shared'
-import type { ReadableStream } from 'next/dist/compiled/web-streams-polyfill/ponyfill'
 import type { NextRequest } from '../web/spec-extension/request'
 import type { NextFetchEvent } from '../web/spec-extension/fetch-event'
 import type { NextResponse } from './spec-extension/response'