react-native 0.87.0-rc.1 → 0.87.0-rc.2

package/Libraries/Core/InitializeCore.js

@@ -27,4 +27,11 @@
 
 'use strict';
 
-require('../../src/private/setup/setUpDefaultReactNativeEnvironment').default();
+// NOTE: This delegates to the `'react-native/setup-env'` entry point (rather
+// than calling `setUpDefaultReactNativeEnvironment` directly) so that
+// `src/setup-env.js` is pulled into the module graph. Metro's
+// `getModulesRunBeforeMainModule` only runs modules that are already part of
+// the bundle, and `InitializeCore` is a guaranteed graph entry (via
+// `ReactNativePrivateInitializeCore`). This keeps `'react-native/setup-env'`
+// reachable so it runs before the main module.
+require('../../src/setup-env');

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 87;
   static patch: number = 0;
-  static prerelease: string | null = 'rc.1';
+  static prerelease: string | null = 'rc.2';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/ReactNative/AppRegistry.flow.js

@@ -44,5 +44,6 @@ export type Registry = {
 };
 export type WrapperComponentProvider = (
   appParameters: Object,
+  appKey?: string,
 ) => React.ComponentType<any>;
 export type RootViewStyleProvider = (appParameters: Object) => ViewStyleProp;

package/Libraries/ReactNative/AppRegistryImpl.js

@@ -22,7 +22,6 @@ import type {
   WrapperComponentProvider,
 } from './AppRegistry.flow';
 
-import SceneTracker from '../Utilities/SceneTracker';
 import DeprecatedPerformanceLoggerStub from './DeprecatedPerformanceLoggerStub';
 import {coerceDisplayMode} from './DisplayMode';
 import HeadlessJsTaskError from './HeadlessJsTaskError';
@@ -105,7 +104,8 @@ export function registerComponent(
       initialProps: appParameters.initialProps,
       rootTag: appParameters.rootTag,
       WrapperComponent:
-        wrapperComponentProvider && wrapperComponentProvider(appParameters),
+        wrapperComponentProvider &&
+        wrapperComponentProvider(appParameters, appKey),
       rootViewStyle:
         rootViewStyleProvider && rootViewStyleProvider(appParameters),
       isLogBox: appKey === 'LogBox',
@@ -212,7 +212,6 @@ export function runApplication(
       "* A module failed to load due to an error and `AppRegistry.registerComponent` wasn't called.",
   );
 
-  SceneTracker.setActiveScene({name: appKey});
   runnables[appKey](appParameters, coerceDisplayMode(displayMode));
 }
 

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(87),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.1",
+                  RCTVersionPrerelease: @"rc.2",
                   };
   });
   return __rnVersion;

package/React/I18n/RCTLocalizedString.mm

@@ -7,8 +7,45 @@
 
 #import "RCTLocalizedString.h"
 
+#import <React/RCTLog.h>
+
 #if !defined(WITH_FBI18N) || !(WITH_FBI18N)
 
