react-native 0.71.6 → 0.72.0-rc.1

package/ReactCommon/cxxreact/JSExecutor.cpp

@@ -11,6 +11,8 @@
 
 #include <folly/Conv.h>
 
+#include <chrono>
+
 namespace facebook {
 namespace react {
 
@@ -23,5 +25,15 @@ std::string JSExecutor::getSyntheticBundlePath(
   return folly::to<std::string>("seg-", bundleId, ".js");
 }
 
+double JSExecutor::performanceNow() {
+  auto time = std::chrono::steady_clock::now();
+  auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(
+                      time.time_since_epoch())
+                      .count();
+
+  constexpr double NANOSECONDS_IN_MILLISECOND = 1000000.0;
+  return duration / NANOSECONDS_IN_MILLISECOND;
+}
+
 } // namespace react
 } // namespace facebook

package/ReactCommon/cxxreact/JSExecutor.h

@@ -138,6 +138,8 @@ class RN_EXPORT JSExecutor {
   static std::string getSyntheticBundlePath(
       uint32_t bundleId,
       const std::string &bundlePath);
+
+  static double performanceNow();
 };
 
 } // namespace react

package/ReactCommon/cxxreact/MethodCall.cpp

@@ -15,7 +15,7 @@ namespace react {
 
 #define REQUEST_MODULE_IDS 0
 #define REQUEST_METHOD_IDS 1
-#define REQUEST_PARAMSS 2
+#define REQUEST_PARAMS 2
 #define REQUEST_CALLID 3
 
 static const char *errorPrefix = "Malformed calls from JS: ";
@@ -30,14 +30,14 @@ std::vector<MethodCall> parseMethodCalls(folly::dynamic &&jsonData) {
         errorPrefix, "input isn't array but ", jsonData.typeName()));
   }
 
