Revert "[Flight] Serialize weird numbers (facebook#26623)"

This reverts commit ab2385f.

Author: kassens

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[2] === '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-server-dom-webpack/src/__tests__/ReactFlightDOMReply-test.js

@@ -76,18 +76,6 @@ describe('ReactFlightDOMReply', () => {
     expect(items).toEqual(['A', 'B', 'C']);
   });
 
-  it('can pass weird numbers as a reply', async () => {
-    const nums = [0, -0, Infinity, -Infinity, NaN];
-    const body = await ReactServerDOMClient.encodeReply(nums);
-    const nums2 = await ReactServerDOMServer.decodeReply(
-      body,
-      webpackServerMap,
-    );
-
-    expect(nums).toEqual(nums2);
-    expect(nums.every((n, i) => Object.is(n, nums2[i]))).toBe(true);
-  });
-
   it('can pass a BigInt as a reply', async () => {
     const body = await ReactServerDOMClient.encodeReply(90071992547409910000n);
     const n = await ReactServerDOMServer.decodeReply(body, webpackServerMap);

packages/react-server/src/ReactFlightReplyServer.js

@@ -397,22 +397,6 @@ function parseModelString(
           key,
         );
       }
-      case 'I': {
-        // $Infinity
-        return Infinity;
-      }
-      case '-': {
-        // $-0 or $-Infinity
-        if (value[2] === '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-server/src/ReactFlightServer.js

@@ -549,24 +549,6 @@ function serializeProviderReference(name: string): string {
   return '$P' + 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';
 }
@@ -895,14 +877,10 @@ export function resolveModelToJSON(
     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();
   }