react-native 0.75.0-rc.4 → 0.75.0-rc.6

package/scripts/cocoapods/new_architecture.rb

@@ -9,34 +9,21 @@ require_relative "./utils.rb"
 require_relative "./helpers.rb"
 
 class NewArchitectureHelper
-    @@cplusplus_version = "c++20"
-
     @@NewArchWarningEmitted = false # Used not to spam warnings to the user.
 
     def self.set_clang_cxx_language_standard_if_needed(installer)
-        language_standard = nil
-
-        installer.pods_project.targets.each do |target|
-            # The React-Core pod may have a suffix added by Cocoapods, so we test whether 'React-Core' is a substring, and do not require exact match
-            if target.name.include? 'React-Core'
-                language_standard = target.resolved_build_setting("CLANG_CXX_LANGUAGE_STANDARD", resolve_against_xcconfig: true).values[0]
-            end
-        end
+        projects = installer.aggregate_targets
+            .map{ |t| t.user_project }
+            .uniq{ |p| p.path }
 
-        unless language_standard.nil?
-            projects = installer.aggregate_targets
-                .map{ |t| t.user_project }
-                .uniq{ |p| p.path }
+        projects.each do |project|
+            Pod::UI.puts("Setting CLANG_CXX_LANGUAGE_STANDARD to #{ Helpers::Constants::cxx_language_standard } on #{ project.path }")
 
-            projects.each do |project|
-                Pod::UI.puts("Setting CLANG_CXX_LANGUAGE_STANDARD to #{ language_standard } on #{ project.path }")
-
-                project.build_configurations.each do |config|
-                    config.build_settings["CLANG_CXX_LANGUAGE_STANDARD"] = language_standard
-                end
-
-                project.save()
+            project.build_configurations.each do |config|
+                config.build_settings["CLANG_CXX_LANGUAGE_STANDARD"] = Helpers::Constants::cxx_language_standard
             end
+
+            project.save()
         end
     end
 
@@ -103,7 +90,7 @@ class NewArchitectureHelper
         current_config["HEADER_SEARCH_PATHS"] = current_headers.empty? ?
             header_search_paths_string :
             "#{current_headers} #{header_search_paths_string}"
-        current_config["CLANG_CXX_LANGUAGE_STANDARD"] = @@cplusplus_version
+        current_config["CLANG_CXX_LANGUAGE_STANDARD"] = Helpers::Constants::cxx_language_standard
 
 
         spec.dependency "React-Core"

package/scripts/cocoapods/privacy_manifest_utils.rb

@@ -50,7 +50,7 @@ module PrivacyManifestUtils
     end
 
     def self.get_application_targets(user_project)
-        return user_project.targets.filter { |t| t.symbol_type == :application }
+        return user_project.targets.filter { |t| t.respond_to?(:symbol_type) && t.symbol_type == :application }
     end
 
     def self.read_privacyinfo_file(file_path)
@@ -67,26 +67,34 @@ module PrivacyManifestUtils
     end
 
     def self.ensure_reference(file_path, user_project, target)
-        reference_exists = target.resources_build_phase.files_references.any? { |file_ref| file_ref.path&.end_with? "PrivacyInfo.xcprivacy" }
+        reference_exists = target.resources_build_phase.files_references.any? { |file_ref| file_ref&.path&.end_with? "PrivacyInfo.xcprivacy" }
         unless reference_exists
             # We try to find the main group, but if it doesn't exist, we default to adding the file to the project root – both work
-            file_root = user_project.root_object.main_group.children.find { |group| group.class == Xcodeproj::Project::Object::PBXGroup && (group.name == target.name || group.path == target.name) } || user_project
+            file_root = user_project.root_object.main_group.children.find { |group|
+                group.class == Xcodeproj::Project::Object::PBXGroup && (group.name == target.name || group.path == target.name)
+            } || user_project
             file_ref = file_root.new_file(file_path)
             build_file = target.resources_build_phase.add_file_reference(file_ref, true)
         end
     end
 
     def self.get_privacyinfo_file_path(user_project, targets)
+        
         file_refs = targets.flat_map { |target| target.resources_build_phase.files_references }
-        existing_file = file_refs.find { |file_ref| file_ref.path&.end_with? "PrivacyInfo.xcprivacy" }
+        existing_file = file_refs.find { |file_ref| file_ref&.path&.end_with?("PrivacyInfo.xcprivacy") }
+
+
         if existing_file
             return existing_file.real_path
         end
