react-native-tvos 0.83.0-0rc2 → 0.83.0-0rc4

package/Libraries/Core/ReactNativeVersion.js

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

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(83),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"0rc2",
+                  RCTVersionPrerelease: @"0rc4",
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.83.0-0rc2
+VERSION_NAME=0.83.0-0rc4
 react.internal.publishingGroup=io.github.react-native-tvos
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

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

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 83,
     "patch" to 0,
-    "prerelease" to "0rc2"
+    "prerelease" to "0rc4"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt

@@ -5,13 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+@file:Suppress("DEPRECATION") // PreferenceManager should be migrated to androidx
+
 package com.facebook.react.packagerconnection
 
 import android.content.Context
+import android.content.SharedPreferences
+import android.preference.PreferenceManager
 import com.facebook.common.logging.FLog
 import com.facebook.react.modules.systeminfo.AndroidInfoHelpers
 
 public open class PackagerConnectionSettings(private val appContext: Context) {
+  private val preferences: SharedPreferences =
+      PreferenceManager.getDefaultSharedPreferences(appContext)
   public val packageName: String = appContext.packageName
   private val _additionalOptionsForPackager: MutableMap<String, String> = mutableMapOf()
   private var _packagerOptionsUpdater: (Map<String, String>) -> Map<String, String> = { it }
@@ -24,6 +30,12 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
       cachedHost?.let {
         return it
       }
+
+      val hostFromSettings = preferences.getString(PREFS_DEBUG_SERVER_HOST_KEY, null)
+      if (!hostFromSettings.isNullOrEmpty()) {
+        return hostFromSettings
+      }
+
       val host = AndroidInfoHelpers.getServerHost(appContext)
       if (host == AndroidInfoHelpers.DEVICE_LOCALHOST) {
         FLog.w(
@@ -63,5 +75,6 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
 
   private companion object {
     private val TAG = PackagerConnectionSettings::class.java.simpleName
+    private const val PREFS_DEBUG_SERVER_HOST_KEY = "debug_http_host"
   }
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 83;
   int32_t Patch = 0;
-  std::string_view Prerelease = "0rc2";
+  std::string_view Prerelease = "0rc4";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/networking/CMakeLists.txt

@@ -21,3 +21,10 @@ target_link_libraries(react_networking
         jsinspector_tracing
         react_performance_timeline
         react_timing)
+
+if(${CMAKE_BUILD_TYPE} MATCHES Debug OR REACT_NATIVE_DEBUG_OPTIMIZED)
+  target_compile_options(react_networking PRIVATE
+          -DREACT_NATIVE_DEBUGGER_ENABLED=1
+          -DREACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1
+  )
+endif ()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.83.0-0rc2",
+  "version": "0.83.0-0rc4",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -164,12 +164,12 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.83.0-rc.2",
-    "@react-native/codegen": "0.83.0-rc.2",
-    "@react-native/community-cli-plugin": "0.83.0-rc.2",
-    "@react-native/gradle-plugin": "0.83.0-rc.2",
-    "@react-native/js-polyfills": "0.83.0-rc.2",
-    "@react-native/normalize-colors": "0.83.0-rc.2",
+    "@react-native/assets-registry": "0.83.0-rc.4",
+    "@react-native/codegen": "0.83.0-rc.4",
+    "@react-native/community-cli-plugin": "0.83.0-rc.4",
+    "@react-native/gradle-plugin": "0.83.0-rc.4",
+    "@react-native/js-polyfills": "0.83.0-rc.4",
+    "@react-native/normalize-colors": "0.83.0-rc.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -197,7 +197,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^7.5.10",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.83.0-0rc2"
+    "@react-native-tvos/virtualized-lists": "0.83.0-0rc4"
   },
   "codegenConfig": {
     "libraries": [

package/scripts/cocoapods/rncore.rb

@@ -235,7 +235,16 @@ class ReactNativeCoreUtils
 
             # Add the dSYMs folder to the framework folder
             rncore_log("  Adding dSYMs to framework tarball")
-            `(cd "$(dirname "#{dsyms_tmp_dir}")" && mkdir -p React.xcframework && cp -r "$(basename "#{dsyms_tmp_dir}")" React.xcframework/dSYMs && tar -rf "#{frameworkTarPath}" React.xcframework/dSYMs && rm -rf React.xcframework)`
+
+            # Move symbol bundles into each of the slices in the xcframework
+            # Example:
+            # move dSYMs/ios-arm64/. into React.xcframework/ios-arm64/React.framework/dSYMs/.
+            Dir.glob(File.join(dsyms_tmp_dir, "*")).each do |dsym_path|
+                slice_name = File.basename(dsym_path)
+                slice_dsym_dest = File.join("React.xcframework", slice_name, "React.framework", "dSYMs")
+                rncore_log("    Adding dSYM slice #{slice_name} into tarball at #{slice_dsym_dest}")
+                `(cd "#{File.dirname(frameworkTarPath)}" && mkdir -p "#{slice_dsym_dest}" && cp -R "#{dsym_path}/." "#{slice_dsym_dest}" && tar -rf "#{frameworkTarPath}" "#{slice_dsym_dest}")`
+            end
 
             # Now gzip the framework tarball again - remember to use the .tar file and not the .gz file
             rncore_log("  Packing #{Pathname.new(frameworkTarPath).relative_path_from(Pathname.pwd).to_s}")
@@ -248,6 +257,10 @@ class ReactNativeCoreUtils
             # Remove backup of original tarballs
             FileUtils.rm_f("#{frameworkTarball}.orig")
 
+            # Remove temp dSYMs folder and the temp Framework folder
+            FileUtils.rm_rf(dsyms_tmp_dir)
+            FileUtils.rm_rf(File.join(artifacts_dir, "React.xcframework"))
+
         rescue => e
             rncore_log("Failed to process dSYMs: #{e.message}", :error)
             # Restore the original tarballs

package/scripts/cocoapods/utils.rb

@@ -59,8 +59,10 @@ class ReactNativePodsUtils
     def self.set_gcc_preprocessor_definition_for_debugger(installer)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED=1", "React-jsinspector", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED=1", "React-RCTNetwork", :debug)
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED=1", "React-networking", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-jsinspector", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-RCTNetwork", :debug)
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-networking", :debug)
     end
 
     def self.turn_off_resource_bundle_react_core(installer)

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

@@ -76,14 +76,18 @@ function getInputFiles(appPath /*: string */, appPkgJson /*: $FlowFixMe */) {
   return `[${list}]`;
 }
 
-function codegenScripts(appPath /*: string */, outputPath /*: string */) {
-  const relativeAppPath = path.relative(outputPath, appPath);
+function codegenScripts(appPath /*: string */, baseOutputPath /*: string */) {
+  const relativeAppPath = path.relative(baseOutputPath, appPath);
+  const relativeReactNativeRootFolder = path.relative(
+    baseOutputPath,
+    REACT_NATIVE_PACKAGE_ROOT_FOLDER,
+  );
   return `<<-SCRIPT
 pushd "$PODS_ROOT/../" > /dev/null
 RCT_SCRIPT_POD_INSTALLATION_ROOT=$(pwd)
 popd >/dev/null
 
-export RCT_SCRIPT_RN_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${path.relative(outputPath, REACT_NATIVE_PACKAGE_ROOT_FOLDER)}"
+export RCT_SCRIPT_RN_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${relativeReactNativeRootFolder}"
 export RCT_SCRIPT_APP_PATH="$RCT_SCRIPT_POD_INSTALLATION_ROOT/${relativeAppPath.length === 0 ? '.' : relativeAppPath}"
 export RCT_SCRIPT_OUTPUT_DIR="$RCT_SCRIPT_POD_INSTALLATION_ROOT"
 export RCT_SCRIPT_TYPE="withCodegenDiscovery"

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

@@ -63,7 +63,7 @@ const path = require('path');
 function execute(
   projectRoot /*: string */,
   targetPlatform /*: string */,
-  baseOutputPath /*: string */,
+  optionalBaseOutputPath /*: ?string */,
   source /*: string */,
   runReactNativeCodegen /*: boolean */ = true,
 ) {
@@ -88,32 +88,35 @@ function execute(
       buildCodegenIfNeeded();
     }
 
-    const reactNativeConfig = readReactNativeConfig(
-      projectRoot,
-      // NOTE: Used to load `build/generated/autolinking/autolinking.json` generated by `scripts/cocoapods/autolinking.rb`
-      // If we have RCT_SCRIPT_OUTPUT_DIR (set in `react_native_pods_utils/script_phases.sh`, it takes precedence, otherwise
-      // we search for the `autolinking.json` output in the `baseOutputPath`
-      process.env.RCT_SCRIPT_OUTPUT_DIR != null &&
-        process.env.RCT_SCRIPT_OUTPUT_DIR.length > 0
-        ? process.env.RCT_SCRIPT_OUTPUT_DIR
-        : baseOutputPath,
-    );
-
-    const codegenEnabledLibraries = findCodegenEnabledLibraries(
-      pkgJson,
-      projectRoot,
-      baseOutputPath,
-      reactNativeConfig,
-    );
-
-    if (codegenEnabledLibraries.length === 0) {
-      codegenLog('No codegen-enabled libraries found.', true);
-    }
-
-    let platforms =
+    const platforms =
       targetPlatform === 'all' ? supportedPlatforms : [targetPlatform];
 
+    // NOTE: We cache the external libraries search (which may not run) across platforms to not change previous behaviour
+    const externalLibrariesCache /*: { current?: ?Array<$FlowFixMe> } */ = {};
+
     for (const platform of platforms) {
+      // NOTE: This needs to be computed per-platform since `platform` can alter the path via a `package.json:codegenConfig.outputDir[platform]` override
+      const baseOutputPath = computeBaseOutputPath(
+        projectRoot,
+        optionalBaseOutputPath,
+        pkgJson,
+        platform,
+      );
+      const reactNativeConfig = readReactNativeConfig(
+        projectRoot,
+        baseOutputPath,
+      );
+      const codegenEnabledLibraries = findCodegenEnabledLibraries(
+        pkgJson,
+        projectRoot,
+        baseOutputPath,
+        reactNativeConfig,
+        externalLibrariesCache,
+      );
+      if (codegenEnabledLibraries.length === 0) {
+        codegenLog('No codegen-enabled libraries found.', true);
+      }
+
       const disabledLibraries = findDisabledLibrariesByPlatform(
         reactNativeConfig,
         platform,
@@ -209,22 +212,38 @@ function readOutputDirFromPkgJson(
   return null;
 }
 
-function computeOutputPath(
+function computeBaseOutputPath(
   projectRoot /*: string */,
-  baseOutputPath /*: string */,
+  optionalBaseOutputPath /*: ?string */,
   pkgJson /*: $FlowFixMe */,
   platform /*: string */,
 ) {
-  if (baseOutputPath == null) {
+  if (
+    process.env.RCT_SCRIPT_OUTPUT_DIR != null &&
+    process.env.RCT_SCRIPT_OUTPUT_DIR.length > 0
+  ) {
+    return process.env.RCT_SCRIPT_OUTPUT_DIR;
+  }
+  let baseOutputPath /*: string */;
+  if (optionalBaseOutputPath == null) {
     const outputDirFromPkgJson = readOutputDirFromPkgJson(pkgJson, platform);
     if (outputDirFromPkgJson != null) {
-      // $FlowFixMe[reassign-const]
       baseOutputPath = path.join(projectRoot, outputDirFromPkgJson);
     } else {
-      // $FlowFixMe[reassign-const]
       baseOutputPath = projectRoot;
     }
+  } else {
+    baseOutputPath = optionalBaseOutputPath;
   }
+  return baseOutputPath;
+}
+
+function computeOutputPath(
+  projectRoot /*: string */,
+  baseOutputPath /*: string */,
+  pkgJson /*: $FlowFixMe */,
+  platform /*: string */,
+) /*: string */ {
   if (pkgJsonIncludesGeneratedCode(pkgJson)) {
     // Don't create nested directories for libraries to make importing generated headers easier.
     return baseOutputPath;

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

@@ -98,9 +98,11 @@ function cleanupEmptyFilesAndFolders(filepath /*: string */) {
 }
 
 function readGeneratedAutolinkingOutput(
+  projectRoot /*: string */,
   baseOutputPath /*: string */,
 ) /*: $FlowFixMe */ {
   // NOTE: Generated by scripts/cocoapods/autolinking.rb in list_native_modules (called by use_native_modules)
+  // The `baseOutputPath` is based on a CLI argument and optional
   const autolinkingGeneratedPath = path.resolve(
     baseOutputPath,
     'build/generated/autolinking/autolinking.json',
@@ -120,7 +122,10 @@ function readReactNativeConfig(
   projectRoot /*: string */,
   baseOutputPath /*: string */,
 ) /*: $FlowFixMe */ {
-  const autolinkingOutput = readGeneratedAutolinkingOutput(baseOutputPath);
+  const autolinkingOutput = readGeneratedAutolinkingOutput(
+    projectRoot,
+    baseOutputPath,
+  );
   const rnConfigFilePath = path.resolve(projectRoot, 'react-native.config.js');
   if (autolinkingOutput) {
     return autolinkingOutput;
@@ -141,6 +146,7 @@ function findCodegenEnabledLibraries(
   projectRoot /*: string */,
   baseOutputPath /*: string */,
   reactNativeConfig /*: $FlowFixMe */,
+  externalLibrariesCache /*: { current?: ?Array<$FlowFixMe> } */ = {},
 ) /*: Array<$FlowFixMe> */ {
   const projectLibraries = findProjectRootLibraries(pkgJson, projectRoot);
   if (pkgJsonIncludesGeneratedCode(pkgJson)) {
@@ -149,8 +155,14 @@ function findCodegenEnabledLibraries(
     const libraries = [...projectLibraries];
     // If we ran autolinking, we shouldn't try to run our own "autolinking-like"
     // library discovery
-    if (!readGeneratedAutolinkingOutput(baseOutputPath)) {
-      libraries.push(...findExternalLibraries(pkgJson, projectRoot));
+    if (!readGeneratedAutolinkingOutput(projectRoot, baseOutputPath)) {
+      const externalLibraries =
+        externalLibrariesCache.current ??
+        (externalLibrariesCache.current = findExternalLibraries(
+          pkgJson,
+          projectRoot,
+        ));
+      libraries.push(...externalLibraries);
     }
     libraries.push(
       ...findLibrariesFromReactNativeConfig(projectRoot, reactNativeConfig),
@@ -266,7 +278,8 @@ function findExternalLibraries(
           pkgJson.dependencies[dependency],
           'package.json',
         );
-      } else {
+      }
+      if (!configFilePath) {
         return [];
       }
     }

package/sdks/.hermesv1version

@@ -1 +1 @@
-hermes-v250829098.0.3
+hermes-v250829098.0.4

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

@@ -72,10 +72,7 @@ Pod::Spec.new do |spec|
     # In other cases, when using Hermes V1, the prebuilt versioned binaries can be used.
     if source_type != HermesEngineSourceType::LOCAL_PREBUILT_TARBALL
       hermes_compiler_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
-        'require.resolve(
-        "hermes-compiler",
-        {paths: [process.argv[1]]}
-        )', __dir__]).strip
+        "require.resolve(\"hermes-compiler\", {paths: [\"#{react_native_path}\"]})", __dir__]).strip
       )
 
       spec.user_target_xcconfig = {

package/sdks/hermes-engine/version.properties

@@ -1,2 +1,2 @@
 HERMES_VERSION_NAME=0.14.0
-HERMES_V1_VERSION_NAME=250829098.0.3
+HERMES_V1_VERSION_NAME=250829098.0.4