react-native 0.71.6 → 0.72.0-rc.1

package/ReactCommon/hermes/inspector/README.md

@@ -17,23 +17,23 @@ can get debug logs to show even when tests are passing by running the test
 executable directly:
 
 ```
-$ buck build //xplat/js/react-native-github/ReactCommon/hermes/inspector:chrome-tests
-$ buck-out/gen/js/react-native-github/ReactCommon/hermes/inspector/chrome-tests
+$ buck build //xplat/js/react-native-github/packages/react-native/ReactCommon/hermes/inspector:chrome-tests
+$ buck-out/gen/xplat/js/react-native-github/packages/react-native/ReactCommon/hermes/inspector/chrome-tests
 [...]
 ```
 
 You can use standard gtest filters to only execute a particular set of tests:
 
 ```
-$ buck-out/gen/js/react-native-github/ReactCommon/hermes/inspector/chrome-tests \
+$ buck-out/gen/xplat/js/react-native-github/packages/react-native/ReactCommon/hermes/inspector/chrome-tests \
     --gtest_filter='ConnectionTests.testSetBreakpoint'
 ```
 
 You can debug the tests using lldb or gdb:
 
 ```
-$ lldb buck-out/gen/js/react-native-github/ReactCommon/hermes/inspector/chrome-tests
-$ gdb buck-out/gen/js/react-native-github/ReactCommon/hermes/inspector/chrome-tests
+$ lldb buck-out/gen/xplat/js/react-native-github/packages/react-native/ReactCommon/hermes/inspector/chrome-tests
+$ gdb buck-out/gen/xplat/js/react-native-github/packages/react-native/ReactCommon/hermes/inspector/chrome-tests
 ```
 
 # Formatting
@@ -42,7 +42,7 @@ Make sure the code is formatted using the hermes clang-format rules before
 committing:
 
 ```
-$ xplat/js/react-native-github/ReactCommon/hermes/inspector/tools/format
+$ xplat/js/react-native-github/packages/react-native/ReactCommon/hermes/inspector/tools/format
 ```
 
 We follow the clang format rules used by the rest of the Hermes project.
@@ -53,7 +53,7 @@ To add support for a new Chrome DevTools protocol message, add the message you
 want to add to tools/message_types.txt, and re-run the message types generator:
 
 ```
-$ xplat/js/react-native-github/ReactCommon/hermes/inspector/tools/run_msggen
+$ xplat/js/react-native-github/packages/react-native/ReactCommon/hermes/inspector/tools/run_msggen
 ```
 
 This will generate C++ structs for the new message type in

package/ReactCommon/hermes/inspector/RuntimeAdapter.h

