Merge pull request #2887 from reduxjs/bugfix/1.9-polyfills

reduxjs · Nov 9, 2022 · 026221a · 026221a
2 parents 69ee99a + cd7c208
commit 026221a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/packages/toolkit/src/autoBatchEnhancer.ts b/packages/toolkit/src/autoBatchEnhancer.ts
@@ -14,7 +14,13 @@ export const prepareAutoBatched =
 let promise: Promise<any>
 const queueMicrotaskShim =
   typeof queueMicrotask === 'function'
-    ? queueMicrotask.bind(typeof window !== 'undefined' ? window : global)
+    ? queueMicrotask.bind(
+        typeof window !== 'undefined'
+          ? window
+          : typeof global !== 'undefined'
+          ? global
+          : globalThis
+      )
     : // reuse resolved promise, and allocate it lazily
       (cb: () => void) =>
         (promise || (promise = Promise.resolve())).then(cb).catch((err: any) =>
@@ -23,18 +29,25 @@ const queueMicrotaskShim =
           }, 0)
         )
 
-export type AutoBatchOptions =
-  | { type: 'tick' }
-  | { type: 'timer'; timeout: number }
-  | { type: 'raf' }
-  | { type: 'callback'; queueNotification: (notify: () => void) => void }
-
 const createQueueWithTimer = (timeout: number) => {
   return (notify: () => void) => {
     setTimeout(notify, timeout)
   }
 }
 
+// requestAnimationFrame won't exist in SSR environments.
+// Fall back to a vague approximation just to keep from erroring.
+const rAF =
+  typeof window !== 'undefined' && window.requestAnimationFrame
+    ? window.requestAnimationFrame
+    : createQueueWithTimer(10)
+
+export type AutoBatchOptions =
+  | { type: 'tick' }
+  | { type: 'timer'; timeout: number }
+  | { type: 'raf' }
+  | { type: 'callback'; queueNotification: (notify: () => void) => void }
+
 /**
  * A Redux store enhancer that watches for "low-priority" actions, and delays
  * notifying subscribers until either the queued callback executes or the
@@ -73,7 +86,7 @@ export const autoBatchEnhancer =
       options.type === 'tick'
         ? queueMicrotaskShim
         : options.type === 'raf'
-        ? requestAnimationFrame
+        ? rAF
         : options.type === 'callback'
         ? options.queueNotification
         : createQueueWithTimer(options.timeout)

diff --git a/packages/toolkit/src/query/core/buildMiddleware/batchActions.ts b/packages/toolkit/src/query/core/buildMiddleware/batchActions.ts
@@ -12,7 +12,13 @@ import { createSlice, PayloadAction, AnyAction } from '@reduxjs/toolkit'
 let promise: Promise<any>
 const queueMicrotaskShim =
   typeof queueMicrotask === 'function'
-    ? queueMicrotask.bind(typeof window !== 'undefined' ? window : global)
+    ? queueMicrotask.bind(
+        typeof window !== 'undefined'
+          ? window
+          : typeof global !== 'undefined'
+          ? global
+          : globalThis
+      )
     : // reuse resolved promise, and allocate it lazily
       (cb: () => void) =>
         (promise || (promise = Promise.resolve())).then(cb).catch((err: any) =>