Bug 1839208 - Switch the newtab Redux JSM to an ESM. r=sclements,Mardak,sylvestre

I had to make a minor adjustment to the symbolObservablePonyfill thing inside
of the redux.js code because Symbol.observable is not something that can be
written to in the privileged module context. Hopefully the comment I added
in the code makes that clear!

Differential Revision: https://phabricator.services.mozilla.com/D191348
This commit is contained in:
Mike Conley 2023-10-25 16:05:14 +00:00
parent 02ce00a2ce
commit b148374b57
5 changed files with 7 additions and 7 deletions

View file

@ -13,7 +13,7 @@ browser.jar:
res/activity-stream/aboutwelcome/lib/ (./aboutwelcome/lib/*)
res/activity-stream/schemas/BackgroundTaskMessagingExperiment.schema.json (./content-src/asrouter/schemas/BackgroundTaskMessagingExperiment.schema.json)
res/activity-stream/schemas/MessagingExperiment.schema.json (./content-src/asrouter/schemas/MessagingExperiment.schema.json)
res/activity-stream/vendor/Redux.jsm (./vendor/Redux.jsm)
res/activity-stream/vendor/Redux.sys.mjs (./vendor/Redux.sys.mjs)
res/activity-stream/vendor/react.js (./vendor/react.js)
res/activity-stream/vendor/react-dom.js (./vendor/react-dom.js)
res/activity-stream/vendor/react-dom-server.js (./vendor/react-dom-server.js)

View file

@ -15,8 +15,8 @@ const { Prefs } = ChromeUtils.import(
const { reducers } = ChromeUtils.importESModule(
"resource://activity-stream/common/Reducers.sys.mjs"
);
const { redux } = ChromeUtils.import(
"resource://activity-stream/vendor/Redux.jsm"
const { redux } = ChromeUtils.importESModule(
"resource://activity-stream/vendor/Redux.sys.mjs"
);
/**

View file

@ -4,10 +4,9 @@
* This file was imported from https://unpkg.com/redux@4.0.1/dist/redux.js
* and reformatted as a Javascript Core Module
*/
var EXPORTED_SYMBOLS = ["redux"];
var self = this;
this.redux = (function (global, factory) {
export const redux = (function (global, factory) {
var exports = {};
factory(exports);
return exports;
@ -41,6 +40,8 @@ this.redux = (function (global, factory) {
root = self;
} else if (typeof global !== 'undefined') {
root = global;
} else {
root = { "Symbol": undefined };
}
var result = symbolObservablePonyfill(root);

View file

@ -4396,7 +4396,7 @@ SOFTWARE.
<p>This license applies to the file
<code>devtools/client/shared/vendor/redux.js</code> and
<code>browser/components/newtab/vendor/Redux.jsm</code>.</p>
<code>browser/components/newtab/vendor/Redux.sys.mjs</code>.</p>
<pre>
Copyright (c) 2015 Dan Abramov

View file

@ -346,7 +346,6 @@
"resource://activity-stream/lib/TopSitesFeed.jsm": "browser/components/newtab/lib/TopSitesFeed.jsm",
"resource://activity-stream/lib/TopStoriesFeed.jsm": "browser/components/newtab/lib/TopStoriesFeed.jsm",
"resource://activity-stream/lib/UTEventReporting.jsm": "browser/components/newtab/lib/UTEventReporting.jsm",
"resource://activity-stream/vendor/Redux.jsm": "browser/components/newtab/vendor/Redux.jsm",
"resource://android/assets/web_extensions/test-support/TestSupportChild.jsm": "mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportChild.jsm",
"resource://android/assets/web_extensions/test-support/TestSupportProcessChild.jsm": "mobile/android/geckoview/src/androidTest/assets/web_extensions/test-support/TestSupportProcessChild.jsm",
"resource://app/modules/SnapshotSelector.jsm": "browser/components/places/SnapshotSelector.jsm",