Merge branch 'dev' into 2025-03-10-subgraph-updates

Author: kasparkallas

packages/sdk-redux/CHANGELOG.md

@@ -7,6 +7,13 @@ All notable changes to the SDK-redux will be documented in this file.
 ### Changed
 ### Fixed
 
+## [0.7.0]
+
+### Changed
+- [BREAKING] update to @reduxjs/toolkit 2
+- [BREAKING] leave only ESM support (no CommonJS)
+- use lodash's smaller direct libraries
+
 ## [0.6.1] - 2024-08-01
 
 ### Changed

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,25 @@
     },
     "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/lodash.memoize": "^4.1.7",
+        "@types/lodash.uniqby": "^4.7.9",
+        "@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",
@@ -38,11 +37,10 @@
     "homepage": "https://docs.superfluid.finance/",
     "keywords": [],
     "license": "MIT",
-    "main": "dist/main/index.js",
     "module": "dist/module/index.js",
     "peerDependencies": {
-        "@reduxjs/toolkit": "^1.7.0 || ^1.8.0 || ^1.9.0",
-        "@superfluid-finance/sdk-core": ">0.7.0"
+        "@reduxjs/toolkit": ">=2",
+        "@superfluid-finance/sdk-core": ">=0.7.0"
     },
     "repository": {
         "type": "git",
@@ -51,8 +49,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:*",
@@ -66,7 +63,7 @@
         "cloc": "sh tasks/cloc.sh"
     },
     "sideEffects": [
-        "./src/sdkReduxConfig.ts"
+        "./dist/module/sdkReduxConfig.js"
     ],
     "typings": "dist/module/index.d.ts"
 }

packages/sdk-redux/src/reduxSlices/argTypes.ts

@@ -1,5 +1,5 @@
-import {ISuperTokenModifyFlowParams} from '@superfluid-finance/sdk-core';
-import {Signer} from 'ethers';
+import {type ISuperTokenModifyFlowParams} from '@superfluid-finance/sdk-core';
+import {type Signer} from 'ethers';
 
 import {mutationOverridesKey, mutationSignerKey} from '../utils';
 

packages/sdk-redux/src/reduxSlices/rtkQuery/ModuleName.ts

@@ -0,0 +1,3 @@
+import {ApiModules} from '@reduxjs/toolkit/query';
+
+export type ModuleName = keyof ApiModules<any, any, any, any>;

packages/sdk-redux/src/reduxSlices/rtkQuery/cacheTags/CacheTagTypes.ts

@@ -1,5 +1,5 @@
 import {insertIf, typeGuard} from '../../../utils';
-import {NothingString} from '../../argTypes';
+import {type NothingString} from '../../argTypes';
 
 /**
  * Cache tag types for queries. Read more about caching from RTK-Query documentation: https://redux-toolkit.js.org/rtk-query/usage/automated-refetching#cache-tags

packages/sdk-redux/src/reduxSlices/rtkQuery/cacheTags/invalidateSpecificCacheTagsForEvents.ts

@@ -1,6 +1,6 @@
-import {AnyAction, ThunkDispatch} from '@reduxjs/toolkit';
-import {AllEvents} from '@superfluid-finance/sdk-core';
-import {uniqBy} from 'lodash';
+import {type ThunkDispatch, type UnknownAction} from '@reduxjs/toolkit';
+import {type AllEvents} from '@superfluid-finance/sdk-core';
+import uniqBy from 'lodash.uniqby';
 
 import {getRpcApiSlice, getSubgraphApiSlice} from '../../../sdkReduxConfig';
 
@@ -21,7 +21,7 @@ export const getSpecificCacheTagsToInvalidateForEvents = (chainId: number, event
 export const invalidateSpecificCacheTagsForEvents = (
     chainId: number,
     events: AllEvents[],
-    dispatch: ThunkDispatch<any, any, AnyAction>
+    dispatch: ThunkDispatch<any, any, UnknownAction>
 ) => {
     const tagsToInvalidate = getSpecificCacheTagsToInvalidateForEvents(chainId, events);
 

packages/sdk-redux/src/reduxSlices/rtkQuery/cacheTags/monitorAddressForNextEventToInvalidateCache.ts

@@ -1,9 +1,8 @@
-import {AnyAction} from '@reduxjs/toolkit';
-import {ThunkDispatch} from '@reduxjs/toolkit';
+import {type ThunkDispatch, type UnknownAction} from '@reduxjs/toolkit';
 
 import {getFramework} from '../../../sdkReduxConfig';
 import {MillisecondTimes} from '../../../utils';
-import {TransactionInfo} from '../../argTypes';
+import {type TransactionInfo} from '../../argTypes';
 
 import {invalidateSpecificCacheTagsForEvents} from './invalidateSpecificCacheTagsForEvents';
 
@@ -16,7 +15,7 @@ import {invalidateSpecificCacheTagsForEvents} from './invalidateSpecificCacheTag
 export const monitorAddressForNextEventToInvalidateCache = async (
     address: string,
     transactionInfo: TransactionInfo,
-    dispatch: ThunkDispatch<any, any, AnyAction>
+    dispatch: ThunkDispatch<any, any, UnknownAction>
 ) => {
     const framework = await getFramework(transactionInfo.chainId);
     framework.query.on(

packages/sdk-redux/src/reduxSlices/rtkQuery/createApiWithReactHooks.ts

@@ -1,8 +1,12 @@
 import {createApi} from '@reduxjs/toolkit/query/react';
 
+import {initializeRpcApiSlice} from '../../sdkReduxInitialization';
+
 /**
  * For creating RTK-Query API (e.g. "sfApi") with auto-generated React Hooks.
  *
  * Read more: https://redux-toolkit.js.org/rtk-query/api/created-api/hooks
  */
 export const createApiWithReactHooks = createApi;
+
+initializeRpcApiSlice((options) => createApi(options));

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';
 

packages/sdk-redux/src/reduxSlices/rtkQuery/rpcApiSlice/endpoints/allRpcEndpoints.ts

@@ -1,4 +1,4 @@
-import {RpcEndpointBuilder} from '../rpcEndpointBuilder';
+import {type RpcEndpointBuilder} from '../rpcEndpointBuilder';
 
 import {createFlowEndpoints} from './flowEndpoints';
 import {createIndexEndpoints} from './indexEndpoints';