Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Delete react-router-redux and redux-auth-wrapper (#77590)

Romeo Van Snickcf56c33cddf8
diff --git a/bun.lock b/bun.lock
index 09d16e5a073..a1dd3938662 100644
--- a/bun.lock
+++ b/bun.lock
@@ -68,7 +68,6 @@
"@tiptap/suggestion": "^3.2.0",
"@types/js-yaml": "^4.0.9",
"@types/react-router": "3.0.27",
- "@types/redux-auth-wrapper": "2.0.16",
"@uiw/react-codemirror": "^4.23.6",
"@visx/axis": "^3.10.1",
"@visx/clip-path": "^3.3.0",
@@ -147,12 +146,10 @@
"react-redux": "^9.1.2",
"react-resizable": "^3.1.3",
"react-router": "3",
- "react-router-redux": "^4.0.8",
"react-transition-group": "^4.4.5",
"react-use": "^17.5.1",
"react-virtualized": "9.22.6",
"redux-actions": "^2.0.1",
- "redux-auth-wrapper": "2.1.0",
"redux-undo": "^1.1.0",
"rehype-external-links": "^3.0.0",
"remark-gfm": "^4.0.0",
@@ -271,7 +268,6 @@
"@types/react-grid-layout": "^1.3.5",
"@types/react-is": "^18.2.4",
"@types/react-resizable": "^3.0.4",
- "@types/react-router-redux": "^4.0.53",
"@types/react-textarea-autosize": "^4.3.6",
"@types/react-transition-group": "^4.4.5",
"@types/react-virtualized": "^9.22.2",
@@ -456,6 +452,7 @@
"prosemirror-state": "^1.4.4",
"prosemirror-view": "^1.40.1",
"qs": "6.15.2",
+ "redux": "5.0.1",
"webpack": "5.105.0",
"webpack-dev-middleware": "^5.3.4",
"webpack-dev-server": "^5.2.1",
@@ -1973,8 +1970,6 @@
"@types/react-router": ["@types/[email protected]", "", { "dependencies": { "@types/history": "^3", "@types/react": "*" } }, "sha512-Sq4bfTZ8TuHFTHXyzA3tu/BTGm/d4B8CwtOK4qOyJNoJMkY87qMOazkBizMHNpszVR1+kYOCNLjPdh/wAD7ESw=="],
- "@types/react-router-redux": ["@types/[email protected]", "", { "dependencies": { "@types/history": "^3.2.5", "redux": "^3.6.0" } }, "sha512-2fbxIc9OTmVyOUgBnRa3gcbMJT035Scu1bmkYMEiv7IzMht24W+gGzIrlYurSz3cijY4r9d16O/0+nycZ0RXjg=="],
-
"@types/react-textarea-autosize": ["@types/[email protected]", "", { "dependencies": { "@types/react": "*" } }, "sha512-cTf8tCem0c8A7CERYbTuF+bRFaqYu7N7HLCa6ZhUhDx8XnUsTpGx5udMWljt87JpciUKuUkImKPEsy6kcKhrcQ=="],
"@types/react-transition-group": ["@types/[email protected]", "", { "dependencies": { "@types/react": "*" } }, "sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA=="],
@@ -1985,8 +1980,6 @@
"@types/redux-actions": ["@types/[email protected]", "", {}, "sha512-RgXOigay5cNweP+xH1ru+Vaaj1xXYLpWIfSVO8cSA8Ii2xvR+HRfWYdLe1UVOA8X0kIklalGOa0DTDyld0obkg=="],
- "@types/redux-auth-wrapper": ["@types/[email protected]", "", { "dependencies": { "@types/history": "^4.7.11", "@types/react": "*", "redux": "^3.7.2" } }, "sha512-Uj3IFMqVD4e9aCiBPrw+Ix5msJvWlrjRAVa1iV529zNzEYhdtLfVq9/tM4K9yZWMRjLFqXbTam2qz2bgnklrSA=="],
-
"@types/resolve": ["@types/[email protected]", "", {}, "sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ=="],
"@types/retry": ["@types/[email protected]", "", {}, "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow=="],
@@ -2863,8 +2856,6 @@
"decode-tiff": ["[email protected]", "", {}, "sha512-v/7hQBv/DrOVQ+Eljg0BLMRbXZYuuw3YZ8duZuFxYpo6qUkdn7oFRkN95RZKbnh08EHNjrMXMbEUNhTLuhPvvA=="],
- "decode-uri-component": ["[email protected]", "", {}, "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="],
-
"dedent": ["[email protected]", "", { "peerDependencies": { "babel-plugin-macros": "^3.1.0" }, "optionalPeers": ["babel-plugin-macros"] }, "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg=="],
"deep-eql": ["[email protected]", "", {}, "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q=="],
@@ -4721,8 +4712,6 @@
"react-router": ["[email protected]", "", { "dependencies": { "create-react-class": "^15.5.1", "history": "^3.0.0", "hoist-non-react-statics": "^3.3.2", "invariant": "^2.2.1", "loose-envify": "^1.2.0", "prop-types": "^15.7.2", "react-is": "^16.13.0", "warning": "^3.0.0" } }, "sha512-nlxtQE8B22hb/JxdaslI1tfZacxFU8x8BJryXOnR2RxB4vc01zuHYAHAIgmBkdk1kzXaA25hZxK6KAH/+CXArw=="],
- "react-router-redux": ["[email protected]", "", {}, "sha1-InQDWWtRUeGCN32rg1tdRfD4BU4="],
-
"react-router-v7": ["[email protected]", "", { "dependencies": { "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" }, "optionalPeers": ["react-dom"] }, "sha512-GDLgg3i3uM0aeJO3Fm+TCS+sDQ7gu12T6x0qdTEzcwqEfleci7JwugVNIF3U//0FWKnJT7ptG+20B2jfDqnZAg=="],
"react-style-singleton": ["[email protected]", "", { "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" } }, "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ=="],
@@ -4771,12 +4760,10 @@
"reduce-reducers": ["[email protected]", "", {}, "sha512-+CNMnI8QhgVMtAt54uQs3kUxC3Sybpa7Y63HR14uGLgI9/QR5ggHvpxwhGGe3wmx5V91YwqQIblN9k5lspAmGw=="],
- "redux": ["[email protected]", "", { "dependencies": { "lodash": "^4.2.1", "lodash-es": "^4.2.1", "loose-envify": "^1.1.0", "symbol-observable": "^1.0.3" } }, "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="],
+ "redux": ["[email protected]", "", {}, "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="],
"redux-actions": ["[email protected]", "", { "dependencies": { "invariant": "^2.2.4", "just-curry-it": "^3.1.0", "loose-envify": "^1.4.0", "reduce-reducers": "^0.4.3", "to-camel-case": "^1.0.0" } }, "sha512-pFhEcWFTYNk7DhQgxMGnbsB1H2glqhQJRQrtPb96kD3hWiZRzXHwwmFPswg6V2MjraXRXWNmuP9P84tvdLAJmw=="],
- "redux-auth-wrapper": ["[email protected]", "", { "dependencies": { "hoist-non-react-statics": "^3.3.0", "invariant": "^2.2.4", "lodash.isempty": "^4.4.0", "prop-types": "^15.5.0", "query-string": "^5.1.1" } }, "sha512-UtU64cJk2pWcMMfgWIVoyBVG0p8ZiGJ++vqrvQ5r5ghZZOLRq+M5aTS0RRNneiB+aCCZBzI+txFSaKYVRrv8qQ=="],
-
"redux-thunk": ["[email protected]", "", {}, "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw=="],
"redux-undo": ["[email protected]", "", {}, "sha512-zzLFh2qeF0MTIlzDhDLm9NtkfBqCllQJ3OCuIl5RKlG/ayHw6GUdIFdMhzMS9NnrnWdBX5u//ExMOHpfudGGOg=="],
@@ -5195,8 +5182,6 @@
"swc-plugin-coverage-instrument": ["[email protected]", "", {}, "sha512-KsO1xNQdcVb331Rm98Op6uYf36/CYdF1kILQxOddmtCNlRLISpCUqHcnogu+QgELZvG48oie+w0fzS8uktjcEA=="],
- "symbol-observable": ["[email protected]", "", {}, "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="],
-
"symbol-tree": ["[email protected]", "", {}, "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="],
"synckit": ["[email protected]", "", { "dependencies": { "@pkgr/core": "^0.2.9" } }, "sha512-Bh7QjT8/SuKUIfObSXNHNSK6WHo6J1tHCqJsuaFDP7gP0fkzSfTxI8y85JrppZ0h8l0maIgc2tfuZQ6/t3GtnQ=="],
@@ -5845,8 +5830,6 @@
"@redocly/respect-core/colorette": ["[email protected]", "", {}, "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="],
- "@reduxjs/toolkit/redux": ["[email protected]", "", {}, "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w=="],
-
"@rushstack/node-core-library/ajv": ["[email protected]", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A=="],
"@rushstack/node-core-library/fs-extra": ["[email protected]", "", { "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew=="],
@@ -5983,8 +5966,6 @@
"@types/react-virtualized/@types/prop-types": ["@types/[email protected]", "", {}, "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw=="],
- "@types/redux-auth-wrapper/@types/history": ["@types/[email protected]", "", {}, "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA=="],
-
"@types/serve-index/@types/express": ["@types/[email protected]", "", { "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^4.17.18", "@types/qs": "*", "@types/serve-static": "*" } }, "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="],
"@typescript-eslint/parser/@typescript-eslint/scope-manager": ["@typescript-eslint/[email protected]", "", { "dependencies": { "@typescript-eslint/types": "8.60.0", "@typescript-eslint/visitor-keys": "8.60.0" } }, "sha512-pFzqhllJMs+jghLQWzV00ds39xLzuyqPSev5pd8f4Ir0rtKR3ZLUB4/4dhjOFighWb9larvtfJvqL+4yKDI3Xw=="],
@@ -6299,8 +6280,6 @@
"diffie-hellman/bn.js": ["[email protected]", "", {}, "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="],
- "dnd-core/redux": ["[email protected]", "", { "dependencies": { "@babel/runtime": "^7.9.2" } }, "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA=="],
-
"dom-serializer/domelementtype": ["[email protected]", "", {}, "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="],
"domhandler/domelementtype": ["[email protected]", "", {}, "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="],
@@ -7005,8 +6984,6 @@
"reduce-function-call/balanced-match": ["[email protected]", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
- "redux-auth-wrapper/query-string": ["[email protected]", "", { "dependencies": { "decode-uri-component": "^0.2.0", "object-assign": "^4.1.0", "strict-uri-encode": "^1.0.0" } }, "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="],
-
"reg-cli/glob": ["[email protected]", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="],
"reg-cli/make-dir": ["[email protected]", "", { "dependencies": { "semver": "^6.0.0" } }, "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="],
@@ -8207,10 +8184,6 @@
"raw-body/http-errors/statuses": ["[email protected]", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="],
- "react-dnd-html5-backend/dnd-core/redux": ["[email protected]", "", { "dependencies": { "@babel/runtime": "^7.9.2" } }, "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA=="],
-
- "react-dnd/dnd-core/redux": ["[email protected]", "", { "dependencies": { "@babel/runtime": "^7.9.2" } }, "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA=="],
-
"react-docgen-typescript-plugin/find-cache-dir/make-dir": ["[email protected]", "", { "dependencies": { "semver": "^6.0.0" } }, "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="],
"react-docgen/@types/babel__core/@types/babel__traverse": ["@types/[email protected]", "", { "dependencies": { "@babel/types": "^7.3.0" } }, "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA=="],
diff --git a/eslint.config.mjs b/eslint.config.mjs
index a8af3ef3802..8693114d85d 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -53,10 +53,6 @@ const baseMetabaseRestrictedConfig = {
name: "react-router",
message: "Please import routing from `metabase/router` instead.",
},
- {
- name: "react-router-redux",
- message: "Please import routing from `metabase/router` instead.",
- },
{
name: "@mantine/core",
message: "Please import from `metabase/ui` instead.",
@@ -652,10 +648,6 @@ const configs = [
name: "react-router",
message: "Please import routing from `metabase/router` instead.",
},
- {
- name: "react-router-redux",
- message: "Please import routing from `metabase/router` instead.",
- },
{
name: "@emotion/styled",
message: "Please style components using css modules.",
@@ -696,10 +688,6 @@ const configs = [
name: "react-router",
message: "Please import routing from `metabase/router` instead.",
},
- {
- name: "react-router-redux",
- message: "Please import routing from `metabase/router` instead.",
- },
{
name: "@mantine/core",
message: "Please import from `metabase/ui` instead.",
@@ -878,10 +866,6 @@ const configs = [
name: "react-router",
message: "Please import routing from `metabase/router` instead.",
},
- {
- name: "react-router-redux",
- message: "Please import routing from `metabase/router` instead.",
- },
{
name: "@mantine/core",
message: "Please import from `metabase/ui` instead.",
@@ -959,10 +943,6 @@ const configs = [
name: "react-router",
message: "Please import routing from `metabase/router` instead.",
},
- {
- name: "react-router-redux",
- message: "Please import routing from `metabase/router` instead.",
- },
{
name: "@mantine/core",
message: "Please import from `metabase/ui` instead.",
diff --git a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx
index 444292f9466..94fc0e257b6 100644
--- a/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx
+++ b/frontend/src/metabase/app/nav/Navbar.unit.spec.tsx
@@ -89,7 +89,7 @@ async function setup({
},
);
- // manually dispatch the location event that would otherwise be done for us with react-router-redux
+ // manually dispatch the location event that the router history sync would otherwise dispatch for us
dispatchLocationChange({ store, initialRoute: true, pathname });
await waitForLoaderToBeRemoved();
diff --git a/frontend/src/metabase/redux/auth.ts b/frontend/src/metabase/redux/auth.ts
index adcd761ae7c..0747b8acbdf 100644
--- a/frontend/src/metabase/redux/auth.ts
+++ b/frontend/src/metabase/redux/auth.ts
@@ -1,6 +1,5 @@
import {
type ThunkDispatch,
- type UnknownAction,
createAction,
createReducer,
} from "@reduxjs/toolkit";
@@ -155,9 +154,7 @@ export const logout = createAsyncThunk(
dispatch(clearCurrentUser());
await dispatch(refreshLocale()).unwrap();
- // We use old react-router-redux which references old redux, which does not require
- // action type to be a string - unlike RTK v2+
- dispatch(push(Urls.login()) as unknown as UnknownAction);
+ dispatch(push(Urls.login()));
reload(); // clears redux state and browser caches
}
} catch (error) {
diff --git a/frontend/src/metabase/redux/routing-contract.unit.spec.ts b/frontend/src/metabase/redux/routing-contract.unit.spec.ts
index dfdc6b9ab02..f754e66d5fc 100644
--- a/frontend/src/metabase/redux/routing-contract.unit.spec.ts
+++ b/frontend/src/metabase/redux/routing-contract.unit.spec.ts
@@ -13,7 +13,7 @@ import { getLocation } from "metabase/selectors/routing";
// Keystone characterization test for the navigation TRANSPORT seam.
//
-// `metabase/router` re-owns react-router-redux's `push`/`replace`/`goBack`
+// `metabase/router` owns the `push`/`replace`/`goBack`
// action creators + `routerMiddleware` + `routing` reducer +
// `syncHistoryWithStore`. This test pins the observable contract that the
// replacement preserves byte-for-byte:
diff --git a/frontend/src/metabase/redux/store/mocks/routing.ts b/frontend/src/metabase/redux/store/mocks/routing.ts
index 6509acb374c..bb97e0a0baf 100644
--- a/frontend/src/metabase/redux/store/mocks/routing.ts
+++ b/frontend/src/metabase/redux/store/mocks/routing.ts
@@ -21,7 +21,7 @@ export const createMockLocation = (opts?: Partial<Location>): Location => {
hash: "",
state: undefined,
action: "POP",
- key: "", // can be null but [email protected] typings are inaccurate
+ key: "", // can be null at runtime but the history typings type it as string
...opts,
};
};
diff --git a/frontend/src/metabase/visualizer/visualizer.slice.ts b/frontend/src/metabase/visualizer/visualizer.slice.ts
index d83a2e0eb2b..1906d7b9f35 100644
--- a/frontend/src/metabase/visualizer/visualizer.slice.ts
+++ b/frontend/src/metabase/visualizer/visualizer.slice.ts
@@ -714,7 +714,13 @@ export const reducer = undoable(visualizerSlice.reducer, {
addDataSource.fulfilled.type,
]),
(action, nextState, { present }) => {
- if (action.payload.forget === true) {
+ const payload = action.payload;
+ if (
+ payload != null &&
+ typeof payload === "object" &&
+ "forget" in payload &&
+ payload.forget === true
+ ) {
return false;
}
if (action.type !== _handleDrop.type) {
diff --git a/package.json b/package.json
index 0509ec78997..d2950f7184c 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,6 @@
"@tiptap/suggestion": "^3.2.0",
"@types/js-yaml": "^4.0.9",
"@types/react-router": "3.0.27",
- "@types/redux-auth-wrapper": "2.0.16",
"@uiw/react-codemirror": "^4.23.6",
"@visx/axis": "^3.10.1",
"@visx/clip-path": "^3.3.0",
@@ -156,12 +155,10 @@
"react-redux": "^9.1.2",
"react-resizable": "^3.1.3",
"react-router": "3",
- "react-router-redux": "^4.0.8",
"react-transition-group": "^4.4.5",
"react-use": "^17.5.1",
"react-virtualized": "9.22.6",
"redux-actions": "^2.0.1",
- "redux-auth-wrapper": "2.1.0",
"redux-undo": "^1.1.0",
"rehype-external-links": "^3.0.0",
"remark-gfm": "^4.0.0",
@@ -280,7 +277,6 @@
"@types/react-grid-layout": "^1.3.5",
"@types/react-is": "^18.2.4",
"@types/react-resizable": "^3.0.4",
- "@types/react-router-redux": "^4.0.53",
"@types/react-textarea-autosize": "^4.3.6",
"@types/react-transition-group": "^4.4.5",
"@types/react-virtualized": "^9.22.2",
@@ -459,6 +455,7 @@
"prosemirror-view": "^1.40.1",
"js-cookie": "^3.0.7",
"qs": "6.15.2",
+ "redux": "5.0.1",
"webpack-dev-middleware": "^5.3.4",
"webpack-dev-server": "^5.2.1",
"webpack": "5.105.0"
diff --git a/patches/@types+redux-auth-wrapper+2.0.16.patch b/patches/@types+redux-auth-wrapper+2.0.16.patch
deleted file mode 100644
index bffb377f9c3..00000000000
--- a/patches/@types+redux-auth-wrapper+2.0.16.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/node_modules/@types/redux-auth-wrapper/history3/redirect.d.ts b/node_modules/@types/redux-auth-wrapper/history3/redirect.d.ts
-index 10f8d72..99f3225 100644
---- a/node_modules/@types/redux-auth-wrapper/history3/redirect.d.ts
-+++ b/node_modules/@types/redux-auth-wrapper/history3/redirect.d.ts
-@@ -1,3 +1,4 @@
-+import { Context } from 'react';
- import { Location, LocationDescriptorObject } from "history";
- import { Action, Store } from "redux";
- import { AuthBaseConfig, AuthConfig, AuthWrapperDecorator, StateSelector } from "..";
-@@ -17,6 +18,7 @@ export interface ConnectedRouterRedirectConfig<OwnProps = {}, State = {}> extend
- redirectAction?(location: Location): Action;
- allowRedirectBack?: boolean | StateSelector<State, OwnProps, boolean> | undefined;
- redirectQueryParamName?: string | undefined;
-+ context: Context<any>;
- }
-
- export function connectedRouterRedirect<OwnProps = {}, State = {}>(
diff --git a/patches/redux-auth-wrapper+2.1.0.patch b/patches/redux-auth-wrapper+2.1.0.patch
deleted file mode 100644
index 4c7bc7debe8..00000000000
--- a/patches/redux-auth-wrapper+2.1.0.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/node_modules/redux-auth-wrapper/helper/redirect.js b/node_modules/redux-auth-wrapper/helper/redirect.js
-index 0c4ed18..16eb362 100644
---- a/node_modules/redux-auth-wrapper/helper/redirect.js
-+++ b/node_modules/redux-auth-wrapper/helper/redirect.js
-@@ -103,7 +103,12 @@ exports.default = function (_ref) {
- authenticatingSelector = allArgs.authenticatingSelector,
- allowRedirectBack = allArgs.allowRedirectBack,
- redirectAction = allArgs.redirectAction,
-- redirectQueryParamName = allArgs.redirectQueryParamName;
-+ redirectQueryParamName = allArgs.redirectQueryParamName,
-+ context = allArgs.context;
-+
-+ if (!context) {
-+ (0, _invariant2.default)(false, 'you must provide a custom context');
-+ }
-
- var _locationHelperBuilde2 = locationHelperBuilder({
- redirectQueryParamName: redirectQueryParamName
-@@ -140,7 +145,7 @@ exports.default = function (_ref) {
- };
- };
-
-- var ConnectedFailureComponent = (0, _reactRedux.connect)(null, createRedirect)(FailureComponent);
-+ var ConnectedFailureComponent = (0, _reactRedux.connect)(null, createRedirect, undefined, { context })(FailureComponent);
-
- return function (DecoratedComponent) {
- return (0, _reactRedux.connect)(function (state, ownProps) {
-@@ -149,7 +154,7 @@ exports.default = function (_ref) {
- isAuthenticated: authenticatedSelector(state, ownProps),
- isAuthenticating: authenticatingSelector(state, ownProps)
- };
-- })((0, _authWrapper2.default)(_extends({}, allArgs, { FailureComponent: ConnectedFailureComponent }))(DecoratedComponent));
-+ }, undefined, undefined, { context })((0, _authWrapper2.default)(_extends({}, allArgs, { FailureComponent: ConnectedFailureComponent }))(DecoratedComponent));
- };
- };
-