Try turning on hermes

ospfranco · Feb 14, 2022 · d96e551 · d96e551
1 parent 02a7e7b
commit d96e551
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 4 deletions.
diff --git a/macos/Podfile b/macos/Podfile
@@ -7,7 +7,7 @@ target 'sol-macOS' do
   # "hermes-engine-darwin": "~0.5.3",
   use_react_native!(
     :path => '../node_modules/react-native-macos',
-    :hermes_enabled => false
+    :hermes_enabled => true
   )
 
   post_install do |installer|

diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -12,6 +12,8 @@ PODS:
     - ReactCommon/turbomodule/core (= 0.66.10)
   - fmt (6.2.1)
   - glog (0.3.5)
+  - hermes-engine (0.9.0)
+  - libevent (2.1.12)
   - RCT-Folly (2021.06.28.00-v2):
     - boost
     - DoubleConversion
@@ -23,6 +25,12 @@ PODS:
     - DoubleConversion
     - fmt (~> 6.2.1)
     - glog
+  - RCT-Folly/Futures (2021.06.28.00-v2):
+    - boost
+    - DoubleConversion
+    - fmt (~> 6.2.1)
+    - glog
+    - libevent
   - RCTRequired (0.66.10)
   - RCTTypeSafety (0.66.10):
     - FBLazyVector (= 0.66.10)
@@ -189,6 +197,17 @@ PODS:
     - React-logger (= 0.66.10)
     - React-perflogger (= 0.66.10)
     - React-runtimeexecutor (= 0.66.10)
+  - React-hermes (0.66.10):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2021.06.28.00-v2)
+    - RCT-Folly/Futures (= 2021.06.28.00-v2)
+    - React-cxxreact (= 0.66.10)
+    - React-jsi (= 0.66.10)
+    - React-jsiexecutor (= 0.66.10)
+    - React-jsinspector (= 0.66.10)
+    - React-perflogger (= 0.66.10)
   - React-jsi (0.66.10):
     - boost (= 1.76.0)
     - DoubleConversion
@@ -284,6 +303,8 @@ DEPENDENCIES:
   - FBLazyVector (from `../node_modules/react-native-macos/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native-macos/React/FBReactNativeSpec`)
   - glog (from `../node_modules/react-native-macos/third-party-podspecs/glog.podspec`)
+  - hermes-engine (~> 0.9.0)
+  - libevent (~> 2.1.12)
   - RCT-Folly (from `../node_modules/react-native-macos/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native-macos/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native-macos/Libraries/TypeSafety`)
@@ -294,6 +315,7 @@ DEPENDENCIES:
   - React-Core/RCTWebSocket (from `../node_modules/react-native-macos/`)
   - React-CoreModules (from `../node_modules/react-native-macos/React/CoreModules`)
   - React-cxxreact (from `../node_modules/react-native-macos/ReactCommon/cxxreact`)
+  - React-hermes (from `../node_modules/react-native-macos/ReactCommon/hermes`)
   - React-jsi (from `../node_modules/react-native-macos/ReactCommon/jsi`)
   - React-jsiexecutor (from `../node_modules/react-native-macos/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native-macos/ReactCommon/jsinspector`)
@@ -315,6 +337,8 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - fmt
+    - hermes-engine
+    - libevent
 
 EXTERNAL SOURCES:
   boost:
@@ -345,6 +369,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-macos/React/CoreModules"
   React-cxxreact:
     :path: "../node_modules/react-native-macos/ReactCommon/cxxreact"
+  React-hermes:
+    :path: "../node_modules/react-native-macos/ReactCommon/hermes"
   React-jsi:
     :path: "../node_modules/react-native-macos/ReactCommon/jsi"
   React-jsiexecutor:
@@ -388,6 +414,8 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: ce30e37104a344359efd3498380d28ee7d65368b
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 42c4bf47024808486e90b25ea9e5ac3959047641
+  hermes-engine: bf7577d12ac6ccf53ab8b5af3c6ccf0dd8458c5c
+  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   RCT-Folly: 5c589d0de10e841479ad79352fae591dc0e9533a
   RCTRequired: 32d1295953371363e92b2d4af622a39deb0effac
   RCTTypeSafety: cc95d28b831eef415fbb02d281164594cfd6af32
@@ -396,6 +424,7 @@ SPEC CHECKSUMS:
   React-Core: a243240e7242857792f09c68d4f7c327b927b65b
   React-CoreModules: f92388032865e82064b1db5d463b4a3686486486
   React-cxxreact: 57ebaa098933ebf0d790c93f738bcf652033103a
+  React-hermes: 008f9e9bd6558a4d31557e0e79aa2da18c093d31
   React-jsi: 07c8071706df392af01abe5d4b8ebe3b23571ff1
   React-jsiexecutor: 18d2c3704b8b3aaa96d1f70868ef308803ef432a
   React-jsinspector: 287f6004b2ff21fd33847374cce813533d278817
@@ -414,6 +443,6 @@ SPEC CHECKSUMS:
   ReactCommon: bb5ac6793307dd4d33a51180687d075a157484b5
   Yoga: 37d2e5477a5a162355427013839b0500014ea895
 
-PODFILE CHECKSUM: 043df8668ee64386c6603f823f78677bafe6ef05
+PODFILE CHECKSUM: 342d88b0c9eaf996180c3f516cb60dea26e5dd90
 
 COCOAPODS: 1.11.2
diff --git a/macos/sol.xcodeproj/project.pbxproj b/macos/sol.xcodeproj/project.pbxproj
@@ -166,6 +166,7 @@
 				514201472437B4B30078DB4F /* Resources */,
 				381D8A6E24576A4E00465D17 /* Bundle React Native code and images */,
 				AB47F5B1B5458AA9DCA44477 /* [CP] Copy Pods Resources */,
+				57B018C254AA3D270AF48C99 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -288,6 +289,24 @@
 			shellPath = /bin/sh;
 			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native-macos/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../node_modules/react-native-macos/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
 		};
+		57B018C254AA3D270AF48C99 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-sol-macOS/Pods-sol-macOS-frameworks.sh",
+				"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/macosx/hermes.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-sol-macOS/Pods-sol-macOS-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		AB47F5B1B5458AA9DCA44477 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -436,7 +455,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -499,7 +518,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "axios": "^0.25.0",
     "expr-eval": "^2.0.2",
     "fuse.js": "^6.5.3",
+    "hermes-engine": "^0.11.0",
     "luxon": "^2.3.0",
     "mobx": "^6.3.12",
     "mobx-react-lite": "^3.2.3",

diff --git a/yarn.lock b/yarn.lock
@@ -3471,6 +3471,11 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hermes-engine@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.11.0.tgz#bb224730d230a02a5af02c4e090d1f52d57dd3db"
+  integrity sha512-7aMUlZja2IyLYAcZ69NBnwJAR5ZOYlSllj0oMpx08a8HzxHOys0eKCzfphrf6D0vX1JGO1QQvVsQKe6TkYherw==
+
 hermes-engine@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.9.0.tgz#84d9cfe84e8f6b1b2020d6e71b350cec84ed982f"