Realign index.windows.js with core and disable the deep import warning (#15309)

acoates-ms · web-flow · commit 94a8154e1d3e · 2025-11-05T07:50:26.000-08:00
* Disable the deep import warning

* Change files

* Align index.windows.js with core

* Change files
diff --git a/change/@rnw-scripts-just-task-f44449cc-2f4a-4b74-b76f-b376ae41df1b.json b/change/@rnw-scripts-just-task-f44449cc-2f4a-4b74-b76f-b376ae41df1b.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Copy flow files for rn copy",
+  "packageName": "@rnw-scripts/just-task",
+  "email": "30809111+acoates-ms@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-535a6feb-a06c-4d97-8ad6-ee5dce35c7ad.json b/change/react-native-windows-535a6feb-a06c-4d97-8ad6-ee5dce35c7ad.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Disable the deep import warning",
+  "packageName": "react-native-windows",
+  "email": "30809111+acoates-ms@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/@react-native-windows/tester/src/js/examples-win/NativeComponents/CustomXamlComponentWithNativeLayoutNativeComponent.js b/packages/@react-native-windows/tester/src/js/examples-win/NativeComponents/CustomXamlComponentWithNativeLayoutNativeComponent.js
@@ -13,7 +13,7 @@
 import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
 import type {HostComponent} from 'react-native';
 import type {DirectEventHandler} from 'react-native/Libraries/Types/CodegenTypes';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {codegenNativeComponent} from 'react-native';
 
 type MyEventEvent = $ReadOnly<{|
   value: boolean,
diff --git a/packages/@react-native-windows/tester/src/js/examples-win/NativeComponents/CustomXamlComponentWithYogaLayoutNativeComponent.js b/packages/@react-native-windows/tester/src/js/examples-win/NativeComponents/CustomXamlComponentWithYogaLayoutNativeComponent.js
@@ -13,7 +13,7 @@
 import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
 import type {HostComponent} from 'react-native';
 import type {DirectEventHandler} from 'react-native/Libraries/Types/CodegenTypes';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {codegenNativeComponent} from 'react-native';
 
 type MyEventEvent = $ReadOnly<{|
   value: boolean,
diff --git a/packages/@rnw-scripts/babel-react-native-config/babel.config.js b/packages/@rnw-scripts/babel-react-native-config/babel.config.js
@@ -8,7 +8,7 @@
 
 module.exports = () => ({
   presets: [
-    'module:@react-native/babel-preset',
+    ['module:@react-native/babel-preset', { disableDeepImportWarnings: true }]
   ],
   plugins: [
     "babel-plugin-transform-flow-enums",
diff --git a/packages/@rnw-scripts/just-task/copyRNLibraries.js b/packages/@rnw-scripts/just-task/copyRNLibraries.js
@@ -58,7 +58,7 @@ exports.copyTask = baseDir => {
       dest: base('.'),
     }),
 
-    copyTask({paths: src('**/*+(.d.ts|.js|.png)'), dest: base('.')}),
+    copyTask({paths: src('**/*+(.d.ts|.js|.png|.flow)'), dest: base('.')}),
 
     () => {
       const typesPath = path.resolve(baseDir, 'types/index.d.ts');
diff --git a/packages/sample-custom-component/src/DrawingIslandNativeComponent.ts b/packages/sample-custom-component/src/DrawingIslandNativeComponent.ts
@@ -1,4 +1,4 @@
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import { codegenNativeComponent } from 'react-native';
 import type { ViewProps } from 'react-native';
 
 export interface DrawingIslandProps extends ViewProps {
diff --git a/packages/sample-custom-component/src/FabricXamlCalendarViewNativeComponent.ts b/packages/sample-custom-component/src/FabricXamlCalendarViewNativeComponent.ts
@@ -10,7 +10,7 @@
 // Temporary test example for UseExperimentalWinUI3=true
 // Remove when we get react-native-xaml working well for Fabric
 
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {codegenNativeComponent} from 'react-native';
 import type {ViewProps} from 'react-native';
 import type {DirectEventHandler} from 'react-native/Libraries/Types/CodegenTypes';
 
diff --git a/packages/sample-custom-component/src/MovingLightNativeComponent.ts b/packages/sample-custom-component/src/MovingLightNativeComponent.ts
@@ -1,5 +1,4 @@
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
+import {codegenNativeComponent, codegenNativeCommands} from 'react-native';
 import type { ColorValue, HostComponent, ViewProps } from 'react-native';
 
 import type {
diff --git a/vnext/.flowconfig b/vnext/.flowconfig
@@ -27,7 +27,6 @@
 <PROJECT_ROOT>/Libraries/Components/View/ViewPropTypes.js
 <PROJECT_ROOT>/Libraries/Components/View/View.js
 <PROJECT_ROOT>/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js
-<PROJECT_ROOT>/Libraries/Image/Image.js
 <PROJECT_ROOT>/Libraries/Image/resolveAssetSource.js
 <PROJECT_ROOT>/Libraries/Network/RCTNetworking.js
 <PROJECT_ROOT>/Libraries/Pressability/Pressability.js
diff --git a/vnext/overrides.json b/vnext/overrides.json
@@ -234,6 +234,12 @@
       "baseHash": "aabf033b596a472c9da8b3eb4ab82d2a55acd5da",
       "issue": 4054
     },
+    {
+      "type": "derived",
+      "file": "src-win/index.windows.js.flow",
+      "baseFile": "packages/react-native/index.js.flow",
+      "baseHash": "bb6c7873aa350c235aad233dd75656237d16d79c"
+    },
     {
       "type": "derived",
       "file": "src-win/index.windows.js",
diff --git a/vnext/src-win/Libraries/AppTheme/AppTheme.js b/vnext/src-win/Libraries/AppTheme/AppTheme.js
@@ -56,7 +56,7 @@ if (NativeAppTheme) {
   );
 }
 
-module.exports = {
+export const AppTheme = {
   // $FlowFixMe[unsafe-getters-setters]
   get isHighContrast(): boolean {
     return _isHighContrast;
diff --git a/vnext/src-win/Libraries/Components/Flyout/FlyoutNativeComponent.js b/vnext/src-win/Libraries/Components/Flyout/FlyoutNativeComponent.js
@@ -13,7 +13,7 @@ import type {
   Int32,
 } from 'react-native/Libraries/Types/CodegenTypes';
 
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {codegenNativeComponent} from 'react-native';
 
 type DismissEvent = $ReadOnly<{
   isOpen?: boolean,
diff --git a/vnext/src-win/Libraries/Components/Glyph/GlyphNativeComponent.js b/vnext/src-win/Libraries/Components/Glyph/GlyphNativeComponent.js
@@ -7,7 +7,7 @@
 
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {Double} from '../../Types/CodegenTypes';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {codegenNativeComponent} from 'react-native';
 import type {HostComponent} from '../../../src/private/types/HostComponent';
 import type {ViewProps} from '../View/ViewPropTypes';
 
diff --git a/vnext/src-win/Libraries/Components/Popup/PopupNativeComponent.js b/vnext/src-win/Libraries/Components/Popup/PopupNativeComponent.js
@@ -6,7 +6,7 @@
  */
 
 import type {Double, DirectEventHandler, Int32} from '../../Types/CodegenTypes';
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
+import {codegenNativeComponent} from 'react-native';
 import type {HostComponent} from '../../../src/private/types/HostComponent';
 import type {ViewProps} from '../View/ViewPropTypes';
 
diff --git a/vnext/src-win/index.windows.js b/vnext/src-win/index.windows.js
diff --git a/vnext/src-win/index.windows.js.flow b/vnext/src-win/index.windows.js.flow

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';`
	`1`	`+import { codegenNativeComponent } from 'react-native';`
`2`	`2`	`import type { ViewProps } from 'react-native';`
`3`	`3`
`4`	`4`	`export interface DrawingIslandProps extends ViewProps {`