react-native 0.68.2 → 0.69.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.68.2",
+  "version": "0.69.0-rc.2",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -37,11 +37,12 @@
     "README.md",
     "rn-get-polyfills.js",
     "scripts/compose-source-maps.js",
-    "scripts/find-node.sh",
+    "scripts/find-node-for-xcode.sh",
     "scripts/generate-artifacts.js",
     "scripts/generate-provider-cli.js",
     "scripts/generate-specs-cli.js",
     "scripts/ios-configure-glog.sh",
+    "scripts/xcode/with-environment.sh",
     "scripts/launchPackager.bat",
     "scripts/launchPackager.command",
     "scripts/node-binary.sh",
@@ -51,6 +52,8 @@
     "scripts/react_native_pods_utils/script_phases.sh",
     "scripts/react_native_pods.rb",
     "scripts/react-native-xcode.sh",
+    "sdks/hermes-engine",
+    "sdks/hermesc",
     "template.config.js",
     "template",
     "third-party-podspecs"
@@ -83,55 +86,58 @@
     "test-ios": "./scripts/objc-test.sh test"
   },
   "peerDependencies": {
-    "react": "17.0.2"
+    "react": "18.0.0"
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^27.0.1",
-    "@react-native-community/cli": "^7.0.3",
-    "@react-native-community/cli-platform-android": "^7.0.1",
-    "@react-native-community/cli-platform-ios": "^7.0.1",
+    "@react-native-community/cli": "^8.0.0",
+    "@react-native-community/cli-platform-android": "^8.0.0",
+    "@react-native-community/cli-platform-ios": "^8.0.0",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "base64-js": "^1.1.2",
-    "deprecated-react-native-prop-types": "^2.3.0",
     "event-target-shim": "^5.0.1",
     "hermes-engine": "~0.11.0",
     "invariant": "^2.2.4",
     "jsc-android": "^250230.2.1",
-    "metro-react-native-babel-transformer": "0.67.0",
-    "metro-runtime": "0.67.0",
-    "metro-source-map": "0.67.0",
+    "memoize-one": "^5.0.0",
+    "metro-react-native-babel-transformer": "0.70.3",
+    "metro-runtime": "0.70.3",
+    "metro-source-map": "0.70.3",
+    "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
-    "react-devtools-core": "^4.23.0",
-    "react-native-gradle-plugin": "^0.0.6",
+    "react-devtools-core": "4.24.0",
+    "react-native-gradle-plugin": "^0.0.7",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
     "regenerator-runtime": "^0.13.2",
-    "scheduler": "^0.20.2",
+    "scheduler": "^0.21.0",
     "stacktrace-parser": "^0.1.3",
-    "use-subscription": ">=1.0.0 <1.6.0",
+    "use-sync-external-store": "^1.0.0",
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.1.4",
-    "react-native-codegen": "^0.0.17"
+    "react-native-codegen": "^0.69.1"
   },
   "devDependencies": {
-    "flow-bin": "^0.170.0",
-    "react": "17.0.2",
+    "flow-bin": "^0.176.3",
+    "react": "18.0.0",
+    "react-test-renderer": "18.0.0",
     "@babel/core": "^7.14.0",
     "@babel/generator": "^7.14.0",
+    "@babel/plugin-transform-regenerator": "^7.0.0",
     "@react-native-community/eslint-plugin": "*",
     "@react-native/eslint-plugin-specs": ">0.0.2",
     "@reactions/component": "^2.0.2",
-    "async": "^2.4.0",
+    "async": "^3.2.2",
     "babel-eslint": "^10.1.0",
     "clang-format": "^1.2.4",
     "connect": "^3.6.5",
-    "coveralls": "^3.0.2",
+    "coveralls": "^3.1.1",
     "eslint": "^7.32.0",
     "eslint-config-fb-strict": "^26.0.0",
     "eslint-config-fbjs": "^3.1.1",
@@ -150,11 +156,10 @@
     "jest": "^26.6.3",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.13.1",
-    "metro-babel-register": "0.67.0",
+    "metro-babel-register": "0.70.3",
     "mkdirp": "^0.5.1",
     "prettier": "^2.4.1",
-    "react-test-renderer": "17.0.2",
-    "shelljs": "^0.8.4",
+    "shelljs": "^0.8.5",
     "signedsource": "^1.0.0",
     "ws": "^6.1.4",
     "yargs": "^15.3.1"

package/react-native.config.js

@@ -16,12 +16,10 @@ module.exports = {
   commands: [...ios.commands, ...android.commands],
   platforms: {
     ios: {
-      linkConfig: ios.linkConfig,
       projectConfig: ios.projectConfig,
       dependencyConfig: ios.dependencyConfig,
     },
     android: {
-      linkConfig: android.linkConfig,
       projectConfig: android.projectConfig,
       dependencyConfig: android.dependencyConfig,
     },
@@ -32,7 +30,7 @@ module.exports = {
   reactNativePath: '.',
   project: {
     ios: {
-      project: './packages/rn-tester/RNTesterPods.xcworkspace',
+      sourceDir: './packages/rn-tester',
     },
     android: {
       sourceDir: './packages/rn-tester',

package/react.gradle

@@ -30,7 +30,7 @@ def reactRoot = file(config.root ?: "../../")
 def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
 def bundleConfig = config.bundleConfig ? "${reactRoot}/${config.bundleConfig}" : null ;
 def enableVmCleanup = config.enableVmCleanup == null ? true : config.enableVmCleanup
-def hermesCommand = config.hermesCommand ?: "../../node_modules/hermes-engine/%OS-BIN%/hermesc"
+def hermesCommand = config.hermesCommand
 
 /**
  * Detects CLI location in a similar fashion to the React Native CLI
@@ -90,15 +90,42 @@ def getHermesOSBin() {
 // Make sure not to inspect the Hermes config unless we need it,
 // to avoid breaking any JSC-only setups.
 def getHermesCommand = {
-    // If the project specifies a Hermes command, don't second guess it.
-    if (!hermesCommand.contains("%OS-BIN%")) {
-        return hermesCommand
+    // 1. If the project specifies a Hermes command, don't second guess it.
+    if (config.hermesCommand?.trim()) {
+        if (hermesCommand.contains("%OS-BIN%")) {
+            return hermesCommand
+                .replaceAll("%OS-BIN%", getHermesOSBin())
+                .replace('/' as char, File.separatorChar)
+        } else {
+            return hermesCommand
+                .replace('/' as char, File.separatorChar)
+        }
+    }
+
+    // 2. If the project is building hermes-engine from source, use hermesc from there
+    // Also note that user can override the hermes source location with
+    // the `REACT_NATIVE_OVERRIDE_HERMES_DIR` env variable.
+    def hermesOverrideDir = System.getenv("REACT_NATIVE_OVERRIDE_HERMES_DIR")
+    def builtHermesc = hermesOverrideDir ?
+        new File(hermesOverrideDir, "build/bin/hermesc") :
+        new File(reactRoot, "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/hermesc")
+
+    if (builtHermesc.exists()) {
+        return builtHermesc.getAbsolutePath()
+    }
+
+    // 3. If the react-native contains a pre-built hermesc, use it.
+    def prebuiltHermesPath = "node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc"
+        .replaceAll("%OS-BIN%", getHermesOSBin())
+        .replace('/' as char, File.separatorChar);
+    def prebuiltHermes = new File(reactRoot, prebuiltHermesPath)
+    if (prebuiltHermes.exists()) {
+        return prebuiltHermes.getAbsolutePath()
     }
 
-    // Execution on Windows fails with / as separator
-    return hermesCommand
-            .replaceAll("%OS-BIN%", getHermesOSBin())
-            .replace('/' as char, File.separatorChar);
+    throw new Exception("Couldn't determine Hermesc location. " +
+        "Please set `project.ext.react.hermesCommand` to the path of the hermesc binary file. " +
+        "node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc");
 }
 
 // Set enableHermesForVariant to a function to configure per variant,
@@ -341,29 +368,24 @@ afterEvaluate {
             group = "react"
             description = "copy bundled JS into ${targetName}."
 
+            from(jsBundleDir)
             if (config."jsBundleDir${targetName}") {
-                from(jsBundleDir)
                 into(file(config."jsBundleDir${targetName}"))
             } else {
                 into ("$buildDir/intermediates")
                 if (isAndroidLibrary) {
-                    into ("library_assets/${variant.name}/out") {
-                        from(jsBundleDir)
-                    }
+                    into ("library_assets/${variant.name}/out")
                 } else {
-                    into ("assets/${targetPath}") {
-                        from(jsBundleDir)
-                    }
+                    into ("assets/${targetPath}")
 
                     // Workaround for Android Gradle Plugin 3.2+ new asset directory
-                    into ("merged_assets/${variant.name}/merge${targetName}Assets/out") {
-                        from(jsBundleDir)
-                    }
+                    into ("merged_assets/${variant.name}/merge${targetName}Assets/out")
 
                     // Workaround for Android Gradle Plugin 3.4+ new asset directory
-                    into ("merged_assets/${variant.name}/out") {
-                        from(jsBundleDir)
-                    }
+                    into ("merged_assets/${variant.name}/out")
+
+                    // Workaround for Android Gradle Plugin 7.1 asset directory
+                    into("$buildDir/intermediates/assets/${variant.name}/merge${targetName}Assets")
                 }
             }
 
@@ -423,8 +445,10 @@ afterEvaluate {
 
         if (enableVmCleanup) {
             def task = tasks.findByName("package${targetName}")
-            def transformsLibDir = "$buildDir/intermediates/transforms/"
-            task.doFirst { vmSelectionAction(transformsLibDir) }
+            if (task != null) {
+                def transformsLibDir = "$buildDir/intermediates/transforms/"
+                task.doFirst { vmSelectionAction(transformsLibDir) }
+            }
 
             def sTask = tasks.findByName("strip${targetName}DebugSymbols")
             if (sTask != null) {

package/scripts/{find-node.sh → find-node-for-xcode.sh}

@@ -6,6 +6,17 @@
 
 set -e
 
+# WHY WE NEED THIS:
+# This script is used to find a valid instance of `node` installed in the machine.
+# This script is sourced by other scripts to get access to node.
+# Specifically, it is used by the `react-native-xcode.sh` script, invoked by a
+# post-build phase in Xcode, to build the js files required by React Native.
+#
+# DEPRECATION NOTE:
+# React Native should not make assumptions on your current node environment.
+# This file is deprecated and will be removed in a future release in favor of something
+# node-agnostic and configurable by the developers.
+
 # remove global prefix if it's already set
 # the running shell process will choose a node binary and a global package directory breaks version managers
 unset PREFIX

package/scripts/generate-artifacts.js

@@ -54,6 +54,11 @@ const argv = yargs
     description:
       'Path where codegen config files are located (e.g. node_modules dir).',
   })
+  .option('n', {
+    alias: 'nodeBinary',
+    default: 'node',
+    description: 'Path to the node executable.',
+  })
   .usage('Usage: $0 -p [path to app]')
   .demandOption(['p']).argv;
 
@@ -62,6 +67,7 @@ const CODEGEN_CONFIG_FILENAME = argv.f;
 const CODEGEN_CONFIG_FILE_DIR = argv.c;
 const CODEGEN_CONFIG_KEY = argv.k;
 const CODEGEN_FABRIC_ENABLED = argv.e;
+const NODE = argv.n;
 const CODEGEN_REPO_PATH = `${RN_ROOT}/packages/react-native-codegen`;
 const CODEGEN_NPM_PATH = `${RN_ROOT}/../react-native-codegen`;
 const CORE_LIBRARIES = new Set(['rncore', 'FBReactNativeSpec']);
@@ -71,6 +77,10 @@ function isReactNativeCoreLibrary(libraryName) {
   return CORE_LIBRARIES.has(libraryName);
 }
 
+function executeNodeScript(script) {
+  execSync(`${NODE} ${script}`);
+}
+
 function main(appRootDir, outputPath) {
   if (appRootDir == null) {
     console.error('Missing path to React Native application');
@@ -234,8 +244,8 @@ function main(appRootDir, outputPath) {
 
       console.log(`\n\n[Codegen] >>>>> Processing ${library.config.name}`);
       // Generate one schema for the entire library...
-      execSync(
-        `node ${path.join(
+      executeNodeScript(
+        `${path.join(
           codegenCliPath,
           'lib',
           'cli',
@@ -250,8 +260,8 @@ function main(appRootDir, outputPath) {
         ? `--libraryType ${library.config.type}`
         : '';
       fs.mkdirSync(pathToTempOutputDir, {recursive: true});
-      execSync(
-        `node ${path.join(
+      executeNodeScript(
+        `${path.join(
           RN_ROOT,
           'scripts',
           'generate-specs-cli.js',
@@ -284,8 +294,8 @@ function main(appRootDir, outputPath) {
 
       // Generate FabricComponentProvider.
       // Only for iOS at this moment.
-      execSync(
-        `node ${path.join(
+      executeNodeScript(
+        `${path.join(
           RN_ROOT,
           'scripts',
           'generate-provider-cli.js',

package/scripts/packager.sh

@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree.
 
 # scripts directory
-THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
+THIS_DIR=$(cd -P "$(dirname "$(realpath "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 REACT_NATIVE_ROOT="$THIS_DIR/.."
 # Application root directory - General use case: react-native is a dependency
 PROJECT_ROOT="$THIS_DIR/../../.."

package/scripts/react-native-xcode.sh

@@ -79,10 +79,6 @@ if [[ $DEV != true && ! -f "$ENTRY_FILE" ]]; then
   exit 2
 fi
 
-# Find path to Node
-# shellcheck source=/dev/null
-source "$REACT_NATIVE_DIR/scripts/find-node.sh"
-
 # check and assign NODE_BINARY env
 # shellcheck source=/dev/null
 source "$REACT_NATIVE_DIR/scripts/node-binary.sh"

package/scripts/react_native_pods.rb

@@ -44,7 +44,7 @@ def use_react_native! (options={})
   pod 'FBLazyVector', :path => "#{prefix}/Libraries/FBLazyVector"
   pod 'FBReactNativeSpec', :path => "#{prefix}/React/FBReactNativeSpec"
   pod 'RCTRequired', :path => "#{prefix}/Libraries/RCTRequired"
-  pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety"
+  pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety", :modular_headers => true
   pod 'React', :path => "#{prefix}/"
   pod 'React-Core', :path => "#{prefix}/"
   pod 'React-CoreModules', :path => "#{prefix}/React/CoreModules"
@@ -63,6 +63,7 @@ def use_react_native! (options={})
     pod 'React-Core/DevSupport', :path => "#{prefix}/"
   end
 
+  pod 'React-bridging', :path => "#{prefix}/ReactCommon/react/bridging"
   pod 'React-cxxreact', :path => "#{prefix}/ReactCommon/cxxreact"
   pod 'React-jsi', :path => "#{prefix}/ReactCommon/jsi"
   pod 'React-jsiexecutor', :path => "#{prefix}/ReactCommon/jsiexecutor"
@@ -71,13 +72,13 @@ def use_react_native! (options={})
   pod 'React-runtimeexecutor', :path => "#{prefix}/ReactCommon/runtimeexecutor"
   pod 'React-perflogger', :path => "#{prefix}/ReactCommon/reactperflogger"
   pod 'React-logger', :path => "#{prefix}/ReactCommon/logger"
-  pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon"
+  pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon", :modular_headers => true
   pod 'Yoga', :path => "#{prefix}/ReactCommon/yoga", :modular_headers => true
 
   pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
   pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec"
   pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
-  pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
+  pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
 
   if ENV['USE_CODEGEN_DISCOVERY'] == '1'
     app_path = options[:app_path]
@@ -95,7 +96,7 @@ def use_react_native! (options={})
     generate_react_codegen_podspec!(react_codegen_spec)
   end
 
-  pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR
+  pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
 
   if fabric_enabled
     checkAndGenerateEmptyThirdPartyProvider!(prefix)
@@ -103,15 +104,25 @@ def use_react_native! (options={})
     pod 'React-rncore', :path => "#{prefix}/ReactCommon"
     pod 'React-graphics', :path => "#{prefix}/ReactCommon/react/renderer/graphics"
     pod 'React-jsi/Fabric', :path => "#{prefix}/ReactCommon/jsi"
-    pod 'React-RCTFabric', :path => "#{prefix}/React"
+    pod 'React-RCTFabric', :path => "#{prefix}/React", :modular_headers => true
     pod 'RCT-Folly/Fabric', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec"
   end
 
   if hermes_enabled
+    system("(cd #{prefix} && node scripts/hermes/prepare-hermes-for-build)")
     pod 'React-hermes', :path => "#{prefix}/ReactCommon/hermes"
-    pod 'hermes-engine', '~> 0.11.0'
+    pod 'hermes-engine', :path => "#{prefix}/sdks/hermes/hermes-engine.podspec"
     pod 'libevent', '~> 2.1.12'
   end
+
+  pods_to_update = LocalPodspecPatch.pods_to_update(options)
+  if !pods_to_update.empty?
+    if Pod::Lockfile.public_instance_methods.include?(:detect_changes_with_podfile)
+      Pod::Lockfile.prepend(LocalPodspecPatch)
+    else
+      Pod::UI.warn "Automatically updating #{pods_to_update.join(", ")} has failed, please run `pod update #{pods_to_update.join(" ")} --no-repo-update` manually to fix the issue."
+    end
+  end
 end
 
 def get_default_flags()
@@ -131,10 +142,10 @@ end
 def use_flipper!(versions = {}, configurations: ['Debug'])
   versions['Flipper'] ||= '0.125.0'
   versions['Flipper-Boost-iOSX'] ||= '1.76.0.1.11'
-  versions['Flipper-DoubleConversion'] ||= '3.2.0'
+  versions['Flipper-DoubleConversion'] ||= '3.2.0.1'
   versions['Flipper-Fmt'] ||= '7.1.7'
   versions['Flipper-Folly'] ||= '2.6.10'
-  versions['Flipper-Glog'] ||= '0.5.0.4'
+  versions['Flipper-Glog'] ||= '0.5.0.5'
   versions['Flipper-PeerTalk'] ||= '0.0.4'
   versions['Flipper-RSocket'] ||= '1.4.3'
   versions['OpenSSL-Universal'] ||= '1.1.1100'
@@ -241,7 +252,23 @@ def fix_library_search_paths(installer)
   end
 end
 
-def react_native_post_install(installer)
+def set_node_modules_user_settings(installer, react_native_path)
+  puts "Setting REACT_NATIVE build settings"
+  projects = installer.aggregate_targets
+    .map{ |t| t.user_project }
+    .uniq{ |p| p.path }
+    .push(installer.pods_project)
+
+  projects.each do |project|
+    project.build_configurations.each do |config|
+      config.build_settings["REACT_NATIVE_PATH"] = File.join("${PODS_ROOT}", "..", react_native_path)
+    end
+
+    project.save()
+  end
+end
+
+def react_native_post_install(installer, react_native_path = "../node_modules/react-native")
   if has_pod(installer, 'Flipper')
     flipper_post_install(installer)
   end
@@ -255,6 +282,7 @@ def react_native_post_install(installer)
   end
   modify_flags_for_new_architecture(installer, cpp_flags)
 
+  set_node_modules_user_settings(installer, react_native_path)
 end
 
 def modify_flags_for_new_architecture(installer, cpp_flags)
@@ -267,12 +295,12 @@ def modify_flags_for_new_architecture(installer, cpp_flags)
           config_file.save_as(xcconfig_path)
       end
   end
-  # Add RCT_NEW_ARCH_ENABLED to Pods project xcconfig
-  installer.pods_project.targets.each do |target|
-    # if target.name == 'React-Core'
-    if target.name == 'React-Core'
-      puts "#{target.name}"
-      target.build_configurations.each do |config|
+
+  # Add RCT_NEW_ARCH_ENABLED to generated pod target projects
+  installer.target_installation_results.pod_target_installation_results
+    .each do |pod_name, target_installation_result|
+    if pod_name == 'React-Core'
+      target_installation_result.native_target.build_configurations.each do |config|
         config.build_settings['OTHER_CPLUSPLUSFLAGS'] = cpp_flags
       end
     end
@@ -359,7 +387,7 @@ def get_react_codegen_spec(options={})
     'homepage' => 'https://facebook.com/',
     'license' => 'Unlicense',
     'authors' => 'Facebook',
-    'compiler_flags'  => "#{folly_compiler_flags} #{boost_compiler_flags} -Wno-nullability-completeness",
+    'compiler_flags'  => "#{folly_compiler_flags} #{boost_compiler_flags} -Wno-nullability-completeness -std=c++17",
     'source' => { :git => '' },
     'header_mappings_dir' => './',
     'platforms' => {
@@ -420,7 +448,7 @@ def get_react_codegen_script_phases(options={})
   end
 
   # We need to convert paths to relative path from installation_root for the script phase for CI.
-  relative_app_root = Pathname.new(app_path).relative_path_from(Pod::Config.instance.installation_root)
+  relative_app_root = Pathname.new(app_path).realpath().relative_path_from(Pod::Config.instance.installation_root)
 
   config_file_dir = options[:config_file_dir] ||= ''
   relative_config_file_dir = ''
@@ -444,7 +472,7 @@ def get_react_codegen_script_phases(options={})
     library_dir = File.join(app_path, library['jsSrcsDir'])
     file_list.concat (`find #{library_dir} -type f \\( -name "Native*.js" -or -name "*NativeComponent.js" \\)`.split("\n").sort)
   end
-  input_files = file_list.map { |filename| "${PODS_ROOT}/../#{Pathname.new(filename).relative_path_from(Pod::Config.instance.installation_root)}" }
+  input_files = file_list.map { |filename| "${PODS_ROOT}/../#{Pathname.new(filename).realpath().relative_path_from(Pod::Config.instance.installation_root)}" }
 
   # Add a script phase to trigger generate artifact.
   # Some code is duplicated so that it's easier to delete the old way and switch over to this once it's stabilized.
@@ -613,9 +641,11 @@ def use_react_native_codegen!(spec, options={})
   system(prepare_command) # Always run prepare_command when a podspec uses the codegen, as CocoaPods may skip invoking this command in certain scenarios. Replace with pre_integrate_hook after updating to CocoaPods 1.11
   spec.prepare_command = prepare_command
 
+  env_files = ["$PODS_ROOT/../.xcode.env.local", "$PODS_ROOT/../.xcode.env"]
+
   spec.script_phase = {
     :name => 'Generate Specs',
-    :input_files => input_files, # This also needs to be relative to Xcode
+    :input_files => input_files + env_files, # This also needs to be relative to Xcode
     :output_files => ["${DERIVED_FILE_DIR}/codegen-#{library_name}.log"].concat(generated_files.map { |filename| "${PODS_TARGET_SRCROOT}/#{filename}"} ),
     # The final generated files will be created when this script is invoked at Xcode build time.
     :script => get_script_phases_no_codegen_discovery(
@@ -661,3 +691,46 @@ def __apply_Xcode_12_5_M1_post_install_workaround(installer)
   time_header = "#{Pod::Config.instance.installation_root.to_s}/Pods/RCT-Folly/folly/portability/Time.h"
   `sed -i -e  $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' #{time_header}`
 end
+
+# Monkeypatch of `Pod::Lockfile` to ensure automatic update of dependencies integrated with a local podspec when their version changed.
+# This is necessary because local podspec dependencies must be otherwise manually updated.
+module LocalPodspecPatch
+  # Returns local podspecs whose versions differ from the one in the `react-native` package.
+  def self.pods_to_update(react_native_options)
+    prefix = react_native_options[:path] ||= "../node_modules/react-native"
+    @@local_podspecs = Dir.glob("#{prefix}/third-party-podspecs/*").map { |file| File.basename(file, ".podspec") }
+    @@local_podspecs = @@local_podspecs.select do |podspec_name|
+      # Read local podspec to determine the cached version
+      local_podspec_path = File.join(
+        Dir.pwd, "Pods/Local Podspecs/#{podspec_name}.podspec.json"
+      )
+
+      # Local podspec cannot be outdated if it does not exist, yet
+      next unless File.file?(local_podspec_path)
+
+      local_podspec = File.read(local_podspec_path)
+      local_podspec_json = JSON.parse(local_podspec)
+      local_version = local_podspec_json["version"]
+
+      # Read the version from a podspec from the `react-native` package
+      podspec_path = "#{prefix}/third-party-podspecs/#{podspec_name}.podspec"
+      current_podspec = Pod::Specification.from_file(podspec_path)
+
+      current_version = current_podspec.version.to_s
+      current_version != local_version
+    end
+    @@local_podspecs
+  end
+
+  # Patched `detect_changes_with_podfile` method
+  def detect_changes_with_podfile(podfile)
+    changes = super(podfile)
+    @@local_podspecs.each do |local_podspec|
+      next unless changes[:unchanged].include?(local_podspec)
+
+      changes[:unchanged].delete(local_podspec)
+      changes[:changed] << local_podspec
+    end
+    changes
+  end
+end

package/scripts/react_native_pods_utils/script_phases.rb

@@ -45,9 +45,9 @@ def get_script_template(react_native_path, export_vars={})
         <% end %>
 
         SCRIPT_PHASES_SCRIPT="$RCT_SCRIPT_RN_DIR/scripts/react_native_pods_utils/script_phases.sh"
-        /bin/sh -c "$SCRIPT_PHASES_SCRIPT"
+        WITH_ENVIRONMENT="$RCT_SCRIPT_RN_DIR/scripts/xcode/with-environment.sh"
+        /bin/sh -c "$WITH_ENVIRONMENT $SCRIPT_PHASES_SCRIPT"
         EOS
     result = ERB.new(template, 0, '->').result(binding)
-    # puts result
     return result
 end

package/scripts/react_native_pods_utils/script_phases.sh

@@ -33,12 +33,11 @@ else
 fi
 
 find_node () {
-    # shellcheck disable=SC1091
-    source "$RCT_SCRIPT_RN_DIR/scripts/find-node.sh"
-
     NODE_BINARY="${NODE_BINARY:-$(command -v node || true)}"
     if [ -z "$NODE_BINARY" ]; then
-        error "error: Could not find node. Make sure it is in bash PATH or set the NODE_BINARY environment variable."
+        error "[Error] Could not find node. It looks like that the .xcode.env or .xcode.env.local " \
+"files are misconfigured. Please check that they are exporting a valid NODE_BINARY " \
+"variable, pointing to a node executable."
     fi
 }
 
@@ -101,7 +100,7 @@ generateCodegenArtifactsFromSchema () {
 generateArtifacts () {
     describe "Generating codegen artifacts"
     pushd "$RCT_SCRIPT_RN_DIR" >/dev/null || exit 1
-        "$NODE_BINARY" "scripts/generate-artifacts.js" --path "$RCT_SCRIPT_APP_PATH" --outputPath "$TEMP_OUTPUT_DIR" --fabricEnabled "$RCT_SCRIPT_FABRIC_ENABLED" --configFileDir "$RCT_SCRIPT_CONFIG_FILE_DIR"
+        "$NODE_BINARY" "scripts/generate-artifacts.js" --path "$RCT_SCRIPT_APP_PATH" --outputPath "$TEMP_OUTPUT_DIR" --fabricEnabled "$RCT_SCRIPT_FABRIC_ENABLED" --configFileDir "$RCT_SCRIPT_CONFIG_FILE_DIR" --nodeBinary "$NODE_BINARY"
     popd >/dev/null || exit 1
 }
 

package/scripts/xcode/with-environment.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# This script is used to source in Xcode the environment settings required to run properly.
+# The script first sources the base `.xcode.env` file.
+# Then it sources the `.xcode.env.local` file if present, to override some local config
+# Finally, it will execute the command passed i input if any.
+#
+# USAGE:
+# ./with-environment.sh command
+
+# Start with a default
+NODE_BINARY=$(command -v node)
+export NODE_BINARY
+
+# Override the default with the global environment
+ENV_PATH="$PODS_ROOT/../.xcode.env"
+if [ -f "$ENV_PATH" ]; then
+    source "$ENV_PATH"
+fi
+
+# Override the global with the local environment
+LOCAL_ENV_PATH="${ENV_PATH}.local"
+if [ -f "$LOCAL_ENV_PATH" ]; then
+    source "$LOCAL_ENV_PATH"
+fi
+
+# Check whether NODE_BINARY has been properly set, otherwise help the users with a meaningful error.
+if [ -n "$NODE_BINARY" ]; then
+    echo "Node found at: ${NODE_BINARY}"
+else
+    echo "[Warning] You need to configure your node path in the `'.xcode.env' file` environment. " \
+       "You can set it up quickly by running: " \
+       "echo 'export NODE_BINARY=$(command -v node)' > .xcode.env " \
+       "in the ios folder. This is needed by React Native to work correctly. " \
+       "We fallback to the DEPRECATED behavior of finding `node`. This will be REMOVED in a future version. " \
+       "You can read more about this here: https://reactnative.dev/docs/environment-setup#optional-configuring-your-environment" >&2
+    source "${REACT_NATIVE_PATH}/scripts/find-node-for-xcode.sh"
+fi
+
+# Execute argument, if present
+if [ -n "$1" ]; then
+  $1
+fi