fix: remove unneeded dependencies on JS engines

facebook · Feb 10, 2025 · b84aea5 · b84aea5
1 parent c0415ad
commit b84aea5
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 106 deletions.
diff --git a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec
@@ -88,11 +88,4 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-debug")
   add_dependency(s, "React-rendererdebug")
   add_dependency(s, "React-featureflags")
-
-  if use_hermes
-    s.dependency "React-hermes"
-    s.dependency "React-RuntimeHermes"
-  else
-    s.dependency "React-jsc"
-  end
 end
diff --git a/packages/react-native/React/React-RCTFBReactNativeSpec.podspec b/packages/react-native/React/React-RCTFBReactNativeSpec.podspec
@@ -62,12 +62,6 @@ Pod::Spec.new do |s|
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/bridging", :additional_framework_paths => ["react/nativemodule/bridging"])
 
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
-
 
   s.script_phases = [
     {

diff --git a/packages/react-native/React/React-RCTFabric.podspec b/packages/react-native/React/React-RCTFabric.podspec
@@ -99,12 +99,6 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
   add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
 
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
-
   s.test_spec 'Tests' do |test_spec|
     test_spec.source_files = "Tests/**/*.{mm}"
     test_spec.framework = "XCTest"

diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec
@@ -66,12 +66,6 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-rendererdebug")
   add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
 
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
-
   s.subspec "animations" do |ss|
     ss.dependency             folly_dep_name, folly_version
     ss.compiler_flags       = folly_compiler_flags

diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec
@@ -93,12 +93,6 @@ Pod::Spec.new do |s|
     "react/renderer/imagemanager/platform/ios"
   ])
 
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
-
   s.subspec "components" do |ss|
 
     ss.subspec "inputaccessory" do |sss|

diff --git a/packages/react-native/ReactCommon/React-FabricImage.podspec b/packages/react-native/ReactCommon/React-FabricImage.podspec
@@ -93,10 +93,4 @@ Pod::Spec.new do |s|
     "react/renderer/imagemanager/platform/ios"
   ])
   add_dependency(s, "React-rendererdebug")
-
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
 end
diff --git a/...-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec b/...-native/ReactCommon/react/nativemodule/core/platform/ios/React-NativeModulesApple.podspec
@@ -56,10 +56,4 @@ Pod::Spec.new do |s|
     s.dependency "React-jsi"
     s.dependency "React-runtimeexecutor"
     add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
-
-    if using_hermes
-      s.dependency "hermes-engine"
-    else
-      s.dependency "React-jsc"
-    end
 end
diff --git a/...s/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec b/...s/react-native/ReactCommon/react/nativemodule/defaults/React-defaultsnativemodule.podspec
@@ -53,12 +53,6 @@ Pod::Spec.new do |s|
   s.dependency "RCT-Folly"
   s.dependency "React-jsi"
   s.dependency "React-jsiexecutor"
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
-
   s.dependency "React-domnativemodule"
   s.dependency "React-featureflagsnativemodule"
   s.dependency "React-microtasksnativemodule"

diff --git a/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec b/packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec
@@ -54,11 +54,6 @@ Pod::Spec.new do |s|
   s.dependency "RCT-Folly"
   s.dependency "React-jsi"
   s.dependency "React-jsiexecutor"
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
   s.dependency "Yoga"
   s.dependency "ReactCommon/turbomodule/core"
   s.dependency "React-Fabric"

diff --git a/...native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec b/...native/ReactCommon/react/nativemodule/featureflags/React-featureflagsnativemodule.podspec
@@ -53,11 +53,6 @@ Pod::Spec.new do |s|
   s.dependency "RCT-Folly"
   s.dependency "React-jsi"
   s.dependency "React-jsiexecutor"
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
   s.dependency "ReactCommon/turbomodule/core"
   s.dependency "React-RCTFBReactNativeSpec"
   s.dependency "React-featureflags"

diff --git a/...tive/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec b/...tive/ReactCommon/react/nativemodule/idlecallbacks/React-idlecallbacksnativemodule.podspec
@@ -53,11 +53,6 @@ Pod::Spec.new do |s|
   s.dependency "RCT-Folly"
   s.dependency "React-jsi"
   s.dependency "React-jsiexecutor"
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
   s.dependency "ReactCommon/turbomodule/core"
   s.dependency "React-runtimescheduler"
   add_dependency(s, "React-RCTFBReactNativeSpec")

diff --git a/...act-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec b/...act-native/ReactCommon/react/nativemodule/microtasks/React-microtasksnativemodule.podspec
@@ -53,11 +53,6 @@ Pod::Spec.new do |s|
   s.dependency "RCT-Folly"
   s.dependency "React-jsi"
   s.dependency "React-jsiexecutor"
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
   s.dependency "ReactCommon/turbomodule/core"
   add_dependency(s, "React-RCTFBReactNativeSpec")
 end
diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon-Samples.podspec
@@ -22,7 +22,6 @@ folly_version = folly_config[:version]
 
 boost_config = get_boost_config()
 boost_compiler_flags = boost_config[:compiler_flags]
-using_hermes = ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1"
 
 header_search_paths = [
   "\"$(PODS_ROOT)/boost\"",
@@ -72,10 +71,4 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-RCTFBReactNativeSpec")
   add_dependency(s, "ReactCommon", :subspec => "turbomodule/core", :additional_framework_paths => ["react/nativemodule/core"])
   add_dependency(s, "React-NativeModulesApple")
-
-  if using_hermes
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
 end
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec b/packages/react-native/ReactCommon/react/renderer/graphics/React-graphics.podspec
@@ -66,10 +66,4 @@ Pod::Spec.new do |s|
   s.dependency "DoubleConversion"
   s.dependency "fast_float", "6.1.4"
   s.dependency "fmt", "11.0.2"
-
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
 end
diff --git a/...s/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec b/...s/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec
@@ -65,10 +65,4 @@ Pod::Spec.new do |s|
   s.dependency "React-rendererconsistency"
   add_dependency(s, "React-debug")
 
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-  end
-
 end
diff --git a/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec b/packages/react-native/ReactCommon/react/runtime/React-RuntimeHermes.podspec
@@ -54,11 +54,6 @@ Pod::Spec.new do |s|
   s.dependency "React-featureflags"
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
 
-  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "React-hermes"
-    s.dependency "hermes-engine"
-  else
-    s.dependency "React-jsc"
-    s.exclude_files = "hermes/*.{cpp,h}"
-  end
+  s.dependency "React-hermes"
+  s.dependency "hermes-engine"
 end
diff --git a/packages/react-native/ReactCommon/react/utils/React-utils.podspec b/packages/react-native/ReactCommon/react/utils/React-utils.podspec
@@ -53,9 +53,9 @@ Pod::Spec.new do |s|
   s.dependency "glog"
 
   if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-    s.dependency "hermes-engine"
+     s.dependency "hermes-engine"
   else
-    s.dependency "React-jsc"
+     s.dependency "React-jsc"
   end
 
   add_dependency(s, "React-debug")

diff --git a/packages/react-native/scripts/cocoapods/jsengine.rb b/packages/react-native/scripts/cocoapods/jsengine.rb
@@ -10,7 +10,6 @@
 # @parameter react_native_path: relative path to react-native
 # @parameter fabric_enabled: whether Fabirc is enabled
 def setup_jsc!(react_native_path: "../node_modules/react-native", fabric_enabled: false)
-    pod 'React-jsi', :path => "#{react_native_path}/ReactCommon/jsi"
     pod 'React-jsc', :path => "#{react_native_path}/ReactCommon/jsc"
     if fabric_enabled
         pod 'React-jsc/Fabric', :path => "#{react_native_path}/ReactCommon/jsc"
@@ -23,7 +22,6 @@ def setup_jsc!(react_native_path: "../node_modules/react-native", fabric_enabled
 # @parameter fabric_enabled: whether Fabirc is enabled
 def setup_hermes!(react_native_path: "../node_modules/react-native")
     react_native_dir = Pod::Config.instance.installation_root.join(react_native_path)
-    pod 'React-jsi', :path => "#{react_native_path}/ReactCommon/jsi"
     # This `:tag => hermestag` below is only to tell CocoaPods to update hermes-engine when React Native version changes.
     # We have custom logic to compute the source for hermes-engine. See sdks/hermes-engine/*
     hermestag_file = File.join(react_native_dir, "sdks", ".hermesversion")

diff --git a/packages/react-native/scripts/cocoapods/new_architecture.rb b/packages/react-native/scripts/cocoapods/new_architecture.rb
@@ -136,13 +136,6 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version = He
         spec.dependency "DoubleConversion"
         spec.dependency 'React-jsi'
 
-        if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-            spec.dependency "hermes-engine"
-            spec.dependency 'React-hermes'
-        else
-            spec.dependency "React-jsc"
-        end
-
         spec.pod_target_xcconfig = current_config
     end
 

diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb
@@ -134,6 +134,7 @@ def use_react_native! (
   pod 'React-jserrorhandler', :path => "#{prefix}/ReactCommon/jserrorhandler"
   pod 'RCTDeprecation', :path => "#{prefix}/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
   pod 'React-RCTFBReactNativeSpec', :path => "#{prefix}/React"
+  pod 'React-jsi', :path => "#{prefix}/ReactCommon/jsi"
 
   if hermes_enabled
     setup_hermes!(:react_native_path => prefix)