From a13be817cc77417aae9867e18516bff7de30c799 Mon Sep 17 00:00:00 2001 From: Jakub Grzywacz Date: Mon, 28 Apr 2025 10:30:21 -0700 Subject: [PATCH] Fix ImageSource require (#50963) Summary: In react-native-svg, I found that the `Image` component stopped working starting with `react-native@0.79`. After some debugging, I traced the issue to the migration of `Libraries/Image` to the new export syntax (see https://github.com/facebook/react-native/commit/8783196ee540f8f78ce60ad20800338cc7645194). To fix this, I updated the import to match other requires, similar to https://github.com/facebook/react-native/blob/main/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js#L84. [GENERAL] [FIXED] - Fix codegen ImageSource require Pull Request resolved: https://github.com/facebook/react-native/pull/50963 Test Plan: `validAttributes` process should be a function instead of object with a default property. Before: image After: image Reviewed By: Abbondanzo Differential Revision: D73778127 Pulled By: huntie fbshipit-source-id: ae80c770e8e578794ae1356751f170ff955e1f5a --- .../__snapshots__/GenerateViewConfigJs-test.js.snap | 4 ++-- .../src/generators/components/GenerateViewConfigJs.js | 2 +- .../__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap index fcae1158c95..0024445cbb2 100644 --- a/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap +++ b/packages/react-native-codegen/e2e/__tests__/components/__snapshots__/GenerateViewConfigJs-test.js.snap @@ -367,7 +367,7 @@ export const __INTERNAL_VIEW_CONFIG = { uiViewClassName: \\"ImagePropNativeComponentView\\", validAttributes: { thumbImage: { - process: require('react-native/Libraries/Image/resolveAssetSource') + process: (req => 'default' in req ? req.default : req)(require('react-native/Libraries/Image/resolveAssetSource')) } } }; @@ -503,7 +503,7 @@ export const __INTERNAL_VIEW_CONFIG = { uiViewClassName: \\"MultiNativePropNativeComponentView\\", validAttributes: { thumbImage: { - process: require('react-native/Libraries/Image/resolveAssetSource') + process: (req => 'default' in req ? req.default : req)(require('react-native/Libraries/Image/resolveAssetSource')) }, color: { process: require('react-native/Libraries/StyleSheet/processColor').default diff --git a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js index 171158cda9c..5ed878a1cc9 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js +++ b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js @@ -75,7 +75,7 @@ function getReactDiffProcessValue(typeAnnotation: PropTypeAnnotation) { ); case 'ImageSourcePrimitive': return expression( - `{ process: require('react-native/Libraries/Image/resolveAssetSource') }`, + "{ process: ((req) => 'default' in req ? req.default : req)(require('react-native/Libraries/Image/resolveAssetSource')) }", ); case 'ImageRequestPrimitive': throw new Error('ImageRequest should not be used in props'); diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap index 0ac82e60010..da3d5840023 100644 --- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap +++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap @@ -590,7 +590,7 @@ export const __INTERNAL_VIEW_CONFIG = { uiViewClassName: \\"ImagePropNativeComponent\\", validAttributes: { thumbImage: { - process: require('react-native/Libraries/Image/resolveAssetSource') + process: (req => 'default' in req ? req.default : req)(require('react-native/Libraries/Image/resolveAssetSource')) } } }; @@ -788,7 +788,7 @@ export const __INTERNAL_VIEW_CONFIG = { uiViewClassName: \\"ImageColorPropNativeComponent\\", validAttributes: { thumbImage: { - process: require('react-native/Libraries/Image/resolveAssetSource') + process: (req => 'default' in req ? req.default : req)(require('react-native/Libraries/Image/resolveAssetSource')) }, color: { process: require('react-native/Libraries/StyleSheet/processColor').default