Partially revert to 8310854ce

fixtures/devtools/regression/shared.js

@@ -1,4 +1,4 @@
-/* eslint-disable react/react-in-jsx-scope, react/jsx-no-undef */
+/* eslint-disable no-fallthrough, react/react-in-jsx-scope, react/jsx-no-undef */
 /* global React ReactCache ReactDOM SchedulerTracing ScheduleTracing  */
 
 const apps = [];

packages/react-art/src/ReactFiberConfigART.js → packages/react-art/src/ReactARTHostConfig.js

@@ -238,13 +238,13 @@ function applyTextProps(instance, props, prevProps = {}) {
   }
 }
 
-export * from 'react-reconciler/src/ReactFiberConfigWithNoPersistence';
-export * from 'react-reconciler/src/ReactFiberConfigWithNoHydration';
-export * from 'react-reconciler/src/ReactFiberConfigWithNoScopes';
-export * from 'react-reconciler/src/ReactFiberConfigWithNoTestSelectors';
-export * from 'react-reconciler/src/ReactFiberConfigWithNoMicrotasks';
-export * from 'react-reconciler/src/ReactFiberConfigWithNoResources';
-export * from 'react-reconciler/src/ReactFiberConfigWithNoSingletons';
+export * from 'react-reconciler/src/ReactFiberHostConfigWithNoPersistence';
+export * from 'react-reconciler/src/ReactFiberHostConfigWithNoHydration';
+export * from 'react-reconciler/src/ReactFiberHostConfigWithNoScopes';
+export * from 'react-reconciler/src/ReactFiberHostConfigWithNoTestSelectors';
+export * from 'react-reconciler/src/ReactFiberHostConfigWithNoMicrotasks';
+export * from 'react-reconciler/src/ReactFiberHostConfigWithNoResources';
+export * from 'react-reconciler/src/ReactFiberHostConfigWithNoSingletons';
 
 export function appendInitialChild(parentInstance, child) {
   if (typeof child === 'string') {
@@ -346,10 +346,6 @@ export function getCurrentEventPriority() {
   return DefaultEventPriority;
 }
 
-export function shouldAttemptEagerTransition() {
-  return false;
-}
-
 // The ART renderer is secondary to the React DOM renderer.
 export const isPrimaryRenderer = false;
 

packages/react-art/src/__tests__/ReactART-test.js

@@ -33,16 +33,12 @@ const ReactTestRenderer = require('react-test-renderer');
 
 // Isolate the noop renderer
 jest.resetModules();
-const ReactNoop = require('react-noop-renderer');
-const Scheduler = require('scheduler');
 
 let Group;
 let Shape;
 let Surface;
 let TestComponent;
 
-let waitFor;
-
 const Missing = {};
 
 function testDOMNodeStructure(domNode, expectedStructure) {
@@ -80,8 +76,6 @@ describe('ReactART', () => {
     Shape = ReactART.Shape;
     Surface = ReactART.Surface;
 
-    ({waitFor} = require('internal-test-utils'));
-
     TestComponent = class extends React.Component {
       group = React.createRef();
 
@@ -363,58 +357,6 @@ describe('ReactART', () => {
     doClick(instance);
     expect(onClick2).toBeCalled();
   });
-
-  // @gate !enableSyncDefaultUpdates
-  it('can concurrently render with a "primary" renderer while sharing context', async () => {
-    const CurrentRendererContext = React.createContext(null);
-
-    function Yield(props) {
-      Scheduler.log(props.value);
-      return null;
-    }
-
-    let ops = [];
-    function LogCurrentRenderer() {
-      return (
-        <CurrentRendererContext.Consumer>
-          {currentRenderer => {
-            ops.push(currentRenderer);
-            return null;
-          }}
-        </CurrentRendererContext.Consumer>
-      );
-    }
-
-    // Using test renderer instead of the DOM renderer here because async
-    // testing APIs for the DOM renderer don't exist.
-    ReactNoop.render(
-      <CurrentRendererContext.Provider value="Test">
-        <Yield value="A" />
-        <Yield value="B" />
-        <LogCurrentRenderer />
-        <Yield value="C" />
-      </CurrentRendererContext.Provider>,
-    );
-
-    await waitFor(['A']);
-
-    ReactDOM.render(
-      <Surface>
-        <LogCurrentRenderer />
-        <CurrentRendererContext.Provider value="ART">
-          <LogCurrentRenderer />
-        </CurrentRendererContext.Provider>
-      </Surface>,
-      container,
-    );
-
-    expect(ops).toEqual([null, 'ART']);
-
-    ops = [];
-    await waitFor(['B', 'C']);
-
-    expect(ops).toEqual(['Test']);
-  });
 });
 
 describe('ReactARTComponents', () => {

packages/react-cache/src/__tests__/ReactCacheOld-test.internal.js

@@ -21,7 +21,6 @@ let textResourceShouldFail;
 let waitForAll;
 let assertLog;
 let waitForThrow;
-let act;
 
 describe('ReactCache', () => {
   beforeEach(() => {
@@ -41,7 +40,6 @@ describe('ReactCache', () => {
     waitForAll = InternalTestUtils.waitForAll;
     assertLog = InternalTestUtils.assertLog;
     waitForThrow = InternalTestUtils.waitForThrow;
-    act = InternalTestUtils.act;
 
     TextResource = createResource(
       ([text, ms = 0]) => {
@@ -147,14 +145,11 @@ describe('ReactCache', () => {
     await waitForAll(['Suspend! [Hi]', 'Loading...']);
 
     textResourceShouldFail = true;
-    let error;
-    try {
-      await act(() => jest.advanceTimersByTime(100));
-    } catch (e) {
-      error = e;
-    }
-    expect(error.message).toMatch('Failed to load: Hi');
-    assertLog(['Promise rejected [Hi]', 'Error! [Hi]', 'Error! [Hi]']);
+    jest.advanceTimersByTime(100);
+    assertLog(['Promise rejected [Hi]']);
+
+    await waitForThrow('Failed to load: Hi');
+    assertLog(['Error! [Hi]', 'Error! [Hi]']);
 
     // Should throw again on a subsequent read
     root.update(<App />);
@@ -222,8 +217,9 @@ describe('ReactCache', () => {
     assertLog(['Promise resolved [2]']);
     await waitForAll([1, 2, 'Suspend! [3]']);
 
-    await act(() => jest.advanceTimersByTime(100));
-    assertLog(['Promise resolved [3]', 1, 2, 3]);
+    jest.advanceTimersByTime(100);
+    assertLog(['Promise resolved [3]']);
+    await waitForAll([1, 2, 3]);
 
     expect(root).toMatchRenderedOutput('123');
 
@@ -238,17 +234,13 @@ describe('ReactCache', () => {
 
     await waitForAll([1, 'Suspend! [4]', 'Loading...']);
 
-    await act(() => jest.advanceTimersByTime(100));
-    assertLog([
-      'Promise resolved [4]',
-      1,
-      4,
-      'Suspend! [5]',
-      'Promise resolved [5]',
-      1,
-      4,
-      5,
-    ]);
+    jest.advanceTimersByTime(100);
+    assertLog(['Promise resolved [4]']);
+    await waitForAll([1, 4, 'Suspend! [5]', 'Loading...']);
+
+    jest.advanceTimersByTime(100);
+    assertLog(['Promise resolved [5]']);
+    await waitForAll([1, 4, 5]);
 
     expect(root).toMatchRenderedOutput('145');
 
@@ -270,18 +262,13 @@ describe('ReactCache', () => {
       'Suspend! [2]',
       'Loading...',
     ]);
+    jest.advanceTimersByTime(100);
+    assertLog(['Promise resolved [2]']);
+    await waitForAll([1, 2, 'Suspend! [3]', 'Loading...']);
 
-    await act(() => jest.advanceTimersByTime(100));
-    assertLog([
-      'Promise resolved [2]',
-      1,
-      2,
-      'Suspend! [3]',
-      'Promise resolved [3]',
-      1,
-      2,
-      3,
-    ]);
+    jest.advanceTimersByTime(100);
+    assertLog(['Promise resolved [3]']);
+    await waitForAll([1, 2, 3]);
     expect(root).toMatchRenderedOutput('123');
   });
 
@@ -304,8 +291,9 @@ describe('ReactCache', () => {
 
     await waitForAll(['Loading...']);
 
-    await act(() => jest.advanceTimersByTime(1000));
-    assertLog(['Promise resolved [B]', 'Promise resolved [A]', 'Result']);
+    jest.advanceTimersByTime(1000);
+    assertLog(['Promise resolved [B]', 'Promise resolved [A]']);
+    await waitForAll(['Result']);
     expect(root).toMatchRenderedOutput('Result');
   });
 

packages/react-client/src/ReactFlightClient.js

@@ -559,22 +559,6 @@ export function parseModelString(
             throw chunk.reason;
         }
       }
-      case 'I': {
-        // $Infinity
-        return Infinity;
-      }
-      case '-': {
-        // $-0 or $-Infinity
-        if (value === '$-0') {
-          return -0;
-        } else {
-          return -Infinity;
-        }
-      }
-      case 'N': {
-        // $NaN
-        return NaN;
-      }
       case 'u': {
         // matches "$undefined"
         // Special encoding for `undefined` which can't be serialized as JSON otherwise.

packages/react-client/src/ReactFlightReplyClient.js

@@ -74,24 +74,6 @@ function serializeSymbolReference(name: string): string {
   return '$S' + name;
 }
 
-function serializeNumber(number: number): string | number {
-  if (Number.isFinite(number)) {
-    if (number === 0 && 1 / number === -Infinity) {
-      return '$-0';
-    } else {
-      return number;
-    }
-  } else {
-    if (number === Infinity) {
-      return '$Infinity';
-    } else if (number === -Infinity) {
-      return '$-Infinity';
-    } else {
-      return '$NaN';
-    }
-  }
-}
-
 function serializeUndefined(): string {
   return '$undefined';
 }
@@ -245,14 +227,10 @@ export function processReply(
       return escapeStringValue(value);
     }
 
-    if (typeof value === 'boolean') {
+    if (typeof value === 'boolean' || typeof value === 'number') {
       return value;
     }
 
-    if (typeof value === 'number') {
-      return serializeNumber(value);
-    }
-
     if (typeof value === 'undefined') {
       return serializeUndefined();
     }

packages/react-client/src/__tests__/ReactFlight-test.js

@@ -263,30 +263,6 @@ describe('ReactFlight', () => {
     expect(ReactNoop).toMatchRenderedOutput(null);
   });
 
-  it('can transport weird numbers', async () => {
-    const nums = [0, -0, Infinity, -Infinity, NaN];
-    function ComponentClient({prop}) {
-      expect(prop).not.toBe(nums);
-      expect(prop).toEqual(nums);
-      expect(prop.every((p, i) => Object.is(p, nums[i]))).toBe(true);
-      return `prop: ${prop}`;
-    }
-    const Component = clientReference(ComponentClient);
-
-    const model = <Component prop={nums} />;
-
-    const transport = ReactNoopFlightServer.render(model);
-
-    await act(async () => {
-      ReactNoop.render(await ReactNoopFlightClient.read(transport));
-    });
-
-    expect(ReactNoop).toMatchRenderedOutput(
-      // already checked -0 with expects above
-      'prop: 0,0,Infinity,-Infinity,NaN',
-    );
-  });
-
   it('can transport BigInt', async () => {
     function ComponentClient({prop}) {
       return `prop: ${prop} (${typeof prop})`;

packages/react-client/src/forks/ReactFlightClientConfig.dom-browser.js

@@ -10,4 +10,3 @@
 export * from 'react-client/src/ReactFlightClientConfigBrowser';
 export * from 'react-client/src/ReactFlightClientConfigStream';
 export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
-export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

packages/react-client/src/forks/ReactFlightClientConfig.dom-bun.js

@@ -9,7 +9,6 @@
 
 export * from 'react-client/src/ReactFlightClientConfigBrowser';
 export * from 'react-client/src/ReactFlightClientConfigStream';
-export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';
 
 export type Response = any;
 export opaque type SSRManifest = mixed;

packages/react-client/src/forks/ReactFlightClientConfig.dom-edge-webpack.js

@@ -10,4 +10,3 @@
 export * from 'react-client/src/ReactFlightClientConfigBrowser';
 export * from 'react-client/src/ReactFlightClientConfigStream';
 export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
-export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

packages/react-client/src/forks/ReactFlightClientConfig.dom-legacy.js

@@ -10,4 +10,3 @@
 export * from 'react-client/src/ReactFlightClientConfigBrowser';
 export * from 'react-client/src/ReactFlightClientConfigStream';
 export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
-export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

packages/react-client/src/forks/ReactFlightClientConfig.dom-node-webpack.js

@@ -10,4 +10,3 @@
 export * from 'react-client/src/ReactFlightClientConfigNode';
 export * from 'react-client/src/ReactFlightClientConfigStream';
 export * from 'react-server-dom-webpack/src/ReactFlightClientConfigWebpackBundler';
-export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

packages/react-client/src/forks/ReactFlightClientConfig.dom-node.js

@@ -10,4 +10,3 @@
 export * from 'react-client/src/ReactFlightClientConfigNode';
 export * from 'react-client/src/ReactFlightClientConfigStream';
 export * from 'react-server-dom-webpack/src/ReactFlightClientConfigNodeBundler';
-export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

packages/react-client/src/forks/ReactFlightClientConfig.dom-relay.js

@@ -9,4 +9,3 @@
 
 export * from 'react-server-dom-relay/src/ReactFlightClientConfigDOMRelay';
 export * from '../ReactFlightClientConfigNoStream';
-export * from 'react-dom-bindings/src/shared/ReactFlightClientConfigDOM';

packages/react-devtools-shared/src/__tests__/profilingCache-test.js

@@ -963,7 +963,7 @@ describe('ProfilingCache', () => {
             2 => 0,
           },
           "passiveEffectDuration": null,
-          "priorityLevel": "Normal",
+          "priorityLevel": "Immediate",
           "timestamp": 0,
           "updaters": [
             {