+// Anchors resource lookups to the bundle that contains this code: React.framework
+// when React Native is consumed prebuilt / via SwiftPM, or the app's main bundle
+// for static source builds.
+@interface RCTI18nStringsAnchor : NSObject
+@end
+@implementation RCTI18nStringsAnchor
+@end
+
+// Resolves RCTI18nStrings.bundle wherever it ships: the code's own bundle first
+// (prebuilt/SwiftPM embed it inside React.framework), then the app's main bundle
+// (source builds copy it there via the podspec resource_bundles). Returns nil
+// when absent, so the caller falls back to the untranslated default value.
+static NSBundle *RCTI18nStringsBundle(void)
+{
+  NSBundle *codeBundle = [NSBundle bundleForClass:[RCTI18nStringsAnchor class]];
+  NSURL *url = [codeBundle URLForResource:@"RCTI18nStrings" withExtension:@"bundle"];
+  if (url != nil) {
+    return [NSBundle bundleWithURL:url];
+  }
+  NSString *mainPath = [[NSBundle mainBundle] pathForResource:@"RCTI18nStrings" ofType:@"bundle"];
+  if (mainPath != nil) {
+    return [NSBundle bundleWithPath:mainPath];
+  }
+#if RCT_DEV
+  // Missing resources are otherwise silent (every lookup falls back to the
+  // untranslated default and the privacy manifest quietly drops out of the
+  // app's aggregated privacy report). Called once — the caller caches.
+  RCTLogWarn(
+      @"RCTI18nStrings.bundle not found in React.framework or the app bundle. Localized strings will use their "
+      @"untranslated defaults, and React's PrivacyInfo.xcprivacy may be missing from the app's privacy report. "
+      @"When consuming the prebuilt React.framework, verify it is embedded into the app with its resources intact.");
+#endif
+  return nil;
+}
+
 extern "C" {
 
 static NSString *FBTStringByConvertingIntegerToBase64(uint64_t number)
@@ -33,8 +70,7 @@ __attribute__((noinline)) uint64_t FBcoreLocalexxHash48(const char *input, uint6
 
 NSString *RCTLocalizedStringFromKey(uint64_t key, NSString *defaultValue)
 {
-  static NSBundle *bundle = [NSBundle bundleWithPath:[[NSBundle mainBundle] pathForResource:@"RCTI18nStrings"
-                                                                                     ofType:@"bundle"]];
+  static NSBundle *bundle = RCTI18nStringsBundle();
   if (bundle == nil) {
     return defaultValue;
   } else {

package/React-Core-prebuilt.podspec

@@ -17,36 +17,64 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
+
+  # We vend two xcframeworks that ship together in the prebuilt tarball:
+  #  - React.xcframework: the compiled core. Its per-slice React.framework carries
+  #    every <React/...> header + the framework module map, so `#import <React/...>`
+  #    and `@import React;` resolve through FRAMEWORK_SEARCH_PATHS automatically.
+  #  - ReactNativeHeaders.xcframework: headers-only, PURE-RN. Carries every other
+  #    RN namespace (<react/...>, <yoga/...>, ...). Its headers are flattened into
+  #    a top-level Headers/ (see prepare_command) and exposed via the standard pod
+  #    header search path. The third-party deps namespaces (folly/glog/boost/...)
+  #    are NOT here — the ReactNativeDependencies pod serves them from its own
+  #    artifact (see scripts/cocoapods/__docs__/prebuilt-deps.md), wired through
+  #    add_rn_third_party_dependencies below. (<hermes/...> is supplied by the
+  #    hermes-engine pod here; it is folded into ReactNativeHeaders only on the
+  #    SwiftPM consumer side.)
+  # There is no clang VFS overlay.
   s.vendored_frameworks    = "React.xcframework"
 
   s.preserve_paths       = '**/*.*'
-  s.header_mappings_dir  = 'React.xcframework/Headers'
-  s.source_files         = 'React.xcframework/Headers/**/*.{h,hpp}'
-
-  s.module_name          = 'React'
-  s.module_map           = 'React.xcframework/Modules/module.modulemap'
-  s.public_header_files  = 'React.xcframework/Headers/**/*.h'
+  s.header_mappings_dir  = 'Headers'
+  s.source_files         = 'Headers/**/*.{h,hpp}'
+  s.public_header_files  = 'Headers/**/*.h'
 
   add_rn_third_party_dependencies(s)
 
-  # We need to make sure that the React.xcframework is copied correctly - in the downloaded tarball
-  # the root directory is the framework, but when using it we need to have it in a subdirectory
-  # called React.xcframework, so we need to move the contents of the tarball into that directory.
-  # This is done in the prepare_command.
-  # We need to make sure that the headers are copied to the right place - local tar.gz has a different structure
-  # than the one from the maven repo
+  # The downloaded tarball ships React.xcframework and ReactNativeHeaders.xcframework
+  # at its root. We make sure React.xcframework is in its own subdirectory (the Maven
+  # tarball lays the framework contents at the root; the local tar.gz has a different
+  # structure) and flatten ReactNativeHeaders' headers into a top-level Headers/ dir
+  # so CocoaPods exposes them on the header search path.
   s.prepare_command = <<~'CMD'
     CURRENT_PATH=$(pwd)
     XCFRAMEWORK_PATH="${CURRENT_PATH}/React.xcframework"
 
-    # Check if XCFRAMEWORK_PATH is empty
-    if [ -z "$XCFRAMEWORK_PATH" ]; then
-      echo "ERROR: XCFRAMEWORK_PATH is empty."
-      exit 0
+    # Flatten ReactNativeHeaders' headers (identical across slices) into Headers/
+    # BEFORE we sweep stray root entries into React.xcframework. Fail closed:
+    # a tarball without ReactNativeHeaders.xcframework (an artifact published
+    # before the headers-spec layout, or a truncated download) would otherwise
+    # yield a green install with an empty Headers/ and every <react/...> or
+    # <yoga/...> include failing much later, far from the cause.
+    mkdir -p Headers
+    RNH_XCFRAMEWORK_PATH=$(find "$CURRENT_PATH" -type d -name "ReactNativeHeaders.xcframework" | head -n 1)
+    if [ -z "$RNH_XCFRAMEWORK_PATH" ]; then
+      echo "[React-Core-prebuilt] ERROR: ReactNativeHeaders.xcframework not found in the prebuilt tarball." >&2
+      echo "The artifact predates the headers-spec layout or is incomplete; use a matching react-native version." >&2
+      exit 1
+    fi
+    RNH_HEADERS_PATH=$(find "$RNH_XCFRAMEWORK_PATH" -type d -name "Headers" | head -n 1)
+    if [ -z "$RNH_HEADERS_PATH" ]; then
+      echo "[React-Core-prebuilt] ERROR: no Headers directory inside $RNH_XCFRAMEWORK_PATH." >&2
+      exit 1
     fi
+    cp -R "$RNH_HEADERS_PATH/." Headers
+    rm -rf "$RNH_XCFRAMEWORK_PATH"
 
     mkdir -p "${XCFRAMEWORK_PATH}"
-    find "$CURRENT_PATH" -mindepth 1 -maxdepth 1 ! -name "$(basename "$XCFRAMEWORK_PATH")" -exec mv {} "$XCFRAMEWORK_PATH" \;
+    find "$CURRENT_PATH" -mindepth 1 -maxdepth 1 \
+      ! -name "$(basename "$XCFRAMEWORK_PATH")" ! -name "Headers" \
+      -exec mv {} "$XCFRAMEWORK_PATH" \;
   CMD
 
   # If we are passing a local tarball, we don't want to switch between Debug and Release

package/React-Core.podspec

@@ -51,7 +51,6 @@ Pod::Spec.new do |s|
   s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = min_supported_versions
   s.source                 = source
-  s.resource_bundle        = { "RCTI18nStrings" => ["React/I18n/strings/*.lproj"]}
   s.compiler_flags         = js_engine_flags()
   s.header_dir             = "React"
   s.weak_framework         = "JavaScriptCore"
@@ -122,7 +121,15 @@ Pod::Spec.new do |s|
     s.dependency "React-hermes"
   end
 
-  s.resource_bundles = {'React-Core_privacy' => 'React/Resources/PrivacyInfo.xcprivacy'}
+  # Both bundles in one declaration: a second `resource_bundle(s) =` would replace
+  # (not merge) the first. RCTI18nStrings holds React-Core's localized strings
+  # (loaded by RCTLocalizedString); React-Core_privacy is the privacy manifest.
+  # (Prebuilt/SwiftPM get both from inside React.xcframework instead — see
+  # scripts/ios-prebuild/framework-resources.js — but source builds ship them here.)
+  s.resource_bundles = {
+    'RCTI18nStrings' => ['React/I18n/strings/*.lproj'],
+    'React-Core_privacy' => 'React/Resources/PrivacyInfo.xcprivacy',
+  }
 
   add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')

package/ReactAndroid/external-artifacts/build.gradle.kts

@@ -53,6 +53,30 @@ val reactNativeDependenciesReleaseDSYMArtifact: PublishArtifact =
       classifier = "reactnative-dependencies-dSYM-release"
     }
 
+// [iOS] React Native Dependencies Headers — the headers-only LIBRARY-type
+// sidecar (per-slice Headers/ + HeadersPath) that SwiftPM auto-serves; the
+// binary xcframework above is framework-type and cannot expose headers to
+// SwiftPM binaryTargets. Also shipped INSIDE the deps tarball for CocoaPods.
+val reactNativeDependenciesHeadersDebugArtifactFile: RegularFile =
+    layout.projectDirectory.file("artifacts/ReactNativeDependenciesHeadersDebug.xcframework.tar.gz")
+val reactNativeDependenciesHeadersDebugArtifact: PublishArtifact =
+    artifacts.add("externalArtifacts", reactNativeDependenciesHeadersDebugArtifactFile) {
+      type = "tgz"
+      extension = "tar.gz"
+      classifier = "reactnative-dependencies-headers-debug"
+    }
+
+val reactNativeDependenciesHeadersReleaseArtifactFile: RegularFile =
+    layout.projectDirectory.file(
+        "artifacts/ReactNativeDependenciesHeadersRelease.xcframework.tar.gz"
+    )
+val reactNativeDependenciesHeadersReleaseArtifact: PublishArtifact =
+    artifacts.add("externalArtifacts", reactNativeDependenciesHeadersReleaseArtifactFile) {
+      type = "tgz"
+      extension = "tar.gz"
+      classifier = "reactnative-dependencies-headers-release"
+    }
+
 // [iOS] React Native Core
 val reactCoreDebugArtifactFile: RegularFile =
     layout.projectDirectory.file("artifacts/ReactCoreDebug.xcframework.tar.gz")
@@ -89,6 +113,27 @@ val reactCoreReleaseDSYMArtifact: PublishArtifact =
       classifier = "reactnative-core-dSYM-release"
     }
 
+// [iOS] React Native Headers — the pure-RN headers-only xcframework, published
+// standalone (it also ships inside the ReactCore tarball for CocoaPods) so
+// SwiftPM consumers can wire it as its own binaryTarget.
+val reactNativeHeadersDebugArtifactFile: RegularFile =
+    layout.projectDirectory.file("artifacts/ReactNativeHeadersDebug.xcframework.tar.gz")
+val reactNativeHeadersDebugArtifact: PublishArtifact =
+    artifacts.add("externalArtifacts", reactNativeHeadersDebugArtifactFile) {
+      type = "tgz"
+      extension = "tar.gz"
+      classifier = "reactnative-headers-debug"
+    }
+
+val reactNativeHeadersReleaseArtifactFile: RegularFile =
+    layout.projectDirectory.file("artifacts/ReactNativeHeadersRelease.xcframework.tar.gz")
+val reactNativeHeadersReleaseArtifact: PublishArtifact =
+    artifacts.add("externalArtifacts", reactNativeHeadersReleaseArtifactFile) {
+      type = "tgz"
+      extension = "tar.gz"
+      classifier = "reactnative-headers-release"
+    }
+
 apply(from = "../publish.gradle")
 
 publishing {
@@ -99,10 +144,14 @@ publishing {
       artifact(reactNativeDependenciesReleaseArtifact)
       artifact(reactNativeDependenciesDebugDSYMArtifact)
       artifact(reactNativeDependenciesReleaseDSYMArtifact)
+      artifact(reactNativeDependenciesHeadersDebugArtifact)
+      artifact(reactNativeDependenciesHeadersReleaseArtifact)
       artifact(reactCoreDebugArtifact)
       artifact(reactCoreReleaseArtifact)
       artifact(reactCoreDebugDSYMArtifact)
       artifact(reactCoreReleaseDSYMArtifact)
+      artifact(reactNativeHeadersDebugArtifact)
+      artifact(reactNativeHeadersReleaseArtifact)
     }
   }
 }

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.87.0-rc.1
+VERSION_NAME=0.87.0-rc.2
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/SynchronousMountItem.kt

@@ -28,8 +28,14 @@ internal class SynchronousMountItem(private val reactTag: Int, private val props
   }
 
   override fun toString(): String {
-    val propsString = if (IS_DEVELOPMENT_ENVIRONMENT) props.toHashMap().toString() else "<hidden>"
-    return "SYNC UPDATE PROPS [$reactTag]: $propsString"
+    // NOTE: Intentionally written as an early return rather than assigning the result of an
+    // `if` expression to a local `val`. The latter shape triggers a crash in the Android lint
+    // K2 UAST analyzer (resolveSyntheticJavaPropertyAccessorCall) while resolving the local
+    // variable's `if`-expression initializer, failing `lintVitalAnalyzeRelease`.
+    if (!IS_DEVELOPMENT_ENVIRONMENT) {
+      return "SYNC UPDATE PROPS [$reactTag]: <hidden>"
+    }
+    return "SYNC UPDATE PROPS [$reactTag]: ${props.toHashMap()}"
   }
 
   override fun getSurfaceId(): Int = View.NO_ID

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 87,
     "patch" to 0,
-    "prerelease" to "rc.1"
+    "prerelease" to "rc.2"
   )
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ struct ReactNativeVersionType {
   int32_t Major = 0;
   int32_t Minor = 87;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.1";
+  std::string_view Prerelease = "rc.2";
 };
 
 constexpr ReactNativeVersionType ReactNativeVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.87.0-rc.1",
