Merge branch 'main' into fix/async-test

package.json

@@ -36,7 +36,6 @@
     "@babel/preset-flow": "^7.10.4",
     "@babel/preset-react": "^7.10.4",
     "@babel/traverse": "^7.11.0",
-    "abort-controller": "^3.0.0",
     "art": "0.10.1",
     "babel-plugin-syntax-trailing-function-commas": "^6.5.0",
     "chalk": "^3.0.0",

packages/react-client/src/ReactFlightClient.js

@@ -201,14 +201,6 @@ function createErrorChunk<T>(
   return new Chunk(ERRORED, null, error, response);
 }
 
-function createInitializedChunk<T>(
-  response: Response,
-  value: T,
-): InitializedChunk<T> {
-  // $FlowFixMe Flow doesn't support functions as constructors
-  return new Chunk(INITIALIZED, value, null, response);
-}
-
 function wakeChunk<T>(listeners: Array<(T) => mixed>, value: T): void {
   for (let i = 0; i < listeners.length; i++) {
     const listener = listeners[i];
@@ -483,14 +475,32 @@ export function parseModelString(
   key: string,
   value: string,
 ): any {
-  switch (value[0]) {
-    case '$': {
-      if (value === '$') {
-        return REACT_ELEMENT_TYPE;
-      } else if (value[1] === '$' || value[1] === '@') {
+  if (value[0] === '$') {
+    if (value === '$') {
+      // A very common symbol.
+      return REACT_ELEMENT_TYPE;
+    }
+    switch (value[1]) {
+      case '$': {
         // This was an escaped string value.
         return value.substring(1);
-      } else {
+      }
+      case 'L': {
+        // Lazy node
+        const id = parseInt(value.substring(2), 16);
+        const chunk = getChunk(response, id);
+        // We create a React.lazy wrapper around any lazy values.
+        // When passed into React, we'll know how to suspend on this.
+        return createLazyChunkWrapper(chunk);
+      }
+      case 'S': {
+        return Symbol.for(value.substring(2));
+      }
+      case 'P': {
+        return getOrCreateServerContext(value.substring(2)).Provider;
+      }
+      default: {
+        // We assume that anything else is a reference ID.
         const id = parseInt(value.substring(1), 16);
         const chunk = getChunk(response, id);
         switch (chunk.status) {
@@ -518,13 +528,6 @@ export function parseModelString(
         }
       }
     }
-    case '@': {
-      const id = parseInt(value.substring(1), 16);
-      const chunk = getChunk(response, id);
-      // We create a React.lazy wrapper around any lazy values.
-      // When passed into React, we'll know how to suspend on this.
-      return createLazyChunkWrapper(chunk);
-    }
   }
   return value;
 }
@@ -566,21 +569,6 @@ export function resolveModel(
   }
 }
 
-export function resolveProvider(
-  response: Response,
-  id: number,
-  contextName: string,
-): void {
-  const chunks = response._chunks;
-  chunks.set(
-    id,
-    createInitializedChunk(
-      response,
-      getOrCreateServerContext(contextName).Provider,
-    ),
-  );
-}
-
 export function resolveModule(
   response: Response,
   id: number,
@@ -626,17 +614,6 @@ export function resolveModule(
   }
 }
 
-export function resolveSymbol(
-  response: Response,
-  id: number,
-  name: string,
-): void {
-  const chunks = response._chunks;
-  // We assume that we'll always emit the symbol before anything references it
-  // to save a few bytes.
-  chunks.set(id, createInitializedChunk(response, Symbol.for(name)));
-}
-
 type ErrorWithDigest = Error & {digest?: string};
 export function resolveErrorProd(
   response: Response,

packages/react-client/src/ReactFlightClientStream.js

@@ -14,8 +14,6 @@ import type {BundlerConfig} from './ReactFlightClientHostConfig';
 import {
   resolveModule,
   resolveModel,
-  resolveProvider,
-  resolveSymbol,
   resolveErrorProd,
   resolveErrorDev,
   createResponse as createResponseBase,
@@ -36,33 +34,20 @@ function processFullRow(response: Response, row: string): void {
   if (row === '') {
     return;
   }
-  const tag = row[0];
+  const colon = row.indexOf(':', 0);
+  const id = parseInt(row.substring(0, colon), 16);
+  const tag = row[colon + 1];
   // When tags that are not text are added, check them here before
   // parsing the row as text.
   // switch (tag) {
   // }
-  const colon = row.indexOf(':', 1);
-  const id = parseInt(row.substring(1, colon), 16);
-  const text = row.substring(colon + 1);
   switch (tag) {
-    case 'J': {
-      resolveModel(response, id, text);
-      return;
-    }
-    case 'M': {
-      resolveModule(response, id, text);
-      return;
-    }
-    case 'P': {
-      resolveProvider(response, id, text);
-      return;
-    }
-    case 'S': {
-      resolveSymbol(response, id, JSON.parse(text));
+    case 'I': {
+      resolveModule(response, id, row.substring(colon + 2));
       return;
     }
     case 'E': {
-      const errorInfo = JSON.parse(text);
+      const errorInfo = JSON.parse(row.substring(colon + 2));
       if (__DEV__) {
         resolveErrorDev(
           response,
@@ -77,9 +62,9 @@ function processFullRow(response: Response, row: string): void {
       return;
     }
     default: {
-      throw new Error(
-        "Error parsing the data. It's probably an error code or network corruption.",
-      );
+      // We assume anything else is JSON.
+      resolveModel(response, id, row.substring(colon + 1));
+      return;
     }
   }
 }

packages/react-server-dom-relay/src/ReactFlightDOMRelayClient.js

@@ -15,7 +15,6 @@ import {
   createResponse,
   resolveModel,
   resolveModule,
-  resolveSymbol,
   resolveErrorDev,
   resolveErrorProd,
   close,
@@ -25,15 +24,12 @@ import {
 export {createResponse, close, getRoot};
 
 export function resolveRow(response: Response, chunk: RowEncoding): void {
-  if (chunk[0] === 'J') {
+  if (chunk[0] === 'O') {
     // $FlowFixMe unable to refine on array indices
     resolveModel(response, chunk[1], chunk[2]);
-  } else if (chunk[0] === 'M') {
+  } else if (chunk[0] === 'I') {
     // $FlowFixMe unable to refine on array indices
     resolveModule(response, chunk[1], chunk[2]);
-  } else if (chunk[0] === 'S') {
-    // $FlowFixMe: Flow doesn't support disjoint unions on tuples.
-    resolveSymbol(response, chunk[1], chunk[2]);
   } else {
     if (__DEV__) {
       resolveErrorDev(

packages/react-server-dom-relay/src/ReactFlightDOMRelayProtocol.js

@@ -18,8 +18,8 @@ export type JSONValue =
   | $ReadOnlyArray<JSONValue>;
 
 export type RowEncoding =
-  | ['J', number, JSONValue]
-  | ['M', number, ModuleMetaData]
+  | ['O', number, JSONValue]
+  | ['I', number, ModuleMetaData]
   | ['P', number, string]
   | ['S', number, string]
   | [

packages/react-server-dom-relay/src/ReactFlightDOMRelayServerHostConfig.js

@@ -151,15 +151,15 @@ export function processModelChunk(
 ): Chunk {
   // $FlowFixMe no good way to define an empty exact object
   const json = convertModelToJSON(request, {}, '', model);
-  return ['J', id, json];
+  return ['O', id, json];
 }
 
 export function processReferenceChunk(
   request: Request,
   id: number,
   reference: string,
 ): Chunk {
-  return ['J', id, reference];
+  return ['O', id, reference];
 }
 
 export function processModuleChunk(
@@ -168,23 +168,7 @@ export function processModuleChunk(
   moduleMetaData: ModuleMetaData,
 ): Chunk {
   // The moduleMetaData is already a JSON serializable value.
-  return ['M', id, moduleMetaData];
-}
-
-export function processProviderChunk(
-  request: Request,
-  id: number,
-  contextName: string,
-): Chunk {
-  return ['P', id, contextName];
-}
-
-export function processSymbolChunk(
-  request: Request,
-  id: number,
-  name: string,
-): Chunk {
-  return ['S', id, name];
+  return ['I', id, moduleMetaData];
 }
 
 export function scheduleWork(callback: () => void) {

packages/react-server-native-relay/src/ReactFlightNativeRelayClient.js

@@ -15,7 +15,6 @@ import {
   createResponse,
   resolveModel,
   resolveModule,
-  resolveSymbol,
   resolveErrorDev,
   resolveErrorProd,
   close,
@@ -25,15 +24,12 @@ import {
 export {createResponse, close, getRoot};
 
 export function resolveRow(response: Response, chunk: RowEncoding): void {
-  if (chunk[0] === 'J') {
+  if (chunk[0] === 'O') {
     // $FlowFixMe `Chunk` doesn't flow into `JSONValue` because of the `E` row type.
     resolveModel(response, chunk[1], chunk[2]);
-  } else if (chunk[0] === 'M') {
+  } else if (chunk[0] === 'I') {
     // $FlowFixMe `Chunk` doesn't flow into `JSONValue` because of the `E` row type.
     resolveModule(response, chunk[1], chunk[2]);
-  } else if (chunk[0] === 'S') {
-    // $FlowFixMe: Flow doesn't support disjoint unions on tuples.
-    resolveSymbol(response, chunk[1], chunk[2]);
   } else {
     if (__DEV__) {
       resolveErrorDev(

packages/react-server-native-relay/src/ReactFlightNativeRelayProtocol.js

@@ -18,8 +18,8 @@ export type JSONValue =
   | Array<JSONValue>;
 
 export type RowEncoding =
-  | ['J', number, JSONValue]
-  | ['M', number, ModuleMetaData]
+  | ['O', number, JSONValue]
+  | ['I', number, ModuleMetaData]
   | ['P', number, string]
   | ['S', number, string]
   | [

packages/react-server-native-relay/src/ReactFlightNativeRelayServerHostConfig.js

@@ -146,15 +146,15 @@ export function processModelChunk(
 ): Chunk {
   // $FlowFixMe no good way to define an empty exact object
   const json = convertModelToJSON(request, {}, '', model);
-  return ['J', id, json];
+  return ['O', id, json];
 }
 
 export function processReferenceChunk(
   request: Request,
   id: number,
   reference: string,
 ): Chunk {
-  return ['J', id, reference];
+  return ['O', id, reference];
 }
 
 export function processModuleChunk(
@@ -163,23 +163,7 @@ export function processModuleChunk(
   moduleMetaData: ModuleMetaData,
 ): Chunk {
   // The moduleMetaData is already a JSON serializable value.
-  return ['M', id, moduleMetaData];
-}
-
-export function processProviderChunk(
-  request: Request,
-  id: number,
-  contextName: string,
-): Chunk {
-  return ['P', id, contextName];
-}
-
-export function processSymbolChunk(
-  request: Request,
-  id: number,
-  name: string,
-): Chunk {
-  return ['S', id, name];
+  return ['I', id, moduleMetaData];
 }
 
 export function scheduleWork(callback: () => void) {