Skip to content

Commit

Permalink
Merge pull request #10159 from DestinyItemManager/dependabot/npm_and_…
Browse files Browse the repository at this point in the history
…yarn/major-39c701cc23

Bump the major group with 4 updates
  • Loading branch information
bhollis authored Dec 6, 2023
2 parents 47e7000 + 69ce88e commit d40f388
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 33 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,13 @@
"react-dnd-touch-backend": "^16.0.1",
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-redux": "^8.1.3",
"react-redux": "^9.0.1",
"react-router": "^6.20.1",
"react-router-dom": "^6.20.1",
"react-textarea-autosize": "^8.5.3",
"redux": "^4.2.1",
"redux-thunk": "^2.4.2",
"reselect": "^4.1.8",
"redux": "^5.0.0",
"redux-thunk": "^3.1.0",
"reselect": "^5.0.1",
"safari-14-idb-fix": "^3.0.0",
"typesafe-actions": "^5.1.0",
"ua-parser-js": "^1.0.37",
Expand Down
74 changes: 52 additions & 22 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/app/store/reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { inGameLoadouts } from 'app/loadout/ingame/reducer';
import { streamDeck } from 'app/stream-deck/reducer';
import { vendors } from 'app/vendors/reducer';
import { Reducer, combineReducers } from 'redux';
import { PayloadAction } from 'typesafe-actions';
import { accounts } from '../accounts/reducer';
import { compare } from '../compare/reducer';
import { DimApiState, dimApi, initialState as dimApiInitialState } from '../dim-api/reducer';
Expand Down Expand Up @@ -38,7 +39,7 @@ const reducer: Reducer<RootState> = (state, action) => {
// Run the DIM API reducer last, and provide the current account along with it
const dimApiState = dimApi(
intermediateState.dimApi,
action,
action as PayloadAction<any, any>,
currentAccountSelector(intermediateState),
);

Expand Down
9 changes: 3 additions & 6 deletions src/app/store/store.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { applyMiddleware, compose, createStore } from 'redux';
import thunk from 'redux-thunk';
import { applyMiddleware, compose, legacy_createStore as createStore } from 'redux';
import { thunk } from 'redux-thunk';
import allReducers from './reducers';
import { RootState } from './types';

Expand All @@ -19,10 +19,7 @@ const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
})
: compose;

const store = createStore<RootState, any, {}, {}>(
allReducers,
composeEnhancers(applyMiddleware(thunk)),
);
const store = createStore<RootState, any>(allReducers, composeEnhancers(applyMiddleware(thunk)));

// Allow hot-reloading reducers
if (module.hot) {
Expand Down

0 comments on commit d40f388

Please sign in to comment.