Skip to content

Commit eeb1325

Browse files
authored
Fix UMD bundles by removing usage of global (#20743)
1 parent 4e08fb1 commit eeb1325

File tree

11 files changed

+18
-16
lines changed

11 files changed

+18
-16
lines changed

packages/react-art/src/ReactARTHostConfig.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ export function getChildHostContext() {
330330
export const scheduleTimeout = setTimeout;
331331
export const cancelTimeout = clearTimeout;
332332
export const noTimeout = -1;
333-
export function queueMicrotask(callback: Function) {
333+
export function scheduleMicrotask(callback: Function) {
334334
invariant(false, 'Not implemented.');
335335
}
336336

packages/react-dom/src/client/ReactDOMHostConfig.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,9 @@ export const scheduleTimeout: any =
384384
export const cancelTimeout: any =
385385
typeof clearTimeout === 'function' ? clearTimeout : (undefined: any);
386386
export const noTimeout = -1;
387-
export const queueMicrotask: any =
388-
typeof global.queueMicrotask === 'function'
389-
? global.queueMicrotask
387+
export const scheduleMicrotask: any =
388+
typeof queueMicrotask === 'function'
389+
? queueMicrotask
390390
: typeof Promise !== 'undefined'
391391
? callback =>
392392
Promise.resolve(null)

packages/react-native-renderer/src/ReactFabricHostConfig.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ export const warnsIfNotActing = false;
348348
export const scheduleTimeout = setTimeout;
349349
export const cancelTimeout = clearTimeout;
350350
export const noTimeout = -1;
351-
export function queueMicrotask(callback: Function) {
351+
export function scheduleMicrotask(callback: Function) {
352352
invariant(false, 'Not implemented.');
353353
}
354354

packages/react-native-renderer/src/ReactNativeHostConfig.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ export const warnsIfNotActing = true;
247247
export const scheduleTimeout = setTimeout;
248248
export const cancelTimeout = clearTimeout;
249249
export const noTimeout = -1;
250-
export function queueMicrotask(callback: Function) {
250+
export function scheduleMicrotask(callback: Function) {
251251
invariant(false, 'Not implemented.');
252252
}
253253

packages/react-noop-renderer/src/createReactNoop.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {
371371
scheduleTimeout: setTimeout,
372372
cancelTimeout: clearTimeout,
373373
noTimeout: -1,
374-
queueMicrotask:
374+
scheduleMicrotask:
375375
typeof queueMicrotask === 'function'
376376
? queueMicrotask
377377
: typeof Promise !== 'undefined'

packages/react-reconciler/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ You can proxy this to `clearTimeout` or its equivalent in your environment.
203203

204204
This is a property (not a function) that should be set to something that can never be a valid timeout ID. For example, you can set it to `-1`.
205205

206-
#### `queueMicrotask(fn)`
206+
#### `scheduleMicrotask(fn)`
207207

208208
You can proxy this to `queueMicrotask` or its equivalent in your environment.
209209

packages/react-reconciler/src/ReactFiberWorkLoop.new.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ import {
9292
warnsIfNotActing,
9393
afterActiveInstanceBlur,
9494
clearContainer,
95-
queueMicrotask,
95+
scheduleMicrotask,
9696
} from './ReactFiberHostConfig';
9797

9898
import {
@@ -766,7 +766,7 @@ function ensureRootIsScheduled(root: FiberRoot, currentTime: number) {
766766
enableDiscreteEventMicroTasks &&
767767
newCallbackPriority === InputDiscreteLanePriority
768768
) {
769-
queueMicrotask(performSyncWorkOnRoot.bind(null, root));
769+
scheduleMicrotask(performSyncWorkOnRoot.bind(null, root));
770770
newCallbackNode = null;
771771
} else {
772772
const schedulerPriorityLevel = lanePriorityToSchedulerPriority(

packages/react-reconciler/src/ReactFiberWorkLoop.old.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ import {
9292
warnsIfNotActing,
9393
afterActiveInstanceBlur,
9494
clearContainer,
95-
queueMicrotask,
95+
scheduleMicrotask,
9696
} from './ReactFiberHostConfig';
9797

9898
import {
@@ -766,7 +766,7 @@ function ensureRootIsScheduled(root: FiberRoot, currentTime: number) {
766766
enableDiscreteEventMicroTasks &&
767767
newCallbackPriority === InputDiscreteLanePriority
768768
) {
769-
queueMicrotask(performSyncWorkOnRoot.bind(null, root));
769+
scheduleMicrotask(performSyncWorkOnRoot.bind(null, root));
770770
newCallbackNode = null;
771771
} else {
772772
const schedulerPriorityLevel = lanePriorityToSchedulerPriority(

packages/react-reconciler/src/forks/ReactFiberHostConfig.custom.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const shouldSetTextContent = $$$hostConfig.shouldSetTextContent;
5454
export const createTextInstance = $$$hostConfig.createTextInstance;
5555
export const scheduleTimeout = $$$hostConfig.scheduleTimeout;
5656
export const cancelTimeout = $$$hostConfig.cancelTimeout;
57-
export const queueMicrotask = $$$hostConfig.queueMicrotask;
57+
export const scheduleMicrotask = $$$hostConfig.scheduleMicrotask;
5858
export const noTimeout = $$$hostConfig.noTimeout;
5959
export const now = $$$hostConfig.now;
6060
export const isPrimaryRenderer = $$$hostConfig.isPrimaryRenderer;

packages/react-test-renderer/src/ReactTestHostConfig.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ export const warnsIfNotActing = true;
220220

221221
export const scheduleTimeout = setTimeout;
222222
export const cancelTimeout = clearTimeout;
223-
export const queueMicrotask =
224-
typeof global.queueMicrotask === 'function'
225-
? global.queueMicrotask
223+
export const scheduleMicrotask =
224+
typeof queueMicrotask === 'function'
225+
? queueMicrotask
226226
: typeof Promise !== 'undefined'
227227
? (callback: Function) =>
228228
Promise.resolve(null)

scripts/flow/environment.js

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ declare var __REACT_DEVTOOLS_GLOBAL_HOOK__: any; /*?{
1818
inject: ?((stuff: Object) => void)
1919
};*/
2020

21+
declare var queueMicrotask: (fn: Function) => void;
22+
2123
declare module 'create-react-class' {
2224
declare var exports: React$CreateClass;
2325
}

0 commit comments

Comments
 (0)