+
         # We try to find a file we know exists in the project to get the path to the main group directory
         info_plist_path = user_project.files.find { |file_ref| file_ref.name == "Info.plist" }
         if info_plist_path.nil?
             # return path that is sibling to .xcodeproj
+
             path = user_project.path
+
             return File.join(File.dirname(path), "PrivacyInfo.xcprivacy")
         end
         return File.join(File.dirname(info_plist_path.real_path),"PrivacyInfo.xcprivacy")
@@ -117,6 +125,7 @@ module PrivacyManifestUtils
             end
             end
         end
+
         return used_apis
     end
 
@@ -124,7 +133,7 @@ module PrivacyManifestUtils
         privacy_manifests = user_project
             .files
             .select { |p|
-                p.path&.end_with?('PrivacyInfo.xcprivacy')
+                p&.path&.end_with?('PrivacyInfo.xcprivacy')
             }
         return privacy_manifests
     end
@@ -162,7 +171,7 @@ module PrivacyManifestUtils
                 "NSPrivacyTracking" => false,
                 "NSPrivacyAccessedAPITypes" => get_core_accessed_apis
             }
-            path = File.join(user_project.path.parent, "PrivacyInfo.xcprivacy")
+            path = File.join(user_project&.path.parent, "PrivacyInfo.xcprivacy")
             Xcodeproj::Plist.write_to_path(privacy_manifest, path)
             Pod::UI.puts "Your app does not have a privacy manifest! A template has been generated containing Required Reasons API usage in the core React Native library. Please add the PrivacyInfo.xcprivacy file to your project and complete data use, tracking and any additional required reasons your app is using according to Apple's guidance: https://developer.apple.com/documentation/bundleresources/privacy_manifest_files. Then, you will need to manually add this file to your project in Xcode.".red
         end

package/scripts/cocoapods/spm.rb

@@ -0,0 +1,94 @@
+# 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.
+
+class SPMManager
+  def initialize()
+     @dependencies_by_pod = {}
+  end
+
+  def dependency(pod_spec, url:, requirement:,  products:)
+    @dependencies_by_pod[pod_spec.name] ||= []
+    @dependencies_by_pod[pod_spec.name] << { url: url, requirement: requirement, products: products}
+  end
+
+  def apply_on_post_install(installer)
+    project = installer.pods_project
+
+    log 'Cleaning old SPM dependencies from Pods project'
+    clean_spm_dependencies_from_target(project, @dependencies_by_pod)
+    log 'Adding SPM dependencies to Pods project'
+    @dependencies_by_pod.each do |pod_name, dependencies|
+      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},
+          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)
+          end
+        end
+      end
+    end
+
+    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_FRAMEOWRKS=dynamic, see https://github.com/facebook/react-native/pull/44627#issuecomment-2123119711 for more information"
+        end
+      end
+    end
+  end
+
+  private
+
+  def log(msg)
+    ::Pod::UI.puts "[SPM] #{msg}"
+  end
+
+  def log_warning(msg)
+    ::Pod::UI.puts "\n\n[SPM] WARNING!!! #{msg}\n\n"
+  end
+
+  def clean_spm_dependencies_from_target(project, new_targets)
+    project.root_object.package_references.delete_if { |pkg| (pkg.class == Xcodeproj::Project::Object::XCRemoteSwiftPackageReference) }
+  end
+
+  def add_spm_to_target(project, target, url, requirement, products)
+    pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
+    ref_class = Xcodeproj::Project::Object::XCSwiftPackageProductDependency
+    pkg = project.root_object.package_references.find { |p| p.class == pkg_class && p.repositoryURL == url }
+    if !pkg
+      pkg = project.new(pkg_class)
+      pkg.repositoryURL = url
+      pkg.requirement = requirement
+      log(" Adding package to workspace: #{pkg.inspect}")
+      project.root_object.package_references << pkg
+    end
+    products.each do |product_name|
+      ref = target.package_product_dependencies.find do |r|
+        r.class == ref_class && r.package == pkg && r.product_name == product_name
+      end
+      next if ref
+
+      log(" Adding product dependency #{product_name} to #{target.name}")
+      ref = project.new(ref_class)
+      ref.package = pkg
+      ref.product_name = product_name
+      target.package_product_dependencies << ref
+    end
+  end
+end
+
+SPM = SPMManager.new

package/scripts/cocoapods/utils.rb

@@ -233,7 +233,18 @@ class ReactNativePodsUtils
         end
 
         if !file_manager.exist?("#{file_path}.local")
