From b35914de386eee0183429afba1a12bdfc2bbd7dc Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Tue, 31 Oct 2023 08:26:28 -0700 Subject: [PATCH] Remove references to global.nativeExtensions (#41260) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/41260 This was introduced some experiments which are no longer relevant. Changelog: [Internal] Reviewed By: yungsters Differential Revision: D50736166 fbshipit-source-id: 7c9ff571112127e6a9e317113c05c30483626076 --- .../Libraries/BatchedBridge/NativeModules.js | 2 +- .../Libraries/Image/resolveAssetSource.js | 9 +++---- .../Libraries/Utilities/DebugEnvironment.js | 5 +--- .../Libraries/Utilities/Dimensions.js | 24 +++++++------------ .../ReactCommon/cxxreact/JSExecutor.h | 3 --- 5 files changed, 13 insertions(+), 30 deletions(-) diff --git a/packages/react-native/Libraries/BatchedBridge/NativeModules.js b/packages/react-native/Libraries/BatchedBridge/NativeModules.js index 26961d7f83..612915f6ea 100644 --- a/packages/react-native/Libraries/BatchedBridge/NativeModules.js +++ b/packages/react-native/Libraries/BatchedBridge/NativeModules.js @@ -177,7 +177,7 @@ function updateErrorWithErrorData( let NativeModules: {[moduleName: string]: $FlowFixMe, ...} = {}; if (global.nativeModuleProxy) { NativeModules = global.nativeModuleProxy; -} else if (!global.nativeExtensions) { +} else { const bridgeConfig = global.__fbBatchedBridgeConfig; invariant( bridgeConfig, diff --git a/packages/react-native/Libraries/Image/resolveAssetSource.js b/packages/react-native/Libraries/Image/resolveAssetSource.js index df18b1432c..38d36edd17 100644 --- a/packages/react-native/Libraries/Image/resolveAssetSource.js +++ b/packages/react-native/Libraries/Image/resolveAssetSource.js @@ -15,6 +15,8 @@ import type {ResolvedAssetSource} from './AssetSourceResolver'; import type {ImageSource} from './ImageSource'; +import SourceCode from '../NativeModules/specs/NativeSourceCode'; + const AssetSourceResolver = require('./AssetSourceResolver'); const {pickScale} = require('./AssetUtils'); const AssetRegistry = require('@react-native/assets-registry/registry'); @@ -27,12 +29,7 @@ function getSourceCodeScriptURL(): ?string { return _sourceCodeScriptURL; } - let sourceCode = - global.nativeExtensions && global.nativeExtensions.SourceCode; - if (!sourceCode) { - sourceCode = require('../NativeModules/specs/NativeSourceCode').default; - } - _sourceCodeScriptURL = sourceCode.getConstants().scriptURL; + _sourceCodeScriptURL = SourceCode.getConstants().scriptURL; return _sourceCodeScriptURL; } diff --git a/packages/react-native/Libraries/Utilities/DebugEnvironment.js b/packages/react-native/Libraries/Utilities/DebugEnvironment.js index 8c7c3ec422..c98093df30 100644 --- a/packages/react-native/Libraries/Utilities/DebugEnvironment.js +++ b/packages/react-native/Libraries/Utilities/DebugEnvironment.js @@ -12,8 +12,5 @@ export let isAsyncDebugging: boolean = false; if (__DEV__) { // These native interfaces don't exist in asynchronous debugging environments. - isAsyncDebugging = - !global.nativeExtensions && - !global.nativeCallSyncHook && - !global.RN$Bridgeless; + isAsyncDebugging = !global.nativeCallSyncHook && !global.RN$Bridgeless; } diff --git a/packages/react-native/Libraries/Utilities/Dimensions.js b/packages/react-native/Libraries/Utilities/Dimensions.js index 37ab1e0f92..c8748a9f04 100644 --- a/packages/react-native/Libraries/Utilities/Dimensions.js +++ b/packages/react-native/Libraries/Utilities/Dimensions.js @@ -110,21 +110,13 @@ class Dimensions { } } -let initialDims: ?$ReadOnly = - global.nativeExtensions && - global.nativeExtensions.DeviceInfo && - global.nativeExtensions.DeviceInfo.Dimensions; -if (!initialDims) { - // Subscribe before calling getConstants to make sure we don't miss any updates in between. - RCTDeviceEventEmitter.addListener( - 'didUpdateDimensions', - (update: DimensionsPayload) => { - Dimensions.set(update); - }, - ); - initialDims = NativeDeviceInfo.getConstants().Dimensions; -} - -Dimensions.set(initialDims); +// Subscribe before calling getConstants to make sure we don't miss any updates in between. +RCTDeviceEventEmitter.addListener( + 'didUpdateDimensions', + (update: DimensionsPayload) => { + Dimensions.set(update); + }, +); +Dimensions.set(NativeDeviceInfo.getConstants().Dimensions); export default Dimensions; diff --git a/packages/react-native/ReactCommon/cxxreact/JSExecutor.h b/packages/react-native/ReactCommon/cxxreact/JSExecutor.h index 0a3b4705fe..09a1ac6729 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSExecutor.h +++ b/packages/react-native/ReactCommon/cxxreact/JSExecutor.h @@ -45,9 +45,6 @@ class ExecutorDelegate { folly::dynamic&& args) = 0; }; -using NativeExtensionsProvider = - std::function; - class JSExecutorFactory { public: virtual std::unique_ptr createJSExecutor(