update major version of rtk-query in sdk-redux

kasparkallas · kasparkallas · commit 6d4e494821b1 · 2025-05-13T09:51:24.000+03:00
diff --git a/packages/sdk-redux/CHANGELOG.md b/packages/sdk-redux/CHANGELOG.md
@@ -7,6 +7,15 @@ All notable changes to the SDK-redux will be documented in this file.
 ### Changed
 ### Fixed
 
+## [0.7.0]
+
+### Added
+### Changed
+- [BREAKING] update to @reduxjs/toolkit 2
+- [BREAKING] leave only ESM support (no CommonJS)
+
+### Fixed
+
 ## [0.6.1] - 2024-08-01
 
 ### Changed
diff --git a/packages/sdk-redux/package.json b/packages/sdk-redux/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@superfluid-finance/sdk-redux",
     "description": "SDK Redux for streamlined front-end application development with Superfluid Protocol",
-    "version": "0.6.1",
+    "version": "0.7.0",
     "bugs": "https://github.com/superfluid-finance/protocol-monorepo/issues",
     "config": {
         "commitizen": {
@@ -10,26 +10,23 @@
     },
     "dependencies": {
         "graphql-request": "6.1.0",
-        "lodash": "4.17.21",
-        "promise-retry": "2.0.1"
+        "promise-retry": "2.0.1",
+        "lodash.memoize": "4.1.2",
+        "lodash.uniqby": "4.7.0"
     },
     "devDependencies": {
-        "@reduxjs/toolkit": "^1.9.7",
+        "@reduxjs/toolkit": "^2",
         "@types/promise-retry": "^1.1.6",
-        "@types/react": "^18",
-        "@types/react-dom": "^18",
-        "react": "^18",
-        "react-dom": "^18",
-        "react-redux": "^8.1.3"
+        "@types/react": "^19",
+        "@types/react-dom": "^19",
+        "react": "^19",
+        "react-dom": "^19",
+        "react-redux": "^9"
     },
     "directories": {
         "test": "test"
     },
-    "engines": {
-        "node": ">=12"
-    },
     "files": [
-        "dist/main",
         "dist/module",
         "CHANGELOG.md",
         "LICENSE",
@@ -41,7 +38,7 @@
     "main": "dist/main/index.js",
     "module": "dist/module/index.js",
     "peerDependencies": {
-        "@reduxjs/toolkit": "^1.7.0 || ^1.8.0 || ^1.9.0",
+        "@reduxjs/toolkit": ">=2",
         "@superfluid-finance/sdk-core": ">0.7.0"
     },
     "repository": {
@@ -51,8 +48,7 @@
     },
     "scripts": {
         "build": "rm -rf dist && run-p -l build:*",
-        "build:main": "tsc -p tsconfig.json",
-        "build:module": "tsc -p tsconfig.module.json",
+        "build:module": "tsc -p tsconfig.json",
         "lint": "run-s lint:*",
         "lint:eslint": "eslint src --ext .ts",
         "fix": "run-s fix:*",
diff --git a/packages/sdk-redux/src/reduxSlices/rtkQuery/getSerializeQueryArgs.ts b/packages/sdk-redux/src/reduxSlices/rtkQuery/getSerializeQueryArgs.ts
@@ -1,5 +1,5 @@
 import {isPlainObject} from '@reduxjs/toolkit';
-import {SerializeQueryArgs} from '@reduxjs/toolkit/dist/query/defaultSerializeQueryArgs';
+import {type SerializeQueryArgs} from '@reduxjs/toolkit/query';
 
 import {mutationOverridesKey, mutationSignerKey} from '../../utils';
 
diff --git a/packages/sdk-redux/src/reduxSlices/rtkQuery/rpcApiSlice/rpcApiSlice.ts b/packages/sdk-redux/src/reduxSlices/rtkQuery/rpcApiSlice/rpcApiSlice.ts
@@ -1,5 +1,5 @@
-import {CreateApi} from '@reduxjs/toolkit/dist/query';
-import type {ModuleName} from '@reduxjs/toolkit/dist/query/apiTypes';
+import {type CreateApi} from '@reduxjs/toolkit/query';
+import {coreModuleName} from '@reduxjs/toolkit/query';
 
 import {typeGuard} from '../../../utils';
 import {cacheTagTypes} from '../cacheTags/CacheTagTypes';
@@ -9,6 +9,8 @@ import {rpcBaseQuery} from './rpcBaseQuery';
 import {RpcEndpointBuilder} from './rpcEndpointBuilder';
 import {RpcReducerPath} from './rpcReducerPath';
 
+type ModuleName = typeof coreModuleName;
+
 export const createRpcApiSlice = <T extends ModuleName>(createRtkQueryApi: CreateApi<T>) =>
     createRtkQueryApi({
         reducerPath: typeGuard<RpcReducerPath>('superfluid_rpc'),
diff --git a/packages/sdk-redux/src/reduxSlices/rtkQuery/rpcApiSlice/rpcEndpointBuilder.ts b/packages/sdk-redux/src/reduxSlices/rtkQuery/rpcApiSlice/rpcEndpointBuilder.ts
@@ -1,4 +1,4 @@
-import {EndpointBuilder} from '@reduxjs/toolkit/dist/query/endpointDefinitions';
+import {type EndpointBuilder} from '@reduxjs/toolkit/query';
 
 import {CacheTagType} from '../cacheTags/CacheTagTypes';
 
diff --git a/packages/sdk-redux/src/reduxSlices/rtkQuery/subgraphApiSlice/subgraphApiSlice.ts b/packages/sdk-redux/src/reduxSlices/rtkQuery/subgraphApiSlice/subgraphApiSlice.ts
@@ -1,11 +1,13 @@
-import {CreateApi} from '@reduxjs/toolkit/dist/query';
-import {ModuleName} from '@reduxjs/toolkit/dist/query/apiTypes';
+import {type CreateApi} from '@reduxjs/toolkit/query';
+import {coreModuleName} from '@reduxjs/toolkit/query';
 
 import {typeGuard} from '../../../utils';
 import {cacheTagTypes} from '../cacheTags/CacheTagTypes';
 import {CacheTime} from '../cacheTime';
 import {getSerializeQueryArgs} from '../getSerializeQueryArgs';
 
+type ModuleName = typeof coreModuleName;
+
 import {subgraphBaseQuery} from './subgraphBaseQuery';
 import {SubgraphEndpointBuilder} from './subgraphEndpointBuilder';
 import {SubgraphReducerPath} from './subgraphReducerPath';
diff --git a/packages/sdk-redux/src/reduxSlices/rtkQuery/subgraphApiSlice/subgraphEndpointBuilder.ts b/packages/sdk-redux/src/reduxSlices/rtkQuery/subgraphApiSlice/subgraphEndpointBuilder.ts
@@ -1,4 +1,4 @@
-import {EndpointBuilder} from '@reduxjs/toolkit/dist/query/endpointDefinitions';
+import {type EndpointBuilder} from '@reduxjs/toolkit/query';
 
 import {CacheTagType} from '../cacheTags/CacheTagTypes';
 
diff --git a/packages/sdk-redux/src/reduxSlices/transactionTrackerSlice/thunks/initiateNewTransactionTrackingThunk.ts b/packages/sdk-redux/src/reduxSlices/transactionTrackerSlice/thunks/initiateNewTransactionTrackingThunk.ts
@@ -29,6 +29,7 @@ export const initiateNewTransactionTrackingThunk = createAsyncThunk<
 
     dispatch(
         getTransactionTrackerSlice().actions.addTransaction({
+            id: transactionHash,
             chainId: arg.chainId,
             hash: transactionHash,
             signerAddress: ethers.utils.getAddress(arg.signerAddress),
diff --git a/packages/sdk-redux/src/reduxSlices/transactionTrackerSlice/trackedTransaction.ts b/packages/sdk-redux/src/reduxSlices/transactionTrackerSlice/trackedTransaction.ts
@@ -6,6 +6,7 @@ export type TransactionStatus = 'Pending' | 'Succeeded' | 'Failed' | 'Replaced'
 
 // "Redux" stuff needs to be serializable. Blockchain transaction object is unserializable.
 export interface TrackedTransaction {
+    id: string;
     chainId: number;
     hash: string;
     /**
diff --git a/packages/sdk-redux/src/reduxSlices/transactionTrackerSlice/transactionTrackerAdapter.ts b/packages/sdk-redux/src/reduxSlices/transactionTrackerSlice/transactionTrackerAdapter.ts
@@ -4,7 +4,6 @@ import {TrackedTransaction} from './trackedTransaction';
 import {TransactionTrackerReducer, transactionTrackerSlicePrefix} from './transactionTrackerSlice';
 
 export const transactionTrackerAdapter = createEntityAdapter<TrackedTransaction>({
-    selectId: (transaction) => transaction.hash,
     sortComparer: (a) => a.timestampMs,
 });
 
diff --git a/packages/sdk-redux/src/reduxSlices/transactionTrackerSlice/transactionTrackerSlice.ts b/packages/sdk-redux/src/reduxSlices/transactionTrackerSlice/transactionTrackerSlice.ts
@@ -5,7 +5,6 @@ import {transactionTrackerAdapter} from './transactionTrackerAdapter';
 export const transactionTrackerSlicePrefix = 'superfluid_transactions' as const;
 
 export const createTransactionTrackerSlice = () => ({
-    reducerPath: transactionTrackerSlicePrefix,
     ...createSlice({
         name: transactionTrackerSlicePrefix,
         initialState: transactionTrackerAdapter.getInitialState(),
@@ -14,6 +13,7 @@ export const createTransactionTrackerSlice = () => ({
             updateTransaction: transactionTrackerAdapter.updateOne,
         },
     }),
+    reducerPath: transactionTrackerSlicePrefix,
 });
 
 export type TransactionTrackerSlice = ReturnType<typeof createTransactionTrackerSlice>;
diff --git a/packages/sdk-redux/src/sdkReduxConfig.ts b/packages/sdk-redux/src/sdkReduxConfig.ts
@@ -1,6 +1,6 @@
 import {Framework} from '@superfluid-finance/sdk-core';
 import {Signer} from 'ethers';
-import _ from 'lodash';
+import {memoize} from 'lodash';
 
 // NOTE: This file is marked for side-effects inside the package.json for efficient tree-shaking.
 
@@ -102,7 +102,7 @@ export default class SdkReduxConfig
             ? () => Promise.resolve(instanceOrFactory)
             : instanceOrFactory;
 
-        this.memoizedFrameworkFactories.set(chainId, _.memoize(frameworkFactory));
+        this.memoizedFrameworkFactories.set(chainId, memoize(frameworkFactory));
     }
 
     setTransactionTrackerSlice(slice: TransactionTrackerSlice): void {
diff --git a/packages/sdk-redux/src/sdkReduxInitialization.ts b/packages/sdk-redux/src/sdkReduxInitialization.ts
@@ -1,12 +1,14 @@
-import {CreateApi} from '@reduxjs/toolkit/dist/query';
-import type {ModuleName} from '@reduxjs/toolkit/dist/query/apiTypes';
+import {CreateApi} from '@reduxjs/toolkit/query';
+import {coreModuleName} from '@reduxjs/toolkit/query';
 import {Framework} from '@superfluid-finance/sdk-core';
 
 import {createRpcApiSlice} from './reduxSlices/rtkQuery/rpcApiSlice/rpcApiSlice';
 import {createSubgraphApiSlice} from './reduxSlices/rtkQuery/subgraphApiSlice/subgraphApiSlice';
 import {createTransactionTrackerSlice} from './reduxSlices/transactionTrackerSlice/transactionTrackerSlice';
 import {getConfig} from './sdkReduxConfig';
 
+type ModuleName = typeof coreModuleName;
+
 /**
  * For initializing "rpcApiSlice" Redux slice.
  *
diff --git a/packages/sdk-redux/tsconfig.json b/packages/sdk-redux/tsconfig.json
@@ -1,11 +1,11 @@
 {
     "compilerOptions": {
         "incremental": true,
-        "target": "ES2019",
+        "target": "ESNext",
         "outDir": "dist/main",
         "rootDir": "src",
         "moduleResolution": "node",
-        "module": "commonjs",
+        "module": "ESNext",
         "lib": [ "DOM", "ESNext" ],
         "declaration": true,
         "declarationMap": true,
diff --git a/packages/sdk-redux/tsconfig.module.json b/packages/sdk-redux/tsconfig.module.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {EndpointBuilder} from '@reduxjs/toolkit/dist/query/endpointDefinitions';`
	`1`	`+import {type EndpointBuilder} from '@reduxjs/toolkit/query';`
`2`	`2`
`3`	`3`	`import {CacheTagType} from '../cacheTags/CacheTagTypes';`
`4`	`4`