Merge pull request #3170 from reduxjs/feature/2.0-redux-alpha-dep

Author: markerikson

packages/toolkit/package.json

@@ -118,7 +118,7 @@
   ],
   "dependencies": {
     "immer": "^9.0.16",
-    "redux": "^4.2.0",
+    "redux": "5.0.0-alpha.2",
     "redux-thunk": "3.0.0-alpha.1",
     "reselect": "^4.1.7"
   },

packages/toolkit/scripts/build.ts

@@ -209,7 +209,7 @@ async function bundle(options: BuildOptions & EntryPointOptions) {
     ],
   })
 
-  for (const chunk of result.outputFiles) {
+  for (const chunk of result.outputFiles!) {
     const esVersion =
       target in esVersionMappings
         ? esVersionMappings[target]
@@ -252,7 +252,7 @@ async function bundle(options: BuildOptions & EntryPointOptions) {
           toplevel: true,
         }
       )
-      code = transformResult.code
+      code = transformResult.code!
       mapping = transformResult.map as RawSourceMap
     }
 

packages/toolkit/src/devtoolsExtension.ts

@@ -220,7 +220,9 @@ type Compose = typeof compose
 
 interface ComposeWithDevTools {
   (options: DevToolsEnhancerOptions): Compose
-  <StoreExt>(...funcs: StoreEnhancer<StoreExt>[]): StoreEnhancer<StoreExt>
+  <StoreExt extends {}>(
+    ...funcs: StoreEnhancer<StoreExt>[]
+  ): StoreEnhancer<StoreExt>
 }
 
 /**

packages/toolkit/src/tests/configureStore.test.ts

@@ -270,7 +270,7 @@ describe('configureStore', async () => {
       let dummyEnhancerCalled = false
 
       const dummyEnhancer: StoreEnhancer =
-        (createStore: StoreEnhancerStoreCreator) =>
+        (createStore) =>
         (reducer, ...args: any[]) => {
           dummyEnhancerCalled = true
 

packages/toolkit/src/tests/configureStore.typetest.ts

@@ -159,9 +159,9 @@ const _anyMiddleware: any = () => () => () => {}
   })
 
   {
-    type SomePropertyStoreEnhancer = StoreEnhancer<{ someProperty: string }>
-
-    const somePropertyStoreEnhancer: SomePropertyStoreEnhancer = (next) => {
+    const somePropertyStoreEnhancer: StoreEnhancer<{ someProperty: string }> = (
+      next
+    ) => {
       return (reducer, preloadedState) => {
         return {
           ...next(reducer, preloadedState),
@@ -170,13 +170,9 @@ const _anyMiddleware: any = () => () => () => {}
       }
     }
 
-    type AnotherPropertyStoreEnhancer = StoreEnhancer<{
+    const anotherPropertyStoreEnhancer: StoreEnhancer<{
       anotherProperty: number
-    }>
-
-    const anotherPropertyStoreEnhancer: AnotherPropertyStoreEnhancer = (
-      next
-    ) => {
+    }> = (next) => {
       return (reducer, preloadedState) => {
         return {
           ...next(reducer, preloadedState),
@@ -187,7 +183,10 @@ const _anyMiddleware: any = () => () => () => {}
 
     const store = configureStore({
       reducer: () => 0,
-      enhancers: [somePropertyStoreEnhancer, anotherPropertyStoreEnhancer],
+      enhancers: [
+        somePropertyStoreEnhancer,
+        anotherPropertyStoreEnhancer,
+      ] as const,
     })
 
     expectType<Dispatch & ThunkDispatch<number, undefined, AnyAction>>(

packages/toolkit/src/tsHelpers.ts

@@ -101,8 +101,14 @@ export type ExtractDispatchExtensions<M> = M extends MiddlewareArray<
   ? ExtractDispatchFromMiddlewareTuple<[...M], {}>
   : never
 
-export type ExtractStoreExtensions<E> = E extends any[]
-  ? UnionToIntersection<E[number] extends StoreEnhancer<infer Ext> ? Ext extends {} ? Ext : {} : {}>
+export type ExtractStoreExtensions<E> = E extends readonly any[]
+  ? UnionToIntersection<
+      E[number] extends StoreEnhancer<infer Ext>
+        ? Ext extends {}
+          ? Ext
+          : {}
+        : {}
+    >
   : {}
 
 /**

yarn.lock

@@ -6781,7 +6781,7 @@ __metadata:
     node-fetch: ^2.6.1
     prettier: ^2.2.1
     query-string: ^7.0.1
-    redux: ^4.2.0
+    redux: 5.0.0-alpha.2
     redux-thunk: 3.0.0-alpha.1
     reselect: ^4.1.7
     rimraf: ^3.0.2
@@ -24426,6 +24426,13 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"redux@npm:5.0.0-alpha.2":
+  version: 5.0.0-alpha.2
+  resolution: "redux@npm:5.0.0-alpha.2"
+  checksum: fbae31c55bab62a210a5a24a64721f593080fb94808c547b646ddff91515f8ab4e3363af5ece16491f0179d43729fc0350235c9fea7500b37b67d762a55b6945
+  languageName: node
+  linkType: hard
+
 "redux@npm:^4.0.0, redux@npm:^4.1.2":
   version: 4.1.2
   resolution: "redux@npm:4.1.2"