diff --git a/examples/action-listener/counter/package.json b/examples/action-listener/counter/package.json index f5e5e5b068..39c47b062c 100644 --- a/examples/action-listener/counter/package.json +++ b/examples/action-listener/counter/package.json @@ -3,8 +3,7 @@ "version": "1.0.0", "private": true, "dependencies": { - "@reduxjs/toolkit": "^1.6.0-rc.1", - "@rtk-incubator/action-listener-middleware": "^0.8.0", + "@reduxjs/toolkit": "^1.8.0-rc.0", "@types/node": "^12.0.0", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", diff --git a/examples/action-listener/counter/src/components/App/App.tsx b/examples/action-listener/counter/src/components/App/App.tsx index 5779032d6d..ca09482b2b 100644 --- a/examples/action-listener/counter/src/components/App/App.tsx +++ b/examples/action-listener/counter/src/components/App/App.tsx @@ -8,7 +8,6 @@ import { CounterList } from '../CounterList/CounterList' import { CreateCounterForm } from '../CreateCounterForm/CreateCounterForm' import { store, startAppListening } from '../../store' - export function App() { useEffect(() => { const subscriptions: Unsubscribe[] = [ @@ -32,5 +31,5 @@ export function App() { - ) + ) } diff --git a/examples/action-listener/counter/src/services/counter/listeners.ts b/examples/action-listener/counter/src/services/counter/listeners.ts index 3aa6113493..3fe74b7bfd 100644 --- a/examples/action-listener/counter/src/services/counter/listeners.ts +++ b/examples/action-listener/counter/src/services/counter/listeners.ts @@ -1,5 +1,11 @@ import { counterActions, counterSelectors } from './slice' -import { AnyAction, isAllOf, isAnyOf, PayloadAction, Unsubscribe } from '@reduxjs/toolkit' +import { + AnyAction, + isAllOf, + isAnyOf, + PayloadAction, + Unsubscribe, +} from '@reduxjs/toolkit' import type { AppListenerEffectAPI, AppStartListening } from '../../store' function shouldStopAsyncTasksOf(id: string) { @@ -70,7 +76,9 @@ async function onUpdateAsync( * }, []); * ``` */ -export function setupCounterListeners(startListening: AppStartListening): Unsubscribe { +export function setupCounterListeners( + startListening: AppStartListening +): Unsubscribe { const subscriptions = [ startListening({ actionCreator: counterActions.updateByPeriodically, diff --git a/examples/action-listener/counter/src/store.ts b/examples/action-listener/counter/src/store.ts index 4c7328299f..801bb28018 100644 --- a/examples/action-listener/counter/src/store.ts +++ b/examples/action-listener/counter/src/store.ts @@ -1,13 +1,13 @@ import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux' -import { configureStore } from '@reduxjs/toolkit' -import { counterSlice } from './services/counter/slice' import { + configureStore, createListenerMiddleware, TypedStartListening, TypedAddListener, ListenerEffectAPI, addListener, -} from '@rtk-incubator/action-listener-middleware' +} from '@reduxjs/toolkit' +import { counterSlice } from './services/counter/slice' import { themeSlice } from './services/theme/slice' const listenerMiddlewareInstance = createListenerMiddleware({ diff --git a/yarn.lock b/yarn.lock index 42ba6e9427..ea933f3bbe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3672,8 +3672,7 @@ __metadata: version: 0.0.0-use.local resolution: "@examples-action-listener/counter@workspace:examples/action-listener/counter" dependencies: - "@reduxjs/toolkit": ^1.6.0-rc.1 - "@rtk-incubator/action-listener-middleware": ^0.8.0 + "@reduxjs/toolkit": ^1.8.0-rc.0 "@types/node": ^12.0.0 "@types/react": ^17.0.0 "@types/react-dom": ^17.0.0 @@ -5332,27 +5331,7 @@ __metadata: languageName: node linkType: hard -"@reduxjs/toolkit@npm:^1.6.0, @reduxjs/toolkit@npm:^1.6.0-rc.1": - version: 1.7.2 - resolution: "@reduxjs/toolkit@npm:1.7.2" - dependencies: - immer: ^9.0.7 - redux: ^4.1.2 - redux-thunk: ^2.4.1 - reselect: ^4.1.5 - peerDependencies: - react: ^16.9.0 || ^17.0.0 || 18.0.0-beta - react-redux: ^7.2.1 || ^8.0.0-beta - peerDependenciesMeta: - react: - optional: true - react-redux: - optional: true - checksum: 41c17c660f7c95d776658b9a101f9803c37589b2c08861e90283abe5fab70f99c37af064fae0c5b7501f67308946fa072504f6a801e272f157b9f7427a5e571e - languageName: node - linkType: hard - -"@reduxjs/toolkit@workspace:packages/toolkit": +"@reduxjs/toolkit@^1.8.0-rc.0, @reduxjs/toolkit@workspace:packages/toolkit": version: 0.0.0-use.local resolution: "@reduxjs/toolkit@workspace:packages/toolkit" dependencies: @@ -5421,6 +5400,26 @@ __metadata: languageName: unknown linkType: soft +"@reduxjs/toolkit@npm:^1.6.0, @reduxjs/toolkit@npm:^1.6.0-rc.1": + version: 1.7.2 + resolution: "@reduxjs/toolkit@npm:1.7.2" + dependencies: + immer: ^9.0.7 + redux: ^4.1.2 + redux-thunk: ^2.4.1 + reselect: ^4.1.5 + peerDependencies: + react: ^16.9.0 || ^17.0.0 || 18.0.0-beta + react-redux: ^7.2.1 || ^8.0.0-beta + peerDependenciesMeta: + react: + optional: true + react-redux: + optional: true + checksum: 41c17c660f7c95d776658b9a101f9803c37589b2c08861e90283abe5fab70f99c37af064fae0c5b7501f67308946fa072504f6a801e272f157b9f7427a5e571e + languageName: node + linkType: hard + "@rollup/plugin-alias@npm:^3.1.1": version: 3.1.2 resolution: "@rollup/plugin-alias@npm:3.1.2" @@ -5533,15 +5532,6 @@ __metadata: languageName: node linkType: hard -"@rtk-incubator/action-listener-middleware@npm:^0.8.0": - version: 0.8.0 - resolution: "@rtk-incubator/action-listener-middleware@npm:0.8.0" - peerDependencies: - "@reduxjs/toolkit": ^1.6.0 - checksum: 2e9c0a235758bf2e7915c708ad641a7d3c25b0f7b0da787dca0fbdf73b0f530f3e9923f251232d1650c847e3447e96377ac592d5b167b7b63f216dccbb7c4d61 - languageName: node - linkType: hard - "@rtk-query/codegen-openapi@workspace:packages/rtk-query-codegen-openapi": version: 0.0.0-use.local resolution: "@rtk-query/codegen-openapi@workspace:packages/rtk-query-codegen-openapi"