feat: Enable Hermes to work on iOS

React-Core.podspec

@@ -70,14 +70,14 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Hermes" do |ss|
-    ss.platforms = { :osx => "10.14" }
+    ss.platforms = { :osx => "10.14", :ios => "10.0" }
     ss.source_files = "ReactCommon/hermes/executor/*.{cpp,h}",
                       "ReactCommon/hermes/inspector/*.{cpp,h}",
                       "ReactCommon/hermes/inspector/chrome/*.{cpp,h}",
                       "ReactCommon/hermes/inspector/detail/*.{cpp,h}"
     ss.pod_target_xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" }
     ss.dependency "RCT-Folly/Futures"
-    ss.dependency "hermes", "~> 0.6.0"
+    ss.dependency "hermes-engine"
   end
 
   s.subspec "DevSupport" do |ss|

React/CxxBridge/RCTCxxBridge.mm

@@ -37,7 +37,7 @@
 #import <jsireact/JSIExecutor.h>
 #import <reactperflogger/BridgeNativeModulePerfLogger.h>
 
-#if TARGET_OS_OSX && __has_include(<hermes/hermes.h>)
+#if __has_include(<hermes/hermes.h>)
 #define RCT_USE_HERMES 1
 #endif
 #if RCT_USE_HERMES

packages/rn-tester/Podfile

@@ -13,12 +13,12 @@ def pods()
 
   # Enable TurboModule
   prefix_path = "../.."
-  use_react_native!(path:prefix_path)
+  use_react_native!(path: prefix_path, hermes_enabled: true)
   pod 'ReactCommon/turbomodule/samples', :path => "#{prefix_path}/ReactCommon"
 
   # Additional Pods which aren't included in the default Podfile
   pod 'React-RCTPushNotification', :path => "#{prefix_path}/Libraries/PushNotificationIOS"
-  pod 'Yoga',:path => "#{prefix_path}/ReactCommon/yoga", :modular_headers => true
+  pod 'Yoga', :path => "#{prefix_path}/ReactCommon/yoga", :modular_headers => true
   # Additional Pods which are classed as unstable
   #
   # To use fabric: add `fabric_enabled` option to the use_react_native method above, like below

packages/rn-tester/Podfile.lock

@@ -58,6 +58,12 @@ PODS:
     - FlipperKit/Core
     - FlipperKit/FlipperKitNetworkPlugin
   - glog (0.3.5)
+  - hermes-engine (0.7.1)
+  - libevent (2.1.11):
+    - libevent/core (= 2.1.11)
+  - libevent/core (2.1.11):
+    - libevent/event2-headers
+  - libevent/event2-headers (2.1.11)
   - OpenSSL-Universal (1.0.2.19):
     - OpenSSL-Universal/Static (= 1.0.2.19)
   - OpenSSL-Universal/Static (1.0.2.19)
@@ -70,6 +76,11 @@ PODS:
     - boost-for-react-native
     - DoubleConversion
     - glog
+  - RCT-Folly/Futures (2020.01.13.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
+    - libevent
   - RCTRequired (1000.0.0)
   - RCTTypeSafety (1000.0.0):
     - FBLazyVector (= 1000.0.0)
@@ -127,6 +138,16 @@ PODS:
     - React-jsinspector (= 1000.0.0)
     - React-perflogger (= 1000.0.0)
     - Yoga
+  - React-Core/Hermes (1000.0.0):
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2020.01.13.00)
+    - RCT-Folly/Futures
+    - React-cxxreact (= 1000.0.0)
+    - React-jsi (= 1000.0.0)
+    - React-jsiexecutor (= 1000.0.0)
+    - React-perflogger (= 1000.0.0)
+    - Yoga
   - React-Core/RCTActionSheetHeaders (1000.0.0):
     - glog
     - RCT-Folly (= 2020.01.13.00)
@@ -377,13 +398,16 @@ DEPENDENCIES:
   - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.41.1)
   - FlipperKit/SKIOSNetworkPlugin (~> 0.41.1)
   - glog (from `../../third-party-podspecs/glog.podspec`)
