@depup/react-native 0.86.2-depup.0 → 0.87.0-depup.0

package/scripts/cocoapods/rndeps_facades.rb

@@ -0,0 +1,193 @@
+# 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.
+
+require 'json'
+require 'fileutils'
+# Self-contained against require ordering: this module reads
+# Helpers::Constants.socket_rocket_config. react_native_pods.rb normally loads
+# helpers.rb first, but requiring it here (idempotent) removes that implicit
+# dependency. The defined? guard at the use site stays as a backstop.
+require_relative './helpers'
+
+# Dependency-only facade podspecs for the third-party deps in prebuilt-deps
+# mode (deps-side analogue of RNCoreFacades). Design + rationale:
+# scripts/cocoapods/__docs__/prebuilt-deps.md
+module RNDepsFacades
+    # The name of the umbrella prebuilt-deps pod every facade depends on. Its pod
+    # self-serves the third-party headers + carries the binary (see
+    # rndependencies.rb, ReactNativeDependencies.podspec).
+    DEPS_POD = "ReactNativeDependencies"
+
+    # pod name => podspec path (relative to the react-native package root), or
+    # :synthesized for a pod with no local podspec (SocketRocket). Version +
+    # subspecs + default_subspecs are DERIVED from the real podspec where one
+    # exists; synthesized entries derive their version from a constant.
+    FACADE_PODS = {
+        "RCT-Folly"        => "third-party-podspecs/RCT-Folly.podspec",
+        "glog"             => "third-party-podspecs/glog.podspec",
+        "boost"            => "third-party-podspecs/boost.podspec",
+        "DoubleConversion" => "third-party-podspecs/DoubleConversion.podspec",
+        "fmt"              => "third-party-podspecs/fmt.podspec",
+        "fast_float"       => "third-party-podspecs/fast_float.podspec",
+        "SocketRocket"     => :synthesized,
+    }
+
+    # Sub-directory (relative to the install root) that holds the generated
+    # deps facades. Kept separate from RNCoreFacades' `build/rncore-facades` so
+    # the two families never collide.
+    FACADE_RELDIR = File.join("build", "rndeps-facades")
+
+    # Generates the facade podspecs and returns the base directory holding them.
+    # Each facade gets its OWN sub-directory containing a single
+    # `<Name>.podspec.json`, so it can be installed as a LOCAL pod via
+    # `:path => <dir>` (PathSource uses the spec in place and never downloads
+    # `spec.source`). Idempotent; safe to call once per `pod install`.
+    #
+    # `react_native_path` locates the real third-party podspecs we mirror.
+    # version + subspecs + default_subspecs are DERIVED from the real spec (or,
+    # for SocketRocket, synthesized from the socket_rocket_config version) so the
+    # facade matches the source pod's spec/subspec SHAPE. It is not fully
+    # graph-equivalent: every derived subspec depends only on
+    # ReactNativeDependencies, so intra-pod subspec deps (e.g. RCT-Folly/Fabric
+    # -> RCT-Folly/Default) are not reproduced — harmless here because the deps
+    # are all declared explicitly in react_native_pods.rb. NO source_files and
+    # NO headers are emitted — the ReactNativeDependencies pod supplies both. A
+    # facaded pod whose real podspec can't be read is a hard error (see
+    # load_real_spec) — silently shipping an empty facade would hide drift.
+    def self.generate(react_native_path, install_root, ios_version)
+        abs_base = File.join(install_root.to_s, FACADE_RELDIR)
+        FileUtils.mkdir_p(abs_base)
+        FACADE_PODS.each do |name, podspec_rel_path|
+            dir = File.join(abs_base, name)
+            FileUtils.mkdir_p(dir)
+
+            if podspec_rel_path == :synthesized
+                spec = synthesized_spec(name, ios_version)
+            else
+                podspec_path = File.join(react_native_path.to_s, podspec_rel_path)
+                real = load_real_spec(podspec_path, name)
+                spec = derived_spec(name, real, ios_version)
+            end
+
+            File.write(File.join(dir, "#{name}.podspec.json"), JSON.pretty_generate(spec))
+        end
+        abs_base
+    end
+
+    # Facade dir for `<name>`, RELATIVE to the install root — pass to `pod :path =>`.
+    # Relative (not absolute) so the path CocoaPods records in Podfile.lock is
+    # portable rather than machine-specific.
+    def self.facade_path(name)
+        File.join(FACADE_RELDIR, name)
+    end
+
+    # Base spec skeleton shared by derived + synthesized facades: dependency-only,
+    # no source_files, no headers. Depends solely on ReactNativeDependencies.
+    def self.base_spec(name, version, ios_version)
+        {
+            "name" => name,
+            "version" => version,
+            "summary" => "Prebuilt facade for #{name} (code + headers live in #{DEPS_POD}).",
+            "homepage" => "https://reactnative.dev/",
+            "license" => "MIT",
+            "authors" => "Meta Platforms, Inc. and its affiliates",
+            "platforms" => { "ios" => ios_version },
+            # Required podspec attribute, but never fetched: installed as a LOCAL
+            # pod (`:path => <dir>`), which uses this spec in place and ships no
+            # source_files. Placeholder only.
+            "source" => { "git" => "https://github.com/facebook/react-native.git" },
+            "dependencies" => { DEPS_POD => [] },
+        }
+    end
+    private_class_method :base_spec
+
+    # Facade derived from a real third-party podspec: version + subspecs +
+    # default_subspecs mirror the real spec so a bare `pod '<Name>'` and any
+    # `pod '<Name>/<Subspec>'` resolve to the SAME graph (e.g. RCT-Folly's
+    # bare + /Default + /Fabric). Each subspec is also dependency-only and
+    # depends on ReactNativeDependencies.
+    #
+    # NOTE: resources (e.g. RCT-Folly's PrivacyInfo.xcprivacy) are intentionally
+    # NOT carried. In prebuilt-deps mode the third-party code — and its privacy
+    # manifest — is embedded in the ReactNativeDependencies artifact; the facade
+    # only needs to declare the dependency (see the design note in the PR).
+    def self.derived_spec(name, real, ios_version)
+        spec = base_spec(name, real.version.to_s, ios_version)
+
+        defaults = Array(real.default_subspecs)
+        spec["default_subspecs"] = defaults unless defaults.empty?
+
+        subspecs = derive_subspecs(real)
+        unless subspecs.empty?
+            spec["subspecs"] = subspecs.map do |ss|
+                { "name" => ss, "dependencies" => { DEPS_POD => [] } }
+            end
+        end
+
+        spec
+    end
+    private_class_method :derived_spec
+
+    # Facade synthesized for a pod with NO local podspec (SocketRocket, a trunk
+    # pod). Version comes from Helpers::Constants::socket_rocket_config; no
+    # subspecs. A missing/blank constant is a hard error rather than a silent
+    # versionless facade — a bare `pod 'SocketRocket'` in the source path is
+    # `"~> #{socket_rocket_config[:version]}"`, so the facade MUST carry a version
+    # that satisfies that constraint.
+    def self.synthesized_spec(name, ios_version)
+        version = synthesized_version(name)
+        base_spec(name, version, ios_version)
+    end
+    private_class_method :synthesized_spec
+
+    # Resolves the synthesized version for a no-podspec facade. Fail-closed on a
+    # missing constant/version. Only SocketRocket is synthesized today.
+    def self.synthesized_version(name)
+        case name
+        when "SocketRocket"
+            unless defined?(Helpers::Constants) && Helpers::Constants.respond_to?(:socket_rocket_config)
+                raise "[RNDepsFacades] Cannot synthesize facade for '#{name}': " \
+                      "Helpers::Constants.socket_rocket_config is unavailable."
+            end
+            version = Helpers::Constants.socket_rocket_config[:version]
+            if version.nil? || version.to_s.strip.empty?
+                raise "[RNDepsFacades] Cannot synthesize facade for '#{name}': " \
+                      "socket_rocket_config[:version] is missing or empty."
+            end
+            version.to_s
+        else
+            raise "[RNDepsFacades] No synthesized version rule for facaded pod '#{name}'. " \
+                  "Add one to synthesized_version or give it a real podspec in FACADE_PODS."
+        end
+    end
+    private_class_method :synthesized_version
+
+    # Loads the real podspec so we can mirror its structure. A facaded pod with a
+    # declared podspec path MUST have a readable real podspec — if it's missing or
+    # unparseable we raise rather than ship an empty facade (which would silently
+    # drop subspecs / the version, the very drift this mechanism prevents).
+    def self.load_real_spec(path, name)
+        unless File.exist?(path)
+            raise "[RNDepsFacades] Real podspec for facaded pod '#{name}' not found at #{path}. " \
+                  "Update FACADE_PODS in rndeps_facades.rb if the podspec moved."
+        end
+        begin
+            Pod::Specification.from_file(path)
+        rescue => e
+            raise "[RNDepsFacades] Failed to read real podspec for facaded pod '#{name}' at #{path}: #{e.message}"
+        end
+    end
+    private_class_method :load_real_spec
+
+    # Library (non-test, non-app) subspec names of the real spec, so third-party
+    # libs depending on `<pod>/<subspec>` (e.g. `RCT-Folly/Fabric`) keep
+    # resolving. Derived, never hand-listed.
+    def self.derive_subspecs(real)
+        real.subspecs
+            .reject { |ss| ss.test_specification? || (ss.respond_to?(:app_specification?) && ss.app_specification?) }
+            .map(&:base_name)
+    end
+    private_class_method :derive_subspecs
+end