-  if (jsonData.size() < REQUEST_PARAMSS + 1) {
+  if (jsonData.size() < REQUEST_PARAMS + 1) {
     throw std::invalid_argument(
         folly::to<std::string>(errorPrefix, "size == ", jsonData.size()));
   }
 
   auto &moduleIds = jsonData[REQUEST_MODULE_IDS];
   auto &methodIds = jsonData[REQUEST_METHOD_IDS];
-  auto &params = jsonData[REQUEST_PARAMSS];
+  auto &params = jsonData[REQUEST_PARAMS];
   int callId = -1;
 
   if (!moduleIds.isArray() || !methodIds.isArray() || !params.isArray()) {

package/ReactCommon/cxxreact/ModuleRegistry.cpp

@@ -92,8 +92,7 @@ std::vector<std::string> ModuleRegistry::moduleNames() {
   return names;
 }
 
-folly::Optional<ModuleConfig> ModuleRegistry::getConfig(
-    const std::string &name) {
+std::optional<ModuleConfig> ModuleRegistry::getConfig(const std::string &name) {
   SystraceSection s("ModuleRegistry::getConfig", "module", name);
 
   // Initialize modulesByName_
@@ -107,14 +106,14 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(
     if (unknownModules_.find(name) != unknownModules_.end()) {
       BridgeNativeModulePerfLogger::moduleJSRequireBeginningFail(name.c_str());
       BridgeNativeModulePerfLogger::moduleJSRequireEndingStart(name.c_str());
-      return folly::none;
+      return std::nullopt;
     }
 
     if (!moduleNotFoundCallback_) {
       unknownModules_.insert(name);
       BridgeNativeModulePerfLogger::moduleJSRequireBeginningFail(name.c_str());
       BridgeNativeModulePerfLogger::moduleJSRequireEndingStart(name.c_str());
-      return folly::none;
+      return std::nullopt;
     }
 
     BridgeNativeModulePerfLogger::moduleJSRequireBeginningEnd(name.c_str());
@@ -128,7 +127,7 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(
     if (!wasModuleRegisteredWithRegistry) {
       BridgeNativeModulePerfLogger::moduleJSRequireEndingStart(name.c_str());
       unknownModules_.insert(name);
-      return folly::none;
+      return std::nullopt;
     }
   } else {
     BridgeNativeModulePerfLogger::moduleJSRequireBeginningEnd(name.c_str());
@@ -187,7 +186,7 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(
 
   if (config.size() == 2 && config[1].empty()) {
     // no constants or methods
-    return folly::none;
+    return std::nullopt;
   } else {
     return ModuleConfig{index, std::move(config)};
   }

package/ReactCommon/cxxreact/ModuleRegistry.h

@@ -12,8 +12,8 @@
 #include <vector>
 
 #include <cxxreact/JSExecutor.h>
-#include <folly/Optional.h>
 #include <folly/dynamic.h>
+#include <optional>
 
 #ifndef RN_EXPORT
 #define RN_EXPORT __attribute__((visibility("default")))
@@ -47,7 +47,7 @@ class RN_EXPORT ModuleRegistry {
 
   std::vector<std::string> moduleNames();
 
-  folly::Optional<ModuleConfig> getConfig(const std::string &name);
+  std::optional<ModuleConfig> getConfig(const std::string &name);
 
   void callNativeMethod(
       unsigned int moduleId,
@@ -83,7 +83,7 @@ class RN_EXPORT ModuleRegistry {
 
   // Function will be called if a module was requested but was not found.
   // If the function returns true, ModuleRegistry will try to find the module
-  // again (assuming it's registered) If the functon returns false,
+  // again (assuming it's registered) If the function returns false,
   // ModuleRegistry will not try to find the module and return nullptr instead.
   ModuleNotFoundCallback moduleNotFoundCallback_;
 };

package/ReactCommon/cxxreact/NativeModule.h

@@ -10,8 +10,8 @@
 #include <string>
 #include <vector>
 
-#include <folly/Optional.h>
 #include <folly/dynamic.h>
+#include <optional>
 
 namespace facebook {
 namespace react {
@@ -25,7 +25,7 @@ struct MethodDescriptor {
       : name(std::move(n)), type(std::move(t)) {}
 };
 
-using MethodCallResult = folly::Optional<folly::dynamic>;
+using MethodCallResult = std::optional<folly::dynamic>;
 
 class NativeModule {
  public:

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -27,13 +27,14 @@ Pod::Spec.new do |s|
   s.summary                = "-"  # TODO
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.exclude_files          = "SampleCxxModule.*"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" }
   s.header_dir             = "cxxreact"
 
   s.dependency "boost", "1.76.0"

package/ReactCommon/cxxreact/ReactMarker.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "ReactMarker.h"
+#include <cxxreact/JSExecutor.h>
 
 namespace facebook {
 namespace react {
@@ -16,8 +17,9 @@ namespace ReactMarker {
 #pragma clang diagnostic ignored "-Wglobal-constructors"
 #endif
 
-LogTaggedMarker logTaggedMarker = nullptr;
-LogTaggedMarker logTaggedMarkerBridgeless = nullptr;
+LogTaggedMarker logTaggedMarkerImpl = nullptr;
+LogTaggedMarker logTaggedMarkerBridgelessImpl = nullptr;
+GetAppStartTime getAppStartTimeImpl = nullptr;
 
 #if __clang__
 #pragma clang diagnostic pop
@@ -27,10 +29,61 @@ void logMarker(const ReactMarkerId markerId) {
   logTaggedMarker(markerId, nullptr);
 }
 
+void logTaggedMarker(const ReactMarkerId markerId, const char *tag) {
+  StartupLogger::getInstance().logStartupEvent(markerId);
+  logTaggedMarkerImpl(markerId, tag);
+}
+
 void logMarkerBridgeless(const ReactMarkerId markerId) {
   logTaggedMarkerBridgeless(markerId, nullptr);
 }
 
+void logTaggedMarkerBridgeless(const ReactMarkerId markerId, const char *tag) {
+  StartupLogger::getInstance().logStartupEvent(markerId);
+  logTaggedMarkerBridgelessImpl(markerId, tag);
+}
+
+StartupLogger &StartupLogger::getInstance() {
+  static StartupLogger instance;
+  return instance;
+}
+
+void StartupLogger::logStartupEvent(const ReactMarkerId markerId) {
+  auto now = JSExecutor::performanceNow();
+  switch (markerId) {
+    case ReactMarkerId::RUN_JS_BUNDLE_START:
+      if (runJSBundleStartTime == 0) {
+        runJSBundleStartTime = now;
+      }
+      return;
+
+    case ReactMarkerId::RUN_JS_BUNDLE_STOP:
+      if (runJSBundleEndTime == 0) {
+        runJSBundleEndTime = now;
+      }
+      return;
+
+    default:
+      return;
+  }
+}
+
+double StartupLogger::getAppStartTime() {
+  if (getAppStartTimeImpl == nullptr) {
+    return 0;
+  }
+
+  return getAppStartTimeImpl();
+}
+
+double StartupLogger::getRunJSBundleStartTime() {
+  return runJSBundleStartTime;
+}
+
+double StartupLogger::getRunJSBundleEndTime() {
+  return runJSBundleEndTime;
+}
+
 } // namespace ReactMarker
 } // namespace react
 } // namespace facebook

package/ReactCommon/cxxreact/ReactMarker.h

@@ -36,21 +36,55 @@ using LogTaggedMarker =
     std::function<void(const ReactMarkerId, const char *tag)>; // Bridge only
 using LogTaggedMarkerBridgeless =
     std::function<void(const ReactMarkerId, const char *tag)>;
+using GetAppStartTime = std::function<double()>;
 #else
 typedef void (
     *LogTaggedMarker)(const ReactMarkerId, const char *tag); // Bridge only
 typedef void (*LogTaggedMarkerBridgeless)(const ReactMarkerId, const char *tag);
+typedef double (*GetAppStartTime)();
 #endif
 
 #ifndef RN_EXPORT
 #define RN_EXPORT __attribute__((visibility("default")))
 #endif
 
-extern RN_EXPORT LogTaggedMarker logTaggedMarker; // Bridge only
-extern RN_EXPORT LogTaggedMarker logTaggedMarkerBridgeless;
+extern RN_EXPORT LogTaggedMarker logTaggedMarkerImpl; // Bridge only
+extern RN_EXPORT LogTaggedMarker logTaggedMarkerBridgelessImpl;
+extern RN_EXPORT GetAppStartTime getAppStartTimeImpl;
 
 extern RN_EXPORT void logMarker(const ReactMarkerId markerId); // Bridge only
+extern RN_EXPORT void logTaggedMarker(
+    const ReactMarkerId markerId,
+    const char *tag); // Bridge only
 extern RN_EXPORT void logMarkerBridgeless(const ReactMarkerId markerId);
+extern RN_EXPORT void logTaggedMarkerBridgeless(
+    const ReactMarkerId markerId,
+    const char *tag);
+extern RN_EXPORT double getAppStartTime();
+
+struct ReactMarkerEvent {
+  const ReactMarkerId markerId;
+  const char *tag;
+  double time;
+};
+
+class StartupLogger {
+ public:
+  static StartupLogger &getInstance();
+
+  void logStartupEvent(const ReactMarker::ReactMarkerId markerId);
+  double getAppStartTime();
+  double getRunJSBundleStartTime();
+  double getRunJSBundleEndTime();
+
+ private:
+  StartupLogger() = default;
+  StartupLogger(const StartupLogger &) = delete;
+  StartupLogger &operator=(const StartupLogger &) = delete;
+
+  double runJSBundleStartTime;
+  double runJSBundleEndTime;
+};
 
 } // namespace ReactMarker
 } // namespace react

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -16,9 +16,9 @@ namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 71;
-  int32_t Patch = 6;
-  std::string_view Prerelease = "";
+  int32_t Minor = 72;
+  int32_t Patch = 0;
+  std::string_view Prerelease = "rc.1";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/hermes/.clang-tidy

@@ -2,4 +2,5 @@
 Checks: '>
 clang-diagnostic-*,
 '
+InheritParentConfig: true
 ...

package/ReactCommon/hermes/React-hermes.podspec

@@ -30,7 +30,7 @@ Pod::Spec.new do |s|
   s.summary                = "Hermes engine for React Native"
   s.homepage               = "https://reactnative.dev/"
   s.license                = package['license']
-  s.author                 = "Facebook, Inc. and its affiliates"
+  s.author                 = "Meta Platforms, Inc. and its affiliates"
   s.platforms              = { :osx => "10.14", :ios => "12.4" }
   s.source                 = source
   s.source_files           = "executor/*.{cpp,h}",
@@ -40,7 +40,8 @@ Pod::Spec.new do |s|
   s.public_header_files    = "executor/HermesExecutorFactory.h"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = {
-                               "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include\""
+                               "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include\"",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
                              }.merge!(build_type == :debug ? { "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } : {})
   s.header_dir             = "reacthermes"
   s.dependency "React-cxxreact", version

package/ReactCommon/hermes/executor/CMakeLists.txt

@@ -6,6 +6,8 @@
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
+add_compile_options(-std=c++17)
+
 file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(
         hermes_executor_common
@@ -17,7 +19,6 @@ target_link_libraries(hermes_executor_common
         jsireact
         hermes-engine::libhermes
         jsi
-        debug
         hermes_inspector
 )
 
@@ -27,4 +28,10 @@ if(${CMAKE_BUILD_TYPE} MATCHES Debug)
                 PRIVATE
                 -DHERMES_ENABLE_DEBUGGER=1
         )
+else()
+        target_compile_options(
+                hermes_executor_common
+                PRIVATE
+                -DNDEBUG
+        )
 endif()

package/ReactCommon/hermes/executor/HermesExecutorFactory.cpp

@@ -14,10 +14,8 @@
 #include <hermes/hermes.h>
 #include <jsi/decorator.h>
 
-#ifdef HERMES_ENABLE_DEBUGGER
 #include <hermes/inspector/RuntimeAdapter.h>
 #include <hermes/inspector/chrome/Registration.h>
-#endif
 
 #include "JSITracing.h"
 
@@ -29,14 +27,6 @@ namespace react {
 
 namespace {
 
-std::unique_ptr<HermesRuntime> makeHermesRuntimeSystraced(
-    const ::hermes::vm::RuntimeConfig &runtimeConfig) {
-  SystraceSection s("HermesExecutorFactory::makeHermesRuntimeSystraced");
-  return hermes::makeHermesRuntime(runtimeConfig);
-}
-
-#ifdef HERMES_ENABLE_DEBUGGER
-
 class HermesExecutorRuntimeAdapter
     : public facebook::hermes::inspector::RuntimeAdapter {
  public:
@@ -67,8 +57,6 @@ class HermesExecutorRuntimeAdapter
   std::shared_ptr<MessageQueueThread> thread_;
 };
 
-#endif
-
 struct ReentrancyCheck {
 // This is effectively a very subtle and complex assert, so only
 // include it in builds which would include asserts.
@@ -152,7 +140,6 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
       const std::string &debuggerName)
       : jsi::WithRuntimeDecorator<ReentrancyCheck>(*runtime, reentrancyCheck_),
         runtime_(std::move(runtime)) {
-#ifdef HERMES_ENABLE_DEBUGGER
     enableDebugger_ = enableDebugger;
     if (enableDebugger_) {
       std::shared_ptr<HermesRuntime> rt(runtime_, &hermesRuntime);
@@ -161,15 +148,12 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
       debugToken_ = facebook::hermes::inspector::chrome::enableDebugging(
           std::move(adapter), debuggerName);
     }
-#endif
   }
 
   ~DecoratedRuntime() {
-#ifdef HERMES_ENABLE_DEBUGGER
     if (enableDebugger_) {
       facebook::hermes::inspector::chrome::disableDebugging(debugToken_);
     }
-#endif
   }
 
  private:
@@ -182,10 +166,8 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
 
   std::shared_ptr<Runtime> runtime_;
   ReentrancyCheck reentrancyCheck_;
-#ifdef HERMES_ENABLE_DEBUGGER
   bool enableDebugger_;
   facebook::hermes::inspector::chrome::DebugSessionToken debugToken_;
-#endif
 };
 
 } // namespace
@@ -201,8 +183,12 @@ void HermesExecutorFactory::setDebuggerName(const std::string &debuggerName) {
 std::unique_ptr<JSExecutor> HermesExecutorFactory::createJSExecutor(
     std::shared_ptr<ExecutorDelegate> delegate,
     std::shared_ptr<MessageQueueThread> jsQueue) {
-  std::unique_ptr<HermesRuntime> hermesRuntime =
-      makeHermesRuntimeSystraced(runtimeConfig_);
+  std::unique_ptr<HermesRuntime> hermesRuntime;
+  {
+    SystraceSection s("makeHermesRuntime");
+    hermesRuntime = hermes::makeHermesRuntime(runtimeConfig_);
+  }
+
   HermesRuntime &hermesRuntimeRef = *hermesRuntime;
   auto decoratedRuntime = std::make_shared<DecoratedRuntime>(
       std::move(hermesRuntime),

package/ReactCommon/hermes/inspector/BUCK

@@ -48,7 +48,9 @@ fb_xplat_cxx_library(
     exported_headers = CHROME_EXPORTED_HEADERS,
     compiler_flags = CFLAGS_BY_MODE[hermes_build_mode()],
     fbobjc_header_path_prefix = "hermes/inspector/chrome",
-    labels = [],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     tests = [":chrome-tests"],
@@ -62,7 +64,7 @@ fb_xplat_cxx_library(
         ":inspectorlib",
         "//third-party/glog:glog",
         "//xplat/folly:futures",
-        "//xplat/hermes/API:HermesAPI",
+        "//xplat/hermes/API:HermesAPIFullOrLean",
         "//xplat/jsi:JSIDynamic",
         "//xplat/jsi:jsi",
     ],
@@ -116,7 +118,9 @@ fb_xplat_cxx_library(
         "//fbandroid/libraries/fbjni:fbjni",
     ],
     fbobjc_header_path_prefix = "hermes/inspector/detail",
-    labels = [],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     tests = [":detail-tests"],
@@ -164,7 +168,7 @@ fb_xplat_cxx_binary(
     deps = [
         ":chrome",
         ":inspectorlib",
-        "//xplat/hermes/API:HermesAPI",
+        "//xplat/hermes/API:HermesAPIFullOrLean",
     ],
 )
 
@@ -192,7 +196,9 @@ fb_xplat_cxx_library(
     cxx_tests = [":inspector-tests"],
     exported_preprocessor_flags = get_hermes_shared_library_preprocessor_flags(),
     fbobjc_header_path_prefix = "hermes/inspector",
-    labels = [],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     visibility = [
@@ -203,7 +209,7 @@ fb_xplat_cxx_library(
         ":detail",
         "//third-party/glog:glog",
         "//xplat/folly:futures",
-        "//xplat/hermes/API:HermesAPI",
+        "//xplat/hermes/API:HermesAPIFullOrLean",
         "//xplat/jsi:jsi",
     ],
 )

package/ReactCommon/hermes/inspector/CMakeLists.txt

@@ -15,8 +15,8 @@ add_library(hermes_inspector
 target_compile_options(
         hermes_inspector
         PRIVATE
-        -DHERMES_ENABLE_DEBUGGER=1
         -DHERMES_INSPECTOR_FOLLY_KLUDGE=1
+        -std=c++17
         -fexceptions
 )
 

package/ReactCommon/hermes/inspector/DEFS.bzl

@@ -2,6 +2,6 @@ load("@fbsource//xplat/hermes/defs:hermes.bzl", "hermes_is_debugger_enabled")
 
 def hermes_inspector_dep_list():
     return [
-        "//xplat/js/react-native-github/ReactCommon/hermes/inspector:chrome",
-        "//xplat/js/react-native-github/ReactCommon/hermes/inspector:inspectorlib",
+        "//xplat/js/react-native-github/packages/react-native/ReactCommon/hermes/inspector:chrome",
+        "//xplat/js/react-native-github/packages/react-native/ReactCommon/hermes/inspector:inspectorlib",
     ] if hermes_is_debugger_enabled() else []

package/ReactCommon/hermes/inspector/Inspector.cpp

@@ -348,7 +348,7 @@ folly::Future<Unit> Inspector::executeIfEnabled(
 
 folly::Future<debugger::BreakpointInfo> Inspector::setBreakpoint(
     debugger::SourceLocation loc,
-    folly::Optional<std::string> condition) {
+    std::optional<std::string> condition) {
   auto promise = std::make_shared<folly::Promise<debugger::BreakpointInfo>>();
   // Automatically re-enable breakpoints since the user presumably wants this
   // to start triggering.
@@ -599,7 +599,7 @@ void Inspector::executeIfEnabledOnExecutor(
 
 void Inspector::setBreakpointOnExecutor(
     debugger::SourceLocation loc,
-    folly::Optional<std::string> condition,
+    std::optional<std::string> condition,
     std::shared_ptr<folly::Promise<debugger::BreakpointInfo>> promise) {
   std::lock_guard<std::mutex> lock(mutex_);
 

package/ReactCommon/hermes/inspector/Inspector.h

@@ -15,7 +15,6 @@
 #include <unordered_map>
 
 #include <folly/Executor.h>
-#include <folly/Optional.h>
 #include <folly/Unit.h>
 #include <folly/futures/Future.h>
 #include <hermes/DebuggerAPI.h>
@@ -23,6 +22,7 @@
 #include <hermes/inspector/AsyncPauseState.h>
 #include <hermes/inspector/Exceptions.h>
 #include <hermes/inspector/RuntimeAdapter.h>
+#include <optional>
 
 namespace facebook {
 namespace hermes {
@@ -109,7 +109,7 @@ class Inspector : public facebook::hermes::debugger::EventObserver,
       std::shared_ptr<RuntimeAdapter> adapter,
       InspectorObserver &observer,
       bool pauseOnFirstStatement);
-  ~Inspector();
+  ~Inspector() override;
 
   /**
    * disable turns off the inspector. All of the subsequent methods will not do
@@ -164,7 +164,7 @@ class Inspector : public facebook::hermes::debugger::EventObserver,
    */
   folly::Future<facebook::hermes::debugger::BreakpointInfo> setBreakpoint(
       facebook::hermes::debugger::SourceLocation loc,
-      folly::Optional<std::string> condition = folly::none);
+      std::optional<std::string> condition = std::nullopt);
 
   folly::Future<folly::Unit> removeBreakpoint(
       facebook::hermes::debugger::BreakpointID loc);
@@ -176,7 +176,7 @@ class Inspector : public facebook::hermes::debugger::EventObserver,
 
   /**
    * resume and step methods are only valid when the VM is currently paused. The
-   * returned future suceeds when the VM resumes execution, or fails with an
+   * returned future succeeds when the VM resumes execution, or fails with an
    * InvalidStateException otherwise.
    */
   folly::Future<folly::Unit> resume();
@@ -186,7 +186,7 @@ class Inspector : public facebook::hermes::debugger::EventObserver,
 
   /**
    * pause can be issued at any time while the inspector is enabled. It requests
-   * the VM to asynchronously break execution. The returned future suceeds if
+   * the VM to asynchronously break execution. The returned future succeeds if
    * the VM can be paused in this state and fails with InvalidStateException if
    * otherwise.
    */
@@ -281,7 +281,7 @@ class Inspector : public facebook::hermes::debugger::EventObserver,
 
   void setBreakpointOnExecutor(
       debugger::SourceLocation loc,
-      folly::Optional<std::string> condition,
+      std::optional<std::string> condition,
       std::shared_ptr<
           folly::Promise<facebook::hermes::debugger::BreakpointInfo>> promise);
 
@@ -367,7 +367,7 @@ class Inspector : public facebook::hermes::debugger::EventObserver,
 
 /// Helper function that guards user code execution in a try-catch block.
 template <typename C, typename... A>
-folly::Optional<UserCallbackException> runUserCallback(C &cb, A &&...arg) {
+std::optional<UserCallbackException> runUserCallback(C &cb, A &&...arg) {
   try {
     cb(std::forward<A>(arg)...);
   } catch (const std::exception &e) {

package/ReactCommon/hermes/inspector/InspectorState.h

@@ -184,7 +184,7 @@ class InspectorState::RunningDetached : public InspectorState {
   }
 
   RunningDetached(Inspector &inspector) : InspectorState(inspector) {}
-  ~RunningDetached() {}
+  ~RunningDetached() override {}
 
   std::pair<NextStatePtr, CommandPtr> didPause(MonitorLock &lock) override;
   std::pair<NextStatePtr, bool> enable() override;
@@ -211,7 +211,7 @@ class InspectorState::RunningWaitEnable : public InspectorState {
   }
 
   RunningWaitEnable(Inspector &inspector) : InspectorState(inspector) {}
-  ~RunningWaitEnable() {}
+  ~RunningWaitEnable() override {}
 
   std::pair<NextStatePtr, CommandPtr> didPause(MonitorLock &lock) override;
   std::pair<NextStatePtr, bool> enable() override;
@@ -260,7 +260,7 @@ class InspectorState::PausedWaitEnable : public InspectorState {
   }
 
   PausedWaitEnable(Inspector &inspector) : InspectorState(inspector) {}
-  ~PausedWaitEnable() {}
+  ~PausedWaitEnable() override {}
 
   std::pair<NextStatePtr, CommandPtr> didPause(MonitorLock &lock) override;
   std::pair<NextStatePtr, bool> enable() override;
@@ -306,7 +306,7 @@ class InspectorState::Running : public InspectorState {
   }
 
   Running(Inspector &inspector) : InspectorState(inspector) {}
-  ~Running() {}
+  ~Running() override {}
 
   void onEnter(InspectorState *prevState) override;
 
@@ -366,7 +366,7 @@ class InspectorState::Paused : public InspectorState {
   }
 
   Paused(Inspector &inspector) : InspectorState(inspector) {}
-  ~Paused() {}
+  ~Paused() override {}
 
   void onEnter(InspectorState *prevState) override;