diff --git a/extension/package.json b/extension/package.json index 428f5c69..b16e8cdf 100644 --- a/extension/package.json +++ b/extension/package.json @@ -23,7 +23,6 @@ "type-check": "tsc --noEmit" }, "dependencies": { - "@babel/polyfill": "^7.12.1", "@emotion/react": "^11.11.4", "@redux-devtools/app": "^6.1.0", "@redux-devtools/core": "^4.0.0", @@ -32,6 +31,7 @@ "@redux-devtools/slider-monitor": "^5.0.1", "@redux-devtools/ui": "^1.3.2", "@redux-devtools/utils": "^3.0.0", + "@reduxjs/toolkit": "^1.9.7", "@types/jsan": "^3.1.5", "jsan": "^3.1.14", "localforage": "^1.10.0", diff --git a/extension/test/app/inject/enhancer.spec.js b/extension/test/app/inject/enhancer.spec.js index 219c73ec..ef997dc3 100644 --- a/extension/test/app/inject/enhancer.spec.js +++ b/extension/test/app/inject/enhancer.spec.js @@ -1,4 +1,3 @@ -import '@babel/polyfill'; import { createStore, compose } from 'redux'; import { insertScript, listenMessage } from '../../utils/inject'; import '../../../src/pageScript'; diff --git a/extension/test/perf/send.spec.js b/extension/test/perf/send.spec.js index bb5ed89f..5a179f77 100644 --- a/extension/test/perf/send.spec.js +++ b/extension/test/perf/send.spec.js @@ -1,4 +1,3 @@ -import '@babel/polyfill'; import { bigArray, bigString, circularData } from './data'; import { listenMessage } from '../utils/inject'; import '../../src/browser/extension/inject/pageScript'; diff --git a/extension/test/setup.js b/extension/test/setup.js index fef3c35e..531c497d 100644 --- a/extension/test/setup.js +++ b/extension/test/setup.js @@ -1,4 +1,3 @@ -require('@babel/polyfill'); global.chrome = require('sinon-chrome'); require('@testing-library/jest-dom'); diff --git a/packages/redux-devtools-app-core/package.json b/packages/redux-devtools-app-core/package.json index 756d687b..e1b77ca1 100644 --- a/packages/redux-devtools-app-core/package.json +++ b/packages/redux-devtools-app-core/package.json @@ -96,6 +96,7 @@ }, "peerDependencies": { "@emotion/react": "^11.11.4", + "@reduxjs/toolkit": "^1.0.0 || ^2.0.0", "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", "@types/styled-components": "^5.1.34", "react": "^16.8.4 || ^17.0.0 || ^18.0.0", diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 63d73bd9..51181924 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -95,6 +95,7 @@ }, "peerDependencies": { "@emotion/react": "^11.11.4", + "@reduxjs/toolkit": "^1.0.0 || ^2.0.0", "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", "@types/styled-components": "^5.1.34", "react": "^16.8.4 || ^17.0.0 || ^18.0.0", diff --git a/packages/redux-devtools-cli/package.json b/packages/redux-devtools-cli/package.json index 644bd15f..b6b2be8f 100644 --- a/packages/redux-devtools-cli/package.json +++ b/packages/redux-devtools-cli/package.json @@ -44,6 +44,7 @@ "@apollo/server": "^4.10.4", "@emotion/react": "^11.11.4", "@redux-devtools/app": "^6.0.0", + "@reduxjs/toolkit": "^1.9.7", "@types/react": "^18.3.3", "body-parser": "^1.20.2", "chalk": "^5.3.0", diff --git a/packages/redux-devtools-inspector-monitor-trace-tab/package.json b/packages/redux-devtools-inspector-monitor-trace-tab/package.json index 300c3178..441963aa 100644 --- a/packages/redux-devtools-inspector-monitor-trace-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-trace-tab/package.json @@ -53,7 +53,6 @@ "@testing-library/dom": "^10.3.2", "@testing-library/react": "^16.0.0", "@types/babel__code-frame": "^7.0.6", - "@types/html-entities": "^1.3.4", "@types/jest": "^29.5.12", "@types/node": "^20.14.10", "@types/path-browserify": "^1.0.2", diff --git a/packages/redux-devtools-remote/package.json b/packages/redux-devtools-remote/package.json index ca3bd5a7..06aabfbf 100644 --- a/packages/redux-devtools-remote/package.json +++ b/packages/redux-devtools-remote/package.json @@ -45,7 +45,6 @@ "@redux-devtools/instrument": "^2.2.0", "@redux-devtools/utils": "^3.0.0", "jsan": "^3.1.14", - "querystring": "^0.2.1", "rn-host-detect": "^1.2.0", "socketcluster-client": "^19.2.1" }, diff --git a/packages/redux-devtools-slider-monitor/examples/todomvc/package.json b/packages/redux-devtools-slider-monitor/examples/todomvc/package.json index 3bdee5e3..b28d441f 100644 --- a/packages/redux-devtools-slider-monitor/examples/todomvc/package.json +++ b/packages/redux-devtools-slider-monitor/examples/todomvc/package.json @@ -33,7 +33,6 @@ "@babel/preset-env": "^7.24.8", "@babel/preset-react": "^7.24.7", "@babel/preset-typescript": "^7.24.7", - "@types/classnames": "^2.3.1", "@types/node": "^20.14.10", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", diff --git a/packages/redux-devtools/examples/todomvc/package.json b/packages/redux-devtools/examples/todomvc/package.json index 4e7f4ca0..c8a77942 100644 --- a/packages/redux-devtools/examples/todomvc/package.json +++ b/packages/redux-devtools/examples/todomvc/package.json @@ -46,7 +46,6 @@ "@babel/preset-env": "^7.24.8", "@babel/preset-react": "^7.24.7", "@babel/preset-typescript": "^7.24.7", - "@types/classnames": "^2.3.1", "@types/node": "^20.14.10", "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 37cfda8d..44913462 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,9 +56,6 @@ importers: extension: dependencies: - '@babel/polyfill': - specifier: ^7.12.1 - version: 7.12.1 '@emotion/react': specifier: ^11.11.4 version: 11.11.4(@types/react@18.3.3)(react@18.3.1) @@ -83,6 +80,9 @@ importers: '@redux-devtools/utils': specifier: ^3.0.0 version: link:../packages/redux-devtools-utils + '@reduxjs/toolkit': + specifier: ^1.9.7 + version: 1.9.7(react-redux@8.1.3)(react@18.3.1) '@types/jsan': specifier: ^3.1.5 version: 3.1.5 @@ -852,6 +852,9 @@ importers: '@redux-devtools/ui': specifier: ^1.3.2 version: link:../redux-devtools-ui + '@reduxjs/toolkit': + specifier: ^1.0.0 || ^2.0.0 + version: 1.9.7(react-redux@8.1.3)(react@18.3.1) jsan: specifier: ^3.1.14 version: 3.1.14 @@ -1033,6 +1036,9 @@ importers: '@redux-devtools/ui': specifier: ^1.3.1 version: link:../redux-devtools-ui + '@reduxjs/toolkit': + specifier: ^1.0.0 || ^2.0.0 + version: 1.9.7(react-redux@8.1.3)(react@18.3.1) d3-state-visualizer: specifier: ^3.0.0 version: link:../d3-state-visualizer @@ -1257,6 +1263,9 @@ importers: '@redux-devtools/app': specifier: ^6.0.0 version: link:../redux-devtools-app + '@reduxjs/toolkit': + specifier: ^1.9.7 + version: 1.9.7(react-redux@8.1.3)(react@18.3.1) '@types/react': specifier: ^18.3.3 version: 18.3.3 @@ -1981,9 +1990,6 @@ importers: '@types/babel__code-frame': specifier: ^7.0.6 version: 7.0.6 - '@types/html-entities': - specifier: ^1.3.4 - version: 1.3.4 '@types/jest': specifier: ^29.5.12 version: 29.5.12 @@ -2329,9 +2335,6 @@ importers: jsan: specifier: ^3.1.14 version: 3.1.14 - querystring: - specifier: ^0.2.1 - version: 0.2.1 rn-host-detect: specifier: ^1.2.0 version: 1.2.0 @@ -2857,9 +2860,6 @@ importers: '@babel/preset-typescript': specifier: ^7.24.7 version: 7.24.7(@babel/core@7.24.9) - '@types/classnames': - specifier: ^2.3.1 - version: 2.3.1 '@types/node': specifier: ^20.14.10 version: 20.14.10 @@ -3332,9 +3332,6 @@ importers: '@babel/preset-typescript': specifier: ^7.24.7 version: 7.24.7(@babel/core@7.24.9) - '@types/classnames': - specifier: ^2.3.1 - version: 2.3.1 '@types/node': specifier: ^20.14.10 version: 20.14.10 @@ -4843,14 +4840,6 @@ packages: '@babel/helper-plugin-utils': 7.24.8 dev: true - /@babel/polyfill@7.12.1: - resolution: {integrity: sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==} - deprecated: 🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information. - dependencies: - core-js: 2.6.12 - regenerator-runtime: 0.13.11 - dev: false - /@babel/preset-env@7.24.8(@babel/core@7.24.9): resolution: {integrity: sha512-vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ==} engines: {node: '>=6.9.0'} @@ -8921,13 +8910,6 @@ packages: '@types/filesystem': 0.0.36 '@types/har-format': 1.2.15 - /@types/classnames@2.3.1: - resolution: {integrity: sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==} - deprecated: This is a stub types definition. classnames provides its own type definitions, so you do not need this installed. - dependencies: - classnames: 2.5.1 - dev: true - /@types/codemirror@5.60.15: resolution: {integrity: sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==} dependencies: @@ -9237,13 +9219,6 @@ packages: '@types/react': 18.3.3 hoist-non-react-statics: 3.3.2 - /@types/html-entities@1.3.4: - resolution: {integrity: sha512-Ut62LV90H9tgXwyhmfR8U6yCw/6xeo26IlsbAJJfqPomaqDN2zoLb2Z+cbmy5AycJFhwNJDdH0zqjQp7Ox/eXg==} - deprecated: This is a stub types definition. html-entities provides its own type definitions, so you do not need this installed. - dependencies: - html-entities: 2.5.2 - dev: true - /@types/html-minifier-terser@6.1.0: resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==} dev: true @@ -11128,6 +11103,7 @@ packages: /classnames@2.5.1: resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==} + dev: false /clean-css@5.3.3: resolution: {integrity: sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==} @@ -11450,12 +11426,6 @@ packages: resolution: {integrity: sha512-J/r5JTHSmzTxbiYYrzXg9w1VpqrYt+gexenBE9pugeyhwPZTAEJddyiReJWsLO6uNQ8xJZFbod6XC7KKwatCiA==} requiresBuild: true - /core-js@2.6.12: - resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==} - deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js. - requiresBuild: true - dev: false - /core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} @@ -17437,12 +17407,6 @@ packages: side-channel: 1.0.6 dev: true - /querystring@0.2.1: - resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==} - engines: {node: '>=0.4.x'} - deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead. - dev: false - /querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} dev: true @@ -17930,10 +17894,6 @@ packages: resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} dev: true - /regenerator-runtime@0.13.11: - resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} - dev: false - /regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}