react-native-tvos 0.85.2-0 → 0.86.0-0rc2

package/index.js.flow

@@ -405,7 +405,12 @@ export * as Systrace from './Libraries/Performance/Systrace';
 export {default as ToastAndroid} from './Libraries/Components/ToastAndroid/ToastAndroid';
 export * as TurboModuleRegistry from './Libraries/TurboModule/TurboModuleRegistry';
 export {default as UIManager} from './Libraries/ReactNative/UIManager';
-export {unstable_batchedUpdates} from './Libraries/ReactNative/RendererProxy';
+export function unstable_batchedUpdates<T>(
+  fn: (bookkeeping: T) => void,
+  bookkeeping: T,
+): void {
+  fn(bookkeeping);
+}
 export {default as useAnimatedValue} from './Libraries/Animated/useAnimatedValue';
 export {default as useAnimatedValueXY} from './Libraries/Animated/useAnimatedValueXY';
 export {default as useAnimatedColor} from './Libraries/Animated/useAnimatedColor';
@@ -476,6 +481,23 @@ export {
 } from './src/private/components/virtualview/VirtualView';
 export type {ModeChangeEvent} from './src/private/components/virtualview/VirtualView';
 
+export {VirtualArray as unstable_VirtualArray} from './src/private/components/virtualcollection/Virtual';
+export type {
+  Item as unstable_VirtualItem,
+  VirtualCollection as unstable_VirtualCollection,
+} from './src/private/components/virtualcollection/Virtual';
+export {createVirtualCollectionView as unstable_createVirtualCollectionView} from './src/private/components/virtualcollection/VirtualCollectionView';
+export type {
+  VirtualCollectionGenerator as unstable_VirtualCollectionGenerator,
+  VirtualCollectionLayoutComponent as unstable_VirtualCollectionLayoutComponent,
+  VirtualCollectionViewComponent as unstable_VirtualCollectionViewComponent,
+} from './src/private/components/virtualcollection/VirtualCollectionView';
+export {default as unstable_VirtualColumn} from './src/private/components/virtualcollection/column/VirtualColumn';
+export {default as unstable_VirtualColumnGenerator} from './src/private/components/virtualcollection/column/VirtualColumnGenerator';
+export {default as unstable_VirtualRow} from './src/private/components/virtualcollection/row/VirtualRow';
+export {default as unstable_getScrollParent} from './src/private/components/virtualcollection/dom/getScrollParent';
+export {DEFAULT_INITIAL_NUM_TO_RENDER as unstable_DEFAULT_INITIAL_NUM_TO_RENDER} from './src/private/components/virtualcollection/FlingConstants';
+
 // #endregion
 
 // #region TV

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.85.2-0",
+  "version": "0.86.0-0rc2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -154,7 +154,7 @@
     "featureflags-check": "node ./scripts/featureflags/index.js --verify-unchanged"
   },
   "peerDependencies": {
-    "@react-native/jest-preset": "0.85.2",
+    "@react-native/jest-preset": "0.86.0-rc.2",
     "@types/react": "^19.1.1",
     "react": "^19.2.3"
   },
