react-native 0.73.0-rc.2 → 0.73.0-rc.4

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm

@@ -8,6 +8,7 @@
 #include "RCTLegacyViewManagerInteropCoordinator.h"
 #include <React/RCTBridge+Private.h>
 #include <React/RCTBridgeMethod.h>
+#include <React/RCTBridgeProxy.h>
 #include <React/RCTComponentData.h>
 #include <React/RCTEventDispatcherProtocol.h>
 #include <React/RCTFollyConvert.h>
@@ -16,6 +17,7 @@
 #include <React/RCTUIManager.h>
 #include <React/RCTUIManagerUtils.h>
 #include <React/RCTUtils.h>
+#include <React/RCTViewManager.h>
 #include <folly/json.h>
 #include <objc/runtime.h>
 
@@ -25,6 +27,8 @@ using namespace facebook::react;
   RCTComponentData *_componentData;
   __weak RCTBridge *_bridge;
   __weak RCTBridgeModuleDecorator *_bridgelessInteropData;
+  __weak RCTBridgeProxy *_bridgeProxy;
+
   /*
    Each instance of `RCTLegacyViewManagerInteropComponentView` registers a block to which events are dispatched.
    This is the container that maps unretained UIView pointer to a block to which the event is dispatched.
@@ -40,13 +44,16 @@ using namespace facebook::react;
 }
 
 - (instancetype)initWithComponentData:(RCTComponentData *)componentData
-                               bridge:(RCTBridge *)bridge
+                               bridge:(nullable RCTBridge *)bridge
+                          bridgeProxy:(nullable RCTBridgeProxy *)bridgeProxy
                 bridgelessInteropData:(RCTBridgeModuleDecorator *)bridgelessInteropData;
 {
   if (self = [super init]) {
     _componentData = componentData;
     _bridge = bridge;
     _bridgelessInteropData = bridgelessInteropData;
+    _bridgeProxy = bridgeProxy;
+
     if (bridgelessInteropData) {
       //  During bridge mode, RCTBridgeModules will be decorated with these APIs by the bridge.
       RCTAssert(
@@ -62,7 +69,9 @@ using namespace facebook::react;
       if (strongSelf) {
         InterceptorBlock block = [strongSelf->_eventInterceptors objectForKey:reactTag];
         if (block) {
-          block(std::string([RCTNormalizeInputEventName(eventName) UTF8String]), convertIdToFollyDynamic(event ?: @{}));
+          block(
+              std::string([RCTNormalizeInputEventName(eventName) UTF8String]),
+              convertIdToFollyDynamic(event ? event : @{}));
         }
       }
     };
@@ -92,6 +101,10 @@ using namespace facebook::react;
   if (props.isObject()) {
     NSDictionary<NSString *, id> *convertedProps = convertFollyDynamicToId(props);
     [_componentData setProps:convertedProps forView:view];
+
+    if ([view respondsToSelector:@selector(didSetProps:)]) {
+      [view performSelector:@selector(didSetProps:) withObject:[convertedProps allKeys]];
+    }
   }
 }
 
@@ -131,15 +144,9 @@ using namespace facebook::react;
   NSArray *newArgs = [@[ [NSNumber numberWithInteger:tag] ] arrayByAddingObjectsFromArray:args];
 
   if (_bridge) {
-    [_bridge.batchedBridge
-        dispatchBlock:^{
-          [method invokeWithBridge:self->_bridge module:self->_componentData.manager arguments:newArgs];
-          [self->_bridge.uiManager setNeedsLayout];
-        }
-                queue:RCTGetUIManagerQueue()];
+    [self _handleCommandsOnBridge:method withArgs:newArgs];
   } else {
-    // TODO T86826778 - Figure out which queue this should be dispatched to.
-    [method invokeWithBridge:nil module:self->_componentData.manager arguments:newArgs];
+    [self _handleCommandsOnBridgeless:method withArgs:newArgs];
   }
 }
 
@@ -169,8 +176,37 @@ using namespace facebook::react;
 }
 
 #pragma mark - Private
+- (void)_handleCommandsOnBridge:(id<RCTBridgeMethod>)method withArgs:(NSArray *)newArgs
+{
+  [_bridge.batchedBridge
+      dispatchBlock:^{
+        [method invokeWithBridge:self->_bridge module:self->_componentData.manager arguments:newArgs];
+        [self->_bridge.uiManager setNeedsLayout];
+      }
+              queue:RCTGetUIManagerQueue()];
+}
+
+- (void)_handleCommandsOnBridgeless:(id<RCTBridgeMethod>)method withArgs:(NSArray *)newArgs
+{
+  RCTViewManager *componentViewManager = self->_componentData.manager;
+  [componentViewManager setValue:_bridgeProxy forKey:@"bridge"];
+
+  [self->_bridgeProxy.uiManager
+      addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+        [method invokeWithBridge:nil module:componentViewManager arguments:newArgs];
+      }];
+}
 
 - (void)_addUIBlock:(RCTViewManagerUIBlock)block
+{
+  if (_bridge) {
+    [self _addUIBlockOnBridge:block];
+  } else {
+    [self->_bridgeProxy.uiManager addUIBlock:block];
+  }
+}
+
+- (void)_addUIBlockOnBridge:(RCTViewManagerUIBlock)block
 {
   __weak __typeof__(self) weakSelf = self;
   [_bridge.batchedBridge

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm

@@ -227,24 +227,23 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
   RuntimeExecutor bufferedRuntimeExecutor = _reactInstance->getBufferedRuntimeExecutor();
   timerManager->setRuntimeExecutor(bufferedRuntimeExecutor);
 
-  RCTBridgeProxy *bridgeProxy = RCTTurboModuleInteropEnabled() && RCTTurboModuleInteropBridgeProxyEnabled()
-      ? [[RCTBridgeProxy alloc] initWithViewRegistry:_bridgeModuleDecorator.viewRegistry_DEPRECATED
-            moduleRegistry:_bridgeModuleDecorator.moduleRegistry
-            bundleManager:_bridgeModuleDecorator.bundleManager
-            callableJSModules:_bridgeModuleDecorator.callableJSModules
-            dispatchToJSThread:^(dispatch_block_t block) {
-              __strong __typeof(self) strongSelf = weakSelf;
-              if (strongSelf && strongSelf->_valid) {
-                strongSelf->_reactInstance->getBufferedRuntimeExecutor()([=](jsi::Runtime &runtime) { block(); });
-              }
+  RCTBridgeProxy *bridgeProxy =
+      [[RCTBridgeProxy alloc] initWithViewRegistry:_bridgeModuleDecorator.viewRegistry_DEPRECATED
+          moduleRegistry:_bridgeModuleDecorator.moduleRegistry
+          bundleManager:_bridgeModuleDecorator.bundleManager
+          callableJSModules:_bridgeModuleDecorator.callableJSModules
+          dispatchToJSThread:^(dispatch_block_t block) {
+            __strong __typeof(self) strongSelf = weakSelf;
+            if (strongSelf && strongSelf->_valid) {
+              strongSelf->_reactInstance->getBufferedRuntimeExecutor()([=](jsi::Runtime &runtime) { block(); });
             }
-            registerSegmentWithId:^(NSNumber *segmentId, NSString *path) {
-              __strong __typeof(self) strongSelf = weakSelf;
-              if (strongSelf && strongSelf->_valid) {
-                [strongSelf registerSegmentWithId:segmentId path:path];
-              }
-            }]
-      : nil;
+          }
+          registerSegmentWithId:^(NSNumber *segmentId, NSString *path) {
+            __strong __typeof(self) strongSelf = weakSelf;
+            if (strongSelf && strongSelf->_valid) {
+              [strongSelf registerSegmentWithId:segmentId path:path];
+            }
+          }];
 
   // Set up TurboModules
   _turboModuleManager = [[RCTTurboModuleManager alloc]
@@ -269,6 +268,7 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
       facebook::react::wrapManagedObject([_turboModuleManager moduleForName:"RCTEventDispatcher"]));
   contextContainer->insert("RCTBridgeModuleDecorator", facebook::react::wrapManagedObject(_bridgeModuleDecorator));
   contextContainer->insert("RuntimeScheduler", std::weak_ptr<RuntimeScheduler>(_reactInstance->getRuntimeScheduler()));
+  contextContainer->insert("RCTBridgeProxy", facebook::react::wrapManagedObject(bridgeProxy));
 
   _surfacePresenter = [[RCTSurfacePresenter alloc]
         initWithContextContainer:contextContainer

package/gradle/libs.versions.toml

@@ -16,7 +16,7 @@ assertj = "3.21.0"
 download = "5.4.0"
 fbjni = "0.5.1"
 flipper = "0.201.0"
-fresco = "3.0.0"
+fresco = "3.1.3"
 infer-annotation = "0.18.0"
 javax-inject = "1"
 jsr305 = "3.0.2"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.73.0-rc.2",
+  "version": "0.73.0-rc.4",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -93,29 +93,29 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "12.0.0-alpha.17",
-    "@react-native-community/cli-platform-android": "12.0.0-alpha.17",
-    "@react-native-community/cli-platform-ios": "12.0.0-alpha.17",
+    "@react-native-community/cli": "12.0.0",
+    "@react-native-community/cli-platform-android": "12.0.0",
+    "@react-native-community/cli-platform-ios": "12.0.0",
     "@react-native/assets-registry": "^0.73.1",
-    "@react-native/community-cli-plugin": "^0.73.6",
+    "@react-native/community-cli-plugin": "^0.73.8",
     "@react-native/codegen": "^0.73.1",
-    "@react-native/gradle-plugin": "^0.73.1",
+    "@react-native/gradle-plugin": "^0.73.3",
     "@react-native/js-polyfills": "^0.73.1",
     "@react-native/normalize-colors": "^0.73.2",
-    "@react-native/virtualized-lists": "^0.73.1",
+    "@react-native/virtualized-lists": "^0.73.3",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "base64-js": "^1.5.1",
-    "deprecated-react-native-prop-types": "4.2.1",
+    "deprecated-react-native-prop-types": "^5.0.0",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.6",
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.6.3",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "0.79.1",
-    "metro-source-map": "0.79.1",
+    "metro-runtime": "^0.80.0",
+    "metro-source-map": "^0.80.0",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",

package/scripts/cocoapods/utils.rb

@@ -291,32 +291,13 @@ class ReactNativePodsUtils
     end
 
     def self.updateOSDeploymentTarget(installer)
-        pod_to_update = Set.new([
-            "boost",
-            "CocoaAsyncSocket",
-            "Flipper",
-            "Flipper-DoubleConversion",
-            "Flipper-Fmt",
-            "Flipper-Boost-iOSX",
-            "Flipper-Folly",
-            "Flipper-Glog",
-            "Flipper-PeerTalk",
-            "FlipperKit",
-            "fmt",
-            "libevent",
-            "OpenSSL-Universal",
-            "RCT-Folly",
-            "SocketRocket",
-            "YogaKit"
-        ])
-
         installer.target_installation_results.pod_target_installation_results
             .each do |pod_name, target_installation_result|
-                unless pod_to_update.include?(pod_name)
-                    next
-                end
                 target_installation_result.native_target.build_configurations.each do |config|
-                    config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = Helpers::Constants.min_ios_version_supported
+                    old_iphone_deploy_target = config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] ?
+                        config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] :
+                        Helpers::Constants.min_ios_version_supported
+                    config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = [Helpers::Constants.min_ios_version_supported.to_f, old_iphone_deploy_target.to_f].max.to_s
                 end
             end
     end

package/scripts/codegen/generate-legacy-interop-components.js

@@ -11,6 +11,7 @@
 
 const yargs = require('yargs');
 const fs = require('fs');
+const p = require('path');
 
 const CONFIG_FILE_NAME = 'react-native.config.js';
 const PROJECT_FIELD = 'project';
@@ -93,7 +94,11 @@ function extractComponentsNames(reactNativeConfig) {
 }
 
 function generateRCTLegacyInteropComponents() {
-  const configFilePath = `${appRoot}/${CONFIG_FILE_NAME}`;
+  const cwd = process.cwd();
+  const configFilePath = p.join(cwd, appRoot, CONFIG_FILE_NAME);
+  console.log(
+    `Looking for a react-native.config.js file at ${configFilePath}...`,
+  );
   let reactNativeConfig = null;
   try {
     reactNativeConfig = require(configFilePath);
@@ -107,7 +112,7 @@ function generateRCTLegacyInteropComponents() {
     console.log('Skip LegacyInterop generation');
     return;
   }
-
+  console.log(`Components found: ${componentNames}`);
   let componentsArray = componentNames.map(name => `\t\t\t@"${name}",`);
   // Remove the last comma
   if (componentsArray.length > 0) {
@@ -118,6 +123,7 @@ function generateRCTLegacyInteropComponents() {
 
   const filePath = `${outputPath}/${OUTPUT_FILE_NAME}`;
   fs.writeFileSync(filePath, fileBody(componentsArray.join('\n')));
+  console.log(`${filePath} updated!`);
 }
 
 generateRCTLegacyInteropComponents();

package/scripts/react_native_pods.rb

@@ -258,7 +258,7 @@ def react_native_post_install(
     flipper_post_install(installer)
   end
 
-  fabric_enabled = ReactNativePodsUtils.has_pod(installer, 'React-Fabric')
+  fabric_enabled = ENV['RCT_FABRIC_ENABLED'] == '1'
   hermes_enabled = ReactNativePodsUtils.has_pod(installer, "React-hermes")
 
   if hermes_enabled

package/sdks/hermes-engine/hermes-engine.podspec

@@ -60,7 +60,13 @@ Pod::Spec.new do |spec|
         :execution_position => :before_compile,
         :script => <<-EOS
         . "$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh"
-        "$NODE_BINARY" "$REACT_NATIVE_PATH/sdks/hermes-engine/utils/replace_hermes_version.js" -c "$CONFIGURATION" -r "#{version}" -p "$REACT_NATIVE_PATH"
+
+        CONFIG="Release"
+        if echo $GCC_PREPROCESSOR_DEFINITIONS | grep -q "DEBUG=1"; then
+          CONFIG="Debug"
+        fi
+
+        "$NODE_BINARY" "$REACT_NATIVE_PATH/sdks/hermes-engine/utils/replace_hermes_version.js" -c "$CONFIG" -r "#{version}" -p "$PODS_ROOT"
         EOS
       }
     end

package/sdks/hermes-engine/hermes-utils.rb

@@ -125,7 +125,7 @@ def podspec_source_build_from_local_source_dir(react_native_path)
     source_dir_path = ENV['REACT_NATIVE_OVERRIDE_HERMES_DIR']
     if Dir.exist?(source_dir_path)
         hermes_log("Using source code from local path: #{source_dir_path}")
-        tarball_path = File.join(react_native_path, "sdks", "hermes-engine", "hermes-engine-from-local-source-dir.tar.gz")
+        tarball_path = File.join(artifacts_dir(), "hermes-engine-from-local-source-dir.tar.gz")
         exclude_paths = [
             "__tests__",
             "./external/flowtest",
@@ -192,6 +192,10 @@ end
 
 # HELPERS
 
+def artifacts_dir()
+    return File.join(Pod::Config.instance.project_pods_root, "hermes-engine-artifacts")
+end
+
 def hermestag_file(react_native_path)
     return File.join(react_native_path, "sdks", ".hermesversion")
 end
@@ -208,15 +212,14 @@ def download_stable_hermes(react_native_path, version, configuration)
 end
 
 def download_hermes_tarball(react_native_path, tarball_url, version, configuration)
-    destination_folder = "#{react_native_path}/sdks/downloads"
     destination_path = configuration == nil ?
-        "#{destination_folder}/hermes-ios-#{version}.tar.gz" :
-        "#{destination_folder}/hermes-ios-#{version}-#{configuration}.tar.gz"
+        "#{artifacts_dir()}/hermes-ios-#{version}.tar.gz" :
+        "#{artifacts_dir()}/hermes-ios-#{version}-#{configuration}.tar.gz"
 
     unless File.exist?(destination_path)
       # Download to a temporary file first so we don't cache incomplete downloads.
-      tmp_file = "#{destination_folder}/hermes-ios.download"
-      `mkdir -p "#{destination_folder}" && curl "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
+      tmp_file = "#{artifacts_dir()}/hermes-ios.download"
+      `mkdir -p "#{artifacts_dir()}" && curl "#{tarball_url}" -Lo "#{tmp_file}" && mv "#{tmp_file}" "#{destination_path}"`
     end
     return destination_path
 end

package/sdks/hermes-engine/utils/replace_hermes_version.js

@@ -52,8 +52,8 @@ function shouldReplaceHermesConfiguration(configuration) {
   return true;
 }
 
-function replaceHermesConfiguration(configuration, version, reactNativePath) {
-  const tarballURLPath = `${reactNativePath}/sdks/downloads/hermes-ios-${version}-${configuration}.tar.gz`;
+function replaceHermesConfiguration(configuration, version, podsRoot) {
+  const tarballURLPath = `${podsRoot}/hermes-engine-artifacts/hermes-ios-${version}-${configuration}.tar.gz`;
 
   const finalLocation = 'hermes-engine';
   console.log('Preparing the final location');
@@ -68,7 +68,7 @@ function updateLastBuildConfiguration(configuration) {
   fs.writeFileSync(LAST_BUILD_FILENAME, configuration);
 }
 
-function main(configuration, version, reactNativePath) {
+function main(configuration, version, podsRoot) {
   validateBuildConfiguration(configuration);
   validateVersion(version);
 
@@ -76,7 +76,7 @@ function main(configuration, version, reactNativePath) {
     return;
   }
 
-  replaceHermesConfiguration(configuration, version, reactNativePath);
+  replaceHermesConfiguration(configuration, version, podsRoot);
   updateLastBuildConfiguration(configuration);
   console.log('Done replacing hermes-engine');
 }
@@ -94,13 +94,13 @@ const argv = yargs
       'The Version of React Native associated with the Hermes tarball.',
   })
   .option('p', {
-    alias: 'reactNativePath',
-    description: 'The path to the React Native root folder',
+    alias: 'podsRoot',
+    description: 'The path to the Pods root folder',
   })
   .usage('Usage: $0 -c Debug -r <version> -p <path/to/react-native>').argv;
 
 const configuration = argv.configuration;
 const version = argv.reactNativeVersion;
-const reactNativePath = argv.reactNativePath;
+const podsRoot = argv.podsRoot;
 
-main(configuration, version, reactNativePath);
+main(configuration, version, podsRoot);

package/template/android/app/build.gradle

@@ -71,7 +71,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
-
+    buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdk rootProject.ext.compileSdkVersion
 
     namespace "com.helloworld"

package/template/android/app/src/main/java/com/helloworld/MainApplication.kt

@@ -3,17 +3,15 @@ package com.helloworld
 import android.app.Application
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
-import com.facebook.react.defaults.DefaultReactHost
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.react.flipper.ReactNativeFlipper
-import com.facebook.react.interfaces.ReactHost
 import com.facebook.soloader.SoLoader
 
-@UnstableReactNativeAPI
 class MainApplication : Application(), ReactApplication {
 
   override val reactNativeHost: ReactNativeHost =
@@ -33,12 +31,7 @@ class MainApplication : Application(), ReactApplication {
       }
 
   override val reactHost: ReactHost
-    get() =
-        DefaultReactHost.getDefaultReactHost(
-            context = this,
-            packageList = PackageList(this).packages,
-            jsMainModulePath = "index",
-            isHermesEnabled = BuildConfig.IS_HERMES_ENABLED)
+    get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
 
   override fun onCreate() {
     super.onCreate()

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "0.73.0-rc.2"
+    "react-native": "0.73.0-rc.4"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
@@ -19,7 +19,7 @@
     "@babel/runtime": "^7.20.0",
     "@react-native/babel-preset": "^0.73.18",
     "@react-native/eslint-config": "^0.73.1",
-    "@react-native/metro-config": "^0.73.1",
+    "@react-native/metro-config": "^0.73.2",
     "@react-native/typescript-config": "^0.73.1",
     "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",

package/third-party-podspecs/glog.podspec

@@ -29,10 +29,23 @@ Pod::Spec.new do |spec|
                         'src/base/*.h'
   spec.exclude_files       = "src/windows/**/*"
   spec.compiler_flags      = '-Wno-shorten-64-to-32'