+  - hermes-engine
+  - libevent (from `../../third-party-podspecs/libevent.podspec`)
   - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../../Libraries/RCTRequired`)
   - RCTTypeSafety (from `../../Libraries/TypeSafety`)
   - React (from `../../`)
   - React-callinvoker (from `../../ReactCommon/callinvoker`)
   - React-Core (from `../../`)
   - React-Core/DevSupport (from `../../`)
+  - React-Core/Hermes (from `../../`)
   - React-Core/RCTWebSocket (from `../../`)
   - React-CoreModules (from `../../React/CoreModules`)
   - React-cxxreact (from `../../ReactCommon/cxxreact`)
@@ -419,6 +443,7 @@ SPEC REPOS:
     - Flipper-PeerTalk
     - Flipper-RSocket
     - FlipperKit
+    - hermes-engine
     - OpenSSL-Universal
     - YogaKit
 
@@ -431,6 +456,8 @@ EXTERNAL SOURCES:
     :path: "../../Libraries/FBReactNativeSpec"
   glog:
     :podspec: "../../third-party-podspecs/glog.podspec"
+  libevent:
+    :podspec: "../../third-party-podspecs/libevent.podspec"
   RCT-Folly:
     :podspec: "../../third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -489,8 +516,8 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   DoubleConversion: cde416483dac037923206447da6e1454df403714
-  FBLazyVector: 8ea0285646adaf7fa725c20ed737c49ee5ea680a
-  FBReactNativeSpec: 29b1b8a11346e71351f3a2ba126439810edee362
+  FBLazyVector: e924d1711aa99fb5bd365c78872f4ec7df28bbd0
+  FBReactNativeSpec: 93cbe1bf6e56e2546b6d3980352ac84d1f3af88f
   Flipper: 33585e2d9810fe5528346be33bcf71b37bb7ae13
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
@@ -499,35 +526,37 @@ SPEC CHECKSUMS:
   Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
   FlipperKit: bc68102cd4952a258a23c9c1b316c7bec1fecf83
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  hermes-engine: 2d25059126292d4375a46b65704767b3b0f529aa
+  libevent: f1c51c1e883112c92d1247a63c1c4c0f4a56618e
   OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
-  RCT-Folly: b39288cedafe50da43317ec7d91bcc8cc0abbf33
-  RCTRequired: 34582e9b3ebe69f244e091f37218d318406d5c4a
-  RCTTypeSafety: 84db212a990ce622a28f1bcb1ac68c658e722373
-  React: cafb3c2321f7df55ce90dbf29d513799a79e4418
-  React-callinvoker: 0dada022d38b73e6e15b33e2a96476153f79bbf6
-  React-Core: d377a770bb13aa5120a6ce553f75f0e1cbc1aafe
-  React-CoreModules: f38b671f8df4c1c744ed69f00264539a7c4024b4
-  React-cxxreact: de6de17eac6bbaa4f9fad46b66e7f0c4aaaf863d
-  React-jsi: 652ad7cb7ff8c87e0e9fb11e9ebcbbc70cdfe865
-  React-jsiexecutor: f20d2b5986dbe3d0e94ccbf2d8da24e0d9c42cc9
-  React-jsinspector: 7fbf9b42b58b02943a0d89b0ba9fff0070f2de98
-  React-perflogger: 1f668f3e4d1adef1fafb3b95e7d6cf922113fe31
-  React-RCTActionSheet: 51c43beeb74ef41189e87fe9823e53ebf6210359
-  React-RCTAnimation: 62f271148b71d0200773b4959e99a80f624182d4
-  React-RCTBlob: e3e60611af4a077b3c0a3f74f49a2c4a9a298da3
-  React-RCTImage: 37646ebc761e9f68781867e9e802afdadd18a3dc
-  React-RCTLinking: b5c261eb3befe7d5c62a4706ae904943e73f9c82
-  React-RCTNetwork: 2f6c4ba283c9c2ea768fecc6c681d3ab9448b5f5
-  React-RCTPushNotification: a4f86ef3d7c0cb3ee570108a62e39fcd296a5030
-  React-RCTSettings: 5a76683d9cf7408b5f8c3306cda3eaf4db191fce
-  React-RCTTest: 090e9816044220c39462be109dab6d473d94b1c9
-  React-RCTText: 6c01963d3e562109f5548262b09b1b2bc260dd60
-  React-RCTVibration: 0997fcaf753c7ac0a341177db120eebc438484cf
-  React-runtimeexecutor: 60dd6204a13f68a1aa1118870edcc604a791df2b
-  ReactCommon: 1f231b4fbed866032aa084ca23973063bbb51927
-  Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae
+  RCT-Folly: 5e30358ace2d9ed239e59155e177d684b29e2fb3
+  RCTRequired: 0357886559c3268e012bc9632b5b91d1315e82d2
+  RCTTypeSafety: 0bf552be67442eb1e6acb8073f4f09eef7305cdb
+  React: a8fce3d43a07cb0a4305a09eee5a0b07f6e2c2d3
+  React-callinvoker: e1a329e08106730e9c3a88b622f94ecfa6ff7366
+  React-Core: fc9a2720e0a303d49b2b81e69cabf68d7de77da2
+  React-CoreModules: 07a9ef171b449517951fd4ecf3493537cadbce95
+  React-cxxreact: 41806ffcbae8dcf1c0d8177aeebd65f20cadb5c0
+  React-jsi: 942ab492c4d7037234496849bd1f19221098aee0
+  React-jsiexecutor: 082ec309f5966c4355f1a28834fe5b1cf87066cf
+  React-jsinspector: a0f8a3c0ff517bab1a0d1676653dbcb7bc28ffcf
+  React-perflogger: a55eb5a43ffcc71dad54198dfc46bca92ec603b8
+  React-RCTActionSheet: 4a6d637bd7c8bcabe5c25d5eb53fd345bb521a6b
+  React-RCTAnimation: 5a9e2816bbb055c744459407f5f139499ac4a457
+  React-RCTBlob: 67969651171f120a67c1ef2e29c032575121ac11
+  React-RCTImage: 3da6160ff6eac0a7254f516877835a3a392a2e6f
+  React-RCTLinking: ca06c70eb0b2c6739913d26e0da61ce4e4b21d6e
+  React-RCTNetwork: db32941c3d23ca0e74e0ec55b93a871285ae225b
+  React-RCTPushNotification: 7ee92fa3956e8ac0632d481e690977bb67d36b03
+  React-RCTSettings: f66a4cd3b5261c6f21da1da748f964cdb703a33b
+  React-RCTTest: b45120c05cf0e3a8e7c5fac94c2e996cf9073e64
+  React-RCTText: 55d044f93276c82fd4e72c6bc30686f27566ab8a
+  React-RCTVibration: e5549af2fbffad14d25d68f41ca90e38dcebba98
+  React-runtimeexecutor: ed4291b9f76d6dbed6d758759bde6303a9e357ad
+  ReactCommon: dd19690749952f0818ecf85363b916423f8a62de
+  Yoga: 300b6ed9ce71fad32c7c2a3e0a3d94c3ed9a9c53
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: c38c19657f5aaa2d604f5f4c607f030b60452997
+PODFILE CHECKSUM: 62736d272a364609e2128a3f2710122588b5012e
 
 COCOAPODS: 1.9.3

packages/rn-tester/RNTester/AppDelegate.mm

@@ -7,7 +7,15 @@
 
 #import "AppDelegate.h"
 
+#if __has_include(<hermes/hermes.h>)
+#define RCT_USE_HERMES 1
+#endif
+#if RCT_USE_HERMES
+#import <React/HermesExecutorFactory.h>
+#else
 #import <React/JSCExecutorFactory.h>
+#endif
+
 #import <React/RCTJSIExecutorRuntimeInstaller.h>
 #import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
@@ -165,7 +173,11 @@ - (void)loadSourceForBridge:(RCTBridge *)bridge
 #endif
 
   __weak __typeof(self) weakSelf = self;
+#if RCT_USE_HERMES
+  return std::make_unique<facebook::react::HermesExecutorFactory>(
+#else
   return std::make_unique<facebook::react::JSCExecutorFactory>(
+#endif
     facebook::react::RCTJSIExecutorRuntimeInstaller([weakSelf, bridge](facebook::jsi::Runtime &runtime) {
       if (!bridge) {
         return;

packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj

@@ -164,7 +164,7 @@
 		E7DB215F22B2F3EC005AC45F /* RCTUIManagerScenarioTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUIManagerScenarioTests.m; sourceTree = "<group>"; };
 		E7DB216022B2F3EC005AC45F /* RNTesterSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterSnapshotTests.m; sourceTree = "<group>"; };
 		E7DB216122B2F3EC005AC45F /* RCTRootViewIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRootViewIntegrationTests.m; sourceTree = "<group>"; };
-		E7DB218B22B41FCD005AC45F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		E7DB218B22B41FCD005AC45F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		E9618482EC8608D4872A6E28 /* Pods-RNTesterUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -399,6 +399,7 @@
 				68CD48B71D2BCB2C007E06A9 /* Build JS Bundle */,
 				5CF0FD27207FC6EC00C13D65 /* Start Metro */,
 				C1C7A9D58CE1D09515F20577 /* [CP] Copy Pods Resources */,
+				8CE34A8AABFD09C8B3A00B1D /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -418,6 +419,7 @@
 				E7DB209C22B2BA84005AC45F /* Frameworks */,
 				E7DB209D22B2BA84005AC45F /* Resources */,
 				D45F7C4830D42738CAAC9684 /* [CP] Copy Pods Resources */,
+				7A5E3C3F59BF3EA884A39149 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -437,6 +439,7 @@
 				E7DB215022B2F332005AC45F /* Frameworks */,
 				E7DB215122B2F332005AC45F /* Resources */,
 				CD1D70F24AD74F4E13B7435D /* [CP] Copy Pods Resources */,
+				A934FCF321A9F192FD849C8A /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -586,7 +589,58 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\nexport PROJECT_ROOT=$SRCROOT/..\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" $SRCROOT/../../packages/rn-tester/js/RNTesterApp.ios.js\n";
+			shellScript = "export NODE_BINARY=node\nexport SOURCEMAP_FILE=../sourcemap.ios.map\nexport PROJECT_ROOT=\"$SRCROOT/../../\"\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" $SRCROOT/../../packages/rn-tester/js/RNTesterApp.ios.js\n";
+		};
+		7A5E3C3F59BF3EA884A39149 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		8CE34A8AABFD09C8B3A00B1D /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTester/Pods-RNTester-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		A934FCF321A9F192FD849C8A /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RNTesterIntegrationTests/Pods-RNTesterIntegrationTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
 		C1C7A9D58CE1D09515F20577 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;

packages/rn-tester/RNTesterPods.xcodeproj/xcshareddata/xcschemes/RNTester.xcscheme

@@ -67,7 +67,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"