package/scripts/cocoapods/spm.rb

@@ -19,33 +19,51 @@ class SPMManager
     log 'Cleaning old SPM dependencies from Pods project'
     clean_spm_dependencies_from_target(project, @dependencies_by_pod)
     log 'Adding SPM dependencies to Pods project'
+    flattened_pod_names = []
     @dependencies_by_pod.each do |pod_name, dependencies|
+      target = project.targets.find { |t| t.name == pod_name}
       dependencies.each do |spm_spec|
         log "Adding SPM dependency on product #{spm_spec[:products]}"
         add_spm_to_target(
           project,
-          project.targets.find { |t| t.name == pod_name},
+          target,
           spm_spec[:url],
           spm_spec[:requirement],
           spm_spec[:products]
         )
-        log " Adding workaround for Swift package not found issue"
-        target = project.targets.find { |t| t.name == pod_name}
-        target.build_configurations.each do |config|
-          target.build_settings(config.name)['SWIFT_INCLUDE_PATHS'] ||= ['$(inherited)']
-          search_path = '${SYMROOT}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/'
-          unless target.build_settings(config.name)['SWIFT_INCLUDE_PATHS'].include?(search_path)
-            target.build_settings(config.name)['SWIFT_INCLUDE_PATHS'].push(search_path)
+        if target.product_type == 'com.apple.product-type.library.static'
+          # Xcode emits a package C-target's module map both into the shared
+          # products dir and into this pod's CONFIGURATION_BUILD_DIR, and both
+          # copies are unavoidably visible (the package swiftmodule serializes
+          # the products-root path) — clang hard-errors with "redefinition of
+          # module" on Xcode 26.3. Building the pod straight into the products
+          # root makes both paths the same file, and puts the package
+          # swiftmodule on the pod's default search path.
+          log " Building #{pod_name} into the shared products dir to avoid duplicate module maps"
+          target.build_configurations.each do |config|
+            target.build_settings(config.name)['CONFIGURATION_BUILD_DIR'] = '${PODS_CONFIGURATION_BUILD_DIR}'
+          end
+          flattened_pod_names << pod_name unless flattened_pod_names.include?(pod_name)
+        else
+          log " Adding workaround for Swift package not found issue"
+          target.build_configurations.each do |config|
+            target.build_settings(config.name)['SWIFT_INCLUDE_PATHS'] ||= ['$(inherited)']
+            search_path = '${SYMROOT}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/'
+            unless target.build_settings(config.name)['SWIFT_INCLUDE_PATHS'].include?(search_path)
+              target.build_settings(config.name)['SWIFT_INCLUDE_PATHS'].push(search_path)
+            end
           end
         end
       end
     end
 
