react-native-tvos 0.84.1-0 → 0.85.0-0

package/ReactCommon/yoga/yoga/algorithm/CalculateLayout.cpp

@@ -339,13 +339,13 @@ static void measureNodeWithMeasureFunc(
 
     Event::publish<Event::MeasureCallbackEnd>(
         node,
-        {innerWidth,
-         unscopedEnum(measureMode(widthSizingMode)),
-         innerHeight,
-         unscopedEnum(measureMode(heightSizingMode)),
-         measuredSize.width,
-         measuredSize.height,
-         reason});
+        {.width = innerWidth,
+         .widthMeasureMode = unscopedEnum(measureMode(widthSizingMode)),
+         .height = innerHeight,
+         .heightMeasureMode = unscopedEnum(measureMode(heightSizingMode)),
+         .measuredWidth = measuredSize.width,
+         .measuredHeight = measuredSize.height,
+         .reason = reason});
 
     node->setLayoutMeasuredDimension(
         boundAxis(

package/ReactCommon/yoga/yoga/enums/YogaEnums.h

@@ -67,7 +67,6 @@ auto ordinals() {
     }
 
     bool operator==(const Iterator& other) const = default;
-    bool operator!=(const Iterator& other) const = default;
   };
 
   struct Range {

package/ReactCommon/yoga/yoga/node/LayoutResults.h

@@ -111,9 +111,6 @@ struct LayoutResults {
   }
 
   bool operator==(LayoutResults layout) const;
-  bool operator!=(LayoutResults layout) const {
-    return !(*this == layout);
-  }
 
  private:
   Direction direction_ : bitCount<Direction>() = Direction::Inherit;

package/ReactCommon/yoga/yoga/numeric/FloatOptional.h

@@ -44,23 +44,14 @@ constexpr bool operator==(FloatOptional lhs, FloatOptional rhs) {
   return lhs.unwrap() == rhs.unwrap() ||
       (lhs.isUndefined() && rhs.isUndefined());
 }
-constexpr bool operator!=(FloatOptional lhs, FloatOptional rhs) {
-  return !(lhs == rhs);
-}
 
 constexpr bool operator==(FloatOptional lhs, float rhs) {
   return lhs == FloatOptional{rhs};
 }
-constexpr bool operator!=(FloatOptional lhs, float rhs) {
-  return !(lhs == rhs);
-}
 
 constexpr bool operator==(float lhs, FloatOptional rhs) {
   return rhs == lhs;
 }
-constexpr bool operator!=(float lhs, FloatOptional rhs) {
-  return !(lhs == rhs);
-}
 
 constexpr FloatOptional operator+(FloatOptional lhs, FloatOptional rhs) {
   return FloatOptional{lhs.unwrap() + rhs.unwrap()};

package/ReactCommon/yoga/yoga/style/Style.h

@@ -548,10 +548,6 @@ class YG_EXPORT Style {
         numbersEqual(aspectRatio_, pool_, other.aspectRatio_, other.pool_);
   }
 
-  bool operator!=(const Style& other) const {
-    return !(*this == other);
-  }
-
  private:
   using Dimensions = std::array<StyleValueHandle, ordinalCount<Dimension>()>;
   using Edges = std::array<StyleValueHandle, ordinalCount<Edge>()>;

package/flow/bom.js.flow

@@ -32,31 +32,31 @@ declare interface ConsoleTask {
 // $FlowExpectedError[libdef-override] Flow core definitions are incomplete.
 declare var console: {
   // Logging
-  log(...data: $ReadOnlyArray<unknown>): void,
-  trace(...data: $ReadOnlyArray<unknown>): void,
-  debug(...data: $ReadOnlyArray<unknown>): void,
-  info(...data: $ReadOnlyArray<unknown>): void,
-  warn(...data: $ReadOnlyArray<unknown>): void,
-  error(...data: $ReadOnlyArray<unknown>): void,
+  log(...data: ReadonlyArray<unknown>): void,
+  trace(...data: ReadonlyArray<unknown>): void,
+  debug(...data: ReadonlyArray<unknown>): void,
+  info(...data: ReadonlyArray<unknown>): void,
+  warn(...data: ReadonlyArray<unknown>): void,
+  error(...data: ReadonlyArray<unknown>): void,
 
   // Grouping
-  group(...data: $ReadOnlyArray<unknown>): void,
-  groupCollapsed(...data: $ReadOnlyArray<unknown>): void,
+  group(...data: ReadonlyArray<unknown>): void,
+  groupCollapsed(...data: ReadonlyArray<unknown>): void,
   groupEnd(): void,
 
   // Printing
   table(
     tabularData:
-      | $ReadOnly<{[key: string]: unknown, ...}>
-      | $ReadOnlyArray<$ReadOnly<{[key: string]: unknown, ...}>>
-      | $ReadOnlyArray<$ReadOnlyArray<unknown>>,
+      | Readonly<{[key: string]: unknown, ...}>
+      | ReadonlyArray<Readonly<{[key: string]: unknown, ...}>>
+      | ReadonlyArray<ReadonlyArray<unknown>>,
   ): void,
-  dir(...data: $ReadOnlyArray<unknown>): void,
-  dirxml(...data: $ReadOnlyArray<unknown>): void,
+  dir(...data: ReadonlyArray<unknown>): void,
+  dirxml(...data: ReadonlyArray<unknown>): void,
   clear(): void,
 
   // Utilities
-  assert(condition: unknown, ...data: $ReadOnlyArray<unknown>): void,
+  assert(condition: unknown, ...data: ReadonlyArray<unknown>): void,
 
   // Profiling
   profile(name?: string): void,
@@ -172,7 +172,7 @@ declare class TaskAttributionTiming extends PerformanceEntry {
 
 // https://w3c.github.io/longtasks/#sec-PerformanceLongTaskTiming
 declare class PerformanceLongTaskTiming extends PerformanceEntry {
-  attribution: $ReadOnlyArray<TaskAttributionTiming>;
+  attribution: ReadonlyArray<TaskAttributionTiming>;
 }
 
 // https://www.w3.org/TR/user-timing/#extensions-performance-interface
@@ -609,12 +609,13 @@ declare class AbortController {
 }
 
 declare class AbortSignal extends EventTarget {
-  abort(reason?: $FlowFixMe): AbortSignal;
+  static abort(reason?: $FlowFixMe): AbortSignal;
+  static any(signals: Iterable<AbortSignal>): AbortSignal;
   +aborted: boolean;
   onabort: (event: Event) => unknown;
   +reason: $FlowFixMe;
   throwIfAborted(): void;
-  timeout(time: number): AbortSignal;
+  static timeout(time: number): AbortSignal;
 }
 
 declare function fetch(

package/flow/dom.js.flow

@@ -58,7 +58,7 @@ declare type FilePropertyBag = {
 };
 declare class File extends Blob {
   constructor(
-    fileBits: $ReadOnlyArray<string | BufferDataSource | Blob>,
+    fileBits: ReadonlyArray<string | BufferDataSource | Blob>,
     filename: string,
     options?: FilePropertyBag,
   ): void;
@@ -1216,7 +1216,7 @@ type ClipboardItemOptions = {
 };
 
 declare class ClipboardItem {
-  +types: $ReadOnlyArray<string>;
+  +types: ReadonlyArray<string>;
   getType(type: string): Promise<Blob>;
   constructor(
     items: {[type: string]: ClipboardItemData},
@@ -1315,7 +1315,7 @@ declare class Node extends EventTarget {
   normalize(): void;
   removeChild<T: Node>(oldChild: T): T;
   replaceChild<T: Node>(newChild: Node, oldChild: T): T;
-  replaceChildren(...nodes: $ReadOnlyArray<Node | string>): void;
+  replaceChildren(...nodes: ReadonlyArray<Node | string>): void;
   static ATTRIBUTE_NODE: number;
   static CDATA_SECTION_NODE: number;
   static COMMENT_NODE: number;
@@ -3797,7 +3797,7 @@ declare class CanvasRenderingContext2D {
     y: number,
     w: number,
     h: number,
-    radii?: number | DOMPointInit | $ReadOnlyArray<number | DOMPointInit>,
+    radii?: number | DOMPointInit | ReadonlyArray<number | DOMPointInit>,
   ): void;
   strokeRect(x: number, y: number, w: number, h: number): void;
 
@@ -5948,12 +5948,19 @@ declare class Comment extends CharacterData {
   text: string;
 }
 
+interface StringLike {
+  toString(): string;
+}
+
 declare class URL {
   static canParse(url: string, base?: string): boolean;
   static createObjectURL(blob: Blob): string;
   static createObjectURL(mediaSource: MediaSource): string;
   static revokeObjectURL(url: string): void;
-  constructor(url: string, base?: string | URL): void;
+  constructor(
+    url: string | URL | StringLike,
+    base?: string | URL | StringLike,
+  ): void;
   hash: string;
   host: string;
   hostname: string;

package/flow/global.js

@@ -24,7 +24,7 @@ declare var global: {
     +env: {
       +NODE_ENV: 'development' | 'production',
     },
-    +argv?: $ReadOnlyArray<string>,
+    +argv?: ReadonlyArray<string>,
   },
 
   // setUpPerformance

package/gradle/libs.versions.toml

@@ -44,7 +44,7 @@ yoga-proguard-annotations = "1.19.0"
 boost="1_83_0"
 doubleconversion="1.1.6"
 fastFloat="8.0.0"
-fmt="11.0.2"
+fmt="12.1.0"
 folly="2024.11.18.00"
 glog="0.3.5"
 gflags="2.2.0"

package/index.js

@@ -42,6 +42,9 @@ module.exports = {
     return require('./Libraries/Components/DrawerAndroid/DrawerLayoutAndroid')
       .default;
   },
+  get EventEmitter() {
+    return require('./Libraries/vendor/emitter/EventEmitter').default;
+  },
   get FlatList() {
     return require('./Libraries/Lists/FlatList').default;
   },
@@ -338,6 +341,12 @@ module.exports = {
   get useAnimatedValue() {
     return require('./Libraries/Animated/useAnimatedValue').default;
   },
+  get useAnimatedValueXY() {
+    return require('./Libraries/Animated/useAnimatedValueXY').default;
+  },
+  get useAnimatedColor() {
+    return require('./Libraries/Animated/useAnimatedColor').default;
+  },
   get useColorScheme() {
     return require('./Libraries/Utilities/useColorScheme').default;
   },

package/index.js.flow

@@ -320,7 +320,6 @@ export * as NativeComponentRegistry from './Libraries/NativeComponent/NativeComp
 export {default as NativeDialogManagerAndroid} from './Libraries/NativeModules/specs/NativeDialogManagerAndroid';
 
 export type {
-  EventSubscription,
   EmitterSubscription,
   NativeEventSubscription,
 } from './Libraries/EventEmitter/NativeEventEmitter';
@@ -408,6 +407,8 @@ export * as TurboModuleRegistry from './Libraries/TurboModule/TurboModuleRegistr
 export {default as UIManager} from './Libraries/ReactNative/UIManager';
 export {unstable_batchedUpdates} from './Libraries/ReactNative/RendererProxy';
 export {default as useAnimatedValue} from './Libraries/Animated/useAnimatedValue';
+export {default as useAnimatedValueXY} from './Libraries/Animated/useAnimatedValueXY';
+export {default as useAnimatedColor} from './Libraries/Animated/useAnimatedColor';
 export type {
   PressabilityConfig,
   EventHandlers as PressabilityEventHandlers,
@@ -463,6 +464,12 @@ export type {
   PublicTextInstance,
 } from './Libraries/ReactPrivate/ReactNativePrivateInterface';
 
+export type {
+  EventSubscription,
+  IEventEmitter,
+} from './Libraries/vendor/emitter/EventEmitter';
+export {default as EventEmitter} from './Libraries/vendor/emitter/EventEmitter';
+
 export {
   default as unstable_VirtualView,
   VirtualViewMode,

package/jest-preset.js

@@ -10,21 +10,17 @@
 
 'use strict';
 
-module.exports = {
-  haste: {
-    defaultPlatform: 'ios',
-    platforms: ['android', 'ios', 'native'],
-  },
-  resolver: require.resolve('./jest/resolver.js'),
-  transform: {
-    '^.+\\.(js|ts|tsx)$': 'babel-jest',
-    '^.+\\.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$': require.resolve(
-      './jest/assetFileTransformer.js',
-    ),
-  },
-  transformIgnorePatterns: [
-    'node_modules/(?!((jest-)?react-native|@react-native(-community)?)/)',
-  ],
-  setupFiles: [require.resolve('./jest/setup.js')],
-  testEnvironment: require.resolve('./jest/react-native-env.js'),
-};
+try {
+  module.exports = require('@react-native/jest-preset');
+} catch (error) {
+  if (error.code === 'MODULE_NOT_FOUND') {
+    throw new Error(
+      `The React Native Jest preset has moved to a separate package.
+To migrate, please install "@react-native/jest-preset" and update your
+jest.config.js to reference:
+  preset: '@react-native/jest-preset'`,
+    );
+  } else {
+    throw error;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.84.1-0",
+  "version": "0.85.0-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -24,7 +24,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": ">= 20.19.4"
+    "node": "^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0"
   },
   "bin": {
     "react-native": "cli.js"
@@ -85,7 +85,6 @@
     "index.js.flow",
     "interface.js",
     "jest-preset.js",
-    "jest",
     "Libraries",
     "LICENSE",
     "React-Core.podspec",
@@ -155,36 +154,37 @@
     "featureflags-check": "node ./scripts/featureflags/index.js --verify-unchanged"
   },
   "peerDependencies": {
+    "@react-native/jest-preset": "0.85.0",
     "@types/react": "^19.1.1",
     "react": "^19.2.3"
   },
   "peerDependenciesMeta": {
     "@types/react": {
       "optional": true
+    },
+    "@react-native/jest-preset": {
+      "optional": true
     }
   },
   "dependencies": {
-    "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.84.1",
-    "@react-native/codegen": "0.84.1",
-    "@react-native/community-cli-plugin": "0.84.1",
-    "@react-native/gradle-plugin": "0.84.1",
-    "@react-native/js-polyfills": "0.84.1",
-    "@react-native/normalize-colors": "0.84.1",
+    "@react-native/assets-registry": "0.85.0",
+    "@react-native/codegen": "0.85.0",
+    "@react-native/community-cli-plugin": "0.85.0",
+    "@react-native/gradle-plugin": "0.85.0",
+    "@react-native/js-polyfills": "0.85.0",
+    "@react-native/normalize-colors": "0.85.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
-    "babel-jest": "^29.7.0",
-    "babel-plugin-syntax-hermes-parser": "0.32.0",
+    "babel-plugin-syntax-hermes-parser": "0.33.3",
     "base64-js": "^1.5.1",
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-compiler": "250829098.0.9",
+    "hermes-compiler": "250829098.0.10",
     "invariant": "^2.2.4",
-    "jest-environment-node": "^29.7.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.83.3",
-    "metro-source-map": "^0.83.3",
+    "metro-runtime": "^0.84.0",
+    "metro-source-map": "^0.84.0",
     "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.84.1-0"
+    "@react-native-tvos/virtualized-lists": "0.85.0-0"
   },
   "codegenConfig": {
     "libraries": [

package/scripts/cocoapods/rncore.rb

@@ -13,10 +13,27 @@ require_relative './utils.rb'
 ### building ReactNativeCore from source (then this function does nothing).
 def add_rncore_dependency(s)
     if !ReactNativeCoreUtils.build_rncore_from_source()
+        # Add the dependency
+        s.dependency "React-Core-prebuilt"
+
         current_pod_target_xcconfig = s.to_hash["pod_target_xcconfig"] || {}
         current_pod_target_xcconfig = current_pod_target_xcconfig.to_h unless current_pod_target_xcconfig.is_a?(Hash)
-        s.dependency "React-Core-prebuilt"
-        current_pod_target_xcconfig["HEADER_SEARCH_PATHS"] ||= [] << "$(PODS_ROOT)/React-Core-prebuilt/React.xcframework/Headers"
+
+        # Add VFS overlay flags for both Objective-C and Swift
+        # The VFS overlay file is pre-resolved at pod install time for each platform slice.
+        # We reference it directly in the xcframework using the React-VFS.yaml file that
+        # is written to the React-Core-prebuilt folder during setup_vfs_overlay.
+        # See scripts/ios-prebuild/__docs__/README.md for more details on VFS overlays.
+        vfs_overlay_flag = "-ivfsoverlay $(PODS_ROOT)/React-Core-prebuilt/React-VFS.yaml"
+        current_pod_target_xcconfig["OTHER_CFLAGS"] ||= "$(inherited)"
+        current_pod_target_xcconfig["OTHER_CFLAGS"] += " #{vfs_overlay_flag}"
+        current_pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"] ||= "$(inherited)"
+        current_pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"] += " #{vfs_overlay_flag}"
+        # For Swift, we need to use -Xcc to pass flags to the underlying Clang compiler
+        # Both the flag and its argument need separate -Xcc prefixes
+        current_pod_target_xcconfig["OTHER_SWIFT_FLAGS"] ||= "$(inherited)"
+        current_pod_target_xcconfig["OTHER_SWIFT_FLAGS"] += " -Xcc -ivfsoverlay -Xcc $(PODS_ROOT)/React-Core-prebuilt/React-VFS.yaml"
+
         s.pod_target_xcconfig = current_pod_target_xcconfig
     end
 end
@@ -469,4 +486,96 @@ class ReactNativeCoreUtils
         return latest_nightly
     end
 
+    # Processes the VFS overlay file from the React.xcframework to resolve the ${ROOT_PATH} placeholder.
+    # This method should be called from react_native_post_install after pod install completes.
+    #
+    # The VFS overlay file maps header import paths to their actual locations within the xcframework.
+    # Since the xcframework contains platform-specific slices, we generate a resolved VFS file for each
+    # slice and also create a default VFS file that can be used immediately (before script phases run).
+    def self.process_vfs_overlay()
+        return if @@build_from_source
+
+        prebuilt_path = File.join(Pod::Config.instance.project_pods_root, "React-Core-prebuilt")
+        xcframework_path = File.join(prebuilt_path, "React.xcframework")
+        vfs_template_path = File.join(xcframework_path, "React-VFS-template.yaml")
+
+        unless File.exist?(vfs_template_path)
+            rncore_log("VFS overlay template not found at #{vfs_template_path}", :error)
+            exit 1
+        end
+
+        rncore_log("Processing VFS overlay file...")
+
+        # Read the template content
+        vfs_template_content = File.read(vfs_template_path)
+
+        # Write the VFS file - use the top-level xcframework path
+        # so that ${ROOT_PATH}/Headers points to the xcframework's Headers folder
+        resolved_vfs_content = vfs_template_content.gsub('${ROOT_PATH}', xcframework_path)
+        resolved_vfs_path = File.join(prebuilt_path, "React-VFS.yaml")
+        File.write(resolved_vfs_path, resolved_vfs_content)
+        rncore_log("  Created VFS overlay at #{resolved_vfs_path}")
+
+        rncore_log("VFS overlay setup complete")
+    end
+
+    # Configures the xcconfig files for aggregate (main app) targets to enable VFS overlay for React Native Core.
+    # This is needed because the main app target does not go through podspec processing,
+    # so it won't get the VFS overlay flags from add_rncore_dependency.
+    #
+    # Parameters:
+    # - installer: The CocoaPods installer object
+    def self.configure_aggregate_xcconfig(installer)
+        return if @@build_from_source
+
+        prebuilt_path = File.join(Pod::Config.instance.project_pods_root, "React-Core-prebuilt")
+        vfs_overlay_path = File.join(prebuilt_path, "React-VFS.yaml")
+
+        unless File.exist?(vfs_overlay_path)
+            rncore_log("VFS overlay not found at #{vfs_overlay_path}, skipping prebuilt xcconfig configuration", :error)
+            exit 1
+        end
+
+        rncore_log("Configuring xcconfig for prebuilt React Native Core...")
+
+        vfs_overlay_flag = " -ivfsoverlay \"#{vfs_overlay_path}\""
+        swift_vfs_overlay_flag = " -Xcc -ivfsoverlay -Xcc \"#{vfs_overlay_path}\""
+
+        # Add flags to aggregate target xcconfigs (these are used by the main app target)
+        installer.aggregate_targets.each do |aggregate_target|
+            aggregate_target.xcconfigs.each do |config_name, config_file|
+                add_vfs_overlay_flags(config_file.attributes, vfs_overlay_flag, swift_vfs_overlay_flag)
+                xcconfig_path = aggregate_target.xcconfig_path(config_name)
+                config_file.save_as(xcconfig_path)
+            end
+        end
+
+        # Add flags to ALL pod targets (for third-party pods that don't call add_rncore_dependency)
+        installer.pod_targets.each do |pod_target|
+            pod_target.build_settings.each do |config_name, build_settings|
+                xcconfig_path = pod_target.xcconfig_path(config_name)
+                next unless File.exist?(xcconfig_path)
+
+                xcconfig = Xcodeproj::Config.new(xcconfig_path)
+
+                # Check if VFS overlay is already present
+                other_cflags = xcconfig.attributes["OTHER_CFLAGS"] || ""
+                next if other_cflags.include?("ivfsoverlay")
+
+                add_vfs_overlay_flags(xcconfig.attributes, vfs_overlay_flag, swift_vfs_overlay_flag)
+                xcconfig.save_as(xcconfig_path)
+            end
+        end
+
+        rncore_log("Prebuilt xcconfig configuration complete")
+    end
+
+    # Helper method to add VFS overlay flags to an xcconfig attributes map
+    def self.add_vfs_overlay_flags(attributes, vfs_overlay_flag, swift_vfs_overlay_flag)
+        ReactNativePodsUtils.add_flag_to_map_with_inheritance(attributes, "OTHER_CFLAGS", vfs_overlay_flag)
+        ReactNativePodsUtils.add_flag_to_map_with_inheritance(attributes, "OTHER_CPLUSPLUSFLAGS", vfs_overlay_flag)
+        ReactNativePodsUtils.add_flag_to_map_with_inheritance(attributes, "OTHER_SWIFT_FLAGS", swift_vfs_overlay_flag)
+        # Suppress incomplete umbrella warnings for the prebuilt frameworks (it is expected, as our umbrella headers do not include all headers)
+        ReactNativePodsUtils.add_flag_to_map_with_inheritance(attributes, "OTHER_SWIFT_FLAGS", " -Xcc -Wno-incomplete-umbrella")
+    end
 end

package/scripts/cocoapods/utils.rb

@@ -334,6 +334,8 @@ class ReactNativePodsUtils
                     .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-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", []))
                     .each{ |search_path|
                         header_search_paths = self.add_search_path_if_not_included(header_search_paths, search_path)
                     }

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

@@ -1,3 +1,10 @@
+/*
+ * 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.
+ */
+
 // swift-tools-version: 6.1
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 

package/scripts/react_native_pods.rb

@@ -75,10 +75,13 @@ def use_react_native! (
   error_if_try_to_use_jsc_from_core()
   warn_if_new_arch_disabled()
 
+  react_native_path = Pod::Config.instance.installation_root.join(path)
+  prefix = react_native_path.relative_path_from(Pod::Config.instance.installation_root)
+
   hermes_enabled= true
   # Set the app_path as env variable so the podspecs can access it.
   ENV['APP_PATH'] = app_path
-  ENV['REACT_NATIVE_PATH'] = path
+  ENV['REACT_NATIVE_PATH'] = react_native_path.to_s
 
   # We set RCT_SKIP_CODEGEN to true, if the user wants to skip the running Codegen step from Cocoapods.
   # This is needed as part of our migration away from cocoapods
@@ -103,20 +106,17 @@ def use_react_native! (
   # that has invoked the `use_react_native!` function.
   ReactNativePodsUtils.detect_use_frameworks(current_target_definition)
 
-  CodegenUtils.clean_up_build_folder(path, $CODEGEN_OUTPUT_DIR)
+  CodegenUtils.clean_up_build_folder(react_native_path, $CODEGEN_OUTPUT_DIR)
 
   # We are relying on this flag also in third parties libraries to proper install dependencies.
   # Better to rely and enable this environment flag if the new architecture is turned on using flags.
-  relative_path_from_current = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
-  react_native_version = NewArchitectureHelper.extract_react_native_version(File.join(relative_path_from_current, path))
+  react_native_version = NewArchitectureHelper.extract_react_native_version(react_native_path)
   fabric_enabled = true
 
   ENV['RCT_FABRIC_ENABLED'] = "1"
   ENV['RCT_AGGREGATE_PRIVACY_FILES'] = privacy_file_aggregation_enabled ? "1" : "0"
   ENV["RCT_NEW_ARCH_ENABLED"] = "1"
 
-  prefix = path
-
   ReactNativePodsUtils.warn_if_not_on_arm64()
 
   # Update ReactNativeDependencies so that we can easily switch between source and prebuilt
@@ -548,6 +548,13 @@ def react_native_post_install(
     # In XCode 26 we need to revert the new setting SWIFT_ENABLE_EXPLICIT_MODULES when building
     # with precompiled binaries.
     ReactNativePodsUtils.set_build_setting(installer, build_setting: "SWIFT_ENABLE_EXPLICIT_MODULES", value: "NO")
+
+    # Process the VFS overlay for prebuilt React Native Core - this is done as part of the post install so
+    # that we can update paths based on the final location of the Pods installation.
+    ReactNativeCoreUtils.process_vfs_overlay()
+
+    # Configure xcconfig for prebuilt usage (VFS overlay, header paths, cleanup redundant paths)
+    ReactNativeCoreUtils.configure_aggregate_xcconfig(installer)
   end
 
   SPM.apply_on_post_install(installer)

package/scripts/replace-rncore-version.js

@@ -62,9 +62,18 @@ function replaceRNCoreConfiguration(
   const tarballURLPath = `${podsRoot}/ReactNativeCore-artifacts/reactnative-core-${version.toLowerCase()}-${configuration.toLowerCase()}.tar.gz`;
 
   const finalLocation = 'React-Core-prebuilt';
-  console.log('Preparing the final location', finalLocation);
-  fs.rmSync(finalLocation, {force: true, recursive: true});
-  fs.mkdirSync(finalLocation, {recursive: true});
+
+  // Delete all directories - not files, since we want to keep the React-VFS.yaml file
+  const dirs = fs
+    .readdirSync(finalLocation, {withFileTypes: true})
+    .filter(dirent => dirent.isDirectory());
+  for (const dirent of dirs) {
+    const direntName =
+      typeof dirent.name === 'string' ? dirent.name : dirent.name.toString();
+    const dirPath = `${finalLocation}/${direntName}`;
+    console.log('Removing directory', dirPath);
+    fs.rmSync(dirPath, {force: true, recursive: true});
+  }
 
   console.log('Extracting the tarball', tarballURLPath);
   spawnSync('tar', ['-xf', tarballURLPath, '-C', finalLocation], {

package/sdks/.hermesv1version

@@ -1 +1 @@
-hermes-v250829098.0.9
+hermes-v250829098.0.10

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-v0.15.1
+hermes-v0.16.0

package/sdks/hermes-engine/version.properties

@@ -1,2 +1,2 @@
-HERMES_VERSION_NAME=0.15.1
-HERMES_V1_VERSION_NAME=250829098.0.9
+HERMES_VERSION_NAME=0.16.0
+HERMES_V1_VERSION_NAME=250829098.0.10