react-native-windows 0.78.6 → 0.79.0-preview.1

package/Libraries/Core/ExceptionsManager.js

@@ -13,7 +13,7 @@
 import type {ExtendedError} from './ExtendedError';
 import type {ExceptionData} from './NativeExceptionsManager';
 
-class SyntheticError extends Error {
+export class SyntheticError extends Error {
   name: string = '';
 }
 
@@ -62,7 +62,7 @@ function reportException(
   isFatal: boolean,
   reportToConsole: boolean, // only true when coming from handleException; the error has not yet been logged
 ) {
-  const parseErrorStack = require('./Devtools/parseErrorStack');
+  const parseErrorStack = require('./Devtools/parseErrorStack').default;
   const stack = parseErrorStack(e?.stack);
   const currentExceptionID = ++exceptionID;
   const originalMessage = e.message || '';
@@ -273,10 +273,12 @@ function installConsoleErrorReporter() {
   }
 }
 
-module.exports = {
+const ExceptionsManager = {
   decoratedExtraDataKey,
   handleException,
   installConsoleErrorReporter,
-  SyntheticError,
+  SyntheticError, // <- for backwards compatibility
   unstable_setExceptionDecorator,
 };
+
+export default ExceptionsManager;

package/Libraries/Core/InitializeCore.js

@@ -31,10 +31,13 @@ const start = Date.now();
 require('./setUpGlobals');
 require('../../src/private/setup/setUpDOM').default();
 require('./setUpPerformance');
-require('./setUpErrorHandling');
 require('./polyfillPromise');
-require('./setUpRegeneratorRuntime');
 require('./setUpTimers');
+if (__DEV__) {
+  require('./setUpReactDevTools');
+}
+require('./setUpErrorHandling');
+require('./setUpRegeneratorRuntime');
 require('./setUpXHR');
 require('./setUpAlert');
 require('./setUpNavigator');
@@ -48,7 +51,8 @@ if (__DEV__) {
 
 require('../ReactNative/AppRegistry');
 
-const GlobalPerformanceLogger = require('../Utilities/GlobalPerformanceLogger');
+const GlobalPerformanceLogger =
+  require('../Utilities/GlobalPerformanceLogger').default;
 // We could just call GlobalPerformanceLogger.markPoint at the top of the file,
 // but then we'd be excluding the time it took to require the logger.
 // Instead, we just use Date.now and backdate the timestamp.

package/Libraries/Core/NativeExceptionsManager.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../src/private/specs/modules/NativeExceptionsManager';
-import NativeExceptionsManager from '../../src/private/specs/modules/NativeExceptionsManager';
+export * from '../../src/private/specs_DEPRECATED/modules/NativeExceptionsManager';
+import NativeExceptionsManager from '../../src/private/specs_DEPRECATED/modules/NativeExceptionsManager';
 export default NativeExceptionsManager;

package/Libraries/Core/RawEventEmitter.js

@@ -12,13 +12,13 @@ import type {IEventEmitter} from '../vendor/emitter/EventEmitter';
 
 import EventEmitter from '../vendor/emitter/EventEmitter';
 
-export type RawEventEmitterEvent = $ReadOnly<{|
+export type RawEventEmitterEvent = $ReadOnly<{
   eventName: string,
   // We expect, but do not/cannot require, that nativeEvent is an object
   // with the properties: key, elementType (string), type (string), tag (numeric),
   // and a stateNode of the native element/Fiber the event was emitted to.
   nativeEvent: {[string]: mixed},
-|}>;
+}>;
 
 type RawEventDefinitions = {
   [eventChannel: string]: [RawEventEmitterEvent],

package/Libraries/Core/ReactFiberErrorDialog.js

@@ -10,7 +10,7 @@
 
 import type {ExtendedError} from './ExtendedError';
 
-import {SyntheticError, handleException} from './ExceptionsManager';
+import ExceptionsManager, {SyntheticError} from './ExceptionsManager';
 
 export type CapturedError = {
   +componentStack: string,
@@ -52,7 +52,7 @@ const ReactFiberErrorDialog = {
       // Ignored.
     }
 
-    handleException(error, false);
+    ExceptionsManager.handleException(error, false);
 
     // Return false here to prevent ReactFiberErrorLogger default behavior of
     // logging error details to console.error. Calls to console.error are

package/Libraries/Core/ReactNativeVersion.js

@@ -8,16 +8,14 @@
  * @generated by scripts/releases/set-version.js
  */
 
-const version: $ReadOnly<{
+export const version: $ReadOnly<{
   major: number,
   minor: number,
   patch: number,
   prerelease: string | null,
 }> = {
   major: 0,
-  minor: 78,
+  minor: 79,
   patch: 0,
-  prerelease: null,
+  prerelease: 'rc.0',
 };
-
-module.exports = {version};

package/Libraries/Core/ReactNativeVersionCheck.js

@@ -21,7 +21,7 @@ const ReactNativeVersion = require('./ReactNativeVersion');
  * implementations for other platforms (ex: Windows) may override this module
  * and rely on its existence as a separate module.
  */
-const checkVersions = function checkVersions(): void {
+export function checkVersions(): void {
   const nativeVersion = Platform.constants.reactNativeVersion;
   if (
     ReactNativeVersion.version.major !== nativeVersion.major ||
@@ -37,7 +37,7 @@ const checkVersions = function checkVersions(): void {
         '`watchman watch-del-all && npx react-native start --reset-cache`.',
     );
   }
-};
+}
 
 function _formatVersion(
   version: (typeof Platform)['constants']['reactNativeVersion'],
@@ -48,5 +48,3 @@ function _formatVersion(
     (version.prerelease != undefined ? `-${version.prerelease}` : '')
   );
 }
-
-module.exports = {checkVersions};

package/Libraries/Core/SegmentFetcher/NativeSegmentFetcher.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../../src/private/specs/modules/NativeSegmentFetcher';
-import NativeSegmentFetcher from '../../../src/private/specs/modules/NativeSegmentFetcher';
+export * from '../../../src/private/specs_DEPRECATED/modules/NativeSegmentFetcher';
+import NativeSegmentFetcher from '../../../src/private/specs_DEPRECATED/modules/NativeSegmentFetcher';
 export default NativeSegmentFetcher;

package/Libraries/Core/Timers/JSTimers.js

@@ -10,7 +10,7 @@
 
 import NativeTiming from './NativeTiming';
 
-const BatchedBridge = require('../../BatchedBridge/BatchedBridge');
+const BatchedBridge = require('../../BatchedBridge/BatchedBridge').default;
 const Systrace = require('../../Performance/Systrace');
 const invariant = require('invariant');
 
@@ -36,6 +36,7 @@ const IDLE_CALLBACK_FRAME_DEADLINE = 1;
 const callbacks: Array<?Function> = [];
 const types: Array<?JSTimerType> = [];
 const timerIDs: Array<?number> = [];
+const freeIdxs: Array<number> = [];
 let reactNativeMicrotasks: Array<number> = [];
 let requestIdleCallbacks: Array<number> = [];
 const requestIdleCallbackTimeouts: {[number]: number, ...} = {};
@@ -47,11 +48,11 @@ let hasEmittedTimeDriftWarning = false;
 
 // Returns a free index if one is available, and the next consecutive index otherwise.
 function _getFreeIndex(): number {
-  let freeIndex = timerIDs.indexOf(null);
-  if (freeIndex === -1) {
-    freeIndex = timerIDs.length;
+  const freeIdx = freeIdxs.pop();
+  if (freeIdx === undefined) {
+    return timerIDs.length;
   }
-  return freeIndex;
+  return freeIdx;
 }
 
 function _allocateCallback(func: Function, type: JSTimerType): number {
@@ -171,6 +172,7 @@ function _clearIndex(i: number) {
   timerIDs[i] = null;
   callbacks[i] = null;
   types[i] = null;
+  freeIdxs.push(i);
 }
 
 function _freeCallback(timerID: number) {
@@ -452,7 +454,7 @@ function setSendIdleEvents(sendIdleEvents: boolean): void {
   NativeTiming.setSendIdleEvents(sendIdleEvents);
 }
 
-let ExportedJSTimers: {|
+let ExportedJSTimers: {
   callIdleCallbacks: (frameTime: number) => any | void,
   callReactNativeMicrotasks: () => void,
   callTimers: (timersToCall: Array<number>) => any | void,
@@ -467,7 +469,7 @@ let ExportedJSTimers: {|
   queueReactNativeMicrotask: (func: any, ...args: any) => number,
   setInterval: (func: any, duration: number, ...args: any) => number,
   setTimeout: (func: any, duration: number, ...args: any) => number,
-|};
+};
 
 if (!NativeTiming) {
   console.warn("Timing native module is not available, can't set timers.");
@@ -484,4 +486,4 @@ BatchedBridge.setReactNativeMicrotasksCallback(
   JSTimers.callReactNativeMicrotasks,
 );
 
-module.exports = ExportedJSTimers;
+export default ExportedJSTimers;

package/Libraries/Core/Timers/NativeTiming.js

@@ -8,6 +8,6 @@
  * @format
  */
 
-export * from '../../../src/private/specs/modules/NativeTiming';
-import NativeTiming from '../../../src/private/specs/modules/NativeTiming';
+export * from '../../../src/private/specs_DEPRECATED/modules/NativeTiming';
+import NativeTiming from '../../../src/private/specs_DEPRECATED/modules/NativeTiming';
 export default NativeTiming;

package/Libraries/Core/Timers/immediateShim.js

@@ -21,7 +21,7 @@ const clearedImmediates: Set<number> = new Set();
  * @param {function} func Callback to be invoked before the end of the
  * current JavaScript execution loop.
  */
-function setImmediate(callback: Function, ...args: any): number {
+export function setImmediate(callback: Function, ...args: any): number {
   if (arguments.length < 1) {
     throw new TypeError(
       'setImmediate must be called with at least one argument (a function to call)',
@@ -56,13 +56,6 @@ function setImmediate(callback: Function, ...args: any): number {
 /**
  * @param {number} immediateID The ID of the immediate to be clearred.
  */
-function clearImmediate(immediateID: number) {
+export function clearImmediate(immediateID: number) {
   clearedImmediates.add(immediateID);
 }
-
-const immediateShim = {
-  setImmediate: setImmediate,
-  clearImmediate: clearImmediate,
-};
-
-module.exports = immediateShim;

package/Libraries/Core/polyfillPromise.js

@@ -34,5 +34,5 @@ if (global?.HermesInternal?.hasPromise?.()) {
     );
   }
 } else {
-  polyfillGlobal('Promise', () => require('../Promise'));
+  polyfillGlobal('Promise', () => require('../Promise').default);
 }

package/Libraries/Core/registerCallableModule.js

@@ -28,7 +28,7 @@ const registerCallableModule: RegisterCallableModule = (function () {
     };
   }
 
-  const BatchedBridge = require('../BatchedBridge/BatchedBridge');
+  const BatchedBridge = require('../BatchedBridge/BatchedBridge').default;
   return (name, moduleOrFactory) => {
     if (typeof moduleOrFactory === 'function') {
       BatchedBridge.registerLazyCallableModule(name, moduleOrFactory);

package/Libraries/Core/setUpAlert.js

@@ -18,6 +18,6 @@ if (!global.alert) {
   global.alert = function (text: string) {
     // Require Alert on demand. Requiring it too early can lead to issues
     // with things like Platform not being fully initialized.
-    require('../Alert/Alert').alert('Alert', '' + text);
+    require('../Alert/Alert').default.alert('Alert', '' + text);
   };
 }

package/Libraries/Core/setUpBatchedBridge.js

@@ -14,22 +14,27 @@ import registerModule from './registerCallableModule';
 
 registerModule('Systrace', () => require('../Performance/Systrace'));
 if (!(global.RN$Bridgeless === true)) {
-  registerModule('JSTimers', () => require('./Timers/JSTimers'));
+  registerModule('JSTimers', () => require('./Timers/JSTimers').default);
 }
-registerModule('RCTLog', () => require('../Utilities/RCTLog'));
+registerModule('RCTLog', () => require('../Utilities/RCTLog').default);
 registerModule(
   'RCTDeviceEventEmitter',
   () => require('../EventEmitter/RCTDeviceEventEmitter').default,
 );
-registerModule('RCTNativeAppEventEmitter', () =>
-  require('../EventEmitter/RCTNativeAppEventEmitter'),
+registerModule(
+  'RCTNativeAppEventEmitter',
+  () => require('../EventEmitter/RCTNativeAppEventEmitter').default,
 );
-registerModule('GlobalPerformanceLogger', () =>
-  require('../Utilities/GlobalPerformanceLogger'),
+registerModule(
+  'GlobalPerformanceLogger',
+  () => require('../Utilities/GlobalPerformanceLogger').default,
 );
 
 if (__DEV__) {
-  registerModule('HMRClient', () => require('../Utilities/HMRClient'));
+  registerModule('HMRClient', () => require('../Utilities/HMRClient').default);
 } else {
-  registerModule('HMRClient', () => require('../Utilities/HMRClientProdShim'));
+  registerModule(
+    'HMRClient',
+    () => require('../Utilities/HMRClientProdShim').default,
+  );
 }

package/Libraries/Core/setUpDeveloperTools.js

@@ -17,30 +17,8 @@ declare var console: {[string]: $FlowFixMe};
  * You can use this module directly, or just require InitializeCore.
  */
 if (__DEV__) {
-  require('./setUpReactDevTools');
-
-  // Set up inspector
-  const JSInspector = require('../JSInspector/JSInspector');
-  JSInspector.registerAgent(require('../JSInspector/NetworkAgent'));
-
-  // Note we can't check if console is "native" because it would appear "native" in JSC and Hermes.
-  // We also can't check any properties that don't exist in the Chrome worker environment.
-  // So we check a navigator property that's set to a particular value ("Netscape") in all real browsers.
-  const isLikelyARealBrowser =
-    global.navigator != null &&
-    /*              _
-     *             | |
-     *   _ __   ___| |_ ___  ___ __ _ _ __   ___
-     *  | '_ \ / _ \ __/ __|/ __/ _` | '_ \ / _ \
-     *  | | | |  __/ |_\__ \ (_| (_| | |_) |  __/
-     *  |_| |_|\___|\__|___/\___\__,_| .__/ \___|
-     *                               | |
-     *                               |_|
-     */
-    global.navigator.appName === 'Netscape'; // Any real browser
-
   if (!Platform.isTesting) {
-    const HMRClient = require('../Utilities/HMRClient');
+    const HMRClient = require('../Utilities/HMRClient').default;
 
     // TODO(T214991636): Remove legacy Metro log forwarding
     if (console._isPolyfilled) {
@@ -62,21 +40,11 @@ if (__DEV__) {
           originalFunction.apply(console, args);
         };
       });
-    } else {
-      // We assume the environment has a real rich console (like Chrome), and don't hijack it to log to Metro.
-      // It's likely the developer is using rich console to debug anyway, and hijacking it would
-      // lose the filenames in console.log calls: https://github.com/facebook/react-native/issues/26788.
-      HMRClient.log('log', [
-        `JavaScript logs will appear in your ${
-          isLikelyARealBrowser ? 'browser' : 'environment'
-        } console`,
-      ]);
     }
   }
 
   require('./setUpReactRefresh');
 
-  global[
-    `${global.__METRO_GLOBAL_PREFIX__ ?? ''}__loadBundleAsync`
-  ] = require('./Devtools/loadBundleFromServer');
+  global[`${global.__METRO_GLOBAL_PREFIX__ ?? ''}__loadBundleAsync`] =
+    require('./Devtools/loadBundleFromServer').default;
 }

package/Libraries/Core/setUpErrorHandling.js

@@ -15,7 +15,7 @@ if (global.RN$useAlwaysAvailableJSErrorHandling !== true) {
    * Sets up the console and exception handling (redbox) for React Native.
    * You can use this module directly, or just require InitializeCore.
    */
-  const ExceptionsManager = require('./ExceptionsManager');
+  const ExceptionsManager = require('./ExceptionsManager').default;
   ExceptionsManager.installConsoleErrorReporter();
 
   // Set up error handler
@@ -29,7 +29,7 @@ if (global.RN$useAlwaysAvailableJSErrorHandling !== true) {
       }
     };
 
-    const ErrorUtils = require('../vendor/core/ErrorUtils');
+    const ErrorUtils = require('../vendor/core/ErrorUtils').default;
     ErrorUtils.setGlobalHandler(handleError);
   }
 }

package/Libraries/Core/setUpReactDevTools.js

@@ -13,6 +13,22 @@
 import type {Domain} from '../../src/private/debugging/setUpFuseboxReactDevToolsDispatcher';
 import type {Spec as NativeReactDevToolsRuntimeSettingsModuleSpec} from '../../src/private/fusebox/specs/NativeReactDevToolsRuntimeSettingsModule';
 
+if (__DEV__) {
+  if (typeof global.queueMicrotask !== 'function') {
+    console.error(
+      'queueMicrotask should exist before setting up React DevTools.',
+    );
+  }
+
+  // Keep in sync with ExceptionsManager/installConsoleErrorReporter
+  // $FlowExpectedError[prop-missing]
+  if (console._errorOriginal != null) {
+    console.error(
+      'ExceptionsManager should be set up after React DevTools to avoid console.error arguments mutation',
+    );
+  }
+}
+
 if (__DEV__) {
   // Register dispatcher on global, which can be used later by Chrome DevTools frontend
   require('../../src/private/debugging/setUpFuseboxReactDevToolsDispatcher');
@@ -54,8 +70,9 @@ if (__DEV__) {
   const reactDevToolsFuseboxGlobalBindingName =
     fuseboxReactDevToolsDispatcher.BINDING_NAME;
 
-  const ReactNativeStyleAttributes = require('../Components/View/ReactNativeStyleAttributes');
-  const resolveRNStyle = require('../StyleSheet/flattenStyle');
+  const ReactNativeStyleAttributes =
+    require('../Components/View/ReactNativeStyleAttributes').default;
+  const resolveRNStyle = require('../StyleSheet/flattenStyle').default;
 
   function handleReactDevToolsSettingsUpdate(settings: Object) {
     reactDevToolsSettingsManager.setGlobalHookSettings(
@@ -114,8 +131,8 @@ if (__DEV__) {
     // not when debugging in chrome
     // TODO(t12832058) This check is broken
     if (!window.document) {
-      const AppState = require('../AppState/AppState');
-      const getDevServer = require('./Devtools/getDevServer');
+      const AppState = require('../AppState/AppState').default;
+      const getDevServer = require('./Devtools/getDevServer').default;
 
       // Don't steal the DevTools from currently active app.
       // Note: if you add any AppState subscriptions to this file,
@@ -135,11 +152,13 @@ if (__DEV__) {
       // Read the optional global variable for backward compatibility.
       // It was added in https://github.com/facebook/react-native/commit/bf2b435322e89d0aeee8792b1c6e04656c2719a0.
       const port =
+        // $FlowFixMe[prop-missing]
+        // $FlowFixMe[incompatible-use]
         window.__REACT_DEVTOOLS_PORT__ != null
           ? window.__REACT_DEVTOOLS_PORT__
           : 8097;
 
-      const WebSocket = require('../WebSocket/WebSocket');
+      const WebSocket = require('../WebSocket/WebSocket').default;
       ws = new WebSocket('ws://' + host + ':' + port);
       ws.addEventListener('close', event => {
         isWebSocketOpen = false;
@@ -192,7 +211,8 @@ if (__DEV__) {
   );
 
   // 3. Fallback to attempting to connect WS-based RDT frontend
-  const RCTNativeAppEventEmitter = require('../EventEmitter/RCTNativeAppEventEmitter');
+  const RCTNativeAppEventEmitter =
+    require('../EventEmitter/RCTNativeAppEventEmitter').default;
   RCTNativeAppEventEmitter.addListener(
     'RCTDevMenuShown',
     connectToWSBasedReactDevToolsFrontend,

package/Libraries/Core/setUpReactRefresh.js

@@ -11,7 +11,7 @@
 'use strict';
 
 if (__DEV__) {
-  const DevSettings = require('../Utilities/DevSettings');
+  const DevSettings = require('../Utilities/DevSettings').default;
 
   if (typeof DevSettings.reload !== 'function') {
     throw new Error('Could not find the reload() implementation.');

package/Libraries/Core/setUpTimers.js

@@ -10,9 +10,6 @@
 
 'use strict';
 
-const ReactNativeFeatureFlags = require('../../src/private/featureflags/ReactNativeFeatureFlags');
-const NativeReactNativeFeatureFlags =
-  require('../../src/private/featureflags/specs/NativeReactNativeFeatureFlags').default;
 const {polyfillGlobal} = require('../Utilities/PolyfillFunctions');
 
 if (__DEV__) {
@@ -21,19 +18,46 @@ if (__DEV__) {
   }
 }
 
-const isEventLoopEnabled = (() => {
-  if (NativeReactNativeFeatureFlags == null) {
-    return false;
-  }
+// In bridgeless mode, timers are host functions installed from cpp.
+if (global.RN$Bridgeless === true) {
+  // This is the flag that tells React to use `queueMicrotask` to batch state
+  // updates, instead of using the scheduler to schedule a regular task.
+  // We use a global variable because we don't currently have any other
+  // mechanism to pass feature flags from RN to React in OSS.
+  global.RN$enableMicrotasksInReact = true;
 
-  return (
-    ReactNativeFeatureFlags.enableBridgelessArchitecture() &&
-    !ReactNativeFeatureFlags.disableEventLoopOnBridgeless()
+  polyfillGlobal(
+    'queueMicrotask',
+    () =>
+      require('../../src/private/webapis/microtasks/specs/NativeMicrotasks')
+        .default.queueMicrotask,
   );
-})();
 
-// In bridgeless mode, timers are host functions installed from cpp.
-if (global.RN$Bridgeless !== true) {
+  // We shim the immediate APIs via `queueMicrotask` to maintain the backward
+  // compatibility.
+  polyfillGlobal(
+    'setImmediate',
+    () => require('./Timers/immediateShim').setImmediate,
+  );
+  polyfillGlobal(
+    'clearImmediate',
+    () => require('./Timers/immediateShim').clearImmediate,
+  );
+
+  polyfillGlobal(
+    'requestIdleCallback',
+    () =>
+      require('../../src/private/webapis/idlecallbacks/specs/NativeIdleCallbacks')
+        .default.requestIdleCallback,
+  );
+
+  polyfillGlobal(
+    'cancelIdleCallback',
+    () =>
+      require('../../src/private/webapis/idlecallbacks/specs/NativeIdleCallbacks')
+        .default.cancelIdleCallback,
+  );
+} else {
   /**
    * Set up timers.
    * You can use this module directly, or just require InitializeCore.
@@ -49,7 +73,7 @@ if (global.RN$Bridgeless !== true) {
       | 'setInterval'
       | 'setTimeout',
   ) => {
-    polyfillGlobal(name, () => require('./Timers/JSTimers')[name]);
+    polyfillGlobal(name, () => require('./Timers/JSTimers').default[name]);
   };
   defineLazyTimer('setTimeout');
   defineLazyTimer('clearTimeout');
@@ -59,67 +83,22 @@ if (global.RN$Bridgeless !== true) {
   defineLazyTimer('cancelAnimationFrame');
   defineLazyTimer('requestIdleCallback');
   defineLazyTimer('cancelIdleCallback');
-} else if (isEventLoopEnabled) {
-  polyfillGlobal(
-    'requestIdleCallback',
-    () =>
-      require('../../src/private/webapis/idlecallbacks/specs/NativeIdleCallbacks')
-        .default.requestIdleCallback,
-  );
-
-  polyfillGlobal(
-    'cancelIdleCallback',
-    () =>
-      require('../../src/private/webapis/idlecallbacks/specs/NativeIdleCallbacks')
-        .default.cancelIdleCallback,
-  );
-}
-
-// We need to check if the native module is available before accessing the
-// feature flag, because otherwise the API would throw an error in the legacy
-// architecture in OSS, where the native module isn't available.
-if (isEventLoopEnabled) {
-  // This is the flag that tells React to use `queueMicrotask` to batch state
-  // updates, instead of using the scheduler to schedule a regular task.
-  // We use a global variable because we don't currently have any other
-  // mechanism to pass feature flags from RN to React in OSS.
-  global.RN$enableMicrotasksInReact = true;
 
+  // Polyfill it with promise (regardless it's polyfilled or native) otherwise.
   polyfillGlobal(
     'queueMicrotask',
-    () =>
-      require('../../src/private/webapis/microtasks/specs/NativeMicrotasks')
-        .default.queueMicrotask,
+    () => require('./Timers/queueMicrotask.js').default,
   );
 
-  // We shim the immediate APIs via `queueMicrotask` to maintain the backward
-  // compatibility.
+  // When promise was polyfilled hence is queued to the RN microtask queue,
+  // we polyfill the immediate APIs as aliases to the ReactNativeMicrotask APIs.
+  // Note that in bridgeless mode, immediate APIs are installed from cpp.
   polyfillGlobal(
     'setImmediate',
-    () => require('./Timers/immediateShim').setImmediate,
+    () => require('./Timers/JSTimers').default.queueReactNativeMicrotask,
   );
   polyfillGlobal(
     'clearImmediate',
-    () => require('./Timers/immediateShim').clearImmediate,
-  );
-} else {
-  // Polyfill it with promise (regardless it's polyfilled or native) otherwise.
-  polyfillGlobal(
-    'queueMicrotask',
-    () => require('./Timers/queueMicrotask.js').default,
+    () => require('./Timers/JSTimers').default.clearReactNativeMicrotask,
   );
-
-  // When promise was polyfilled hence is queued to the RN microtask queue,
-  // we polyfill the immediate APIs as aliases to the ReactNativeMicrotask APIs.
-  // Note that in bridgeless mode, immediate APIs are installed from cpp.
-  if (global.RN$Bridgeless !== true) {
-    polyfillGlobal(
-      'setImmediate',
-      () => require('./Timers/JSTimers').queueReactNativeMicrotask,
-    );
-    polyfillGlobal(
-      'clearImmediate',
-      () => require('./Timers/JSTimers').clearReactNativeMicrotask,
-    );
-  }
 }