+    rewrite_aggregate_modulemap_references(installer, flattened_pod_names) unless flattened_pod_names.empty?
+
     unless @dependencies_by_pod.empty?
       log_warning "If you're using Xcode 15 or earlier you might need to close and reopen the Xcode workspace"
       unless ENV["USE_FRAMEWORKS"] == "dynamic"
         @dependencies_by_pod.each do |pod_name, dependencies|
-          log_warning "Pod #{pod_name} is using swift package(s) #{dependencies.map{|i| i[:products]}.flatten.uniq.join(", ")} with static linking, this might cause linker errors. Consider using USE_FRAMEWORKS=dynamic, see https://github.com/react/react-native/pull/44627#issuecomment-2123119711 for more information"
+          log_warning "Pod #{pod_name} is using swift package(s) #{dependencies.map{|i| i[:products]}.flatten.uniq.join(", ")} with static linking, this might cause linker errors. Consider using USE_FRAMEWORKS=dynamic, see https://github.com/facebook/react-native/pull/44627#issuecomment-2123119711 for more information"
         end
       end
     end
@@ -53,6 +71,55 @@ class SPMManager
 
   private
 
+  # Flattening a pod's build dir moves its generated modulemap from
+  # "<Pod>/<Pod>.modulemap" to "<Pod>.modulemap"; the aggregate xcconfigs
+  # reference the old path via -fmodule-map-file. Must mutate the in-memory
+  # Config attributes — later post_install steps (NewArchitectureHelper) re-save
+  # the same Config objects and would clobber a plain file edit.
+  def rewrite_aggregate_modulemap_references(installer, pod_names)
+    installer.aggregate_targets.each do |aggregate_target|
+      aggregate_target.xcconfigs.each do |config_name, config_file|
+        %w[OTHER_CFLAGS OTHER_SWIFT_FLAGS].each do |key|
+          value = config_file.attributes[key]
+          next unless value
+
+          updated_value = pod_names.reduce(value) do |acc, pod_name|
+            acc.gsub(
+              "${PODS_CONFIGURATION_BUILD_DIR}/#{pod_name}/#{pod_name}.modulemap",
+              "${PODS_CONFIGURATION_BUILD_DIR}/#{pod_name}.modulemap"
+            )
+          end
+          config_file.attributes[key] = updated_value if updated_value != value
+        end
+
+        config_file.save_as(aggregate_target.xcconfig_path(config_name))
+      end
+    end
+  end
+
+  # Creates a new object in the project with a UUID guaranteed not to collide
+  # with any UUID already present in the project.
+  #
+  # `Pod::Project` overrides `generate_available_uuid_list` with a fast,
+  # counter-based scheme (`<sha prefix><counter>0`) that deliberately skips
+  # collision checks, on the assumption that the whole Pods project is generated
+  # in a single pass. That assumption does not hold here: we run in a
+  # `post_install` hook, and the generator's counter can be out of sync with the
+  # UUIDs already assigned to existing objects (e.g. when the project has been
+  # reloaded from disk during an incremental install, the counter restarts at 0
+  # while the root object still occupies `<prefix>00000000`). Using `project.new`
+  # directly can therefore hand back a UUID that is already in use and overwrite
+  # an existing object (notably the root `PBXProject`), producing a Pods project
+  # Xcode refuses to load. We keep the deterministic scheme but probe forward
+  # until we find a UUID that is actually free.
+  def new_object(project, klass)
+    uuid = project.generate_uuid
+    uuid = project.generate_uuid while project.objects_by_uuid.key?(uuid)
+    object = klass.new(project, uuid)
+    object.initialize_defaults
+    object
+  end
+
   def log(msg)
     ::Pod::UI.puts "[SPM] #{msg}"
   end