@@ -167,24 +167,24 @@
     }
   },
   "dependencies": {
-    "@react-native/assets-registry": "0.85.2",
-    "@react-native/codegen": "0.85.2",
-    "@react-native/community-cli-plugin": "0.85.2",
-    "@react-native/gradle-plugin": "0.85.2",
-    "@react-native/js-polyfills": "0.85.2",
-    "@react-native/normalize-colors": "0.85.2",
+    "@react-native/assets-registry": "0.86.0-rc.2",
+    "@react-native/codegen": "0.86.0-rc.2",
+    "@react-native/community-cli-plugin": "0.86.0-rc.2",
+    "@react-native/gradle-plugin": "0.86.0-rc.2",
+    "@react-native/js-polyfills": "0.86.0-rc.2",
+    "@react-native/normalize-colors": "0.86.0-rc.2",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
-    "babel-plugin-syntax-hermes-parser": "0.33.3",
+    "babel-plugin-syntax-hermes-parser": "0.36.0",
     "base64-js": "^1.5.1",
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-compiler": "250829098.0.10",
+    "hermes-compiler": "250829098.0.13",
     "invariant": "^2.2.4",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.84.0",
-    "metro-source-map": "^0.84.0",
+    "metro-runtime": "^0.84.3",
+    "metro-source-map": "^0.84.3",
     "nullthrows": "^1.1.1",
     "pretty-format": "^29.7.0",
     "promise": "^8.3.0",
@@ -198,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.85.2-0"
+    "@react-native-tvos/virtualized-lists": "0.86.0-0rc2"
   },
   "codegenConfig": {
     "libraries": [

package/react-native.config.js

@@ -114,9 +114,9 @@ commands.push(codegenCommand);
 
 const config = {
   commands,
-  platforms: {} /*:: as {[string]: $ReadOnly<{
-      projectConfig: mixed,
-      dependencyConfig: mixed,
+  platforms: {} /*:: as {[string]: Readonly<{
+      projectConfig: unknown,
+      dependencyConfig: unknown,
     }>} */,
 };
 

package/scripts/cocoapods/rncore.rb

@@ -105,7 +105,7 @@ class ReactNativeCoreUtils
         if ENV["RCT_TESTONLY_RNCORE_TARBALL_PATH"]
             abort_if_use_local_rncore_with_no_file()
             rncore_log("Using local xcframework at #{ENV["RCT_TESTONLY_RNCORE_TARBALL_PATH"]}")
-            return {:http => "file://#{ENV["RCT_TESTONLY_RNCORE_TARBALL_PATH"]}" }
+            return {:http => ReactNativePodsUtils.local_file_uri(ENV["RCT_TESTONLY_RNCORE_TARBALL_PATH"]) }
         end
 
         if ENV["RCT_USE_PREBUILT_RNCORE"] == "1"
@@ -162,7 +162,8 @@ class ReactNativeCoreUtils
         rncore_log("  #{Pathname.new(destinationDebug).relative_path_from(Pathname.pwd).to_s}")
         rncore_log("  #{Pathname.new(destinationRelease).relative_path_from(Pathname.pwd).to_s}")
 
-        return {:http => URI::File.build(path: destinationDebug).to_s }
+        return {:http => stable_tarball_url(@@react_native_version, :debug) } unless @@download_dsyms
+        return {:http => ReactNativePodsUtils.local_file_uri(destinationDebug) }
     end
 
     def self.podspec_source_download_prebuilt_nightly_tarball()
@@ -198,7 +199,8 @@ class ReactNativeCoreUtils
         rncore_log("Resolved nightly ReactNativeCore-prebuilt version:")
         rncore_log("  #{Pathname.new(destinationDebug).relative_path_from(Pathname.pwd).to_s}")
         rncore_log("  #{Pathname.new(destinationRelease).relative_path_from(Pathname.pwd).to_s}")
-        return {:http => URI::File.build(path: destinationDebug).to_s }
+        return {:http => nightly_tarball_url(@@react_native_version, :debug) } unless @@download_dsyms
+        return {:http => ReactNativePodsUtils.local_file_uri(destinationDebug) }
     end
 
     def self.process_dsyms(frameworkTarball, dSymsTarball)
@@ -420,17 +422,69 @@ class ReactNativeCoreUtils
     end
 
     def self.download_rncore_tarball(react_native_path, tarball_url, version, configuration, dsyms = false)
-        destination_path = configuration == nil ?
-            "#{artifacts_dir()}/reactnative-core-#{version}#{dsyms ? "-dSYM" : ""}.tar.gz" :
-            "#{artifacts_dir()}/reactnative-core-#{version}#{dsyms ? "-dSYM" : ""}-#{configuration}.tar.gz"
+        filename = configuration == nil ?
+            "reactnative-core-#{version}#{dsyms ? "-dSYM" : ""}.tar.gz" :
+            "reactnative-core-#{version}#{dsyms ? "-dSYM" : ""}-#{configuration}.tar.gz"
+        destination_path = "#{artifacts_dir()}/#{filename}"
+
+        if File.exist?(destination_path)
+          rncore_log("Tarball #{filename} already exists in Pods. Skipping download.")
+          return destination_path
+        end
 
-        unless File.exist?(destination_path)
-          # Download to a temporary file first so we don't cache incomplete downloads.
-          rncore_log("Downloading ReactNativeCore-prebuilt #{dsyms ? "dSYMs " : ""}#{configuration ? configuration.to_s : ""} tarball from #{tarball_url} to #{Pathname.new(destination_path).relative_path_from(Pathname.pwd).to_s}")
+        `mkdir -p "#{artifacts_dir()}"`
+
+        if ReactNativePodsUtils.skip_caches?
+          rncore_log("RCT_SKIP_CACHES is set. Downloading #{filename} directly (bypassing shared cache).")
           tmp_file = "#{artifacts_dir()}/reactnative-core.download"
-          `mkdir -p "#{artifacts_dir()}" && curl "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+          `curl -A "react-native-#{version}" "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+          unless File.exist?(destination_path)
+            abort("[ReactNativeCore] Failed to download #{filename} from #{tarball_url}. Aborting.")
+          end
+          return destination_path
+        end
+
+        cached_path = File.join(ReactNativePodsUtils.shared_cache_dir(), filename)
+        if File.exist?(cached_path)
+          rncore_log("Verifying checksum for cached #{filename}...")
+          if ReactNativePodsUtils.validate_tarball(cached_path, tarball_url)
+            rncore_log("Cache hit: copying #{filename} from shared cache (#{ReactNativePodsUtils.shared_cache_dir()})")
+            FileUtils.cp(cached_path, destination_path)
+          else
+            rncore_log("Shared cache file #{filename} failed SHA verification. Re-downloading.")
+            File.delete(cached_path)
+            tmp_file = "#{artifacts_dir()}/reactnative-core.download"
+            `curl -A "react-native-#{version}" "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+            unless File.exist?(destination_path)
+              abort("[ReactNativeCore] Failed to download #{filename} from #{tarball_url}. Aborting.")
+            end
+            rncore_log("Verifying checksum for downloaded #{filename}...")
+            if ReactNativePodsUtils.validate_tarball(destination_path, tarball_url)
+              FileUtils.cp(destination_path, cached_path)
+              rncore_log("Saved #{filename} to shared cache (#{ReactNativePodsUtils.shared_cache_dir()})")
+            else
+              File.delete(destination_path) if File.exist?(destination_path)
+              abort("[ReactNativeCore] Downloaded file #{filename} failed SHA verification. Aborting.")
+            end
+          end
         else
-          rncore_log("Using downloaded ReactNativeCore-prebuilt #{dsyms ? "dSYMs " : ""}#{configuration ? configuration.to_s : ""} tarball at #{Pathname.new(destination_path).relative_path_from(Pathname.pwd).to_s}")
+          rncore_log("Cache miss: downloading #{filename} from #{tarball_url}")
+          # Download to a temporary file first so we don't cache incomplete downloads.
+          tmp_file = "#{artifacts_dir()}/reactnative-core.download"
+          `curl -A "react-native-#{version}" "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+          unless File.exist?(destination_path)
+            abort("[ReactNativeCore] Failed to download #{filename} from #{tarball_url}. Aborting.")
+          end
+          rncore_log("Verifying checksum for downloaded #{filename}...")
+          if ReactNativePodsUtils.validate_tarball(destination_path, tarball_url)
+            # Save to shared cache for future use
+            `mkdir -p "#{ReactNativePodsUtils.shared_cache_dir()}"`
+            FileUtils.cp(destination_path, cached_path)
+            rncore_log("Saved #{filename} to shared cache (#{ReactNativePodsUtils.shared_cache_dir()})")
+          else
+            File.delete(destination_path) if File.exist?(destination_path)
+            abort("[ReactNativeCore] Downloaded file #{filename} failed SHA verification. Aborting.")
+          end
         end
 
         return destination_path

package/scripts/cocoapods/rndependencies.rb

@@ -70,7 +70,7 @@ class ReactNativeDependenciesUtils
         if ENV["RCT_USE_LOCAL_RN_DEP"]
             abort_if_use_local_rndeps_with_no_file()
             rndeps_log("Using local xcframework at #{ENV["RCT_USE_LOCAL_RN_DEP"]}")
-            return {:http => "file://#{ENV["RCT_USE_LOCAL_RN_DEP"]}" }
+            return {:http => ReactNativePodsUtils.local_file_uri(ENV["RCT_USE_LOCAL_RN_DEP"]) }
         end
 
         if ENV["RCT_USE_RN_DEP"] && ENV["RCT_USE_RN_DEP"] == "1"
@@ -158,10 +158,10 @@ class ReactNativeDependenciesUtils
 
         url = release_tarball_url(@@react_native_version, :debug)
         rndeps_log("Using tarball from URL: #{url}")
-        destinationDebug = download_stable_rndeps(@@react_native_path, @@react_native_version, :debug)
+        download_stable_rndeps(@@react_native_path, @@react_native_version, :debug)
         download_stable_rndeps(@@react_native_path, @@react_native_version, :release)
 
-        return {:http => URI::File.build(path: destinationDebug).to_s }
+        return {:http => url }
     end
 
     def self.release_tarball_url(version, build_type)
@@ -236,22 +236,76 @@ class ReactNativeDependenciesUtils
 
         url = nightly_tarball_url(version, :debug)
         rndeps_log("Using tarball from URL: #{url}")
-        destinationDebug = download_nightly_rndeps(@@react_native_path, @@react_native_version, :debug)
+        download_nightly_rndeps(@@react_native_path, @@react_native_version, :debug)
         download_nightly_rndeps(@@react_native_path, @@react_native_version, :release)
 
-        return {:http => URI::File.build(path: destinationDebug).to_s }
-        return {:http => url}
+        return {:http => url }
     end
 
     def self.download_rndeps_tarball(react_native_path, tarball_url, version, configuration)
-        destination_path = configuration == nil ?
-            "#{artifacts_dir()}/reactnative-dependencies-#{version}.tar.gz" :
-            "#{artifacts_dir()}/reactnative-dependencies-#{version}-#{configuration}.tar.gz"
+        filename = configuration == nil ?
+            "reactnative-dependencies-#{version}.tar.gz" :
+            "reactnative-dependencies-#{version}-#{configuration}.tar.gz"
+        destination_path = "#{artifacts_dir()}/#{filename}"
+
+        if File.exist?(destination_path)
+          rndeps_log("Tarball #{filename} already exists in Pods. Skipping download.")
+          return destination_path
+        end
+
+        `mkdir -p "#{artifacts_dir()}"`
+
+        if ReactNativePodsUtils.skip_caches?
+          rndeps_log("RCT_SKIP_CACHES is set. Downloading #{filename} directly (bypassing shared cache).")
+          tmp_file = "#{artifacts_dir()}/reactnative-dependencies.download"
+          `curl -A "react-native-#{version}" "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+          unless File.exist?(destination_path)
+            abort("[ReactNativeDependencies] Failed to download #{filename} from #{tarball_url}. Aborting.")
+          end
+          return destination_path
+        end
 
-        unless File.exist?(destination_path)
+        cached_path = File.join(ReactNativePodsUtils.shared_cache_dir(), filename)
+        if File.exist?(cached_path)
+          rndeps_log("Verifying checksum for cached #{filename}...")
+          if ReactNativePodsUtils.validate_tarball(cached_path, tarball_url)
+            rndeps_log("Cache hit: copying #{filename} from shared cache (#{ReactNativePodsUtils.shared_cache_dir()})")
+            FileUtils.cp(cached_path, destination_path)
+          else
+            rndeps_log("Shared cache file #{filename} failed SHA verification. Re-downloading.")
+            File.delete(cached_path)
+            tmp_file = "#{artifacts_dir()}/reactnative-dependencies.download"
+            `curl -A "react-native-#{version}" "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+            unless File.exist?(destination_path)
+              abort("[ReactNativeDependencies] Failed to download #{filename} from #{tarball_url}. Aborting.")
+            end
+            rndeps_log("Verifying checksum for downloaded #{filename}...")
+            if ReactNativePodsUtils.validate_tarball(destination_path, tarball_url)
+              FileUtils.cp(destination_path, cached_path)
+              rndeps_log("Saved #{filename} to shared cache (#{ReactNativePodsUtils.shared_cache_dir()})")
+            else
+              File.delete(destination_path) if File.exist?(destination_path)
+              abort("[ReactNativeDependencies] Downloaded file #{filename} failed SHA verification. Aborting.")
+            end
+          end
+        else
+          rndeps_log("Cache miss: downloading #{filename} from #{tarball_url}")
           # Download to a temporary file first so we don't cache incomplete downloads.
           tmp_file = "#{artifacts_dir()}/reactnative-dependencies.download"
-          `mkdir -p "#{artifacts_dir()}" && curl "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+          `curl -A "react-native-#{version}" "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+          unless File.exist?(destination_path)
+            abort("[ReactNativeDependencies] Failed to download #{filename} from #{tarball_url}. Aborting.")
+          end
+          rndeps_log("Verifying checksum for downloaded #{filename}...")
+          if ReactNativePodsUtils.validate_tarball(destination_path, tarball_url)
+            # Save to shared cache for future use
+            `mkdir -p "#{ReactNativePodsUtils.shared_cache_dir()}"`
+            FileUtils.cp(destination_path, cached_path)
+            rndeps_log("Saved #{filename} to shared cache (#{ReactNativePodsUtils.shared_cache_dir()})")
+          else
+            File.delete(destination_path) if File.exist?(destination_path)
+            abort("[ReactNativeDependencies] Downloaded file #{filename} failed SHA verification. Aborting.")
+          end
         end
 
         return destination_path

package/scripts/cocoapods/utils.rb

@@ -4,12 +4,19 @@
 # LICENSE file in the root directory of this source tree.
 
 require 'shellwords'
+require 'digest'
+require 'uri'
 
 require_relative "./helpers.rb"
 require_relative "./jsengine.rb"
 
 # Utilities class for React Native Cocoapods
 class ReactNativePodsUtils
+    # URI::File.build validates path components as ASCII, so escape the filesystem path first.
+    def self.local_file_uri(path)
+        URI::File.build(path: URI::DEFAULT_PARSER.escape(path)).to_s
+    end
+
     def self.warn_if_not_on_arm64
         if SysctlChecker.new().call_sysctl_arm64() == 1 && !Environment.new().ruby_platform().include?('arm64')
             Pod::UI.warn 'Do not use "pod install" from inside Rosetta2 (x86_64 emulation on arm64).'
@@ -61,6 +68,7 @@ class ReactNativePodsUtils
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED=1", "React-jsinspectornetwork", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED=1", "React-RCTNetwork", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED=1", "React-networking", :debug)
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED=1", "React-RuntimeApple", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-jsinspector", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-jsinspectornetwork", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-RCTNetwork", :debug)
@@ -782,4 +790,49 @@ class ReactNativePodsUtils
             spec.header_mappings_dir = header_mappings_dir
         end
     end
+
+    # ==================== #
+    # Shared download cache #
+    # ==================== #
+
+    def self.skip_caches?
+        ENV['RCT_SKIP_CACHES'] == '1'
+    end
+
+    def self.shared_cache_dir()
+        return File.join(Dir.home, "Library", "Caches", "ReactNative")
+    end
+
+    def self.fetch_maven_sha1(tarball_url)
+        sha1 = `curl -sL "#{tarball_url}.sha1"`.strip
+        return sha1.downcase if $?.success? && sha1.match?(/\A[a-fA-F0-9]{40}\z/)
+        nil
+    end
+
+    def self.validate_tarball(path, tarball_url)
+        expected_sha1 = fetch_maven_sha1(tarball_url)
+        basename = File.basename(path)
+        if expected_sha1.nil?
+          cache_log("SHA1 not available from Maven for #{basename}. Skipping validation.")
+          return true
+        end
+        actual_sha1 = Digest::SHA1.file(path).hexdigest
+        if actual_sha1 == expected_sha1
+          cache_log("SHA1 verified for #{basename}")
+          return true
+        end
+        cache_log("SHA1 mismatch for #{basename}: expected #{expected_sha1}, got #{actual_sha1}", :error)
+        return false
+    end
+
+    def self.cache_log(message, level = :info)
+        return unless Object.const_defined?("Pod::UI")
+        prefix = '[Cache] '
+        case level
+        when :error
+            Pod::UI.puts prefix.red + message
+        else
+            Pod::UI.puts prefix.green + message
+        end
+    end
 end

package/scripts/codegen/generate-artifacts-executor/generateCustomURLHandlers.js

@@ -26,7 +26,7 @@ const MODULES_PROTOCOLS_MM_TEMPLATE_PATH = path.join(
 );
 
 function generateCustomURLHandlers(
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
   outputDir /*: string */,
 ) {
   const iosAnnotations = parseiOSAnnotations(libraries);

package/scripts/codegen/generate-artifacts-executor/generateNativeCode.js

@@ -19,12 +19,19 @@ const path = require('path');
 
 function generateNativeCode(
   outputPath /*: string */,
-  schemaInfos /*: $ReadOnlyArray<$FlowFixMe> */,
+  schemaInfos /*: ReadonlyArray<$FlowFixMe> */,
   includesGeneratedCode /*: boolean */,
   platform /*: string */,
+  forceOutputPath /*: boolean */ = false,
 ) /*: Array<void> */ {
   return schemaInfos.map(schemaInfo => {
-    generateCode(outputPath, schemaInfo, includesGeneratedCode, platform);
+    generateCode(
+      outputPath,
+      schemaInfo,
+      includesGeneratedCode,
+      platform,
+      forceOutputPath,
+    );
   });
 }
 
@@ -33,6 +40,7 @@ function generateCode(
   schemaInfo /*: $FlowFixMe */,
   includesGeneratedCode /*: boolean */,
   platform /*: string */,
+  forceOutputPath /*: boolean */ = false,
 ) {
   if (shouldSkipGenerationForFBReactNativeSpec(schemaInfo, platform)) {
     codegenLog(
@@ -60,8 +68,9 @@ function generateCode(
   );
 
   // Finally, copy artifacts to the final output directory.
-  const outputDir =
-    reactNativeCoreLibraryOutputPath(libraryName, platform) ?? outputPath;
+  const outputDir = forceOutputPath
+    ? outputPath
+    : (reactNativeCoreLibraryOutputPath(libraryName, platform) ?? outputPath);
   fs.mkdirSync(outputDir, {recursive: true});
   cpSyncRecursiveIfChanged(tmpOutputDir, outputDir);
   codegenLog(`Generated artifacts: ${outputDir}`);

package/scripts/codegen/generate-artifacts-executor/generateRCTModuleProviders.js

@@ -32,7 +32,7 @@ const MODULE_PROVIDERS_MM_TEMPLATE_PATH = path.join(
 function generateRCTModuleProviders(
   projectRoot /*: string */,
   pkgJson /*: $FlowFixMe */,
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
   outputDir /*: string */,
 ) {
   fs.mkdirSync(outputDir, {recursive: true});

package/scripts/codegen/generate-artifacts-executor/generateRCTThirdPartyComponents.js

@@ -31,7 +31,7 @@ const THIRD_PARTY_COMPONENTS_MM_TEMPLATE_PATH = path.join(
 );
 
 function generateRCTThirdPartyComponents(
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
   outputDir /*: string */,
 ) {
   fs.mkdirSync(outputDir, {recursive: true});

package/scripts/codegen/generate-artifacts-executor/generateReactCodegenPodspec.js

@@ -49,8 +49,13 @@ function getInputFiles(appPath /*: string */, appPkgJson /*: $FlowFixMe */) {
     return '[]';
   }
 
+  // Normalize appPath so any "Pods/.." segment is collapsed before find runs.
+  // Otherwise every find result inherits the search-root prefix containing
+  // "/Pods/" and gets dropped by the exclusion filter below.
+  const resolvedAppPath = path.resolve(appPath);
+
   const xcodeproj = String(
-    execSync(`find ${appPath} -type d -name "*.xcodeproj"`),
+    execSync(`find ${resolvedAppPath} -type d -name "*.xcodeproj"`),
   )
     .trim()
     .split('\n')
@@ -61,12 +66,12 @@ function getInputFiles(appPath /*: string */, appPkgJson /*: $FlowFixMe */) {
     )[0];
   if (!xcodeproj) {
     throw new Error(
-      `Cannot find .xcodeproj file inside ${appPath}. This is required to determine codegen spec paths relative to native project.`,
+      `Cannot find .xcodeproj file inside ${resolvedAppPath}. This is required to determine codegen spec paths relative to native project.`,
     );
   }
   const jsFiles = '-name "Native*.js" -or -name "*NativeComponent.js"';
   const tsFiles = '-name "Native*.ts" -or -name "*NativeComponent.ts"';
-  const findCommand = `find ${path.join(appPath, jsSrcsDir)} -type f -not -path "*/__mocks__/*" -and \\( ${jsFiles} -or ${tsFiles} \\)`;
+  const findCommand = `find ${path.join(resolvedAppPath, jsSrcsDir)} -type f -not -path "*/__mocks__/*" -and \\( ${jsFiles} -or ${tsFiles} \\)`;
   const list = String(execSync(findCommand))
     .trim()
     .split('\n')
@@ -82,10 +87,16 @@ function codegenScripts(appPath /*: string */, baseOutputPath /*: string */) {
     baseOutputPath,
     REACT_NATIVE_PACKAGE_ROOT_FOLDER,
   );
+  // Use PODFILE_DIR (set by react_native_post_install) to locate the Podfile
+  // directory. PODS_ROOT/.. does not work when Pods/ is a symlink.
   return `<<-SCRIPT
-pushd "$PODS_ROOT/../" > /dev/null
-RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
-popd >/dev/null
+if [ -n "$PODFILE_DIR" ]; then
+  RCT_SCRIPT_POD_INSTALLATION_ROOT="$PODFILE_DIR"
+else
+  pushd "$PODS_ROOT/../" > /dev/null
+  RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
+  popd >/dev/null
+fi
 
 export RCT_SCRIPT_RN_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${relativeReactNativeRootFolder}"
 export RCT_SCRIPT_APP_PATH="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${relativeAppPath.length === 0 ? '.' : relativeAppPath}"

package/scripts/codegen/generate-artifacts-executor/generateSchemaInfos.js

@@ -17,7 +17,7 @@ const path = require('path');
 const {globSync} = require('tinyglobby');
 
 function generateSchemaInfos(
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
 ) /*: Array<$FlowFixMe> */ {
   // $FlowFixMe[incompatible-type]
   return libraries.map(generateSchemaInfo);

package/scripts/codegen/generate-artifacts-executor/generateUnstableModulesRequiringMainQueueSetupProvider.js

@@ -28,7 +28,7 @@ const UNSTABLE_MODULES_REQUIRING_MAIN_QUEUE_SETUP_PROVIDER_MM_TEMPLATE_PATH =
   );
 
 function generateUnstableModulesRequiringMainQueueSetupProvider(
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
   outputDir /*: string */,
 ) {
   const iosAnnotations = parseiOSAnnotations(libraries);

package/scripts/codegen/generate-artifacts-executor/index.js

@@ -66,6 +66,7 @@ function execute(
   optionalBaseOutputPath /*: ?string */,
   source /*: string */,
   runReactNativeCodegen /*: boolean */ = true,
+  forceOutputPath /*: boolean */ = false,
 ) {
   try {
     codegenLog(`Analyzing ${path.join(projectRoot, 'package.json')}`);
@@ -146,6 +147,7 @@ function execute(
           ),
           pkgJsonIncludesGeneratedCode(pkgJson),
           platform,
+          forceOutputPath,
         );
       }
 

package/scripts/codegen/generate-artifacts-executor/utils.js

@@ -390,7 +390,7 @@ function isReactNativeCoreLibrary(libraryName /*: string */) /*: boolean */ {
  * Validates that components are defined in at most one library.
  */
 function parseiOSAnnotations(
-  libraries /*: $ReadOnlyArray<$FlowFixMe> */,
+  libraries /*: ReadonlyArray<$FlowFixMe> */,
 ) /*: {[string]: $FlowFixMe} */ {
   const mLibraryMap /*: {[string]: $FlowFixMe} */ = {};
   const cLibraryMap /*: {[string]: $FlowFixMe} */ = {};

package/scripts/codegen/generate-specs-cli-executor.js

@@ -14,7 +14,7 @@ const utils = require('./codegen-utils');
 const fs = require('fs');
 const path = require('path');
 
-const GENERATORS /*: {[string]: {[string]: $ReadOnlyArray<string>}} */ = {
+const GENERATORS /*: {[string]: {[string]: ReadonlyArray<string>}} */ = {
   all: {
     android: ['componentsAndroid', 'modulesAndroid', 'modulesCxx'],
     ios: ['componentsIOS', 'modulesIOS', 'modulesCxx'],

package/scripts/generate-codegen-artifacts.js

@@ -31,8 +31,26 @@ const argv = yargs
     description: 'Whether the script is invoked from an `app` or a `library`',
     default: 'app',
   })
+  .option('f', {
+    alias: 'forceOutputPath',
+    description:
+      'Whether to force React Native Core artifacts to output to the specified path',
+    type: 'boolean',
+    default: false,
+  })
   .usage('Usage: $0 -p [path to app] -t [target platform] -o [output path]')
   .demandOption(['p', 't']).argv;
 
-// $FlowFixMe[prop-missing]
-executor.execute(argv.path, argv.targetPlatform, argv.outputPath, argv.source);
+executor.execute(
+  // $FlowFixMe[prop-missing]
+  argv.path,
+  // $FlowFixMe[prop-missing]
+  argv.targetPlatform,
+  // $FlowFixMe[prop-missing]
+  argv.outputPath,
+  // $FlowFixMe[prop-missing]
+  argv.source,
+  true, // runReactNativeCodegen
+  // $FlowFixMe[prop-missing]
+  argv.forceOutputPath,
+);

package/scripts/generate-provider-cli.js

@@ -34,7 +34,7 @@ const argv = yargs
     'Please provide platform, schema path, and output directory.',
   ).argv;
 
-const GENERATORS /*: {[string]: $ReadOnlyArray<string>} */ = {
+const GENERATORS /*: {[string]: ReadonlyArray<string>} */ = {
   android: [],
   ios: ['providerIOS'],
 };