-            node_binary = `command -v node`
+            # When installing pods with a yarn alias, yarn creates a fake yarn and node executables
+            # in a temporary folder.
+            # Using `type -a` we are able to retrieve all the paths of an executable and we can
+            # exclude the temporary ones.
+            # see https://github.com/facebook/react-native/issues/43285 for more info
+            node_binary = `type -a node`.split("\n").map { |path|
+                path.gsub!("node is ", "")
+            }.select { |b|
+                return !b.start_with?("/var")
+            }
+
+            node_binary = node_binary[0]
             system("echo 'export NODE_BINARY=#{node_binary}' > #{file_path}.local")
         end
     end

package/scripts/react-native-xcode.sh

@@ -90,7 +90,7 @@ fi
 
 [ -z "$NODE_ARGS" ] && export NODE_ARGS=""
 
-[ -z "$BUNDLE_COMMAND" ] && BUNDLE_COMMAND="bundle"
+[ -z "$CLI_PATH" ] && CLI_PATH="$REACT_NATIVE_DIR/scripts/bundle.js"
 
 [ -z "$COMPOSE_SOURCEMAP_PATH" ] && COMPOSE_SOURCEMAP_PATH="$REACT_NATIVE_DIR/scripts/compose-source-maps.js"
 
@@ -147,7 +147,7 @@ else
 fi
 
 # shellcheck disable=SC2086
-"$NODE_BINARY" $NODE_ARGS "$REACT_NATIVE_DIR/scripts/bundle.js" \
+"$NODE_BINARY" $NODE_ARGS "$CLI_PATH" $BUNDLE_COMMAND \
   $CONFIG_ARG \
   --config-cmd "$CONFIG" \
   --entry-file "$ENTRY_FILE" \

package/scripts/react_native_pods.rb

@@ -17,6 +17,7 @@ require_relative './cocoapods/local_podspec_patch.rb'
 require_relative './cocoapods/runtime.rb'
 require_relative './cocoapods/helpers.rb'
 require_relative './cocoapods/privacy_manifest_utils.rb'
+require_relative './cocoapods/spm.rb'
 # Importing to expose use_native_modules!
 require_relative './cocoapods/autolinking.rb'
 