+
+  # TODO: T167482718 Remove this code after April 2024, when Apple will
+  # push the lower version of Xcode required to upload apps to the Store.
+  xcode_path = `xcodebuild -version` # This return the current version of Xcode
+
+  match = xcode_path.match(/Xcode (\d+)\.(\d+)/)
+  major_version = match[1].to_i
+  minor_version = match[2].to_i
+  is_greater_than_15 = major_version >= 15
+  is_greater_than_14_3 = major_version == 14 && minor_version >= 3
+  should_define_modules = is_greater_than_15 ? "YES" : is_greater_than_14_3 ? "YES" : "NO"
+  # End TODO.
+
   spec.pod_target_xcconfig = {
     "USE_HEADERMAP" => "NO",
     "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/src",
-    "DEFINES_MODULE" => "YES"
+    "DEFINES_MODULE" => should_define_modules # When the workaround is removed, set this var to "YES"
   }
 
   # Pinning to the same version as React.podspec.

package/ReactCommon/jsinspector/.clang-tidy

@@ -1,6 +0,0 @@
----
-Checks: '>
-clang-diagnostic-*,
-'
-InheritParentConfig: true
-...

package/ReactCommon/jsinspector/InspectorInterfaces.cpp

@@ -1,106 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include "InspectorInterfaces.h"
-
-#include <mutex>
-#include <tuple>
-#include <unordered_map>
-
-namespace facebook::react {
-
-// pure destructors in C++ are odd. You would think they don't want an
-// implementation, but in fact the linker requires one. Define them to be
-// empty so that people don't count on them for any particular behaviour.
-IDestructible::~IDestructible() {}
-ILocalConnection::~ILocalConnection() {}
-IRemoteConnection::~IRemoteConnection() {}
-IInspector::~IInspector() {}
-
-namespace {
-
-class InspectorImpl : public IInspector {
- public:
-  int addPage(
-      const std::string& title,
-      const std::string& vm,
-      ConnectFunc connectFunc) override;
-  void removePage(int pageId) override;
-
-  std::vector<InspectorPage> getPages() const override;
-  std::unique_ptr<ILocalConnection> connect(
-      int pageId,
-      std::unique_ptr<IRemoteConnection> remote) override;
-
- private:
-  mutable std::mutex mutex_;
-  int nextPageId_{1};
-  std::unordered_map<int, std::tuple<std::string, std::string>> titles_;
-  std::unordered_map<int, ConnectFunc> connectFuncs_;
-};
-
-int InspectorImpl::addPage(
-    const std::string& title,
-    const std::string& vm,
-    ConnectFunc connectFunc) {
-  std::scoped_lock lock(mutex_);
-
-  int pageId = nextPageId_++;
-  titles_[pageId] = std::make_tuple(title, vm);
-  connectFuncs_[pageId] = std::move(connectFunc);
-
-  return pageId;
-}
-
-void InspectorImpl::removePage(int pageId) {
-  std::scoped_lock lock(mutex_);
-
-  titles_.erase(pageId);
-  connectFuncs_.erase(pageId);
-}
-
-std::vector<InspectorPage> InspectorImpl::getPages() const {
-  std::scoped_lock lock(mutex_);
-
-  std::vector<InspectorPage> inspectorPages;
-  for (auto& it : titles_) {
-    inspectorPages.push_back(InspectorPage{
-        it.first, std::get<0>(it.second), std::get<1>(it.second)});
-  }
-
-  return inspectorPages;
-}
-
-std::unique_ptr<ILocalConnection> InspectorImpl::connect(
-    int pageId,
-    std::unique_ptr<IRemoteConnection> remote) {
-  IInspector::ConnectFunc connectFunc;
-
-  {
-    std::scoped_lock lock(mutex_);
-
-    auto it = connectFuncs_.find(pageId);
-    if (it != connectFuncs_.end()) {
-      connectFunc = it->second;
-    }
-  }
-
-  return connectFunc ? connectFunc(std::move(remote)) : nullptr;
-}
-
-} // namespace
-
-IInspector& getInspectorInstance() {
-  static InspectorImpl instance;
-  return instance;
-}
-
-std::unique_ptr<IInspector> makeTestInspectorInstance() {
-  return std::make_unique<InspectorImpl>();
-}
-
-} // namespace facebook::react