[CxxBridge] Add Hermes engine as option for macOS

This removes the need to maintain this in our fork. See:
microsoft#473

Author: alloy

React-Core.podspec

@@ -69,6 +69,12 @@ Pod::Spec.new do |s|
     ss.private_header_files   = "React/Cxx*/*.h"
   end
 
+  s.subspec "Hermes" do |ss|
+    ss.platforms = { :osx => "10.14" }
+    ss.source_files = "ReactCommon/hermes/executor/*.{cpp,h}"
+    ss.dependency "hermes", "~> 0.6.0"
+  end
+
   s.subspec "DevSupport" do |ss|
     ss.source_files = "React/DevSupport/*.{h,mm,m}",
                       "React/Inspector/*.{h,mm,m}"

React/CxxBridge/JSCExecutorFactory.mm

@@ -7,7 +7,6 @@
 
 #include "JSCExecutorFactory.h"
 
-#import <React/RCTLog.h>
 #import <jsi/JSCRuntime.h>
 
 #import <memory>
@@ -19,25 +18,8 @@
     std::shared_ptr<ExecutorDelegate> delegate,
     std::shared_ptr<MessageQueueThread> __unused jsQueue)
 {
-  auto installBindings = [runtimeInstaller = runtimeInstaller_](jsi::Runtime &runtime) {
-    react::Logger iosLoggingBinder = [](const std::string &message, unsigned int logLevel) {
-      _RCTLogJavaScriptInternal(static_cast<RCTLogLevel>(logLevel), [NSString stringWithUTF8String:message.c_str()]);
-    };
-    react::bindNativeLogger(runtime, iosLoggingBinder);
-
-    react::PerformanceNow iosPerformanceNowBinder = []() {
-      // CACurrentMediaTime() returns the current absolute time, in seconds
-      return CACurrentMediaTime() * 1000;
-    };
-    react::bindNativePerformanceNow(runtime, iosPerformanceNowBinder);
-
-    // Wrap over the original runtimeInstaller
-    if (runtimeInstaller) {
-      runtimeInstaller(runtime);
-    }
-  };
   return std::make_unique<JSIExecutor>(
-      facebook::jsc::makeJSCRuntime(), delegate, JSIExecutor::defaultTimeoutInvoker, std::move(installBindings));
+      facebook::jsc::makeJSCRuntime(), delegate, JSIExecutor::defaultTimeoutInvoker, runtimeInstaller_);
 }
 
 } // namespace react

React/CxxBridge/RCTCxxBridge.mm

@@ -37,7 +37,16 @@
 #import <jsireact/JSIExecutor.h>
 #import <reactperflogger/BridgeNativeModulePerfLogger.h>
 
+#if TARGET_OS_OSX && __has_include(<hermes/hermes.h>)
+#define RCT_USE_HERMES 1
+#endif
+#if RCT_USE_HERMES
+#import "HermesExecutorFactory.h"
+#else
 #import "JSCExecutorFactory.h"
+#endif
+#import "RCTJSIExecutorRuntimeInstaller.h"
+
 #import "NSDataBigString.h"
 #import "RCTMessageThread.h"
 #import "RCTObjcExecutor.h"
@@ -370,7 +379,12 @@ - (void)start
       executorFactory = [cxxDelegate jsExecutorFactoryForBridge:self];
     }
     if (!executorFactory) {
-      executorFactory = std::make_shared<JSCExecutorFactory>(nullptr);
+      auto installBindings = RCTJSIExecutorRuntimeInstaller(nullptr);
+#if RCT_USE_HERMES
+      executorFactory = std::make_shared<HermesExecutorFactory>(installBindings);
+#else
+      executorFactory = std::make_shared<JSCExecutorFactory>(installBindings);
+#endif
     }
   } else {
     id<RCTJavaScriptExecutor> objcExecutor = [self moduleForClass:self.executorClass];

React/CxxBridge/RCTJSIExecutorRuntimeInstaller.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <jsireact/JSIExecutor.h>
+
+namespace facebook {
+namespace react {
+
+/**
+ * Creates a lambda used to bind a JSIRuntime in the context of
+ * Apple platforms, such as console logging, performance metrics, etc.
+ */
+JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(JSIExecutor::RuntimeInstaller runtimeInstallerToWrap);
+
+} // namespace react
+} // namespace facebook

React/CxxBridge/RCTJSIExecutorRuntimeInstaller.mm

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "RCTJSIExecutorRuntimeInstaller.h"
+
+#import <React/RCTLog.h>
+
+namespace facebook {
+namespace react {
+
+JSIExecutor::RuntimeInstaller RCTJSIExecutorRuntimeInstaller(JSIExecutor::RuntimeInstaller runtimeInstallerToWrap) {
+  return [runtimeInstaller = runtimeInstallerToWrap](jsi::Runtime &runtime) {
+    Logger iosLoggingBinder = [](const std::string &message, unsigned int logLevel) {
+      _RCTLogJavaScriptInternal(static_cast<RCTLogLevel>(logLevel), [NSString stringWithUTF8String:message.c_str()]);
+    };
+    bindNativeLogger(runtime, iosLoggingBinder);
+
+    PerformanceNow iosPerformanceNowBinder = []() {
+      // CACurrentMediaTime() returns the current absolute time, in seconds
+      return CACurrentMediaTime() * 1000;
+    };
+    bindNativePerformanceNow(runtime, iosPerformanceNowBinder);
+
+    // Wrap over the original runtimeInstaller
+    if (runtimeInstaller) {
+      runtimeInstaller(runtime);
+    }
+  };
+}
+
+} // namespace react
+} // namespace facebook

ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/Android.mk

@@ -17,7 +17,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsireact libjsi
+LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-release
 LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
 
 include $(BUILD_SHARED_LIBRARY)
@@ -34,7 +34,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-no
 
 LOCAL_CPP_FEATURES := exceptions
 
-LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-inspector
+LOCAL_STATIC_LIBRARIES := libjsireact libjsi libhermes-executor-common-debug libhermes-inspector
 LOCAL_SHARED_LIBRARIES := libfolly_json libfb libfbjni libreactnativejni libhermes
 
 include $(BUILD_SHARED_LIBRARY)

ReactCommon/cxxreact/Android.mk

@@ -33,3 +33,4 @@ $(call import-module,glog)
 $(call import-module,jsi)
 $(call import-module,jsinspector)
 $(call import-module,hermes/inspector)
+$(call import-module,hermes/executor)

ReactCommon/hermes/executor/Android.mk

@@ -0,0 +1,37 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+REACT_NATIVE := $(LOCAL_PATH)/../../..
+
+include $(REACT_NATIVE)/ReactCommon/common.mk
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := hermes-executor-common-release
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_STATIC_LIBRARIES := libjsi libjsireact
+LOCAL_SHARED_LIBRARIES := libhermes
+
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := hermes-executor-common-debug
+LOCAL_CFLAGS := -DHERMES_ENABLE_DEBUGGER=1
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(REACT_NATIVE)/ReactCommon/jsi $(call find-node-module,$(LOCAL_PATH),hermes-engine)/android/include
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_STATIC_LIBRARIES := libjsi libjsireact libhermes-inspector
+LOCAL_SHARED_LIBRARIES := libhermes
+
+include $(BUILD_SHARED_LIBRARY)