diff --git a/components/brave_extension/extension/brave_extension/background/store.ts b/components/brave_extension/extension/brave_extension/background/store.ts index 8631b4a97f31..c341b167dd0f 100644 --- a/components/brave_extension/extension/brave_extension/background/store.ts +++ b/components/brave_extension/extension/brave_extension/background/store.ts @@ -3,7 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ import { applyMiddleware, createStore, Middleware } from 'redux' -import { wrapStore } from 'react-chrome-redux' +import { wrapStore } from 'webext-redux' import { createLogger } from 'redux-logger' import thunk from 'redux-thunk' diff --git a/components/brave_extension/extension/brave_extension/braveShieldsPanel.tsx b/components/brave_extension/extension/brave_extension/braveShieldsPanel.tsx index 1cbfa73441bc..3712c3568b99 100644 --- a/components/brave_extension/extension/brave_extension/braveShieldsPanel.tsx +++ b/components/brave_extension/extension/brave_extension/braveShieldsPanel.tsx @@ -7,7 +7,7 @@ import * as ReactDOM from 'react-dom' import shieldsDarkTheme from './theme/shields-dark' import shieldsLightTheme from './theme/shields-light' import { Provider } from 'react-redux' -import { Store } from 'react-chrome-redux' +import { Store } from 'webext-redux' import BraveCoreThemeProvider from '../../../common/BraveCoreThemeProvider' import BraveShields from './containers/app' import { getViewPreferences } from './background/api/shieldsAPI' diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/store.ts b/components/brave_rewards/resources/extension/brave_rewards/background/store.ts index abef0cab7b30..3b598d022033 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/background/store.ts +++ b/components/brave_rewards/resources/extension/brave_rewards/background/store.ts @@ -3,7 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ import { createStore } from 'redux' -import { wrapStore } from 'react-chrome-redux' +import { wrapStore } from 'webext-redux' import reducers from './reducers' diff --git a/components/brave_rewards/resources/extension/brave_rewards/brave_rewards_panel.tsx b/components/brave_rewards/resources/extension/brave_rewards/brave_rewards_panel.tsx index 13120d8dbd20..2352ec0f1cf4 100644 --- a/components/brave_rewards/resources/extension/brave_rewards/brave_rewards_panel.tsx +++ b/components/brave_rewards/resources/extension/brave_rewards/brave_rewards_panel.tsx @@ -5,7 +5,7 @@ import * as React from 'react' import { render } from 'react-dom' import { Provider } from 'react-redux' -import { Store } from 'react-chrome-redux' +import { Store } from 'webext-redux' import Theme from 'brave-ui/theme/brave-default' import { ThemeProvider } from 'brave-ui/theme' diff --git a/components/brave_webtorrent/extension/background/store.ts b/components/brave_webtorrent/extension/background/store.ts index a0a11f1fad47..041872bb5281 100644 --- a/components/brave_webtorrent/extension/background/store.ts +++ b/components/brave_webtorrent/extension/background/store.ts @@ -3,7 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ import { createStore } from 'redux' -import { wrapStore } from 'react-chrome-redux' +import { wrapStore } from 'webext-redux' import reducers from './reducers' diff --git a/components/brave_webtorrent/extension/brave_webtorrent.tsx b/components/brave_webtorrent/extension/brave_webtorrent.tsx index a4d56efe2aa8..85980f855033 100644 --- a/components/brave_webtorrent/extension/brave_webtorrent.tsx +++ b/components/brave_webtorrent/extension/brave_webtorrent.tsx @@ -5,7 +5,7 @@ import * as React from 'react' import { render } from 'react-dom' import { Provider } from 'react-redux' -import { Store } from 'react-chrome-redux' +import { Store } from 'webext-redux' import Theme from 'brave-ui/theme/brave-default' import { ThemeProvider } from 'brave-ui/theme' diff --git a/package-lock.json b/package-lock.json index ab12c985f874..9751c79544aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12199,6 +12199,16 @@ "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.14.tgz", "integrity": "sha512-7zchRrGa8UZXjD/4ivUWP1867jDkhzTG2c/uj739utSd7O/pFFdxspCemIFKEEjErbcqRzn8nKnGsi7mvTgRPA==" }, + "lodash.assignin": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", + "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=" + }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=" + }, "lodash.curry": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz", @@ -14445,28 +14455,6 @@ } } }, - "react-chrome-redux": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/react-chrome-redux/-/react-chrome-redux-1.5.1.tgz", - "integrity": "sha1-ucbVamg+cexeEDp1/JKVnovqE9s=", - "requires": { - "lodash": "^4.5.1", - "redux": "^3.7.2" - }, - "dependencies": { - "redux": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz", - "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==", - "requires": { - "lodash": "^4.2.1", - "lodash-es": "^4.2.1", - "loose-envify": "^1.1.0", - "symbol-observable": "^1.0.3" - } - } - } - }, "react-clientside-effect": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.1.tgz", @@ -17980,6 +17968,29 @@ "integrity": "sha512-r8sAtNmgR0WKOKOxzuSgk09JsHlpKlB+uHi937qypOu3PZ17UxPrierFKDye/uNHjNTTEshu5PId8rojIPj/tA==", "dev": true }, + "webext-redux": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/webext-redux/-/webext-redux-2.1.4.tgz", + "integrity": "sha512-YNs8Q38jxcf4ANVxlbpMIo+fa2U4uQYuOIZePVNCi4Y01nOKTMR+DC7T2zaozkFALq5tkmkHcOmklMJwPMh3mg==", + "requires": { + "lodash.assignin": "^4.2.0", + "lodash.clonedeep": "^4.5.0", + "redux": "^3.7.2" + }, + "dependencies": { + "redux": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz", + "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==", + "requires": { + "lodash": "^4.2.1", + "lodash-es": "^4.2.1", + "loose-envify": "^1.1.0", + "symbol-observable": "^1.0.3" + } + } + } + }, "webidl-conversions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", diff --git a/package.json b/package.json index 9cd53192597b..21e7173015d3 100644 --- a/package.json +++ b/package.json @@ -340,11 +340,11 @@ "jszip": "^3.2.2", "prettier-bytes": "^1.0.4", "qr-image": "^3.2.0", - "react-chrome-redux": "^1.5.1", "redux-logger": "^3.0.6", "redux-thunk": "^2.3.0", "throttleit": "^1.0.0", "unique-selector": "^0.4.1", + "webext-redux": "^2.1.4", "webtorrent": "^0.107.16" } } diff --git a/third_party/npm-react-chrome-redux/README.chromium b/third_party/npm-react-chrome-redux/README.chromium deleted file mode 100644 index 549c8d511118..000000000000 --- a/third_party/npm-react-chrome-redux/README.chromium +++ /dev/null @@ -1,4 +0,0 @@ -Name: React Chrome Redux -URL: https://github.com/tshaddix/webext-redux -License: MIT -License File: /brave/node_modules/react-chrome-redux/LICENSE diff --git a/third_party/npm-webext-redux/README.chromium b/third_party/npm-webext-redux/README.chromium new file mode 100644 index 000000000000..cdffa0f0b08c --- /dev/null +++ b/third_party/npm-webext-redux/README.chromium @@ -0,0 +1,4 @@ +Name: WebExt Redux +URL: https://github.com/tshaddix/webext-redux +License: MIT +License File: /brave/node_modules/webext-redux/LICENSE