@@ -49,7 +49,7 @@ class INSPECTOR_EXPORT RuntimeAdapter {
   /// the ability to force the process to enter the Hermes interpreter loop
   /// soon. This is important because the inspector can only do a number of
   /// important operations (like manipulating breakpoints) within the context of
-  /// a Hermes interperter loop.
+  /// a Hermes interpreter loop.
   ///
   /// The default implementation does nothing.
   virtual void tickleJs();

package/ReactCommon/hermes/inspector/chrome/Connection.cpp

@@ -23,6 +23,7 @@
 #include <hermes/inspector/detail/SerialExecutor.h>
 #include <hermes/inspector/detail/Thread.h>
 #include <jsi/instrumentation.h>
+#include <optional>
 
 namespace facebook {
 namespace hermes {
@@ -667,7 +668,7 @@ void Connection::Impl::handle(
 void Connection::Impl::handle(
     const m::heapProfiler::GetObjectByHeapObjectIdRequest &req) {
   uint64_t objID = atoi(req.objectId.c_str());
-  folly::Optional<std::string> group = req.objectGroup;
+  std::optional<std::string> group = req.objectGroup;
   auto remoteObjPtr = std::make_shared<m::runtime::RemoteObject>();
 
   inspector_
@@ -782,7 +783,7 @@ namespace {
 class CallFunctionOnArgument {
  public:
   explicit CallFunctionOnArgument(
-      folly::Optional<m::runtime::RemoteObjectId> maybeObjectId)
+      std::optional<m::runtime::RemoteObjectId> maybeObjectId)
       : maybeObjectId_(std::move(maybeObjectId)) {}
 
   /// Computes the real value for this argument, which can be an object
@@ -814,7 +815,7 @@ class CallFunctionOnArgument {
     throw std::runtime_error("unknown object id " + objId);
   }
 
-  folly::Optional<m::runtime::RemoteObjectId> maybeObjectId_;
+  std::optional<m::runtime::RemoteObjectId> maybeObjectId_;
 };
 
 /// Functor that should be used to run the result of eval-ing a CallFunctionOn
@@ -876,7 +877,7 @@ class CallFunctionOnRunner {
 
   CallFunctionOnRunner(
       std::vector<CallFunctionOnArgument> thisAndArguments,
-      folly::Optional<m::runtime::ExecutionContextId> executionContextId)
+      std::optional<m::runtime::ExecutionContextId> executionContextId)
       : thisAndArguments_(std::move(thisAndArguments)),
         executionContextId_(std::move(executionContextId)) {}
 
@@ -909,7 +910,7 @@ class CallFunctionOnRunner {
   }
 
   std::vector<CallFunctionOnArgument> thisAndArguments_;
-  folly::Optional<m::runtime::ExecutionContextId> executionContextId_;
+  std::optional<m::runtime::ExecutionContextId> executionContextId_;
 };
 
 /*static*/ const char *CallFunctionOnRunner::kJsThisArgPlaceholder =
@@ -966,7 +967,7 @@ class CallFunctionOnBuilder {
   }
 
  private:
-  void addParams(const folly::Optional<std::vector<m::runtime::CallArgument>>
+  void addParams(const std::optional<std::vector<m::runtime::CallArgument>>
                      &maybeArguments) {
     if (maybeArguments) {
       for (const auto &ca : *maybeArguments) {
@@ -998,7 +999,7 @@ class CallFunctionOnBuilder {
   std::ostringstream out_;
 
   std::vector<CallFunctionOnArgument> thisAndArguments_;
-  folly::Optional<m::runtime::ExecutionContextId> executionContextId_;
+  std::optional<m::runtime::ExecutionContextId> executionContextId_;
 };
 
 } // namespace
@@ -1009,8 +1010,8 @@ void Connection::Impl::handle(const m::runtime::CallFunctionOnRequest &req) {
 
   auto validateAndParseRequest =
       [&expression, &runner](const m::runtime::CallFunctionOnRequest &req)
-      -> folly::Optional<std::string> {
-    if (req.objectId.hasValue() == req.executionContextId.hasValue()) {
+      -> std::optional<std::string> {
+    if (req.objectId.has_value() == req.executionContextId.has_value()) {
       return std::string(
           "The request must specify either object id or execution context id.");
     }
@@ -1049,7 +1050,6 @@ void Connection::Impl::handle(const m::runtime::CallFunctionOnRequest &req) {
            remoteObjPtr,
            objectGroup = req.objectGroup,
            jsThisId = req.objectId,
-           executionContextId = req.executionContextId,
            byValue = req.returnByValue.value_or(false),
            runner =
                std::move(runner)](const facebook::hermes::debugger::EvalResult
@@ -1091,7 +1091,7 @@ void Connection::Impl::handle(const m::runtime::CompileScriptRequest &req) {
       ->executeIfEnabled(
           "Runtime.compileScriptRequest",
           [this, req, resp](const debugger::ProgramState &state) {
-            if (req.executionContextId.hasValue() &&
+            if (req.executionContextId.has_value() &&
                 req.executionContextId.value() != kHermesExecutionContextId) {
               throw std::invalid_argument("Invalid execution context");
             }
@@ -1482,7 +1482,7 @@ void Connection::Impl::handle(
       ->executeIfEnabled(
           "Runtime.globalLexicalScopeNames",
           [req, resp](const debugger::ProgramState &state) {
-            if (req.executionContextId.hasValue() &&
+            if (req.executionContextId.has_value() &&
                 req.executionContextId.value() != kHermesExecutionContextId) {
               throw std::invalid_argument("Invalid execution context");
             }

package/ReactCommon/hermes/inspector/chrome/MessageConverters.h

@@ -33,7 +33,7 @@ void setHermesLocation(
     const std::vector<std::string> &parsedScripts) {
   hermesLoc.line = chromeLoc.lineNumber + 1;
 
-  if (chromeLoc.columnNumber.hasValue()) {
+  if (chromeLoc.columnNumber.has_value()) {
     if (chromeLoc.columnNumber.value() == 0) {
       // TODO: When CDTP sends a column number of 0, we send Hermes a column
       // number of 1. For some reason, this causes Hermes to not be
@@ -44,9 +44,9 @@ void setHermesLocation(
     }
   }
 
-  if (chromeLoc.url.hasValue()) {
+  if (chromeLoc.url.has_value()) {
     hermesLoc.fileName = stripCachePrevention(chromeLoc.url.value());
-  } else if (chromeLoc.urlRegex.hasValue()) {
+  } else if (chromeLoc.urlRegex.has_value()) {
     const std::regex regex(stripCachePrevention(chromeLoc.urlRegex.value()));
     auto it = parsedScripts.rbegin();
 

package/ReactCommon/hermes/inspector/chrome/MessageTypes.h

@@ -1,14 +1,13 @@
 // Copyright (c) Meta Platforms, Inc. and affiliates. All Rights Reserved.
-// @generated SignedSource<<2bada3d9c303c840ddcc292c7ba52604>>
+// @generated SignedSource<<521cb6eba7e5df060b4836f0f60126b9>>
 
 #pragma once
 
 #include <hermes/inspector/chrome/MessageInterfaces.h>
 
+#include <optional>
 #include <vector>
 
-#include <folly/Optional.h>
-
 namespace facebook {
 namespace hermes {
 namespace inspector {
@@ -199,7 +198,7 @@ struct debugger::Location : public Serializable {
 
   runtime::ScriptId scriptId{};
   int lineNumber{};
-  folly::Optional<int> columnNumber;
+  std::optional<int> columnNumber;
 };
 
 struct runtime::RemoteObject : public Serializable {
@@ -208,12 +207,12 @@ struct runtime::RemoteObject : public Serializable {
   folly::dynamic toDynamic() const override;
 
   std::string type;
-  folly::Optional<std::string> subtype;
-  folly::Optional<std::string> className;
-  folly::Optional<folly::dynamic> value;
-  folly::Optional<runtime::UnserializableValue> unserializableValue;
-  folly::Optional<std::string> description;
-  folly::Optional<runtime::RemoteObjectId> objectId;
+  std::optional<std::string> subtype;
+  std::optional<std::string> className;
+  std::optional<folly::dynamic> value;
+  std::optional<runtime::UnserializableValue> unserializableValue;
+  std::optional<std::string> description;
+  std::optional<runtime::RemoteObjectId> objectId;
 };
 
 struct runtime::CallFrame : public Serializable {
@@ -233,7 +232,7 @@ struct runtime::StackTrace : public Serializable {
   explicit StackTrace(const folly::dynamic &obj);
   folly::dynamic toDynamic() const override;
 
-  folly::Optional<std::string> description;
+  std::optional<std::string> description;
   std::vector<runtime::CallFrame> callFrames;
   std::unique_ptr<runtime::StackTrace> parent;
 };
@@ -247,11 +246,11 @@ struct runtime::ExceptionDetails : public Serializable {
   std::string text;
   int lineNumber{};
   int columnNumber{};
-  folly::Optional<runtime::ScriptId> scriptId;
-  folly::Optional<std::string> url;
-  folly::Optional<runtime::StackTrace> stackTrace;
-  folly::Optional<runtime::RemoteObject> exception;
-  folly::Optional<runtime::ExecutionContextId> executionContextId;
+  std::optional<runtime::ScriptId> scriptId;
+  std::optional<std::string> url;
+  std::optional<runtime::StackTrace> stackTrace;
+  std::optional<runtime::RemoteObject> exception;
+  std::optional<runtime::ExecutionContextId> executionContextId;
 };
 
 struct debugger::Scope : public Serializable {
@@ -261,9 +260,9 @@ struct debugger::Scope : public Serializable {
 
   std::string type;
   runtime::RemoteObject object{};
-  folly::Optional<std::string> name;
-  folly::Optional<debugger::Location> startLocation;
-  folly::Optional<debugger::Location> endLocation;
+  std::optional<std::string> name;
+  std::optional<debugger::Location> startLocation;
+  std::optional<debugger::Location> endLocation;
 };
 
 struct debugger::CallFrame : public Serializable {
@@ -273,12 +272,12 @@ struct debugger::CallFrame : public Serializable {
 
   debugger::CallFrameId callFrameId{};
   std::string functionName;
-  folly::Optional<debugger::Location> functionLocation;
+  std::optional<debugger::Location> functionLocation;
   debugger::Location location{};
   std::string url;
   std::vector<debugger::Scope> scopeChain;
   runtime::RemoteObject thisObj{};
-  folly::Optional<runtime::RemoteObject> returnValue;
+  std::optional<runtime::RemoteObject> returnValue;
 };
 
 struct heapProfiler::SamplingHeapProfileNode : public Serializable {
@@ -327,10 +326,10 @@ struct profiler::ProfileNode : public Serializable {
 
   int id{};
   runtime::CallFrame callFrame{};
-  folly::Optional<int> hitCount;
-  folly::Optional<std::vector<int>> children;
-  folly::Optional<std::string> deoptReason;
-  folly::Optional<std::vector<profiler::PositionTickInfo>> positionTicks;
+  std::optional<int> hitCount;
+  std::optional<std::vector<int>> children;
+  std::optional<std::string> deoptReason;
+  std::optional<std::vector<profiler::PositionTickInfo>> positionTicks;
 };
 
 struct profiler::Profile : public Serializable {
@@ -341,8 +340,8 @@ struct profiler::Profile : public Serializable {
   std::vector<profiler::ProfileNode> nodes;
   double startTime{};
   double endTime{};
-  folly::Optional<std::vector<int>> samples;
-  folly::Optional<std::vector<int>> timeDeltas;
+  std::optional<std::vector<int>> samples;
+  std::optional<std::vector<int>> timeDeltas;
 };
 
 struct runtime::CallArgument : public Serializable {
@@ -350,9 +349,9 @@ struct runtime::CallArgument : public Serializable {
   explicit CallArgument(const folly::dynamic &obj);
   folly::dynamic toDynamic() const override;
 
-  folly::Optional<folly::dynamic> value;
-  folly::Optional<runtime::UnserializableValue> unserializableValue;
-  folly::Optional<runtime::RemoteObjectId> objectId;
+  std::optional<folly::dynamic> value;
+  std::optional<runtime::UnserializableValue> unserializableValue;
+  std::optional<runtime::RemoteObjectId> objectId;
 };
 
 struct runtime::ExecutionContextDescription : public Serializable {
@@ -363,7 +362,7 @@ struct runtime::ExecutionContextDescription : public Serializable {
   runtime::ExecutionContextId id{};
   std::string origin;
   std::string name;
-  folly::Optional<folly::dynamic> auxData;
+  std::optional<folly::dynamic> auxData;
 };
 
 struct runtime::PropertyDescriptor : public Serializable {
@@ -372,15 +371,15 @@ struct runtime::PropertyDescriptor : public Serializable {
   folly::dynamic toDynamic() const override;
 
   std::string name;
-  folly::Optional<runtime::RemoteObject> value;
-  folly::Optional<bool> writable;
-  folly::Optional<runtime::RemoteObject> get;
-  folly::Optional<runtime::RemoteObject> set;
+  std::optional<runtime::RemoteObject> value;
+  std::optional<bool> writable;
+  std::optional<runtime::RemoteObject> get;
+  std::optional<runtime::RemoteObject> set;
   bool configurable{};
   bool enumerable{};
-  folly::Optional<bool> wasThrown;
-  folly::Optional<bool> isOwn;
-  folly::Optional<runtime::RemoteObject> symbol;
+  std::optional<bool> wasThrown;
+  std::optional<bool> isOwn;
+  std::optional<runtime::RemoteObject> symbol;
 };
 
 struct runtime::InternalPropertyDescriptor : public Serializable {
@@ -389,7 +388,7 @@ struct runtime::InternalPropertyDescriptor : public Serializable {
   folly::dynamic toDynamic() const override;
 
   std::string name;
-  folly::Optional<runtime::RemoteObject> value;
+  std::optional<runtime::RemoteObject> value;
 };
 
 /// Requests
@@ -400,7 +399,7 @@ struct UnknownRequest : public Request {
   folly::dynamic toDynamic() const override;
   void accept(RequestHandler &handler) const override;
 
-  folly::Optional<folly::dynamic> params;
+  std::optional<folly::dynamic> params;
 };
 
 struct debugger::DisableRequest : public Request {
@@ -428,11 +427,11 @@ struct debugger::EvaluateOnCallFrameRequest : public Request {
 
   debugger::CallFrameId callFrameId{};
   std::string expression;
-  folly::Optional<std::string> objectGroup;
-  folly::Optional<bool> includeCommandLineAPI;
-  folly::Optional<bool> silent;
-  folly::Optional<bool> returnByValue;
-  folly::Optional<bool> throwOnSideEffect;
+  std::optional<std::string> objectGroup;
+  std::optional<bool> includeCommandLineAPI;
+  std::optional<bool> silent;
+  std::optional<bool> returnByValue;
+  std::optional<bool> throwOnSideEffect;
 };
 
 struct debugger::PauseRequest : public Request {
@@ -460,7 +459,7 @@ struct debugger::ResumeRequest : public Request {
   folly::dynamic toDynamic() const override;
   void accept(RequestHandler &handler) const override;
 
-  folly::Optional<bool> terminateOnResume;
+  std::optional<bool> terminateOnResume;
 };
 
 struct debugger::SetBreakpointRequest : public Request {
@@ -471,7 +470,7 @@ struct debugger::SetBreakpointRequest : public Request {
   void accept(RequestHandler &handler) const override;
 
   debugger::Location location{};
-  folly::Optional<std::string> condition;
+  std::optional<std::string> condition;
 };
 
 struct debugger::SetBreakpointByUrlRequest : public Request {
@@ -482,11 +481,11 @@ struct debugger::SetBreakpointByUrlRequest : public Request {
   void accept(RequestHandler &handler) const override;
 
   int lineNumber{};
-  folly::Optional<std::string> url;
-  folly::Optional<std::string> urlRegex;
-  folly::Optional<std::string> scriptHash;
-  folly::Optional<int> columnNumber;
-  folly::Optional<std::string> condition;
+  std::optional<std::string> url;
+  std::optional<std::string> urlRegex;
+  std::optional<std::string> scriptHash;
+  std::optional<int> columnNumber;
+  std::optional<std::string> condition;
 };
 
 struct debugger::SetBreakpointsActiveRequest : public Request {
@@ -569,7 +568,7 @@ struct heapProfiler::GetObjectByHeapObjectIdRequest : public Request {
   void accept(RequestHandler &handler) const override;
 
   heapProfiler::HeapSnapshotObjectId objectId{};
-  folly::Optional<std::string> objectGroup;
+  std::optional<std::string> objectGroup;
 };
 
 struct heapProfiler::StartSamplingRequest : public Request {
@@ -579,7 +578,7 @@ struct heapProfiler::StartSamplingRequest : public Request {
   folly::dynamic toDynamic() const override;
   void accept(RequestHandler &handler) const override;
 
-  folly::Optional<double> samplingInterval;
+  std::optional<double> samplingInterval;
 };
 
 struct heapProfiler::StartTrackingHeapObjectsRequest : public Request {
@@ -589,7 +588,7 @@ struct heapProfiler::StartTrackingHeapObjectsRequest : public Request {
   folly::dynamic toDynamic() const override;
   void accept(RequestHandler &handler) const override;
 
-  folly::Optional<bool> trackAllocations;
+  std::optional<bool> trackAllocations;
 };
 
 struct heapProfiler::StopSamplingRequest : public Request {
@@ -607,9 +606,9 @@ struct heapProfiler::StopTrackingHeapObjectsRequest : public Request {
   folly::dynamic toDynamic() const override;
   void accept(RequestHandler &handler) const override;
 
-  folly::Optional<bool> reportProgress;
-  folly::Optional<bool> treatGlobalObjectsAsRoots;
-  folly::Optional<bool> captureNumericValue;
+  std::optional<bool> reportProgress;
+  std::optional<bool> treatGlobalObjectsAsRoots;
+  std::optional<bool> captureNumericValue;
 };
 
 struct heapProfiler::TakeHeapSnapshotRequest : public Request {
@@ -619,9 +618,9 @@ struct heapProfiler::TakeHeapSnapshotRequest : public Request {
   folly::dynamic toDynamic() const override;
   void accept(RequestHandler &handler) const override;
 
-  folly::Optional<bool> reportProgress;
-  folly::Optional<bool> treatGlobalObjectsAsRoots;
-  folly::Optional<bool> captureNumericValue;
+  std::optional<bool> reportProgress;
+  std::optional<bool> treatGlobalObjectsAsRoots;
+  std::optional<bool> captureNumericValue;
 };
 
 struct profiler::StartRequest : public Request {
@@ -648,14 +647,14 @@ struct runtime::CallFunctionOnRequest : public Request {
   void accept(RequestHandler &handler) const override;
 
   std::string functionDeclaration;
-  folly::Optional<runtime::RemoteObjectId> objectId;
-  folly::Optional<std::vector<runtime::CallArgument>> arguments;
-  folly::Optional<bool> silent;
-  folly::Optional<bool> returnByValue;
-  folly::Optional<bool> userGesture;
-  folly::Optional<bool> awaitPromise;
-  folly::Optional<runtime::ExecutionContextId> executionContextId;
-  folly::Optional<std::string> objectGroup;
+  std::optional<runtime::RemoteObjectId> objectId;
+  std::optional<std::vector<runtime::CallArgument>> arguments;
+  std::optional<bool> silent;
+  std::optional<bool> returnByValue;
+  std::optional<bool> userGesture;
+  std::optional<bool> awaitPromise;
+  std::optional<runtime::ExecutionContextId> executionContextId;
+  std::optional<std::string> objectGroup;
 };
 
 struct runtime::CompileScriptRequest : public Request {
@@ -668,7 +667,7 @@ struct runtime::CompileScriptRequest : public Request {
   std::string expression;
   std::string sourceURL;
   bool persistScript{};
-  folly::Optional<runtime::ExecutionContextId> executionContextId;
+  std::optional<runtime::ExecutionContextId> executionContextId;
 };
 
 struct runtime::EvaluateRequest : public Request {
@@ -679,13 +678,13 @@ struct runtime::EvaluateRequest : public Request {
   void accept(RequestHandler &handler) const override;
 
   std::string expression;
-  folly::Optional<std::string> objectGroup;
-  folly::Optional<bool> includeCommandLineAPI;
-  folly::Optional<bool> silent;
-  folly::Optional<runtime::ExecutionContextId> contextId;
-  folly::Optional<bool> returnByValue;
-  folly::Optional<bool> userGesture;
-  folly::Optional<bool> awaitPromise;
+  std::optional<std::string> objectGroup;
+  std::optional<bool> includeCommandLineAPI;
+  std::optional<bool> silent;
+  std::optional<runtime::ExecutionContextId> contextId;
+  std::optional<bool> returnByValue;
+  std::optional<bool> userGesture;
+  std::optional<bool> awaitPromise;
 };
 
 struct runtime::GetHeapUsageRequest : public Request {
@@ -704,7 +703,7 @@ struct runtime::GetPropertiesRequest : public Request {
   void accept(RequestHandler &handler) const override;
 
   runtime::RemoteObjectId objectId{};
-  folly::Optional<bool> ownProperties;
+  std::optional<bool> ownProperties;
 };
 
 struct runtime::GlobalLexicalScopeNamesRequest : public Request {
@@ -714,7 +713,7 @@ struct runtime::GlobalLexicalScopeNamesRequest : public Request {
   folly::dynamic toDynamic() const override;
   void accept(RequestHandler &handler) const override;
 
-  folly::Optional<runtime::ExecutionContextId> executionContextId;
+  std::optional<runtime::ExecutionContextId> executionContextId;
 };
 
 struct runtime::RunIfWaitingForDebuggerRequest : public Request {
@@ -733,7 +732,7 @@ struct ErrorResponse : public Response {
 
   int code;
   std::string message;
-  folly::Optional<folly::dynamic> data;
+  std::optional<folly::dynamic> data;
 };
 
 struct OkResponse : public Response {
@@ -748,7 +747,7 @@ struct debugger::EvaluateOnCallFrameResponse : public Response {
   folly::dynamic toDynamic() const override;
 
   runtime::RemoteObject result{};
-  folly::Optional<runtime::ExceptionDetails> exceptionDetails;
+  std::optional<runtime::ExceptionDetails> exceptionDetails;
 };
 
 struct debugger::SetBreakpointResponse : public Response {
@@ -815,7 +814,7 @@ struct runtime::CallFunctionOnResponse : public Response {
   folly::dynamic toDynamic() const override;
 
   runtime::RemoteObject result{};
-  folly::Optional<runtime::ExceptionDetails> exceptionDetails;
+  std::optional<runtime::ExceptionDetails> exceptionDetails;
 };
 
 struct runtime::CompileScriptResponse : public Response {
@@ -823,8 +822,8 @@ struct runtime::CompileScriptResponse : public Response {
   explicit CompileScriptResponse(const folly::dynamic &obj);
   folly::dynamic toDynamic() const override;
 
-  folly::Optional<runtime::ScriptId> scriptId;
-  folly::Optional<runtime::ExceptionDetails> exceptionDetails;
+  std::optional<runtime::ScriptId> scriptId;
+  std::optional<runtime::ExceptionDetails> exceptionDetails;
 };
 
 struct runtime::EvaluateResponse : public Response {
@@ -833,7 +832,7 @@ struct runtime::EvaluateResponse : public Response {
   folly::dynamic toDynamic() const override;
 
   runtime::RemoteObject result{};
-  folly::Optional<runtime::ExceptionDetails> exceptionDetails;
+  std::optional<runtime::ExceptionDetails> exceptionDetails;
 };
 
 struct runtime::GetHeapUsageResponse : public Response {
@@ -851,9 +850,9 @@ struct runtime::GetPropertiesResponse : public Response {
   folly::dynamic toDynamic() const override;
 
   std::vector<runtime::PropertyDescriptor> result;
-  folly::Optional<std::vector<runtime::InternalPropertyDescriptor>>
+  std::optional<std::vector<runtime::InternalPropertyDescriptor>>
       internalProperties;
-  folly::Optional<runtime::ExceptionDetails> exceptionDetails;
+  std::optional<runtime::ExceptionDetails> exceptionDetails;
 };
 
 struct runtime::GlobalLexicalScopeNamesResponse : public Response {
@@ -881,9 +880,9 @@ struct debugger::PausedNotification : public Notification {
 
   std::vector<debugger::CallFrame> callFrames;
   std::string reason;
-  folly::Optional<folly::dynamic> data;
-  folly::Optional<std::vector<std::string>> hitBreakpoints;
-  folly::Optional<runtime::StackTrace> asyncStackTrace;
+  std::optional<folly::dynamic> data;
+  std::optional<std::vector<std::string>> hitBreakpoints;
+  std::optional<runtime::StackTrace> asyncStackTrace;
 };
 
 struct debugger::ResumedNotification : public Notification {
@@ -905,11 +904,11 @@ struct debugger::ScriptParsedNotification : public Notification {
   int endColumn{};
   runtime::ExecutionContextId executionContextId{};
   std::string hash;
-  folly::Optional<folly::dynamic> executionContextAuxData;
-  folly::Optional<std::string> sourceMapURL;
-  folly::Optional<bool> hasSourceURL;
-  folly::Optional<bool> isModule;
-  folly::Optional<int> length;
+  std::optional<folly::dynamic> executionContextAuxData;
+  std::optional<std::string> sourceMapURL;
+  std::optional<bool> hasSourceURL;
+  std::optional<bool> isModule;
+  std::optional<int> length;
 };
 
 struct heapProfiler::AddHeapSnapshotChunkNotification : public Notification {
@@ -945,7 +944,7 @@ struct heapProfiler::ReportHeapSnapshotProgressNotification
 
   int done{};
   int total{};
-  folly::Optional<bool> finished;
+  std::optional<bool> finished;
 };
 
 struct runtime::ConsoleAPICalledNotification : public Notification {
@@ -957,7 +956,7 @@ struct runtime::ConsoleAPICalledNotification : public Notification {
   std::vector<runtime::RemoteObject> args;
   runtime::ExecutionContextId executionContextId{};
   runtime::Timestamp timestamp{};
-  folly::Optional<runtime::StackTrace> stackTrace;
+  std::optional<runtime::StackTrace> stackTrace;
 };
 
 struct runtime::ExecutionContextCreatedNotification : public Notification {