[pull] main from react:main

packages/react-native-renderer/src/ReactFabric.js

@@ -45,7 +45,7 @@ import {
   ReactFiberErrorDialog,
   createPublicRootInstance,
   type PublicRootInstance,
-} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
+} from 'react-native/react-private-interface';
 import {
   disableLegacyMode,
   enableDefaultTransitionIndicator,

packages/react-native-renderer/src/ReactFabricEventEmitter.js

@@ -31,7 +31,7 @@ import {runEventsInBatch} from './legacy-events/EventBatching';
 import {
   RawEventEmitter,
   dispatchNativeEvent,
-} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
+} from 'react-native/react-private-interface';
 import {getPublicInstance} from './ReactFiberConfigFabric';
 import {enableNativeEventTargetEventDispatching} from './ReactNativeFeatureFlags';
 

packages/react-native-renderer/src/ReactFiberConfigFabric.js

@@ -39,7 +39,7 @@ import {
   type PublicInstance as ReactNativePublicInstance,
   type PublicTextInstance,
   type PublicRootInstance,
-} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
+} from 'react-native/react-private-interface';
 import {
   enableFragmentRefsInstanceHandles,
   enableFragmentRefsTextNodes,

packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js

@@ -16,7 +16,7 @@ import type {TopLevelType} from './legacy-events/TopLevelEventTypes';
 import SyntheticEvent from './legacy-events/SyntheticEvent';
 
 // Module provided by RN:
-import {ReactNativeViewConfigRegistry} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
+import {ReactNativeViewConfigRegistry} from 'react-native/react-private-interface';
 import accumulateInto from './legacy-events/accumulateInto';
 import getListener from './ReactNativeGetListener';
 import forEachAccumulated from './legacy-events/forEachAccumulated';

packages/react-native-renderer/src/ReactNativeFiberInspector.js

@@ -17,7 +17,7 @@ import {
 import getComponentNameFromType from 'shared/getComponentNameFromType';
 import {HostComponent} from 'react-reconciler/src/ReactWorkTags';
 // Module provided by RN:
-import {getNodeFromPublicInstance} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
+import {getNodeFromPublicInstance} from 'react-native/react-private-interface';
 import {getNodeFromInternalInstanceHandle} from './ReactNativePublicCompat';
 import {getStackByFiberInDevAndProd} from 'react-reconciler/src/ReactFiberComponentStack';
 

packages/react-native-renderer/src/ReactNativeInjectionShared.js

@@ -14,7 +14,7 @@
  * TODO: require this in packager, not in React #10932517
  */
 // Module provided by RN:
-import 'react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore';
+import 'react-native/setup-env';
 
 import ResponderEventPlugin from './legacy-events/ResponderEventPlugin';
 import {

packages/react-native-renderer/src/ReactNativePublicCompat.js

@@ -9,14 +9,14 @@
 
 import type {Node} from './ReactNativeTypes';
 import type {ElementRef, ElementType} from 'react';
-import type {PublicInstance} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
+import type {PublicInstance} from 'react-native/react-private-interface';
 
 // Modules provided by RN:
 import {
   getNodeFromPublicInstance,
   getNativeTagFromPublicInstance,
   getInternalInstanceHandleFromPublicInstance,
-} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
+} from 'react-native/react-private-interface';
 
 import {
   findHostInstance,

packages/react-native-renderer/src/__mocks__/react-native/react-private-interface.js

@@ -0,0 +1,10 @@
+/**
+ * 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.
+ *
+ * @flow strict-local
+ */
+
+module.exports = require('./Libraries/ReactPrivate/ReactNativePrivateInterface');

packages/react-native-renderer/src/__tests__/ReactFabric-test.internal.js

@@ -35,9 +35,9 @@ describe('ReactFabric', () => {
     React = require('react');
     StrictMode = React.StrictMode;
     ReactFabric = require('react-native-renderer/fabric');
-    ReactNativePrivateInterface = require('react-native/Libraries/ReactPrivate/ReactNativePrivateInterface');
+    ReactNativePrivateInterface = require('react-native/react-private-interface');
     createReactNativeComponentClass =
-      require('react-native/Libraries/ReactPrivate/ReactNativePrivateInterface')
+      require('react-native/react-private-interface')
         .ReactNativeViewConfigRegistry.register;
     ({act, assertConsoleErrorDev} = require('internal-test-utils'));
   });

packages/react-native-renderer/src/__tests__/ReactFabricFragmentRefs-test.internal.js

@@ -26,7 +26,7 @@ describe('Fabric FragmentRefs', () => {
     React = require('react');
     ReactFabric = require('react-native-renderer/fabric');
     createReactNativeComponentClass =
-      require('react-native/Libraries/ReactPrivate/ReactNativePrivateInterface')
+      require('react-native/react-private-interface')
         .ReactNativeViewConfigRegistry.register;
     ({act} = require('internal-test-utils'));
     View = createReactNativeComponentClass('RCTView', () => ({

packages/react-native-renderer/src/__tests__/ReactNativeError-test.internal.js

@@ -17,7 +17,7 @@ describe('ReactNativeError', () => {
     jest.resetModules();
 
     createReactNativeComponentClass =
-      require('react-native/Libraries/ReactPrivate/ReactNativePrivateInterface')
+      require('react-native/react-private-interface')
         .ReactNativeViewConfigRegistry.register;
   });
 

scripts/flow/react-native-host-hooks.js

@@ -54,7 +54,7 @@ declare opaque type __PublicInstance;
 declare opaque type __PublicTextInstance;
 declare opaque type __PublicRootInstance;
 
-declare module 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface' {
+declare module 'react-native/react-private-interface' {
   declare export function deepFreezeAndThrowOnMutationInDev<T>(obj: T): T;
   declare export const ReactFiberErrorDialog: {
     showErrorDialog: (error: __CapturedError) => boolean,
@@ -117,7 +117,7 @@ declare module 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface'
   ): null | Object;
 }
 
-declare module 'react-native/Libraries/ReactPrivate/ReactNativePrivateInitializeCore' {
+declare module 'react-native/setup-env' {
 }
 
 declare module 'react-native' {

scripts/rollup/modules.js

@@ -13,13 +13,12 @@ const importSideEffects = Object.freeze({
   path: HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   stream: HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   'prop-types/checkPropTypes': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
-  'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface':
-    HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   scheduler: HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   react: HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   'react-dom/server': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   'react/jsx-dev-runtime': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   'react-dom': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
+  'react-native/react-private-interface': HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   url: HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   ReactNativeInternalFeatureFlags: HAS_NO_SIDE_EFFECTS_ON_IMPORT,
   'webpack-sources/lib/helpers/createMappingsSerializer.js':

scripts/rollup/shims/react-native/ReactFabric.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import {BatchedBridge} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
+import {BatchedBridge} from 'react-native/react-private-interface';
 
 import type {ReactFabricType} from './ReactNativeTypes';
 

scripts/rollup/shims/react-native/createReactNativeComponentClass.js

@@ -11,7 +11,7 @@
 
 'use strict';
 
-import {ReactNativeViewConfigRegistry} from 'react-native/Libraries/ReactPrivate/ReactNativePrivateInterface';
+import {ReactNativeViewConfigRegistry} from 'react-native/react-private-interface';
 import {type ViewConfig} from './ReactNativeTypes';
 
 const {register} = ReactNativeViewConfigRegistry;