From b9adf95f39e6906ed4e60dc1c5b16d9ed1ce404b Mon Sep 17 00:00:00 2001 From: D N <4661784+retyui@users.noreply.github.com> Date: Wed, 16 Sep 2026 04:19:13 -0700 Subject: [PATCH] fix: use ES import for Platform instead of require (#58453) Summary: Previously, the Metro inline plugin for `Platform` didn't work inside React Native files that used ES imports for `Platform` (making `require()` the only way for the inline plugin to do its job). Read more: https://github.com/react/metro/pull/1521#issuecomment-4281839470 Since the inline plugin was moved from `metro` to `react-native-babel-preset` (PR: https://github.com/react/react-native/pull/57848), this issue has been resolved, so using `require()` is no longer necessary. ## Changelog: [INTERNAL] [CHANGED] - Use ES module imports for Platform API Pull Request resolved: https://github.com/react/react-native/pull/58453 Test Plan: ... Reviewed By: cipolleschi Differential Revision: D120122290 Pulled By: vzaidman fbshipit-source-id: 560efc01ee2f9bfeb6f087efc8946f55ff234dad --- .../Libraries/Components/RefreshControl/RefreshControl.js | 3 +-- .../Libraries/Components/TextInput/TextInputState.js | 2 +- packages/react-native/Libraries/Image/AssetSourceResolver.js | 3 ++- packages/react-native/Libraries/Lists/FlatList.js | 2 +- packages/react-native/Libraries/Modal/Modal.js | 2 +- .../Libraries/PermissionsAndroid/PermissionsAndroid.js | 3 +-- packages/react-native/Libraries/ReactNative/PaperUIManager.js | 2 +- packages/react-native/Libraries/Share/Share.js | 2 +- packages/react-native/Libraries/StyleSheet/processColor.js | 3 ++- packages/react-native/Libraries/Utilities/HMRClient.js | 2 +- packages/react-native/Libraries/Vibration/Vibration.js | 3 +-- 11 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/react-native/Libraries/Components/RefreshControl/RefreshControl.js b/packages/react-native/Libraries/Components/RefreshControl/RefreshControl.js index 437a83b3f1e..c6cdc260161 100644 --- a/packages/react-native/Libraries/Components/RefreshControl/RefreshControl.js +++ b/packages/react-native/Libraries/Components/RefreshControl/RefreshControl.js @@ -11,6 +11,7 @@ import type {ColorValue} from '../../StyleSheet/StyleSheet'; import type {ViewProps} from '../View/ViewPropTypes'; +import Platform from '../../Utilities/Platform'; import AndroidSwipeRefreshLayoutNativeComponent, { Commands as AndroidSwipeRefreshLayoutCommands, } from './AndroidSwipeRefreshLayoutNativeComponent'; @@ -19,8 +20,6 @@ import PullToRefreshViewNativeComponent, { } from './PullToRefreshViewNativeComponent'; import * as React from 'react'; -const Platform = require('../../Utilities/Platform').default; - export type RefreshControlPropsIOS = Readonly<{ /** * The color of the refresh indicator. diff --git a/packages/react-native/Libraries/Components/TextInput/TextInputState.js b/packages/react-native/Libraries/Components/TextInput/TextInputState.js index 9ef598defee..7df793453ff 100644 --- a/packages/react-native/Libraries/Components/TextInput/TextInputState.js +++ b/packages/react-native/Libraries/Components/TextInput/TextInputState.js @@ -16,9 +16,9 @@ import type {HostInstance} from '../../../src/private/types/HostInstance'; import {Commands as AndroidTextInputCommands} from '../../Components/TextInput/AndroidTextInputNativeComponent'; import {Commands as iOSTextInputCommands} from '../../Components/TextInput/RCTSingelineTextInputNativeComponent'; +import Platform from '../../Utilities/Platform'; const {findNodeHandle} = require('../../ReactNative/RendererProxy'); -const Platform = require('../../Utilities/Platform').default; let currentlyFocusedInputRef: ?HostInstance = null; const inputs = new Set(); diff --git a/packages/react-native/Libraries/Image/AssetSourceResolver.js b/packages/react-native/Libraries/Image/AssetSourceResolver.js index b508160c33c..e804cd1dc80 100644 --- a/packages/react-native/Libraries/Image/AssetSourceResolver.js +++ b/packages/react-native/Libraries/Image/AssetSourceResolver.js @@ -15,8 +15,9 @@ import type { PackagerAsset, } from '../../src/private/assets/AssetRegistry'; +import Platform from '../Utilities/Platform'; + const PixelRatio = require('../Utilities/PixelRatio').default; -const Platform = require('../Utilities/Platform').default; const {pickScale} = require('./AssetUtils'); const { getAndroidResourceFolderName, diff --git a/packages/react-native/Libraries/Lists/FlatList.js b/packages/react-native/Libraries/Lists/FlatList.js index cf9697226e2..c2770b947b4 100644 --- a/packages/react-native/Libraries/Lists/FlatList.js +++ b/packages/react-native/Libraries/Lists/FlatList.js @@ -21,13 +21,13 @@ import type { import * as ReactNativeFeatureFlags from '../../src/private/featureflags/ReactNativeFeatureFlags'; import {type ScrollResponderType} from '../Components/ScrollView/ScrollView'; import View from '../Components/View/View'; +import Platform from '../Utilities/Platform'; import VirtualizedLists from '@react-native/virtualized-lists'; import memoizeOne from 'memoize-one'; import * as React from 'react'; const StyleSheet = require('../StyleSheet/StyleSheet').default; const deepDiffer = require('../Utilities/differ/deepDiffer').default; -const Platform = require('../Utilities/Platform').default; const invariant = require('invariant'); const VirtualizedList = VirtualizedLists.VirtualizedList; diff --git a/packages/react-native/Libraries/Modal/Modal.js b/packages/react-native/Libraries/Modal/Modal.js index 66a9343eaa8..31a7cb64bc0 100644 --- a/packages/react-native/Libraries/Modal/Modal.js +++ b/packages/react-native/Libraries/Modal/Modal.js @@ -14,6 +14,7 @@ import type {RootTag} from '../ReactNative/RootTag'; import type {DirectEventHandler} from '../Types/CodegenTypes'; import {type ColorValue} from '../StyleSheet/StyleSheet'; +import Platform from '../Utilities/Platform'; import RCTModalHostView from './RCTModalHostViewNativeComponent'; import VirtualizedLists from '@react-native/virtualized-lists'; import * as React from 'react'; @@ -24,7 +25,6 @@ const AppContainer = require('../ReactNative/AppContainer').default; const I18nManager = require('../ReactNative/I18nManager').default; const {RootTagContext} = require('../ReactNative/RootTag'); const StyleSheet = require('../StyleSheet/StyleSheet').default; -const Platform = require('../Utilities/Platform').default; const VirtualizedListContextResetter = VirtualizedLists.VirtualizedListContextResetter; diff --git a/packages/react-native/Libraries/PermissionsAndroid/PermissionsAndroid.js b/packages/react-native/Libraries/PermissionsAndroid/PermissionsAndroid.js index 51358be3e5d..ce5eeb4699d 100644 --- a/packages/react-native/Libraries/PermissionsAndroid/PermissionsAndroid.js +++ b/packages/react-native/Libraries/PermissionsAndroid/PermissionsAndroid.js @@ -11,11 +11,10 @@ import type {DialogOptions} from '../../src/private/specs_DEPRECATED/modules/NativeDialogManagerAndroid'; import NativeDialogManagerAndroid from '../NativeModules/specs/NativeDialogManagerAndroid'; +import Platform from '../Utilities/Platform'; import NativePermissionsAndroid from './NativePermissionsAndroid'; import invariant from 'invariant'; -const Platform = require('../Utilities/Platform').default; - export type Rationale = { title: string, message: string, diff --git a/packages/react-native/Libraries/ReactNative/PaperUIManager.js b/packages/react-native/Libraries/ReactNative/PaperUIManager.js index 151b06fe457..ea0850ee3f4 100644 --- a/packages/react-native/Libraries/ReactNative/PaperUIManager.js +++ b/packages/react-native/Libraries/ReactNative/PaperUIManager.js @@ -12,13 +12,13 @@ import type {RootTag} from '../Types/RootTagTypes'; import type {UIManagerJSInterface} from '../Types/UIManagerJSInterface'; import type {UIManagerConstants, ViewManagerConfig} from './NativeUIManager'; +import Platform from '../Utilities/Platform'; import NativeUIManager from './NativeUIManager'; import nullthrows from 'nullthrows'; const NativeModules = require('../BatchedBridge/NativeModules').default; const defineLazyObjectProperty = require('../Utilities/defineLazyObjectProperty').default; -const Platform = require('../Utilities/Platform').default; const UIManagerProperties = require('./UIManagerProperties').default; const viewManagerConfigs: {[string]: ViewManagerConfig | null} = {}; diff --git a/packages/react-native/Libraries/Share/Share.js b/packages/react-native/Libraries/Share/Share.js index d431168ac72..a74d0401c1d 100644 --- a/packages/react-native/Libraries/Share/Share.js +++ b/packages/react-native/Libraries/Share/Share.js @@ -11,10 +11,10 @@ import type {ColorValue} from '../StyleSheet/StyleSheet'; import NativeActionSheetManager from '../ActionSheetIOS/NativeActionSheetManager'; +import Platform from '../Utilities/Platform'; import NativeShareModule from './NativeShareModule'; const processColor = require('../StyleSheet/processColor').default; -const Platform = require('../Utilities/Platform').default; const invariant = require('invariant'); export type ShareContent = diff --git a/packages/react-native/Libraries/StyleSheet/processColor.js b/packages/react-native/Libraries/StyleSheet/processColor.js index e2a2bf51190..2082e178b2e 100644 --- a/packages/react-native/Libraries/StyleSheet/processColor.js +++ b/packages/react-native/Libraries/StyleSheet/processColor.js @@ -12,7 +12,8 @@ import type {ColorValue, NativeColorValue} from './StyleSheet'; -const Platform = require('../Utilities/Platform').default; +import Platform from '../Utilities/Platform'; + const normalizeColor = require('./normalizeColor').default; export type ProcessedColorValue = number | NativeColorValue; diff --git a/packages/react-native/Libraries/Utilities/HMRClient.js b/packages/react-native/Libraries/Utilities/HMRClient.js index c42b3feaca7..5b3a91f2ac9 100644 --- a/packages/react-native/Libraries/Utilities/HMRClient.js +++ b/packages/react-native/Libraries/Utilities/HMRClient.js @@ -13,9 +13,9 @@ import type {ExtendedError} from '../Core/ExtendedError'; import getDevServer from '../Core/Devtools/getDevServer'; import LogBox from '../LogBox/LogBox'; import NativeRedBox from '../NativeModules/specs/NativeRedBox'; +import Platform from './Platform'; const DevSettings = require('./DevSettings').default; -const Platform = require('./Platform').default; const invariant = require('invariant'); const MetroHMRClient = require('metro-runtime/src/modules/HMRClient'); const prettyFormat = require('pretty-format'); diff --git a/packages/react-native/Libraries/Vibration/Vibration.js b/packages/react-native/Libraries/Vibration/Vibration.js index 2f9f88bd298..2fe6beb7699 100644 --- a/packages/react-native/Libraries/Vibration/Vibration.js +++ b/packages/react-native/Libraries/Vibration/Vibration.js @@ -8,10 +8,9 @@ * @format */ +import Platform from '../Utilities/Platform'; import NativeVibration from './NativeVibration'; -const Platform = require('../Utilities/Platform').default; - let _vibrating: boolean = false; let _id: number = 0; // _id is necessary to prevent race condition. const _default_vibration_length = 400;