diff --git a/packages/react-native/scripts/codegen/generate-artifacts-executor/index.js b/packages/react-native/scripts/codegen/generate-artifacts-executor/index.js index f057a9eb05ee32..20aed7c0a2a8d6 100644 --- a/packages/react-native/scripts/codegen/generate-artifacts-executor/index.js +++ b/packages/react-native/scripts/codegen/generate-artifacts-executor/index.js @@ -90,8 +90,14 @@ function execute( const reactNativeConfig = readReactNativeConfig( projectRoot, - baseOutputPath, + // NOTE: Used to load `build/generated/autolinking/autolinking.json` generated by `scripts/cocoapods/autolinking.rb` + // If we have RCT_SCRIPT_OUTPUT_DIR (set in `react_native_pods_utils/script_phases.sh`, it takes precedence, otherwise + // we search for the `autolinking.json` output in the `baseOutputPath` + process.env.RCT_SCRIPT_OUTPUT_DIR != null && process.env.RCT_SCRIPT_OUTPUT_DIR.length > 0 + ? process.env.RCT_SCRIPT_OUTPUT_DIR + : baseOutputPath, ); + const codegenEnabledLibraries = findCodegenEnabledLibraries( pkgJson, projectRoot, diff --git a/packages/react-native/scripts/react_native_pods_utils/script_phases.sh b/packages/react-native/scripts/react_native_pods_utils/script_phases.sh index 92325f1ad078f4..0878b9d6a8cf8a 100755 --- a/packages/react-native/scripts/react_native_pods_utils/script_phases.sh +++ b/packages/react-native/scripts/react_native_pods_utils/script_phases.sh @@ -96,7 +96,7 @@ generateCodegenArtifactsFromSchema () { generateArtifacts () { describe "Generating codegen artifacts" pushd "$RCT_SCRIPT_RN_DIR" >/dev/null || exit 1 - "$NODE_BINARY" "scripts/generate-codegen-artifacts.js" --path "$RCT_SCRIPT_APP_PATH" --outputPath "$TEMP_OUTPUT_DIR" --targetPlatform "ios" + "$NODE_BINARY" "scripts/generate-codegen-artifacts.js" --path "$RCT_SCRIPT_APP_PATH" --outputPath "$RCT_SCRIPT_OUTPUT_DIR" --targetPlatform "ios" popd >/dev/null || exit 1 } @@ -110,11 +110,9 @@ moveOutputs () { } withCodegenDiscovery () { - setup_dirs find_node find_codegen generateArtifacts - moveOutputs } noCodegenDiscovery () {