@@ -76,7 +143,7 @@ class SPMManager
       pkg_class = Xcodeproj::Project::Object::XCLocalSwiftPackageReference
       pkg = project.root_object.package_references.find { |p| p.class == pkg_class && p.relative_path == url }
       if !pkg
-        pkg = project.new(pkg_class)
+        pkg = new_object(project, pkg_class)
         pkg.relative_path = url
         log(" Adding local package to workspace: #{pkg.inspect}")
         project.root_object.package_references << pkg
@@ -85,7 +152,7 @@ class SPMManager
       pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
       pkg = project.root_object.package_references.find { |p| p.class == pkg_class && p.repositoryURL == url }
       if !pkg
-        pkg = project.new(pkg_class)
+        pkg = new_object(project, pkg_class)
         pkg.repositoryURL = url
         pkg.requirement = requirement
         log(" Adding remote package to workspace: #{pkg.inspect}")
@@ -101,7 +168,7 @@ class SPMManager
       next if ref
 
       log(" Adding product dependency #{product_name} to #{target.name}")
-      ref = project.new(ref_class)
+      ref = new_object(project, ref_class)
       ref.package = pkg
       ref.product_name = product_name
       target.package_product_dependencies << ref

package/scripts/cocoapods/utils.rb

@@ -52,13 +52,10 @@ class ReactNativePodsUtils
     end
 
     def self.set_gcc_preprocessor_definition_for_React_hermes(installer)
