From dd4504bb039e6082b518b8bd4f0e1e9d4cb9795e Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Mon, 17 Jan 2022 15:20:35 +0800 Subject: [PATCH 1/2] Fix codegen resolution error when node_modules has different version --- scripts/generate-specs-cli.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/generate-specs-cli.js b/scripts/generate-specs-cli.js index 257ecc84126b..756913d7316d 100644 --- a/scripts/generate-specs-cli.js +++ b/scripts/generate-specs-cli.js @@ -11,7 +11,8 @@ let RNCodegen; try { - RNCodegen = require('react-native-codegen/lib/generators/RNCodegen.js'); + // Use the `react-native-codegen` from the `react-native` repository instead of node_modules. + RNCodegen = require(__dirname + '/../packages/react-native-codegen/lib/generators/RNCodegen.js'); } catch (e) { RNCodegen = require('../packages/react-native-codegen/lib/generators/RNCodegen.js'); if (!RNCodegen) { From 73bca5879b86e115b946072d302ba597850d248b Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Mon, 17 Jan 2022 21:01:33 +0800 Subject: [PATCH 2/2] Fix another codegen resolution error from ios building --- scripts/generate-specs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/generate-specs.sh b/scripts/generate-specs.sh index b7096de376ca..0dc1ee058397 100755 --- a/scripts/generate-specs.sh +++ b/scripts/generate-specs.sh @@ -62,7 +62,8 @@ main() { exit 1 fi - CODEGEN_PATH=$("$NODE_BINARY" -e "console.log(require('path').dirname(require.resolve('react-native-codegen/package.json')))") + # Use the `react-native-codegen` from the `react-native` repository instead of node_modules. + CODEGEN_PATH="$RN_DIR/packages/react-native-codegen" # Special case for running CodeGen from source: build it if [ ! -d "$CODEGEN_PATH/lib" ]; then