react-native-tvos 0.84.0-0rc0 → 0.84.1-0

package/ReactCommon/react/runtime/hermes/CMakeLists.txt

@@ -35,8 +35,4 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
                 PRIVATE
                 -DHERMES_ENABLE_DEBUGGER=1
         )
-
-        if (HERMES_V1_ENABLED)
-                target_compile_options(bridgelesshermes PRIVATE -DHERMES_V1_ENABLED=1)
-        endif()
 endif()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.84.0-0rc0",
+  "version": "0.84.1-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": ">= 22.11.0"
+    "node": ">= 20.19.4"
   },
   "bin": {
     "react-native": "cli.js"
@@ -91,6 +91,7 @@
     "React-Core.podspec",
     "React-Core-prebuilt.podspec",
     "react-native.config.js",
+    "tvosCommands.js",
     "React.podspec",
     "React",
     "!React/Fabric/RCTThirdPartyFabricComponentsProvider.*",
@@ -164,12 +165,12 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.84.0-rc.0",
-    "@react-native/codegen": "0.84.0-rc.0",
-    "@react-native/community-cli-plugin": "0.84.0-rc.0",
-    "@react-native/gradle-plugin": "0.84.0-rc.0",
-    "@react-native/js-polyfills": "0.84.0-rc.0",
-    "@react-native/normalize-colors": "0.84.0-rc.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",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -178,7 +179,7 @@
     "base64-js": "^1.5.1",
     "commander": "^12.0.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-compiler": "0.15.0",
+    "hermes-compiler": "250829098.0.9",
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.7.0",
     "memoize-one": "^5.0.0",
@@ -197,7 +198,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.84.0-0rc0"
+    "@react-native-tvos/virtualized-lists": "0.84.1-0"
   },
   "codegenConfig": {
     "libraries": [

package/react-native.config.js

@@ -136,4 +136,21 @@ if (android != null) {
   };
 }
 
+try {
+  const apple = require('@react-native-community/cli-platform-apple');
+  const tvosCommands = require('./tvosCommands');
+
+  config.commands.push(...tvosCommands);
+  config.platforms.tvos = {
+    projectConfig: apple.getProjectConfig({platformName: 'tvos'}),
+    dependencyConfig: apple.getDependencyConfig({platformName: 'tvos'}),
+  };
+} catch {
+  if (verbose) {
+    console.warn(
+      '@react-native-community/cli-platform-apple not found, the react-native.config.js may be unusable.',
+    );
+  }
+}
+
 module.exports = config;

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

@@ -169,11 +169,10 @@ function findFilesWithExtension(
       return null;
     }
 
-    // Skip hidden folders, that starts with `.` but allow `.pnpm`
-    if (
-      absolutePath.includes(`${path.sep}.`) &&
-      !absolutePath.includes(`${path.sep}.pnpm`)
-    ) {
+    // Skip hidden files/folders (starting with `.`) but allow `.pnpm`
+    // Note: Only check the filename, not the entire path, to avoid false positives
+    // when the workspace itself is under a hidden folder (e.g., ~/.jenkins/)
+    if (file.startsWith('.') && file !== '.pnpm') {
       return null;
     }
 
@@ -226,5 +225,6 @@ function findRCTComponentViewProtocolClass(filepath /*: string */) {
 }
 
 module.exports = {
+  findFilesWithExtension,
   generateRCTThirdPartyComponents,
 };

package/scripts/ios-configure-glog.sh

@@ -104,3 +104,21 @@ cp -f src/glog/logging.h "$EXPORTED_INCLUDE_DIR/"
 cp -f src/glog/raw_logging.h "$EXPORTED_INCLUDE_DIR/"
 cp -f src/glog/stl_logging.h "$EXPORTED_INCLUDE_DIR/"
 cp -f src/glog/vlog_is_on.h "$EXPORTED_INCLUDE_DIR/"
+
+
+# Create a custom module.modulemap that works with Swift C++ interop
+# The issue is that glog headers include other headers inside namespace blocks
+# which Clang treats as module imports inside namespaces (which is illegal)
+# Solution: Use textual headers to prevent submodule creation
+cat > src/glog/module.modulemap << 'MODULEMAP'
+module glog {
+     // Use textual headers to avoid submodule generation
+     // This prevents the "import within namespace" error with Swift C++ interop
+     textual header "log_severity.h"
+     textual header "logging.h"
+     textual header "raw_logging.h"
+     textual header "stl_logging.h"
+     textual header "vlog_is_on.h"
+     export *
+}
+MODULEMAP

package/scripts/react_native_pods.rb

@@ -92,6 +92,11 @@ def use_react_native! (
   # excluding the legacy arch unless the user turns this flag off explicitly.
   ENV['RCT_REMOVE_LEGACY_ARCH'] = ENV['RCT_REMOVE_LEGACY_ARCH'] == '0' ? '0' : '1'
 
+  # Enable Hermes V1 by default.
+  # Users can still turn it off and use legacy hermes by setting the RCT_HERMES_V1_ENABLED
+  # environment variable to '0'.
+  ENV['RCT_HERMES_V1_ENABLED']= ENV['RCT_HERMES_V1_ENABLED'] == '0' ? '0' : '1'
+
   ReactNativePodsUtils.check_minimum_required_xcode()
 
   # Current target definition is provided by Cocoapods and it refers to the target

package/sdks/.hermesv1version

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

package/sdks/.hermesversion

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

package/sdks/hermes-engine/hermes-engine.podspec

@@ -22,14 +22,15 @@ end
 package = JSON.parse(File.read(File.join(react_native_path, "package.json")))
 versionProperties = Hash[*File.read("version.properties").split(/[=\n]+/)]
 
-if ENV['RCT_HERMES_V1_ENABLED'] == "1"
-  version = versionProperties['HERMES_V1_VERSION_NAME']
-else
+if ENV['RCT_HERMES_V1_ENABLED'] == "0"
   version = versionProperties['HERMES_VERSION_NAME']
+else
+  version = versionProperties['HERMES_V1_VERSION_NAME']
 end
 
 # Local monorepo build
-if package['version'] == "1000.0.0" then
+# We don't want to build Hermes V1 from source
+if ENV['RCT_HERMES_V1_ENABLED'] == "0" && package['version'] == "1000.0.0" then
   hermesCompilerVersion = package['dependencies']['hermes-compiler']
   if hermesCompilerVersion != "0.0.0" then
     version = hermesCompilerVersion
@@ -68,7 +69,15 @@ Pod::Spec.new do |spec|
 
     spec.subspec 'Pre-built' do |ss|
       ss.preserve_paths = ["destroot/bin/*"].concat(["**/*.{h,c,cpp}"])
-      ss.source_files = "destroot/include/hermes/**/*.h"
+      if ENV["RCT_HERMES_V1_ENABLED"] == "0"
+        ss.source_files = "destroot/include/hermes/**/*.h"
+      else
+        # Hermes v1 is shipping a jsi/hermes.h header which is imported by the hermes.h header
+        # and that file is not present in React Native's JSI
+        # (see https://github.com/facebook/react-native/tree/main/packages/react-native/ReactCommon/jsi/jsi/ where there is
+        # hermes-interface.h but not hermes.h)
+        ss.source_files = ["destroot/include/hermes/**/*.h", "destroot/include/jsi/hermes.h"]
+      end
       ss.header_mappings_dir = "destroot/include"
       ss.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermesvm.xcframework"
       ss.visionos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermesvm.xcframework"
@@ -131,7 +140,7 @@ Pod::Spec.new do |spec|
       ss.header_dir = 'hermes/Public'
     end
 
-    if ENV['RCT_HERMES_V1_ENABLED'] != "1"
+    if ENV['RCT_HERMES_V1_ENABLED'] == "0"
       spec.subspec 'inspector' do |ss|
         ss.source_files = ''
         ss.public_header_files = 'API/hermes/inspector/*.h'

package/sdks/hermes-engine/hermes-utils.rb

@@ -91,7 +91,7 @@ def hermes_commit_envvar_defined()
 end
 
 def hermes_v1_enabled()
-    return ENV['RCT_HERMES_V1_ENABLED'] == "1"
+    return ENV['RCT_HERMES_V1_ENABLED'] != "0"
 end
 
 def force_build_from_tag(react_native_path)

package/sdks/hermes-engine/version.properties

@@ -1,2 +1,2 @@
-HERMES_VERSION_NAME=0.15.0
-HERMES_V1_VERSION_NAME=250829098.0.5
+HERMES_VERSION_NAME=0.15.1
+HERMES_V1_VERSION_NAME=250829098.0.9

package/settings.gradle.kts

@@ -47,8 +47,28 @@ buildscript {
   val properties = java.util.Properties()
   val propertiesToInherit = listOf("hermesV1Enabled", "react.hermesV1Enabled")
 
+  // We cannot assume that the node_modules are next to the android project, for example
+  // in monorepos, they might get hoisted.
+  // In a composite build, this included build can access the invoking (consumer) build
+  // via `gradle.parent`. We use its StartParameter to locate the app's `gradle.properties`:
+  // - `projectDir/gradle.properties` when Gradle is run with `-p <androidDir>`
+  // - `currentDir/gradle.properties` when run from the app android folder
+  // If neither exists, we keep the legacy RN fallback path below.
+
+  val parentGradle = gradle.parent
+  val parentProjectDir = parentGradle?.startParameter?.projectDir
+  val parentCurrentDir = parentGradle?.startParameter?.currentDir
+  val gradlePropertiesCandidates =
+      listOfNotNull(
+          parentProjectDir?.resolve("gradle.properties"),
+          parentCurrentDir?.resolve("gradle.properties"),
+          // Backward-compatible fallback for classic RN app layouts.
+          file("../../android/gradle.properties"),
+      )
+
   try {
-    file("../../android/gradle.properties").inputStream().use { properties.load(it) }
+    val propertiesFile = gradlePropertiesCandidates.firstOrNull { it.exists() }
+    propertiesFile?.inputStream()?.use { properties.load(it) }
 
     gradle.rootProject {
       propertiesToInherit.forEach { property ->

package/third-party-podspecs/glog.podspec

@@ -33,6 +33,7 @@ Pod::Spec.new do |spec|
   spec.exclude_files       = "src/windows/**/*"
   spec.compiler_flags      = '-Wno-shorten-64-to-32'
   spec.resource_bundles = {'glog_privacy' => 'glog/PrivacyInfo.xcprivacy'}
+  spec.module_map = 'src/glog/module.modulemap'
 
   spec.pod_target_xcconfig = {
     "USE_HEADERMAP" => "NO",

package/tvosCommands.js

@@ -0,0 +1,51 @@
+/**
+ * @flow
+ */
+
+let apple;
+try {
+  apple = require('@react-native-community/cli-platform-apple');
+} catch {
+  if (verbose) {
+    console.warn(
+      '@react-native-community/cli-platform-apple not found, the react-native.config.js may be unusable.'
+    );
+  }
+}
+
+const platformName = 'tvos';
+
+const run = {
+  name: `run-${platformName}`,
+  description: 'builds your app and starts it on a tvOS simulator or Apple TV device',
+  func: apple.createRun({platformName}),
+  examples: [
+    {
+      desc: 'Run on a specific simulator',
+      cmd: `npx react-native run-${platformName} --simulator "Apple TV"`,
+    },
+  ],
+  options: apple.getRunOptions({platformName}),
+};
+
+const log = {
+  name: `log-${platformName}`,
+  description: 'displays system logs from a connected tvOS device or simulator',
+  func: apple.createLog({platformName: platformName}),
+  options: apple.getLogOptions({platformName}),
+};
+
+const build = {
+  name: `build-${platformName}`,
+  description: 'builds your app for tvOS',
+  func: apple.createBuild({platformName}),
+  examples: [
+      {
+      desc: 'Build the app for all tvOS devices in Release mode',
+      cmd: `npx react-native build-${platformName} --mode "Release"`,
+      },
+  ],
+  options: apple.getBuildOptions({platformName}),
+};
+
+module.exports = [run, log, build];

package/types/public/ReactNativeTVTypes.d.ts

@@ -52,6 +52,13 @@ declare module 'react-native' {
     disableGestureHandlersCancelTouches(): void;
   };
 
+  /**
+   * Hardware event received from TVEventHandler
+   * 
+   * Note: The 'blur' and 'focus' event types are deprecated and will no longer be 
+   * emitted on new architecture (Fabric). Use onFocus/onBlur component props instead.
+   * See: https://github.com/react-native-tvos/react-native-tvos/issues/1037
+   */
   export type HWEvent = {
     eventType: 'up' | 'down' | 'right' | 'left' | 'longUp' | 'longDown' | 'longRight' | 'longLeft' | 'blur' | 'focus' | 'pan' | string;
     eventKeyAction?: -1 | 1 | 0 | number | undefined;