+  "version": "0.87.0-rc.2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -112,6 +112,8 @@
     "scripts/react_native_pods_utils/script_phases.sh",
     "scripts/react_native_pods.rb",
     "scripts/react-native-xcode.sh",
+    "scripts/setup-apple-spm.js",
+    "scripts/spm",
     "scripts/xcode/ccache-clang.sh",
     "scripts/xcode/ccache-clang++.sh",
     "scripts/xcode/ccache.conf",
@@ -146,19 +148,19 @@
     }
   },
   "dependencies": {
-    "@react-native/asset-utils": "0.87.0-rc.1",
-    "@react-native/codegen": "0.87.0-rc.1",
-    "@react-native/community-cli-plugin": "0.87.0-rc.1",
-    "@react-native/gradle-plugin": "0.87.0-rc.1",
-    "@react-native/normalize-colors": "0.87.0-rc.1",
-    "@react-native/virtualized-lists": "0.87.0-rc.1",
+    "@react-native/asset-utils": "0.87.0-rc.2",
+    "@react-native/codegen": "0.87.0-rc.2",
+    "@react-native/community-cli-plugin": "0.87.0-rc.2",
+    "@react-native/gradle-plugin": "0.87.0-rc.2",
+    "@react-native/normalize-colors": "0.87.0-rc.2",
+    "@react-native/virtualized-lists": "0.87.0-rc.2",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "babel-plugin-syntax-hermes-parser": "0.36.1",
     "base64-js": "^1.5.1",
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-compiler": "250829098.0.15",
+    "hermes-compiler": "250829098.0.16",
     "invariant": "^2.2.4",
     "memoize-one": "^5.0.0",
     "metro-runtime": "^0.87.0",

package/react-native.config.js

@@ -112,6 +112,87 @@ const codegenCommand /*: Command */ = {
 
 commands.push(codegenCommand);
 
+const spmCommand /*: Command */ = {
+  name: 'spm [action]',
+  description:
+    'Set up or maintain Swift Package Manager support for the iOS/macOS app. ' +
+    'Actions: add, update, deinit, scaffold. With no action: add (or update ' +
+    'if SPM is already set up).',
+  options: [
+    {
+      name: '--version <string>',
+      description:
+        'React Native version (e.g. 0.80.0). Defaults to the version in node_modules/react-native/package.json.',
+    },
+    {
+      name: '--yes',
+      description: 'Skip the dirty-pbxproj confirmation prompt.',
+    },
+    {
+      name: '--xcodeproj <path>',
+      description:
+        '[add] Path to the .xcodeproj to inject SPM packages into ' +
+        '(disambiguates when several exist).',
+    },
+    {
+      name: '--productName <string>',
+      description:
+        '[add] App target to inject into (disambiguates when several exist).',
+    },
+    {
+      name: '--deintegrate',
+      description:
+        '[add] Run `pod deintegrate` and strip React Native from the Podfile ' +
+        'before injecting (CocoaPods → SwiftPM migration).',
+    },
+    {
+      name: '--artifacts <path>',
+      description:
+        '[advanced] Local artifact root containing complete debug/ and release/ slots.',
+    },
+    {
+      name: '--download <string>',
+      description:
+        '[advanced] Artifact download policy: auto (default), skip, or force.',
+    },
+    {
+      name: '--skipCodegen',
+      description: '[advanced] Skip the react-native codegen step.',
+    },
+  ],
+  func: async (argv, _config, args) => {
+    const passthrough /*: Array<string> */ = [];
+    if (argv[0] != null) {
+      passthrough.push(argv[0]);
+    }
+    const stringOpts /*: Array<[string, string]> */ = [
+      ['version', '--version'],
+      ['productName', '--product-name'],
+      ['xcodeproj', '--xcodeproj'],
+      ['artifacts', '--artifacts'],
+      ['download', '--download'],
+    ];
+    for (const [key, flag] of stringOpts) {
+      if (args[key] != null) {
+        passthrough.push(flag, String(args[key]));
+      }
+    }
+    const boolOpts /*: Array<[string, string]> */ = [
+      ['skipCodegen', '--skip-codegen'],
+      ['deintegrate', '--deintegrate'],
+      ['yes', '--yes'],
+    ];
+    for (const [key, flag] of boolOpts) {
+      if (args[key]) {
+        passthrough.push(flag);
+      }
+    }
+    await require('./scripts/setup-apple-spm').main(passthrough);
+  },
+};
+
+commands.push(spmCommand);
+
 const config = {
   commands,
   platforms: {} /*:: as {[string]: Readonly<{

package/scripts/cocoapods/fabric.rb

@@ -11,7 +11,7 @@ def setup_fabric!(react_native_path: "../node_modules/react-native")
     pod 'React-Fabric', :path => "#{react_native_path}/ReactCommon"
     pod 'React-FabricComponents', :path => "#{react_native_path}/ReactCommon"
     pod 'React-graphics', :path => "#{react_native_path}/ReactCommon/react/renderer/graphics"
-    pod 'React-RCTFabric', :path => "#{react_native_path}/React", :modular_headers => true
+    rncore_pod 'React-RCTFabric', :path => "#{react_native_path}/React", :modular_headers => true
     pod 'React-ImageManager', :path => "#{react_native_path}/ReactCommon/react/renderer/imagemanager/platform/ios"
     pod 'React-FabricImage', :path => "#{react_native_path}/ReactCommon"
 end