fix builds for SwiftPM and address comments on diff

Author: cipolleschi

.github/workflows/prebuild-ios-core.yml

@@ -50,6 +50,8 @@ jobs:
         shell: bash
         run: |
           if [ "${{ inputs.use-hermes-nightly }}" == "true" ]; then
+            # We are not publishing nightly versions of Hermes V1 yet.
+            # For now, we can use the latest version of Hermes V1 published on maven and npm.
             HERMES_VERSION="latest-v1"
           else
             HERMES_VERSION=$(sed -n 's/^HERMES_V1_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties)

packages/react-native/Package.swift

@@ -222,7 +222,7 @@ let reactHermes = RNTarget(
   excludedPaths: ["inspector-modern/chrome/tests"],
   dependencies: [.reactNativeDependencies, .reactCxxReact, .reactJsiExecutor, .reactJsInspector, .reactJsInspectorTracing, .reactPerfLogger, .hermesPrebuilt, .jsi],
   defines: [
-    CXXSetting.define("HERMES_ENABLE_DEBUGGER", to: "1", .when(configuration: BuildConfiguration.debug))
+    // CXXSetting.define("HERMES_ENABLE_DEBUGGER", to: "1", .when(configuration: BuildConfiguration.debug))
   ]
 )
 
@@ -390,7 +390,7 @@ let reactRuntime = RNTarget(
   excludedPaths: ["tests", "iostests", "platform"],
   dependencies: [.reactNativeDependencies, .jsi, .reactJsiExecutor, .reactCxxReact, .reactJsErrorHandler, .reactPerformanceTimeline, .reactUtils, .reactFeatureFlags, .reactJsInspector, .reactJsiTooling, .reactHermes, .reactRuntimeScheduler, .hermesPrebuilt],
   defines: [
-    CXXSetting.define("HERMES_ENABLE_DEBUGGER", to: "1", .when(configuration: BuildConfiguration.debug))
+    // CXXSetting.define("HERMES_ENABLE_DEBUGGER", to: "1", .when(configuration: BuildConfiguration.debug))
   ]
 )
 
@@ -924,6 +924,7 @@ extension Target {
         .define("NDEBUG", .when(configuration: .release)),
         .define("USE_HERMES", to: "1"),
         .define("RCT_REMOVE_LEGACY_ARCH", to: "1"),
+        .define("HERMES_V1_ENABLED", to: "1"),
       ] + defines + cxxCommonHeaderPaths
 
     return .target(

packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.cpp

@@ -13,6 +13,8 @@
 #include <jsi/decorator.h>
 #include <jsinspector-modern/InspectorFlags.h>
 
+#include <thread>
+
 #include <hermes/inspector-modern/chrome/HermesRuntimeTargetDelegate.h>
 
 #if defined(HERMES_ENABLE_DEBUGGER) && !defined(HERMES_V1_ENABLED)

packages/react-native/scripts/ios-prebuild/hermes.js

@@ -118,9 +118,9 @@ async function getLatestV1VersionFromNPM() /*: Promise<string> */ {
   }
 
   const json = await npmResponse.json();
-  const latestNightly = json.version;
-  hermesLog(`Using version ${latestNightly}`);
-  return latestNightly;
+  const latestV1 = json.version;
+  hermesLog(`Using version ${latestV1}`);
+  return latestV1;
 }
 
 async function getNightlyVersionFromNPM() /*: Promise<string> */ {

packages/react-native/sdks/hermes-engine/hermes-utils.rb

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