-        if ENV['RCT_HERMES_V1_ENABLED'] == "1"
-            self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1 HERMES_V1_ENABLED=1", "React-hermes", :debug)
-            self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1 HERMES_V1_ENABLED=1", "React-RuntimeHermes", :debug)
-        else
-            self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-hermes", :debug)
-            self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-RuntimeHermes", :debug)
-        end
+        # HERMES_V1_ENABLED=1 is set unconditionally to stay aligned with the Android/CMake build,
+        # where react-native-flags.cmake always defines HERMES_V1_ENABLED=1.
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1 HERMES_V1_ENABLED=1", "React-hermes", :debug)
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1 HERMES_V1_ENABLED=1", "React-RuntimeHermes", :debug)
 
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "hermes-engine", :debug)
     end
@@ -76,7 +73,7 @@ class ReactNativePodsUtils
     end
 
     def self.turn_off_resource_bundle_react_core(installer)
-        # this is needed for Xcode 14, see more details here https://github.com/react/react-native/issues/34673
+        # this is needed for Xcode 14, see more details here https://github.com/facebook/react-native/issues/34673
         # we should be able to remove this once CocoaPods catches up to it, see more details here https://github.com/CocoaPods/CocoaPods/issues/11402
         installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
             if pod_name.to_s == 'React-Core'
@@ -244,7 +241,7 @@ class ReactNativePodsUtils
             # When installing pods with a yarn alias, yarn creates a fake yarn and node executables
             # in a temporary folder.
             # Using `node --print "process.argv[0]";` we are able to retrieve the actual path from which node is running.
-            # see https://github.com/react/react-native/issues/43285 for more info. We've tweaked this slightly.
+            # see https://github.com/facebook/react-native/issues/43285 for more info. We've tweaked this slightly.
             node_binary = Shellwords.escape(`node --print "process.argv[0]"`.strip)
             system("echo 'export NODE_BINARY=#{node_binary}' > #{file_path}.local")
         end
@@ -336,6 +333,7 @@ class ReactNativePodsUtils
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon-Samples", "ReactCommon_Samples", ["platform/ios"]))
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", ["react/renderer/components/view/platform/cxx"], false))
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-NativeModulesApple", "React_NativeModulesApple", []))
+                    .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-bridging", "React_bridging", []))
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-graphics", "React_graphics", ["react/renderer/graphics/platform/ios"]))
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-featureflags", "React_featureflags", []))
                     .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-renderercss", "React_renderercss", []))

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

@@ -45,7 +45,6 @@ function generateSchemaInfo(
     schema: CodegenUtils.getCombineJSToSchema().combineSchemasInFileList(
       [pathToJavaScriptSources],
       platform,
-      /NativeSampleTurboModule/,
     ),
   };
 }

package/scripts/codegen/templates/Package.swift.spm-template