@@ -242,6 +243,18 @@ def install_modules_dependencies(spec, new_arch_enabled: NewArchitectureHelper.n
   NewArchitectureHelper.install_modules_dependencies(spec, new_arch_enabled, folly_config[:version])
 end
 
+
+# This function can be used by library developer to declare a SwiftPackageManager dependency.
+#
+# Parameters:
+# - spec: The spec the Swift Package Manager dependency has to be added to
+# - url: The URL of the Swift Package Manager dependency
+# - requirement: The version requirement of the Swift Package Manager dependency (eg. ` {kind: 'upToNextMajorVersion', minimumVersion: '5.9.1'},`)
+# - products: The product/target of the Swift Package Manager dependency (eg. AlamofireDynamic)
+def spm_dependency(spec, url:, requirement:, products:)
+  SPM.dependency(spec, url: url, requirement: requirement, products: products)
+end
+
 # It returns the default flags.
 # deprecated.
 def get_default_flags()
@@ -259,6 +272,10 @@ def get_folly_config()
   return Helpers::Constants.folly_config
 end
 
+def rct_cxx_language_standard()
+  return Helpers::Constants.cxx_language_standard
+end
+
 # Function that executes after React Native has been installed to configure some flags and build settings.
 #
 # Parameters
@@ -297,6 +314,7 @@ def react_native_post_install(
   ReactNativePodsUtils.updateOSDeploymentTarget(installer)
   ReactNativePodsUtils.set_dynamic_frameworks_flags(installer)
   ReactNativePodsUtils.add_ndebug_flag_to_pods_in_release(installer)
+  SPM.apply_on_post_install(installer)
 
   if privacy_file_aggregation_enabled
     PrivacyManifestUtils.add_aggregated_privacy_manifest(installer)

package/src/private/specs/modules/NativePlatformConstantsAndroid.js

@@ -16,7 +16,7 @@ export type ReactNativeVersionAndroid = {|
   major: number,
   minor: number,
   patch: number,
-  prerelease: ?number,
+  prerelease: ?string,
 |};
 
 export type PlatformConstantsAndroid = {|

package/src/private/specs/modules/NativePlatformConstantsIOS.js

@@ -19,7 +19,7 @@ export type PlatformConstantsIOS = {|
     major: number,
     minor: number,
     patch: number,
-    prerelease: ?number,
+    prerelease: ?string,
   |},
   forceTouchAvailable: boolean,
   osVersion: string,

package/third-party-podspecs/RCT-Folly.podspec

@@ -82,7 +82,7 @@ Pod::Spec.new do |spec|
   spec.libraries           = "c++abi" # NOTE Apple-only: Keep c++abi here due to https://github.com/react-native-community/releases/issues/251
   spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                                "DEFINES_MODULE" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
                                # In dynamic framework (use_frameworks!) mode, ignore the unused and undefined boost symbols when generating the library.
                                "OTHER_LDFLAGS" => "\"-Wl,-U,_jump_fcontext\" \"-Wl,-U,_make_fcontext\""

package/third-party-podspecs/fmt.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |spec|
     :tag => "9.1.0"
   }
   spec.pod_target_xcconfig = {
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+    "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
   }
   spec.platforms = min_supported_versions
   spec.libraries = "c++"

package/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModule.kt

@@ -1,55 +0,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.
- */
-
-package com.facebook.react.bridge
-
-import com.facebook.proguard.annotations.DoNotStrip
-import com.facebook.react.common.annotations.DeprecatedInNewArchitecture
-import com.facebook.react.common.annotations.StableReactNativeAPI
-
-/**
- * A native module whose API can be provided to JS catalyst instances. [NativeModule]s whose
- * implementation is written in Kotlin should extend [BaseJavaModule] or
- * [ReactContextBaseJavaModule]. [NativeModule]s whose implementation is written in C++ must not
- * provide any Kotlin code (so they can be reused on other platforms), and instead should register
- * themselves using [CxxModuleWrapper].
- */
-@StableReactNativeAPI
-@DoNotStrip
-public interface NativeModule {
-
-  /**
-   * @return the name of this module. This will be the name used to `require()` this module from
-   *   javascript.
-   */
-  public fun getName(): String
-
-  /** This method is called after [ReactApplicationContext] has been created. */
-  public fun initialize(): Unit
-
-  /** Allow NativeModule to clean up. Called before React Native instance is destroyed. */
-  public fun invalidate(): Unit
-
-  /**
-   * Return true if you intend to override some other native module that was registered e.g. as part
-   * of a different package (such as the core one). Trying to override without returning true from
-   * this method is considered an error and will throw an exception during initialization. By
-   * default all modules return false.
-   */
-  @DeprecatedInNewArchitecture() public fun canOverrideExistingModule(): Boolean = false
-
-  /**
-   * Allow NativeModule to clean up. Called before [CatalystInstance.onHostDestroy]
-   *
-   * @deprecated use [NativeModule.invalidate()] instead.
-   */
-  @Deprecated(
-      "Use invalidate method instead",
-      replaceWith = ReplaceWith("invalidate()"),
-      level = DeprecationLevel.WARNING)
-  public fun onCatalystInstanceDestroy(): Unit = Unit
-}

package/ReactCommon/react/runtime/BridgelessJSCallInvoker.cpp

@@ -1,29 +0,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.
- */
-
-#include "BridgelessJSCallInvoker.h"
-
-#include <stdexcept>
-
-namespace facebook::react {
-
-BridgelessJSCallInvoker::BridgelessJSCallInvoker(
-    RuntimeExecutor runtimeExecutor)
-    : runtimeExecutor_(std::move(runtimeExecutor)) {}
-
-void BridgelessJSCallInvoker::invokeAsync(CallFunc&& func) noexcept {
-  runtimeExecutor_(
-      [func = std::move(func)](jsi::Runtime& runtime) { func(runtime); });
-}
-
-void BridgelessJSCallInvoker::invokeSync(CallFunc&& /*func*/) {
-  // TODO: Implement this method. The TurboModule infra doesn't call invokeSync.
-  throw std::runtime_error(
-      "Synchronous native -> JS calls are currently not supported.");
-}
-
-} // namespace facebook::react

package/ReactCommon/react/runtime/BridgelessJSCallInvoker.h

@@ -1,30 +0,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.
- */
-
-#pragma once
-
-#include <ReactCommon/CallInvoker.h>
-#include <ReactCommon/RuntimeExecutor.h>
-#include <functional>
-
-namespace facebook::react {
-
-/**
- * A native-to-JS call invoker that uses the RuntimeExecutor. It guarantees that
- * any calls from any thread are queued on the right JS thread.
- */
-class BridgelessJSCallInvoker : public CallInvoker {
- public:
-  explicit BridgelessJSCallInvoker(RuntimeExecutor runtimeExecutor);
-  void invokeAsync(CallFunc&& func) noexcept override;
-  void invokeSync(CallFunc&& func) override;
-
- private:
-  RuntimeExecutor runtimeExecutor_;
-};
-
-} // namespace facebook::react