From 8fcc2fa31ab2763e218b489fc59d69fb7050b69e Mon Sep 17 00:00:00 2001 From: Sota Ogo Date: Tue, 19 Oct 2021 18:33:30 -0700 Subject: [PATCH] Update the path to use the full path so that they can be found in the OSS environment. Summary: I had to make this change when enabling Fabric in OSS. Without the full path, it can't find the modules like processColor within node_modules. Changelog: Internal Reviewed By: motiz88 Differential Revision: D31300424 fbshipit-source-id: 59b82470ec1ce63b63704931786e22b98f4bf046 --- .../components/GenerateViewConfigJs.js | 13 ++++++++----- .../GenerateViewConfigJs-test.js.snap | 18 +++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js index 8a16c674275..a1cc7050652 100644 --- a/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js +++ b/packages/react-native-codegen/src/generators/components/GenerateViewConfigJs.js @@ -54,14 +54,17 @@ function getReactDiffProcessValue(typeAnnotation) { case 'ReservedPropTypeAnnotation': switch (typeAnnotation.name) { case 'ColorPrimitive': - return j.template.expression`{ process: require('processColor') }`; + return j.template + .expression`{ process: require('react-native/Libraries/StyleSheet/processColor') }`; case 'ImageSourcePrimitive': return j.template - .expression`{ process: require('resolveAssetSource') }`; + .expression`{ process: require('react-native/Libraries/Image/resolveAssetSource') }`; case 'PointPrimitive': - return j.template.expression`{ diff: require('pointsDiffer') }`; + return j.template + .expression`{ diff: require('react-native/Libraries/Utilities/differ/pointsDiffer') }`; case 'EdgeInsetsPrimitive': - return j.template.expression`{ diff: require('insetsDiffer') }`; + return j.template + .expression`{ diff: require('react-native/Libraries/Utilities/differ/insetsDiffer') }`; default: (typeAnnotation.name: empty); throw new Error( @@ -73,7 +76,7 @@ function getReactDiffProcessValue(typeAnnotation) { switch (typeAnnotation.elementType.name) { case 'ColorPrimitive': return j.template - .expression`{ process: require('processColorArray') }`; + .expression`{ process: require('react-native/Libraries/StyleSheet/processColorArray') }`; case 'ImageSourcePrimitive': return j.literal(true); case 'PointPrimitive': 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 cf218e0b23e..2bb735544c8 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 @@ -30,7 +30,7 @@ export default NativeComponentRegistry.get(nativeComponentName, () => ({ radii: true, colors: { - process: require('processColorArray'), + process: require('react-native/Libraries/StyleSheet/processColorArray'), }, srcs: true, @@ -132,7 +132,7 @@ export default NativeComponentRegistry.get(nativeComponentName, () => ({ validAttributes: { tintColor: { - process: require('processColor'), + process: require('react-native/Libraries/StyleSheet/processColor'), }, }, })); @@ -534,7 +534,7 @@ export default NativeComponentRegistry.get(nativeComponentName, () => ({ validAttributes: { thumbImage: { - process: require('resolveAssetSource'), + process: require('react-native/Libraries/Image/resolveAssetSource'), }, }, })); @@ -567,7 +567,7 @@ export default NativeComponentRegistry.get(nativeComponentName, () => ({ validAttributes: { contentInset: { - diff: require('insetsDiffer'), + diff: require('react-native/Libraries/Utilities/differ/insetsDiffer'), }, }, })); @@ -705,19 +705,19 @@ export default NativeComponentRegistry.get(nativeComponentName, () => ({ validAttributes: { thumbImage: { - process: require('resolveAssetSource'), + process: require('react-native/Libraries/Image/resolveAssetSource'), }, color: { - process: require('processColor'), + process: require('react-native/Libraries/StyleSheet/processColor'), }, thumbTintColor: { - process: require('processColor'), + process: require('react-native/Libraries/StyleSheet/processColor'), }, point: { - diff: require('pointsDiffer'), + diff: require('react-native/Libraries/Utilities/differ/pointsDiffer'), }, }, })); @@ -809,7 +809,7 @@ export default NativeComponentRegistry.get(nativeComponentName, () => ({ validAttributes: { startPoint: { - diff: require('pointsDiffer'), + diff: require('react-native/Libraries/Utilities/differ/pointsDiffer'), }, }, }));