@@ -0,0 +1,97 @@
+// swift-tools-version: 6.0
+/*
+ * 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.
+ */
+
+// AUTO-GENERATED by scripts/setup-apple-spm.js – do not edit manually.
+// This SPM-specific template replaces the CocoaPods codegen template
+// with xcframework configuration built in.
+
+import PackageDescription
+
+// React headers need NO search paths: the React module comes from the
+// invariant ReactHeaders Clang target,
+// every other RN namespace from the ReactNativeHeaders binaryTarget
+// (pure-RN), the third-party deps namespaces (folly/glog/boost/...) from the
+// ReactNativeDependenciesHeaders sidecar, and the per-app generated headers
+// from the ReactAppHeaders target below — all auto-served by SPM through
+// product/target dependencies.
+let headersDep: [Target.Dependency] = [
+    .product(name: "ReactHeaders", package: "ReactNative"),
+    .product(name: "ReactNativeHeaders", package: "ReactNative"),
+    .product(name: "ReactNativeDependenciesHeaders", package: "ReactNative"),
+    "ReactAppHeaders",
+]
+
+let package = Package(
+    name: "React-GeneratedCode",
+    platforms: [.iOS(.v15), .macCatalyst(SupportedPlatform.MacCatalystVersion.v13)],
+    products: [
+        .library(
+            name: "ReactCodegen",
+            targets: ["ReactCodegen"]),
+        .library(
+            name: "ReactAppDependencyProvider",
+            targets: ["ReactAppDependencyProvider"]),
+        .library(
+            name: "ReactAppHeaders",
+            targets: ["ReactAppHeaders"]),
+    ],
+    dependencies: [
+        .package(name: "ReactNative", path: "../../xcframeworks"),
+    ],
+    targets: [
+        .target(
+            name: "ReactCodegen",
+            dependencies: headersDep,
+            path: "ReactCodegen",
+            exclude: ["ReactCodegen.podspec"],
+            publicHeadersPath: ".",
+            cSettings: [.headerSearchPath("headers")],
+            // DEBUG/NDEBUG match the prebuilt React.framework's config-gated C++
+            // ABI: NDEBUG (Release) strips DebugStringConvertible's vtable and
+            // shifts the ShadowNode layout that codegen'd Props inherit, so this
+            // target must compile with the same NDEBUG state or the Release link
+            // fails (undefined "vtable for DebugStringConvertible"). Mirrors
+            // packages/react-native/Package.swift.
+            cxxSettings: [
+                .headerSearchPath("headers"),
+                .define("DEBUG", .when(configuration: .debug)),
+                .define("NDEBUG", .when(configuration: .release)),
+            ],
+            linkerSettings: [
+                .linkedFramework("Foundation")
+            ]
+        ),
+        .target(
+            name: "ReactAppDependencyProvider",
+            dependencies: ["ReactCodegen"] + headersDep,
+            path: "ReactAppDependencyProvider",
+            exclude: ["ReactAppDependencyProvider.podspec"],
+            publicHeadersPath: ".",
+            cSettings: [.headerSearchPath(".."), .headerSearchPath("headers")],
+            cxxSettings: [
+                .headerSearchPath(".."),
+                .headerSearchPath("headers"),
+                // Match the prebuilt React.framework NDEBUG-gated C++ ABI (see above).
+                .define("DEBUG", .when(configuration: .debug)),
+                .define("NDEBUG", .when(configuration: .release)),
+            ],
+            linkerSettings: [
+                .linkedFramework("Foundation")
+            ]
+        ),
+        // The per-app generated-headers farm (built by spm sync), vended as a
+        // normal SPM headers target.
+        .target(
+            name: "ReactAppHeaders",
+            path: "ReactAppHeaders",
+            publicHeadersPath: "."
+        ),
+    ],
+    // React Native headers require C++20 (concepts, std::optional, etc.)
+    cxxLanguageStandard: .cxx20
+)

package/scripts/codegen/templates/ReactAppDependencyProvider.podspec.template

@@ -4,7 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 version = "{react-native-version}"
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")

package/scripts/codegen/templates/ReactCodegen.podspec.template

@@ -4,7 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 version = "{react-native-version}"
-source = { :git => 'https://github.com/react/react-native.git' }
+source = { :git => 'https://github.com/facebook/react-native.git' }
 if version == '1000.0.0'
   # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
   source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
@@ -69,7 +69,7 @@ Pod::Spec.new do |s|
   s.dependency "RCTTypeSafety"
   s.dependency "React-Core"
   s.dependency "React-jsi"
-  s.dependency "ReactCommon/turbomodule/bridging"
+  s.dependency "React-bridging"
   s.dependency "ReactCommon/turbomodule/core"
   s.dependency "React-NativeModulesApple"
   s.dependency 'React-graphics'

package/scripts/hermes/hermes-utils.js

@@ -20,8 +20,7 @@ type BuildType = 'dry-run' | 'release' | 'nightly';
 */
 
 const SDKS_DIR = path.normalize(path.join(__dirname, '..', '..', 'sdks'));
