Manual React Native sync for revisions 48b4ecc...b5e5ce8

Summary: This sync includes the changes from: - D56103750 - [TODO] A shim for SECRET_INTERNALS This sync includes the following changes: - **[b5e5ce8e0](facebook/react@b5e5ce8e0 )**: Update ReactNativeTypes for root options (part 2) ([#28857](facebook/react#28857)) //<Ricky>// - **[da6ba53b1](facebook/react@da6ba53b1 )**: [UMD] Remove umd builds ([#28735](facebook/react#28735)) //<Josh Story>// - **[0c245df1d](facebook/react@0c245df1d )**: Complete the typo fix ([#28856](facebook/react#28856)) //<Sebastian Silbermann>// - **[f82051d7a](facebook/react@f82051d7a )**: console test utils fix: match entire string, not just first letter ([#28855](facebook/react#28855)) //<Andrew Clark>// - **[4ca20fd36](facebook/react@4ca20fd36 )**: Test top level fragment inside lazy semantics ([#28852](facebook/react#28852)) //<Sebastian Markbåge>// - **[c0cf7c696](facebook/react@c0cf7c696 )**: Promote ASYNC_ITERATOR symbol to React Symbols ([#28851](facebook/react#28851)) //<Sebastian Markbåge>// - **[657428a9e](facebook/react@657428a9e )**: Add ReactNativeTypes for root options ([#28850](facebook/react#28850)) //<Ricky>// - **[7909d8eab](facebook/react@7909d8eab )**: [Flight] Encode ReadableStream and AsyncIterables ([#28847](facebook/react#28847)) //<Sebastian Markbåge>// - **[13eb61d05](facebook/react@13eb61d05 )**: Move enableUseDeferredValueInitialArg to canary ([#28818](facebook/react#28818)) //<Andrew Clark>// - **[8afa144bd](facebook/react@8afa144bd )**: Enable flag disableClientCache ([#28846](facebook/react#28846)) //<Jan Kassens>// - **[734956ace](facebook/react@734956ace )**: Devtools: Add support for useFormStatus ([#28413](facebook/react#28413)) //<Sebastian Silbermann>// - **[17e920c00](facebook/react@17e920c00 )**: [Flight Reply] Encode Typed Arrays and Blobs ([#28819](facebook/react#28819)) //<Sebastian Markbåge>// - **[0347fcd00](facebook/react@0347fcd00 )**: Add on(Caught|Uncaught|Recoverable) opts to RN ([#28836](facebook/react#28836)) //<Ricky>// - **[c113503ad](facebook/react@c113503ad )**: Flush direct streams in Bun ([#28837](facebook/react#28837)) //<Kenta Iwasaki>// - **[9defcd56b](facebook/react@9defcd56b )**: Remove redundant props assign ([#28829](facebook/react#28829)) //<Sebastian Silbermann>// - **[ed4023603](facebook/react@ed4023603 )**: Fix mistaken "react-server" condition ([#28835](facebook/react#28835)) //<Sebastian Markbåge>// - **[c8a035036](facebook/react@c8a035036 )**: [Fizz] hoistables should never flush before the preamble ([#28802](facebook/react#28802)) //<Josh Story>// - **[4f5c812a3](facebook/react@4f5c812a3 )**: DevTools: Rely on sourcemaps to compute hook name of built-in hooks in newer versions ([#28593](facebook/react#28593)) //<Sebastian Silbermann>// - **[435415962](facebook/react@435415962 )**: Backwards compatibility for string refs on WWW ([#28826](facebook/react#28826)) //<Jack Pope>// - **[608edcc90](facebook/react@608edcc90 )**: [tests] add `assertConsole<method>Dev` helpers ([#28732](facebook/react#28732)) //<Ricky>// - **[da69b6af9](facebook/react@da69b6af9 )**: ReactDOM.requestFormReset ([#28809](facebook/react#28809)) //<Andrew Clark>// - **[374b5d26c](facebook/react@374b5d26c )**: Scaffolding for requestFormReset API ([#28808](facebook/react#28808)) //<Andrew Clark>// - **[41950d14a](facebook/react@41950d14a )**: Automatically reset forms after action finishes ([#28804](facebook/react#28804)) //<Andrew Clark>// - **[dc6a7e01e](facebook/react@dc6a7e01e )**: [Float] Don't preload images inside `<noscript>` ([#28815](facebook/react#28815)) //<Josh Story>// - **[3f947b1b4](facebook/react@3f947b1b4 )**: [tests] Assert scheduler log empty in internalAct ([#28737](facebook/react#28737)) //<Ricky>// - **[bf09089f6](facebook/react@bf09089f6 )**: Remove Scheduler.log from ReactSuspenseFuzz-test ([#28812](facebook/react#28812)) //<Ricky>// - **[84cb3b4cb](facebook/react@84cb3b4cb )**: Hardcode disableIEWorkarounds for www ([#28811](facebook/react#28811)) //<Ricky>// - **[2243b40ab](facebook/react@2243b40ab )**: [tests] assertLog before act in useEffectEvent ([#28763](facebook/react#28763)) //<Ricky>// - **[dfc64c6e3](facebook/react@dfc64c6e3 )**: [tests] assertLog before act in ReactUse ([#28762](facebook/react#28762)) //<Ricky>// - **[42eff4bc7](facebook/react@42eff4bc7 )**: [tests] Fix assertions not flushed before act ([#28745](facebook/react#28745)) //<Ricky>// - **[ed3c65caf](facebook/react@ed3c65caf )**: Warn if outdated JSX transform is detected ([#28781](facebook/react#28781)) //<Andrew Clark>// - **[3f9e237a2](facebook/react@3f9e237a2 )**: Fix: Suspend while recovering from hydration error ([#28800](facebook/react#28800)) //<Andrew Clark>// - **[7f5d25e23](facebook/react@7f5d25e23 )**: Fix cloneElement using string ref w no owner ([#28797](facebook/react#28797)) //<Joseph Savona>// - **[bf40b0244](facebook/react@bf40b0244 )**: [Fizz] Stop publishing external-runtime to stable channel ([#28796](facebook/react#28796)) //<Josh Story>// - **[7f93cb41c](facebook/react@7f93cb41c )**: [DOM] Infer react-server entries bundles if not explicitly configured ([#28795](facebook/react#28795)) //<Josh Story>// - **[f61316535](facebook/react@f61316535 )**: Rename SECRET INTERNALS to `__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE` ([#28789](facebook/react#28789)) //<Sebastian Markbåge>// - **[9644d206e](facebook/react@9644d206e )**: Soften useFormState warning ([#28788](facebook/react#28788)) //<Ricky>// - **[c771016e1](facebook/react@c771016e1 )**: Rename The Secret Export of Server Internals ([#28786](facebook/react#28786)) //<Sebastian Markbåge>// - **[d50323eb8](facebook/react@d50323eb8 )**: Flatten ReactSharedInternals ([#28783](facebook/react#28783)) //<Sebastian Markbåge>// - **[f62cf8c62](facebook/react@f62cf8c62 )**: [Float] treat `props.async` in Float consistent with the rest of react-dom ([#26760](facebook/react#26760)) //<Josh Story>// - **[dfd3d5af8](facebook/react@dfd3d5af8 )**: Add support for transition{run,start,cancel} events ([#27345](facebook/react#27345)) //<Hugo Sales>// - **[1f8327f83](facebook/react@1f8327f83 )**: [Fiber] Use real event priority for hydration scheduling ([#28765](facebook/react#28765)) //<Josh Story>// - **[97c90ed88](facebook/react@97c90ed88 )**: [DOM] Shrink ReactDOMCurrentDispatcher method names ([#28770](facebook/react#28770)) //<Josh Story>// - **[9007fdc8f](facebook/react@9007fdc8f )**: [DOM] Shrink ReactDOMSharedInternals source representation ([#28771](facebook/react#28771)) //<Josh Story>// - **[14f50ad15](facebook/react@14f50ad15 )**: [Flight] Allow lazily resolving outlined models ([#28780](facebook/react#28780)) //<Sebastian Markbåge>// - **[4c12339ce](facebook/react@4c12339ce )**: [DOM] move `flushSync` out of the reconciler ([#28500](facebook/react#28500)) //<Josh Story>// - **[8e1462e8c](facebook/react@8e1462e8c )**: [Fiber] Move updatePriority tracking to renderers ([#28751](facebook/react#28751)) //<Josh Story>// - **[0b3b8a6a3](facebook/react@0b3b8a6a3 )**: jsx: Remove unnecessary hasOwnProperty check ([#28775](facebook/react#28775)) //<Andrew Clark>// - **[2acfb7b60](facebook/react@2acfb7b60 )**: [Flight] Support FormData from Server to Client ([#28754](facebook/react#28754)) //<Sebastian Markbåge>// - **[d1547defe](facebook/react@d1547defe )**: Fast JSX: Don't clone props object ([#28768](facebook/react#28768)) //<Andrew Clark>// - **[bfd8da807](facebook/react@bfd8da807 )**: Make class prop resolution faster ([#28766](facebook/react#28766)) //<Andrew Clark>// - **[cbb6f2b54](facebook/react@cbb6f2b54 )**: [Flight] Support Blobs from Server to Client ([#28755](facebook/react#28755)) //<Sebastian Markbåge>// - **[f33a6b69c](facebook/react@f33a6b69c )**: Track Owner for Server Components in DEV ([#28753](facebook/react#28753)) //<Sebastian Markbåge>// - **[e3ebcd54b](facebook/react@e3ebcd54b )**: Move string ref coercion to JSX runtime ([#28473](facebook/react#28473)) //<Andrew Clark>// - **[fd0da3eef](facebook/react@fd0da3eef )**: Remove _owner field from JSX elements in prod if string refs are disabled ([#28739](facebook/react#28739)) //<Sebastian Markbåge>// Changelog: [General][Changed] - React Native sync for revisions 48b4ecc...b5e5ce8 jest_e2e[run_all_tests] bypass-github-export-checks Reviewed By: kassens Differential Revision: D56251607 fbshipit-source-id: e16db2fa101fc7ed1e009158c76388206beabd5f
facebook · Apr 19, 2024 · 57aa8b8 · 57aa8b8
1 parent c0ea79d
commit 57aa8b8
Show file tree

Hide file tree

Showing 9 changed files with 217 additions and 5 deletions.
diff --git a/packages/react-native/Libraries/Core/ErrorHandlers.js b/packages/react-native/Libraries/Core/ErrorHandlers.js
@@ -0,0 +1,116 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict
+ */
+
+'use strict';
+
+import type {ExtendedError} from './ExtendedError';
+
+import {SyntheticError, handleException} from './ExceptionsManager';
+
+type ErrorInfo = {
+  +componentStack?: ?string,
+  // $FlowFixMe[unclear-type] unknown props and state.
+  +errorBoundary?: ?React$Component<any, any>,
+};
+
+export function onUncaughtError(errorValue: mixed, errorInfo: ErrorInfo): void {
+  let error;
+
+  // Typically, `errorValue` should be an error. However, other values such as
+  // strings (or even null) are sometimes thrown.
+  if (errorValue instanceof Error) {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for
+     * this parameters */
+    error = (errorValue: ExtendedError);
+  } else if (typeof errorValue === 'string') {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for
+     * this parameters */
+    error = (new SyntheticError(errorValue): ExtendedError);
+  } else {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for
+     * this parameters */
+    error = (new SyntheticError('Unspecified error'): ExtendedError);
+  }
+  try {
+    // $FlowFixMe[incompatible-use] this is in try/catch.
+    error.componentStack = errorInfo.componentStack;
+    error.isComponentError = true;
+  } catch {
+    // Ignored.
+  }
+
+  // Uncaught errors are fatal.
+  handleException(error, true);
+}
+
+export function onCaughtError(errorValue: mixed, errorInfo: ErrorInfo): void {
+  let error;
+
+  // Typically, `errorValue` should be an error. However, other values such as
+  // strings (or even null) are sometimes thrown.
+  if (errorValue instanceof Error) {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for
+     * this parameters */
+    error = (errorValue: ExtendedError);
+  } else if (typeof errorValue === 'string') {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for
+     * this parameters */
+    error = (new SyntheticError(errorValue): ExtendedError);
+  } else {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for
+     * this parameters */
+    error = (new SyntheticError('Unspecified error'): ExtendedError);
+  }
+  try {
+    // $FlowFixMe[incompatible-use] this is in try/catch.
+    error.componentStack = errorInfo.componentStack;
+    error.isComponentError = true;
+  } catch {
+    // Ignored.
+  }
+
+  // Caught errors are not fatal.
+  handleException(error, false);
+}
+
+export function onRecoverableError(
+  errorValue: mixed,
+  errorInfo: ErrorInfo,
+): void {
+  let error;
+
+  // Typically, `errorValue` should be an error. However, other values such as
+  // strings (or even null) are sometimes thrown.
+  if (errorValue instanceof Error) {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for
+     * this parameters */
+    error = (errorValue: ExtendedError);
+  } else if (typeof errorValue === 'string') {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for
+     * this parameters */
+    error = (new SyntheticError(errorValue): ExtendedError);
+  } else {
+    /* $FlowFixMe[class-object-subtyping] added when improving typing for
+     * this parameters */
+    error = (new SyntheticError('Unspecified error'): ExtendedError);
+  }
+  try {
+    // $FlowFixMe[incompatible-use] this is in try/catch.
+    error.componentStack = errorInfo.componentStack;
+    error.isComponentError = true;
+  } catch {
+    // Ignored.
+  }
+
+  // Recoverable errors should only be warnings.
+  // This will make it a soft error in LogBox.
+  // TODO: improve the logging for recoverable errors in prod.
+  console.warn(error);
+}
diff --git a/packages/react-native/Libraries/ReactNative/RendererImplementation.js b/packages/react-native/Libraries/ReactNative/RendererImplementation.js
@@ -12,8 +12,12 @@ import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import type ReactFabricHostComponent from './ReactFabricPublicInstance/ReactFabricHostComponent';
 import type {Element, ElementRef, ElementType} from 'react';
 
+import {
+  onCaughtError,
+  onRecoverableError,
+  onUncaughtError,
+} from '../Core/ErrorHandlers';
 import {type RootTag} from './RootTag';
-
 export function renderElement({
   element,
   rootTag,
@@ -31,9 +35,23 @@ export function renderElement({
       rootTag,
       null,
       useConcurrentRoot,
+      {
+        onCaughtError,
+        onUncaughtError,
+        onRecoverableError,
+      },
     );
   } else {
-    require('../Renderer/shims/ReactNative').render(element, rootTag);
+    require('../Renderer/shims/ReactNative').render(
+      element,
+      rootTag,
+      undefined,
+      {
+        onCaughtError,
+        onUncaughtError,
+        onRecoverableError,
+      },
+    );
   }
 }
 

diff --git a/packages/react-native/Libraries/Renderer/shims/ReactFabric.js b/packages/react-native/Libraries/Renderer/shims/ReactFabric.js
@@ -8,6 +8,9 @@
  * @flow
  * @nolint
  * @generated SignedSource<<c1cc197c110e3a49a5e8f6bd5d32b23f>>
+ * @generated SignedSource<<19f13c8d8dac82cd391ad408f5ad8893>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';

diff --git a/packages/react-native/Libraries/Renderer/shims/ReactFeatureFlags.js b/packages/react-native/Libraries/Renderer/shims/ReactFeatureFlags.js
@@ -8,6 +8,9 @@
  * @flow strict-local
  * @nolint
  * @generated SignedSource<<2881c8e89ef0f73f4cf6612cb518b197>>
+ * @generated SignedSource<<f48352b25600c8534f28130f5256d937>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';

diff --git a/packages/react-native/Libraries/Renderer/shims/ReactNative.js b/packages/react-native/Libraries/Renderer/shims/ReactNative.js
@@ -8,6 +8,9 @@
  * @flow
  * @nolint
  * @generated SignedSource<<0debd6e5a17dc037cb4661315a886de6>>
+ * @generated SignedSource<<228cd610b28ff12c92264be0d9be9374>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';

diff --git a/packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js b/packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js
@@ -7,7 +7,10 @@
  * @noformat
  * @flow strict
  * @nolint
- * @generated SignedSource<<b35184ab7e1e173fd34278def089e277>>
+ * @generated SignedSource<<c41f61379973354629ee7bf55ba92541>>
+ * @generated SignedSource<<39aa3fa373095c6b192fac24f5b6c30c>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 import type {ElementRef, ElementType, Element, AbstractComponent} from 'react';
@@ -176,6 +179,25 @@ export type TouchedViewDataAtPoint = $ReadOnly<{
   ...InspectorData,
 }>;
 
+export type RenderRootOptions = {
+  onUncaughtError?: (
+    error: mixed,
+    errorInfo: {+componentStack?: ?string},
+  ) => void,
+  onCaughtError?: (
+    error: mixed,
+    errorInfo: {
+      +componentStack?: ?string,
+      // $FlowFixMe[unclear-type] unknown props and state.
+      +errorBoundary?: ?React$Component<any, any>,
+    },
+  ) => void,
+  onRecoverableError?: (
+    error: mixed,
+    errorInfo: {+componentStack?: ?string},
+  ) => void,
+};
+
 /**
  * Flat ReactNative renderer bundles are too big for Flow to parse efficiently.
  * Provide minimal Flow typing for the high-level RN API and call it a day.
@@ -204,6 +226,7 @@ export type ReactNativeType = {
     element: Element<ElementType>,
     containerTag: number,
     callback: ?() => void,
+    options: ?RenderRootOptions,
   ): ?ElementRef<ElementType>,
   unmountComponentAtNode(containerTag: number): void,
   unmountComponentAtNodeAndRemoveContainer(containerTag: number): void,
@@ -239,6 +262,7 @@ export type ReactFabricType = {
     containerTag: number,
     callback: ?() => void,
     concurrentRoot: ?boolean,
+    options: ?RenderRootOptions,
   ): ?ElementRef<ElementType>,
   unmountComponentAtNode(containerTag: number): void,
   getNodeFromInternalInstanceHandle(

diff --git a/packages/react-native/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js b/packages/react-native/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js
@@ -8,6 +8,9 @@
  * @flow strict-local
  * @nolint
  * @generated SignedSource<<73af5b3fe29d226634ed64bc861634df>>
+ * @generated SignedSource<<b616e9e4f0bcab37292324fd9dd1b01d>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';

diff --git a/packages/react-native/Libraries/Renderer/shims/createReactNativeComponentClass.js b/packages/react-native/Libraries/Renderer/shims/createReactNativeComponentClass.js
@@ -8,6 +8,9 @@
  * @flow strict-local
  * @nolint
  * @generated SignedSource<<ede54ac2fa1b9a09e234cdf098048989>>
+ * @generated SignedSource<<c20bad591efa52fa416567851318b8ca>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';

diff --git a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap
@@ -3889,6 +3889,26 @@ declare module.exports: symbolicateStackTrace;
 "
 `;
 
+exports[`public API should not change unintentionally Libraries/Core/ErrorHandlers.js 1`] = `
+"type ErrorInfo = {
+  +componentStack?: ?string,
+  +errorBoundary?: ?React$Component<any, any>,
+};
+declare export function onUncaughtError(
+  errorValue: mixed,
+  errorInfo: ErrorInfo
+): void;
+declare export function onCaughtError(
+  errorValue: mixed,
+  errorInfo: ErrorInfo
+): void;
+declare export function onRecoverableError(
+  errorValue: mixed,
+  errorInfo: ErrorInfo
+): void;
+"
+`;
+
 exports[`public API should not change unintentionally Libraries/Core/ExceptionsManager.js 1`] = `
 "declare class SyntheticError extends Error {
   name: string;
@@ -7121,6 +7141,23 @@ export type TouchedViewDataAtPoint = $ReadOnly<{
   }>,
   ...InspectorData,
 }>;
+export type RenderRootOptions = {
+  onUncaughtError?: (
+    error: mixed,
+    errorInfo: { +componentStack?: ?string }
+  ) => void,
+  onCaughtError?: (
+    error: mixed,
+    errorInfo: {
+      +componentStack?: ?string,
+      +errorBoundary?: ?React$Component<any, any>,
+    }
+  ) => void,
+  onRecoverableError?: (
+    error: mixed,
+    errorInfo: { +componentStack?: ?string }
+  ) => void,
+};
 export type ReactNativeType = {
   findHostInstance_DEPRECATED<TElementType: ElementType>(
     componentOrHandle: ?(ElementRef<TElementType> | number)
@@ -7144,7 +7181,8 @@ export type ReactNativeType = {
   render(
     element: Element<ElementType>,
     containerTag: number,
-    callback: ?() => void
+    callback: ?() => void,
+    options: ?RenderRootOptions
   ): ?ElementRef<ElementType>,
   unmountComponentAtNode(containerTag: number): void,
   unmountComponentAtNodeAndRemoveContainer(containerTag: number): void,
@@ -7177,7 +7215,8 @@ export type ReactFabricType = {
     element: Element<ElementType>,
     containerTag: number,
     callback: ?() => void,
-    concurrentRoot: ?boolean
+    concurrentRoot: ?boolean,
+    options: ?RenderRootOptions
   ): ?ElementRef<ElementType>,
   unmountComponentAtNode(containerTag: number): void,
   getNodeFromInternalInstanceHandle(