Simplify interface

Author: devknoll

packages/react-dom/src/server/ReactDOMFizzServerNext.js

@@ -16,7 +16,6 @@ import {
   createRequest,
   startWork,
   startFlowing,
-  stopFlowing,
   abort,
 } from 'react-server/src/ReactFizzServer';
 
@@ -25,56 +24,63 @@ import {
   createRootFormatContext,
 } from './ReactDOMServerFormatConfig';
 
+type NextStreamSource = {
+  start: (controller: Destination) => void,
+  pull: (controller: Destination) => void,
+  cancel: (reason: mixed) => void,
+};
+
 type Options = {|
   identifierPrefix?: string,
   namespaceURI?: string,
+  nonce?: string,
+  bootstrapScriptContent?: string,
+  bootstrapScripts?: Array<string>,
+  bootstrapModules?: Array<string>,
   progressiveChunkSize?: number,
-  onReadyToStream?: () => void,
+  signal?: AbortSignal,
+  onCompleteShell?: () => void,
   onCompleteAll?: () => void,
   onError?: (error: mixed) => void,
 |};
 
-type Controls = {|
-  abort(): void,
-  update(): void,
-|};
-
-function createRequestImpl(
+function renderToNextStream(
   children: ReactNodeList,
-  destination: Destination,
-  options: void | Options,
-) {
-  return createRequest(
+  options?: Options,
+): NextStreamSource {
+  const request = createRequest(
     children,
-    destination,
-    createResponseState(options ? options.identifierPrefix : undefined),
+    createResponseState(
+      options ? options.identifierPrefix : undefined,
+      options ? options.nonce : undefined,
+      options ? options.bootstrapScriptContent : undefined,
+      options ? options.bootstrapScripts : undefined,
+      options ? options.bootstrapModules : undefined,
+    ),
     createRootFormatContext(options ? options.namespaceURI : undefined),
     options ? options.progressiveChunkSize : undefined,
     options ? options.onError : undefined,
     options ? options.onCompleteAll : undefined,
-    options ? options.onReadyToStream : undefined,
+    options ? options.onCompleteShell : undefined,
   );
-}
-
-function renderToNextStream(
-  children: ReactNodeList,
-  destination: Destination,
-  options?: Options,
-): Controls {
-  const request = createRequestImpl(children, destination, options);
-  startWork(request);
-  return {
-    abort() {
+  if (options && options.signal) {
+    const signal = options.signal;
+    const listener = () => {
       abort(request);
+      signal.removeEventListener('abort', listener);
+    };
+    signal.addEventListener('abort', listener);
+  }
+  const stream = {
+    start(controller) {
+      startWork(request);
     },
-    update() {
-      if (destination.ready) {
-        startFlowing(request);
-      } else {
-        stopFlowing(request);
-      }
+    pull(controller) {
+      startFlowing(request, controller);
     },
+    cancel(reason) {},
   };
+  return stream;
 }
 
 export {renderToNextStream, ReactVersion as version};

packages/react-server-dom-webpack/src/ReactFlightDOMServerNext.js

@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+import type {ReactModel} from 'react-server/src/ReactFlightServer';
+import type {BundlerConfig} from './ReactFlightServerWebpackBundlerConfig';
+import type {Destination} from 'react-server/src/ReactServerStreamConfigNext';
+
+import {
+  createRequest,
+  startWork,
+  startFlowing,
+} from 'react-server/src/ReactFlightServer';
+
+type NextStreamSource = {
+  start: (controller: Destination) => void,
+  pull: (controller: Destination) => void,
+  cancel: (reason: mixed) => void,
+};
+
+type Options = {
+  onError?: (error: mixed) => void,
+};
+
+function renderToNextStream(
+  model: ReactModel,
+  webpackMap: BundlerConfig,
+  options?: Options,
+): NextStreamSource {
+  const request = createRequest(
+    model,
+    webpackMap,
+    options ? options.onError : undefined,
+  );
+  const stream = {
+    start(controller) {
+      startWork(request);
+    },
+    pull(controller) {
+      startFlowing(request, controller);
+    },
+    cancel(reason) {},
+  };
+  return stream;
+}
+
+export {renderToNextStream};

packages/react-server-dom-webpack/writer.next.server.js

@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+export * from './src/ReactFlightDOMServerNext.js';

packages/react-server/src/ReactFizzServer.js

@@ -1950,13 +1950,6 @@ export function startFlowing(request: Request, destination: Destination): void {
   }
 }
 
-export function stopFlowing(request: Request): void {
-  if (request.status === CLOSED) {
-    return;
-  }
-  request.status = BUFFERING;
-}
-
 // This is called to early terminate a request. It puts all pending boundaries in client rendered state.
 export function abort(request: Request): void {
   try {

packages/react-server/src/ReactServerStreamConfigNext.js

@@ -7,23 +7,21 @@
  * @flow
  */
 
-declare function __next_scheduleReactServerStreamWork__(
-  callback: () => void,
-): void;
+declare function __next_scheduleReactServerWork(callback: () => void): void;
 
-export type Destination = {|
-  write: (chunk: Uint8Array) => void,
-  buffer: (shouldBuffer: boolean) => void,
+export type Destination = {
   flush: () => void,
+  buffer: (buffer: boolean) => void,
   close: (error: mixed) => void,
-  ready: boolean,
-|};
+  write: (chunk: Uint8Array) => void,
+  desiredSize: number,
+};
 
 export type PrecomputedChunk = Uint8Array;
 export type Chunk = Uint8Array;
 
 export function scheduleWork(callback: () => void) {
-  __next_scheduleReactServerStreamWork__(callback);
+  __next_scheduleReactServerWork(callback);
 }
 
 export function flushBuffered(destination: Destination) {
@@ -36,10 +34,10 @@ export function beginWriting(destination: Destination) {
 
 export function writeChunk(
   destination: Destination,
-  chunk: PrecomputedChunk | Chunk,
+  chunk: Chunk | PrecomputedChunk,
 ): boolean {
   destination.write(chunk);
-  return destination.ready;
+  return destination.desiredSize > 0;
 }
 
 export function completeWriting(destination: Destination) {

scripts/shared/inlinedHostConfigs.js

@@ -69,12 +69,14 @@ module.exports = [
   {
     shortName: 'dom-next',
     entryPoints: [
+      'react-server-dom-webpack/writer.next.server',
+      'react-server-dom-webpack',
       'react-dom/src/server/ReactDOMFizzServerNext', // react-dom/server
     ],
     paths: [
       'react-dom',
       'react-server-dom-webpack',
-      'react-dom/src/server/ReactDOMFizzServerNext.js', // react-dom/server.browser
+      'react-dom/src/server/ReactDOMFizzServerNext.js', // react-dom/server.next
       'react-client/src/ReactFlightClientStream.js', // We can only type check this in streaming configurations.
     ],
     isFlowTyped: true,