-const HERMES_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesversion');
-const HERMES_V1_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesv1version');
+const HERMES_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesv1version');
 
 function readHermesTag() /*: string */ {
   if (fs.existsSync(HERMES_TAG_FILE_PATH)) {
@@ -32,25 +31,6 @@ function readHermesTag() /*: string */ {
       })
       .trim();
 
-    if (data.length > 0) {
-      return data;
-    } else {
-      throw new Error('[Hermes] .hermesversion file is empty.');
-    }
-  }
-
-  throw new Error('[Hermes] .hermesversion does not exist.');
-}
-
-function readHermesV1Tag() /*: string */ {
-  if (fs.existsSync(HERMES_V1_TAG_FILE_PATH)) {
-    const data = fs
-      .readFileSync(HERMES_V1_TAG_FILE_PATH, {
-        encoding: 'utf8',
-        flag: 'r',
-      })
-      .trim();
-
     if (data.length > 0) {
       return data;
     } else {
@@ -61,51 +41,40 @@ function readHermesV1Tag() /*: string */ {
   throw new Error('[Hermes] .hermesv1version does not exist.');
 }
 
-async function updateHermesTag(
-  tagFile /*: string */,
-  hermesTag /*: string */,
-  prompt /*: string */,
-) {
-  if (!fs.existsSync(tagFile)) {
-    fs.writeFileSync(tagFile, hermesTag.trim());
-  } else {
-    const previousHermesTag = fs.readFileSync(tagFile, {
-      encoding: 'utf8',
-      flag: 'r',
-    });
-
-    if (previousHermesTag.trim() !== hermesTag.trim()) {
-      const {confirmHermesTag} = await inquirer.prompt({
-        type: 'confirm',
-        name: 'confirmHermesTag',
-        message: `Do you want to use updtate release tag for ${prompt} from "${previousHermesTag}" to "${hermesTag}"?`,
-      });
+async function setHermesTag(hermesTag /*: string */) {
+  if (!fs.existsSync(SDKS_DIR)) {
+    fs.mkdirSync(SDKS_DIR, {recursive: true});
+  }
 
-      if (confirmHermesTag) {
-        fs.writeFileSync(tagFile, hermesTag.trim());
-      } else {
-        console.log(`[${prompt}] .hermesversion file is unchanged.`);
-      }
-    } else {
-      console.log(`[${prompt}] .hermesversion file is unchanged.`);
-    }
+  if (!fs.existsSync(HERMES_TAG_FILE_PATH)) {
+    fs.writeFileSync(HERMES_TAG_FILE_PATH, hermesTag.trim());
+    return;
   }
-}
 
-async function setHermesTag(
-  hermesTag /*: string */,
-  hermesV1Tag /*: string */,
-) {
-  if (!fs.existsSync(SDKS_DIR)) {
-    fs.mkdirSync(SDKS_DIR, {recursive: true});
+  const previousHermesTag = fs.readFileSync(HERMES_TAG_FILE_PATH, {
+    encoding: 'utf8',
+    flag: 'r',
+  });
+
+  if (previousHermesTag.trim() === hermesTag.trim()) {
+    console.log('[Hermes] .hermesv1version file is unchanged.');
+    return;
   }
 
-  await updateHermesTag(HERMES_TAG_FILE_PATH, hermesTag, 'Hermes');
-  await updateHermesTag(HERMES_V1_TAG_FILE_PATH, hermesV1Tag, 'Hermes V1');
+  const {confirmHermesTag} = await inquirer.prompt({
+    type: 'confirm',
+    name: 'confirmHermesTag',
+    message: `Do you want to update release tag for Hermes from "${previousHermesTag}" to "${hermesTag}"?`,
+  });
+
+  if (confirmHermesTag) {
+    fs.writeFileSync(HERMES_TAG_FILE_PATH, hermesTag.trim());
+  } else {
+    console.log('[Hermes] .hermesv1version file is unchanged.');
+  }
 }
 
 module.exports = {
   readHermesTag,
-  readHermesV1Tag,
   setHermesTag,
 };

package/scripts/ios-configure-glog.sh

@@ -62,7 +62,7 @@ if [ -h "test-driver" ]; then
     rm test-driver
 fi
 
-# Manually disable gflags include to fix issue https://github.com/react/react-native/issues/28446
+# Manually disable gflags include to fix issue https://github.com/facebook/react-native/issues/28446
 sed -i.bak -e 's/\@ac_cv_have_libgflags\@/0/' src/glog/logging.h.in && rm src/glog/logging.h.in.bak
 sed -i.bak -e 's/HAVE_LIB_GFLAGS/HAVE_LIB_GFLAGS_DISABLED/' src/config.h.in && rm src/config.h.in.bak