Move RCT_SCRIPT_OUTPUT_DIR switching to generate-artifacts-executor/index.js

Author: kitten

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.envRCT_SCRIPT_OUTPUT_DIR.length > 0
+        ? process.env.RCT_SCRIPT_OUTPUT_DIR
+        : baseOutputPath,
     );
+
     const codegenEnabledLibraries = findCodegenEnabledLibraries(
       pkgJson,
       projectRoot,

packages/react-native/scripts/codegen/generate-artifacts-executor/utils.js

@@ -100,35 +100,20 @@ function cleanupEmptyFilesAndFolders(filepath /*: string */) {
 function readGeneratedAutolinkingOutput(
   baseOutputPath /*: string */,
 ) /*: $FlowFixMe */ {
-  // When run from Xcode, the generated file can be found via `RCT_SCRIPT_OUTPUT_DIR` consistently
-  if (process.env.RCT_SCRIPT_OUTPUT_DIR) {
-    const xcodeAutolinkingGeneratedPath = path.resolve(
-      process.env.RCT_SCRIPT_OUTPUT_DIR,
-      'build/generated/autolinking/autolinking.json',
-    );
-    if (fs.existsSync(xcodeAutolinkingGeneratedPath)) {
-      // $FlowFixMe[unsupported-syntax]
-      return require(xcodeAutolinkingGeneratedPath);
-    }
-    codegenLog(
-      `Could not find generated autolinking output at: ${xcodeAutolinkingGeneratedPath}`,
-    );
-  }
-
-  // Otherwise, we expect to find it in the output path iself, when it's been generated in Cocoapods
-  const podsAutolinkingGeneratedPath = path.resolve(
+  // NOTE: Generated by scripts/cocoapods/autolinking.rb in list_native_modules (called by use_native_modules)
+  const autolinkingGeneratedPath = path.resolve(
     baseOutputPath,
     'build/generated/autolinking/autolinking.json',
   );
-  if (fs.existsSync(podsAutolinkingGeneratedPath)) {
+  if (fs.existsSync(autolinkingGeneratedPath)) {
     // $FlowFixMe[unsupported-syntax]
-    return require(podsAutolinkingGeneratedPath);
+    return require(autolinkingGeneratedPath);
+  } else {
+    codegenLog(
+      `Could not find generated autolinking output at: ${autolinkingGeneratedPath}`,
+    );
+    return null;
   }
-  codegenLog(
-    `Could not find generated autolinking output at: ${podsAutolinkingGeneratedPath}`,
-  );
-
-  return null;
 }
 
 function readReactNativeConfig(