Merge pull request #2104 from reduxjs/feature/9.0-remove-batching

package.json

@@ -14,20 +14,21 @@
   "bugs": "https://github.com/reduxjs/react-redux/issues",
   "module": "dist/react-redux.legacy-esm.js",
   "main": "dist/cjs/index.js",
-  "react-native": "./dist/react-redux.react-native.js",
+  "react-native": "./dist/react-redux.legacy-esm.js",
   "types": "dist/react-redux.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
       "types": "./dist/react-redux.d.ts",
       "react-server": "./dist/rsc.mjs",
-      "react-native": "./dist/react-redux.react-native.js",
+      "react-native": "./dist/react-redux.legacy-esm.js",
       "import": "./dist/react-redux.mjs",
       "default": "./dist/cjs/index.js"
     },
     "./alternate-renderers": {
       "types": "./dist/react-redux.d.ts",
-      "import": "./dist/react-redux.alternate-renderers.mjs"
+      "import": "./dist/react-redux.mjs",
+      "default": "./dist/cjs/index.js"
     }
   },
   "sideEffects": false,

src/exports.ts

@@ -28,6 +28,7 @@ import { useStore, createStoreHook } from './hooks/useStore'
 
 import shallowEqual from './utils/shallowEqual'
 import type { Subscription } from './utils/Subscription'
+import { defaultNoopBatch } from './utils/batch'
 
 export * from './types'
 export type {
@@ -49,6 +50,13 @@ export type {
   ReactReduxContextValue,
   Subscription,
 }
+
+/**
+ * @deprecated As of React 18, batching is enabled by default for ReactDOM and React Native.
+ * This is now a no-op that immediately runs the callback.
+ */
+const batch = defaultNoopBatch
+
 export {
   Provider,
   ReactReduxContext,
@@ -60,4 +68,5 @@ export {
   useStore,
   createStoreHook,
   shallowEqual,
+  batch,
 }

src/index.ts

@@ -6,23 +6,10 @@
 import * as React from 'react'
 import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/with-selector.js'
 
-import { unstable_batchedUpdates as batchInternal } from './utils/reactBatchedUpdates'
-import { setBatch } from './utils/batch'
-
 import { initializeUseSelector } from './hooks/useSelector'
 import { initializeConnect } from './components/connect'
 
 initializeUseSelector(useSyncExternalStoreWithSelector)
 initializeConnect(React.useSyncExternalStore)
 
-// Enable batched updates in our subscriptions for use
-// with standard React renderers (ReactDOM, React Native)
-setBatch(batchInternal)
-
-// Avoid needing `react-dom` in the final TS types
-// by providing a simpler type for `batch`
-const batch: (cb: () => void) => void = batchInternal
-
-export { batch }
-
 export * from './exports'

src/utils/Subscription.ts

@@ -1,4 +1,4 @@
-import { getBatch } from './batch'
+import { defaultNoopBatch as batch } from './batch'
 
 // encapsulates the subscription logic for connecting a component to the redux store, as
 // well as nesting subscriptions of descendant components, so that we can ensure the
@@ -13,7 +13,6 @@ type Listener = {
 }
 
 function createListenerCollection() {
-  const batch = getBatch()
   let first: Listener | null = null
   let last: Listener | null = null
 

src/utils/batch.ts

@@ -1,13 +1,4 @@
 // Default to a dummy "batch" implementation that just runs the callback
-function defaultNoopBatch(callback: () => void) {
+export function defaultNoopBatch(callback: () => void) {
   callback()
 }
-
-let batch = defaultNoopBatch
-
-// Allow injecting another batching function later
-export const setBatch = (newBatch: typeof defaultNoopBatch) =>
-  (batch = newBatch)
-
-// Supply a getter just to skip dealing with ESM bindings
-export const getBatch = () => batch

test/react-native/batch-integration.tsx

@@ -53,12 +53,6 @@ describe('React Native', () => {
 
   afterEach(() => rtl.cleanup())
 
-  describe('batch', () => {
-    it('batch should be RN unstable_batchedUpdates', () => {
-      expect(batch).toBe(unstable_batchedUpdates)
-    })
-  })
-
   describe('useIsomorphicLayoutEffect', () => {
     it('useIsomorphicLayoutEffect should be useLayoutEffect', () => {
       expect(useIsomorphicLayoutEffect).toBe(useLayoutEffect)

tsup.config.ts

@@ -67,24 +67,6 @@ export default defineConfig((options) => {
       outExtension: () => ({ js: '.mjs' }),
       minify: true,
     },
-    // "Alternate renderers" entry point with a no-op batch
-    {
-      ...commonOptions,
-      entry: {
-        'react-redux.alternate-renderers': 'src/alternate-renderers.ts',
-      },
-      format: ['esm'],
-      outExtension: () => ({ js: '.mjs' }),
-    },
-    // React Native requires a separate entry point for `"react-native"` batch dep
-    {
-      ...commonOptions,
-      entry: {
-        'react-redux.react-native': 'src/react-native.ts',
-      },
-      format: ['esm'],
-      outExtension: () => ({ js: '.js' }),
-    },
     // CJS development
     {
       ...commonOptions,