Merge branch 'canary' into fix/swc-minify-buffer

vercel · Sep 11, 2021 · 526124e · 526124e
2 parents 156426e + 1f99c30
commit 526124e
Show file tree

Hide file tree

Showing 12 changed files with 455 additions and 408 deletions.
diff --git a/packages/next/compiled/zen-observable/LICENSE b/packages/next/compiled/zen-observable/LICENSE
diff --git a/packages/next/compiled/zen-observable/esm.js b/packages/next/compiled/zen-observable/esm.js
diff --git a/packages/next/compiled/zen-observable/package.json b/packages/next/compiled/zen-observable/package.json
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -185,7 +185,6 @@
     "@types/text-table": "0.2.1",
     "@types/webpack": "5.28.0",
     "@types/webpack-sources": "0.1.5",
-    "@types/zen-observable": "0.8.3",
     "@vercel/ncc": "0.27.0",
     "@vercel/nft": "0.12.2",
     "amphtml-validator": "1.0.33",
@@ -252,8 +251,7 @@
     "unistore": "3.4.1",
     "web-vitals": "2.1.0",
     "webpack": "4.44.1",
-    "webpack-sources": "1.4.3",
-    "zen-observable": "0.8.15"
+    "webpack-sources": "1.4.3"
   },
   "engines": {
     "node": ">=12.0.0"

diff --git a/packages/next/server/render-result.ts b/packages/next/server/render-result.ts
@@ -1,41 +1,41 @@
 import { ServerResponse } from 'http'
-import Observable from 'next/dist/compiled/zen-observable'
+import { Writable } from 'stream'
+
+export type NodeWritablePiper = (
+  res: Writable,
+  next: (err?: Error) => void
+) => void
 
 export default class RenderResult {
-  _response: string | Observable<string>
+  _result: string | NodeWritablePiper
 
-  constructor(response: string | Observable<string>) {
-    this._response = response
+  constructor(response: string | NodeWritablePiper) {
+    this._result = response
   }
 
   toUnchunkedString(): string {
-    if (typeof this._response !== 'string') {
+    if (typeof this._result !== 'string') {
       throw new Error(
         'invariant: dynamic responses cannot be unchunked. This is a bug in Next.js'
       )
     }
-    return this._response
+    return this._result
   }
 
-  async pipe(res: ServerResponse): Promise<void> {
-    if (typeof this._response === 'string') {
+  pipe(res: ServerResponse): Promise<void> {
+    if (typeof this._result === 'string') {
       throw new Error(
         'invariant: static responses cannot be piped. This is a bug in Next.js'
       )
     }
-    const maybeFlush =
-      typeof (res as any).flush === 'function'
-        ? () => (res as any).flush()
-        : () => {}
-    await this._response.forEach((chunk) => {
-      res.write(chunk)
-      maybeFlush()
+    const response = this._result
+    return new Promise((resolve, reject) => {
+      response(res, (err) => (err ? reject(err) : resolve()))
     })
-    res.end()
   }
 
   isDynamic(): boolean {
-    return typeof this._response !== 'string'
+    return typeof this._result !== 'string'
   }
 
   static fromStatic(value: string): RenderResult {