lint... also merging is hard

Author: salazarm

packages/react-client/src/ReactFlightClient.js

@@ -47,10 +47,9 @@ export type JSONValue =
 
 const PENDING = 0;
 const RESOLVED_MODEL = 1;
-const RESOLVED_PROVIDER = 2;
-const RESOLVED_MODULE = 3;
-const INITIALIZED = 4;
-const ERRORED = 5;
+const RESOLVED_MODULE = 2;
+const INITIALIZED = 3;
+const ERRORED = 4;
 
 type PendingChunk = {
   _status: 0,
@@ -64,34 +63,27 @@ type ResolvedModelChunk = {
   _response: Response,
   then(resolve: () => mixed): void,
 };
-type ResolvedProviderChunk = {
-  _status: 2,
-  _value: string,
-  _response: Response,
-  then(resolve: () => mixed): void,
-};
 type ResolvedModuleChunk<T> = {
-  _status: 3,
+  _status: 2,
   _value: ModuleReference<T>,
   _response: Response,
   then(resolve: () => mixed): void,
 };
 type InitializedChunk<T> = {
-  _status: 4,
+  _status: 3,
   _value: T,
   _response: Response,
   then(resolve: () => mixed): void,
 };
 type ErroredChunk = {
-  _status: 5,
+  _status: 4,
   _value: Error,
   _response: Response,
   then(resolve: () => mixed): void,
 };
 type SomeChunk<T> =
   | PendingChunk
   | ResolvedModelChunk
-  | ResolvedProviderChunk
   | ResolvedModuleChunk<T>
   | InitializedChunk<T>
   | ErroredChunk;
@@ -127,8 +119,6 @@ function readChunk<T>(chunk: SomeChunk<T>): T {
       return chunk._value;
     case RESOLVED_MODEL:
       return initializeModelChunk(chunk);
-    case RESOLVED_PROVIDER:
-      return initializeProviderChunk(chunk);
     case RESOLVED_MODULE:
       return initializeModuleChunk(chunk);
     case PENDING:
@@ -188,13 +178,6 @@ function createResolvedModelChunk(
   return new Chunk(RESOLVED_MODEL, value, response);
 }
 
-function createResolvedProviderChunk(
-  response: Response,
-  value: string,
-): ResolvedProviderChunk {
-  return new Chunk(RESOLVED_PROVIDER, value, response);
-}
-
 function createResolvedModuleChunk<T>(
   response: Response,
   value: ModuleReference<T>,
@@ -217,18 +200,6 @@ function resolveModelChunk<T>(
   wakeChunk(listeners);
 }
 
-function resolveProviderChunk<T>(chunk: SomeChunk<T>, value: string): void {
-  if (chunk._status !== PENDING) {
-    // We already resolved. We didn't expect to see this.
-    return;
-  }
-  const listeners = chunk._value;
-  const resolvedChunk: ResolvedProviderChunk = (chunk: any);
-  resolvedChunk._status = RESOLVED_PROVIDER;
-  resolvedChunk._value = value;
-  wakeChunk(listeners);
-}
-
 function resolveModuleChunk<T>(
   chunk: SomeChunk<T>,
   value: ModuleReference<T>,
@@ -252,14 +223,6 @@ function initializeModelChunk<T>(chunk: ResolvedModelChunk): T {
   return value;
 }
 
-function initializeProviderChunk<T>(chunk: ResolvedProviderChunk): T {
-  const value: T = getOrCreateServerContext(chunk._value).Provider;
-  const initializedChunk: InitializedChunk<T> = (chunk: any);
-  initializedChunk._status = INITIALIZED;
-  initializedChunk._value = value;
-  return value;
-}
-
 function initializeModuleChunk<T>(chunk: ResolvedModuleChunk<T>): T {
   const value: T = requireModule(chunk._value);
   const initializedChunk: InitializedChunk<T> = (chunk: any);

packages/react-reconciler/src/ReactFiberNewContext.new.js

@@ -7,11 +7,7 @@
  * @flow
  */
 
-import type {
-  ReactContext,
-  ReactServerContext,
-  ReactProviderType,
-} from 'shared/ReactTypes';
+import type {ReactContext, ReactProviderType} from 'shared/ReactTypes';
 import type {
   Fiber,
   ContextDependency,

packages/react-reconciler/src/ReactFiberNewContext.old.js

@@ -7,11 +7,7 @@
  * @flow
  */
 
-import type {
-  ReactContext,
-  ReactServerContext,
-  ReactProviderType,
-} from 'shared/ReactTypes';
+import type {ReactContext, ReactProviderType} from 'shared/ReactTypes';
 import type {
   Fiber,
   ContextDependency,

packages/react-server/src/ReactFizzNewContext.js

@@ -7,8 +7,7 @@
  * @flow
  */
 
-import {REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED} from 'shared/ReactSymbols';
-import type {ReactContext, ReactServerContext} from 'shared/ReactTypes';
+import type {ReactContext} from 'shared/ReactTypes';
 
 import {REACT_SERVER_CONTEXT_DEFAULT_VALUE_NOT_LOADED} from 'shared/ReactSymbols';
 import {isPrimaryRenderer} from './ReactServerFormatConfig';