diff --git a/.github/PULL_REQUEST_TEMPLATE/ff_update.md b/.github/PULL_REQUEST_TEMPLATE/ff_update.md index de9be180..fde800b1 100644 --- a/.github/PULL_REQUEST_TEMPLATE/ff_update.md +++ b/.github/PULL_REQUEST_TEMPLATE/ff_update.md @@ -22,7 +22,7 @@ This bumps Firefox up to `{NEW_VERSION}` for security and performance reasons. R - [ ] Tabliss is loading correctly - [ ] Tabliss does not have the webextention symbol in the title bar - [ ] uBlock origin is loading correctly - - [ ] FirePicker is loading correctly + - [ ] QRCode generator is loading correctly - [ ] About dialog diff --git a/gluon.json b/gluon.json index b9c3084c..09457ba3 100644 --- a/gluon.json +++ b/gluon.json @@ -5,7 +5,7 @@ "binaryName": "pulse-browser", "version": { "product": "firefox", - "version": "106.0.5" + "version": "107.0" }, "buildOptions": { "generateBranding": true @@ -15,7 +15,7 @@ "platform": "github", "id": "uBlock0@raymondhill.net", "repo": "gorhill/uBlock", - "version": "1.44.4", + "version": "1.45.2", "fileGlob": "uBlock0_*.firefox(.signed)?.xpi" }, "tabliss": { diff --git a/package.json b/package.json index 2467c985..4ed18ae2 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "package": "gluon package", "ff-version": "gluon ff-version", "licenseCheck": "gluon license-check", - "gluon": "gluon" + "gluon": "gluon", + "reset": "gluon reset" } } diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index 933e3a26..f49777a8 100644 --- a/src/browser/app/profile/firefox-js.patch +++ b/src/browser/app/profile/firefox-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d746984613 100644 +index 14ecab77149f5645e24c8bffff57c223f64730bb..09bf8bebc166fb1e316e2c0c425f8117468281fc 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -19,6 +19,8 @@ @@ -19,32 +19,36 @@ index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d7 pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing"); // Enable extensionStorage storage actor by default -@@ -773,7 +774,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true); +@@ -774,7 +775,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true); pref("browser.tabs.tooltipsShowPidAndActiveness", false); #endif -pref("browser.tabs.firefox-view", true); +pref("browser.tabs.firefox-view", false); pref("browser.tabs.firefox-view.logLevel", "Warn"); + pref("browser.tabs.firefox-view.notify-for-tabs", false); - // allow_eval_* is enabled on Firefox Desktop only at this -@@ -1937,7 +1938,6 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f +@@ -1945,7 +1946,7 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua"); // Default to enabling VPN promo messages to be shown when specified and allowed -pref("browser.vpn_promo.enabled", true); ++pref("browser.vpn_promo.enabled", false); // Only show vpn card to certain regions. Comma separated string of two letter ISO 3166-1 country codes. // The most recent list of supported countries can be found at https://support.mozilla.org/en-US/kb/mozilla-vpn-countries-available-subscribe // The full list of supported country codes can also be found at https://github.com/mozilla/bedrock/search?q=VPN_COUNTRY_CODES -@@ -2060,7 +2060,6 @@ pref("browser.tabs.crashReporting.includeURL", false); +@@ -2066,10 +2067,6 @@ pref("browser.tabs.remote.warmup.unloadDelayMs", 2000); + pref("browser.tabs.crashReporting.sendReport", true); + pref("browser.tabs.crashReporting.includeURL", false); - // If true, unprivileged extensions may use experimental APIs on - // nightly and developer edition. +-// If true, unprivileged extensions may use experimental APIs on +-// nightly and developer edition. -pref("extensions.experiments.enabled", false); - +- #if defined(XP_LINUX) || defined(XP_WIN) // Allows us to adjust the priority of child processes at the OS level -@@ -2108,13 +2107,6 @@ pref("browser.migrate.chrome.history.limit", 2000); + pref("dom.ipc.processPriorityManager.enabled", true); +@@ -2116,13 +2113,6 @@ pref("browser.migrate.chrome.history.limit", 2000); pref("browser.migrate.chrome.history.maxAgeInDays", 180); pref("browser.migrate.showBookmarksToolbarAfterMigration", true); @@ -58,13 +62,17 @@ index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d7 // Enable Pocket button home panel for non link pages. pref("extensions.pocket.showHome", true); -@@ -2243,9 +2235,6 @@ pref("toolkit.coverage.enabled", false); +@@ -2251,9 +2241,10 @@ pref("toolkit.coverage.enabled", false); pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org"); // Discovery prefs -pref("browser.discovery.enabled", true); -pref("browser.discovery.containers.enabled", true); -pref("browser.discovery.sites", "addons.mozilla.org"); ++// ++// From memory, these connect to Google Analytics, so they are a no go ++pref("browser.discovery.enabled", false); ++pref("browser.discovery.containers.enabled", false); pref("browser.engagement.recent_visited_origins.expiry", 86400); // 24 * 60 * 60 (24 hours in seconds) pref("browser.engagement.downloads-button.has-used", false); diff --git a/src/browser/base/content/browser-menubar-inc.patch b/src/browser/base/content/browser-menubar-inc.patch new file mode 100644 index 00000000..f1c75636 --- /dev/null +++ b/src/browser/base/content/browser-menubar-inc.patch @@ -0,0 +1,14 @@ +diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc +index f3134d5a9a01b7965eede5695def5afef4a66d6b..626fba18a7e9341731f6b71a98197695d63d7c6c 100644 +--- a/browser/base/content/browser-menubar.inc ++++ b/browser/base/content/browser-menubar.inc +@@ -153,6 +153,9 @@ + type="checkbox" + class="sync-ui-item" + oncommand="SidebarUI.toggle('viewTabsSidebar');" data-l10n-id="menu-view-synced-tabs-sidebar"/> ++ + + + diff --git a/src/browser/base/content/browser-sidebar-js.patch b/src/browser/base/content/browser-sidebar-js.patch index f837a538..219af6c2 100644 --- a/src/browser/base/content/browser-sidebar-js.patch +++ b/src/browser/base/content/browser-sidebar-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js -index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafcf1d66f5a 100644 +index f09e37fc42f7754f7f3687884ead25124c1b2076..e1833bbfd8a8ed7da767349f886d554f3dd795f3 100644 --- a/browser/base/content/browser-sidebar.js +++ b/browser/base/content/browser-sidebar.js @@ -11,6 +11,10 @@ var SidebarUI = { @@ -37,11 +37,21 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc }), ], [ -@@ -47,8 +54,27 @@ var SidebarUI = { +@@ -47,8 +54,37 @@ var SidebarUI = { elementId: "sidebar-switcher-tabs", url: "chrome://browser/content/syncedtabs/sidebar.xhtml", menuId: "menu_tabsSidebar", + iconurl: "chrome://browser/skin/tab.svg", ++ }), ++ ], ++ [ ++ "viewDownloadsSidebar", ++ makeSidebar({ ++ elementId: "sidebar-switcher-downloads", ++ title: "Downloads", ++ url: "about:downloads", ++ menuId: "menu_downloadsSidebar", ++ iconurl: "chrome://browser/skin/downloads/downloads.svg" }), ], + [ @@ -65,7 +75,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc ])); }, -@@ -61,6 +87,8 @@ var SidebarUI = { +@@ -61,6 +97,8 @@ var SidebarUI = { return (this._browser = document.getElementById("sidebar")); }, POSITION_START_PREF: "sidebar.position_start", @@ -74,7 +84,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc DEFAULT_SIDEBAR_ID: "viewBookmarksSidebar", // lastOpenedId is set in show() but unlike currentID it's not cleared out on hide -@@ -78,6 +106,8 @@ var SidebarUI = { +@@ -78,6 +116,8 @@ var SidebarUI = { }, _splitter: null, _icon: null, @@ -83,7 +93,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc _reversePositionButton: null, _switcherPanel: null, _switcherTarget: null, -@@ -110,10 +140,40 @@ var SidebarUI = { +@@ -110,10 +150,40 @@ var SidebarUI = { this._switcherTarget = document.getElementById("sidebar-switcher-target"); this._switcherArrow = document.getElementById("sidebar-switcher-arrow"); @@ -124,7 +134,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc this._inited = true; Services.obs.addObserver(this, "intl:app-locales-changed"); -@@ -159,17 +219,26 @@ var SidebarUI = { +@@ -159,17 +229,26 @@ var SidebarUI = { /** * The handler for Services.obs.addObserver. **/ @@ -155,7 +165,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc } } }, -@@ -573,6 +642,10 @@ var SidebarUI = { +@@ -573,6 +652,10 @@ var SidebarUI = { this._box.setAttribute("sidebarcommand", commandID); this.lastOpenedId = commandID; @@ -166,7 +176,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc let { url, title, sourceL10nEl } = this.sidebars.get(commandID); this.title = title; // Keep the title element in sync with any l10n changes. -@@ -618,6 +691,26 @@ var SidebarUI = { +@@ -618,6 +701,26 @@ var SidebarUI = { this.selectMenuItem(""); @@ -193,7 +203,7 @@ index f09e37fc42f7754f7f3687884ead25124c1b2076..3148bad1c6c65207064bd650eef9bafc // Replace the document currently displayed in the sidebar with about:blank // so that we can free memory by unloading the page. We need to explicitly // create a new content viewer because the old one doesn't get destroyed -@@ -641,25 +734,112 @@ var SidebarUI = { +@@ -641,25 +744,112 @@ var SidebarUI = { * none if the argument is an empty string. */ selectMenuItem(commandID) { diff --git a/src/browser/themes/BuiltInThemeConfig-jsm.patch b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch similarity index 52% rename from src/browser/themes/BuiltInThemeConfig-jsm.patch rename to src/browser/themes/BuiltInThemeConfig-sys-mjs.patch index e770a8dd..e9587e09 100644 --- a/src/browser/themes/BuiltInThemeConfig-jsm.patch +++ b/src/browser/themes/BuiltInThemeConfig-sys-mjs.patch @@ -1,8 +1,8 @@ -diff --git a/browser/themes/BuiltInThemeConfig.jsm b/browser/themes/BuiltInThemeConfig.jsm -index 05bc07ac54fa43dd6bcce1f4ab619bc054cb8084..8ace74cac976889ca0e92910388fb5128436d013 100644 ---- a/browser/themes/BuiltInThemeConfig.jsm -+++ b/browser/themes/BuiltInThemeConfig.jsm -@@ -32,6 +32,20 @@ const BuiltInThemeConfig = new Map([ +diff --git a/browser/themes/BuiltInThemeConfig.sys.mjs b/browser/themes/BuiltInThemeConfig.sys.mjs +index 9c93c0d39ad11d95ecb4ad119d3c21da2528af23..e00efac497130363a41c0ecdbe07df761076b368 100644 +--- a/browser/themes/BuiltInThemeConfig.sys.mjs ++++ b/browser/themes/BuiltInThemeConfig.sys.mjs +@@ -32,6 +32,20 @@ export const BuiltInThemeConfig = new Map([ path: "resource://builtin-themes/dark/", }, ], diff --git a/src/browser/themes/ThemeVariableMap-jsm.patch b/src/browser/themes/ThemeVariableMap-jsm.patch deleted file mode 100644 index 72841a1d..00000000 --- a/src/browser/themes/ThemeVariableMap-jsm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/browser/themes/ThemeVariableMap.jsm b/browser/themes/ThemeVariableMap.jsm -index dbd936100907ace650de67a7ca882067fb65f038..3f20307d018a5be1a7de0130d008496d58851c9a 100644 ---- a/browser/themes/ThemeVariableMap.jsm -+++ b/browser/themes/ThemeVariableMap.jsm -@@ -130,7 +130,7 @@ const ThemeVariableMap = [ - "--sidebar-background-color", - { - lwtProperty: "sidebar", -- optionalElementID: "sidebar-box", -+ optionalElementID: "browser", - processColor(rgbaChannels, element) { - if (!rgbaChannels) { - element.removeAttribute("lwt-sidebar"); diff --git a/src/browser/themes/ThemeVariableMap-sys-mjs.patch b/src/browser/themes/ThemeVariableMap-sys-mjs.patch new file mode 100644 index 00000000..940a8be5 --- /dev/null +++ b/src/browser/themes/ThemeVariableMap-sys-mjs.patch @@ -0,0 +1,15 @@ +diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs +index f2fd99193ddd0c24b7ad3ec953216973b162aaed..2d07c599152d8b0329f84a6cb626a1a40fdd241d 100644 +--- a/browser/themes/ThemeVariableMap.sys.mjs ++++ b/browser/themes/ThemeVariableMap.sys.mjs +@@ -126,7 +126,9 @@ export const ThemeVariableMap = [ + "--sidebar-background-color", + { + lwtProperty: "sidebar", +- optionalElementID: "sidebar-box", ++ // Pulse: we want to use the sidebar color in the sidebar tabs, which are ++ // under the `browser` parent rather than the `sidebar-box` parent ++ optionalElementID: "browser", + processColor(rgbaChannels, element) { + if (!rgbaChannels) { + element.removeAttribute("lwt-sidebar"); diff --git a/src/browser/themes/pulse/content/downloads.css b/src/browser/themes/pulse/content/downloads.css new file mode 100644 index 00000000..fdb694b4 --- /dev/null +++ b/src/browser/themes/pulse/content/downloads.css @@ -0,0 +1,33 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/* ========================================================================== */ +/* about:downloads */ + +#contentAreaDownloadsView { + background: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)); +} + +#downloadsListBox { + border: none; + border-radius: 0; + background: none; +} + +#downloadsListBox > richlistitem { + border-radius: 4px; + transition: background-color 0.2s ease-in-out; + + margin-bottom: 8px; +} + +#downloadsListBox > richlistitem:not([selected]):hover { + background-color: var(--in-content-box-background); +} + +@media (prefers-reduced-motion) { + #downloadsListBox > richlistitem { + transition: none; + } +} diff --git a/src/browser/themes/pulse/jar.inc.mn b/src/browser/themes/pulse/jar.inc.mn index cc536668..f1dd059d 100644 --- a/src/browser/themes/pulse/jar.inc.mn +++ b/src/browser/themes/pulse/jar.inc.mn @@ -7,5 +7,6 @@ # be specified once. As a result, the source file paths are relative # to the location of the actual manifest. -* skin/classic/browser/sidebar_tabs.css (../pulse/sidebar_tabs.css) +* skin/classic/browser/pulse/sidebar_tabs.css (../pulse/sidebar_tabs.css) + skin/classic/browser/pulse/downloads.css (../pulse/content/downloads.css) skin/classic/browser/addons/shared.css (../pulse/addons/shared.css) diff --git a/src/browser/themes/pulse/sidebar_tabs.css b/src/browser/themes/pulse/sidebar_tabs.css index 79b5babc..b57e4965 100644 --- a/src/browser/themes/pulse/sidebar_tabs.css +++ b/src/browser/themes/pulse/sidebar_tabs.css @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /* ========================================================================== */ -/* SIDE BAR STYLES */ +/* SIDEBAR TABS STYLES */ :root { --sidebar-inside-padding: 8px; @@ -18,7 +18,7 @@ background-color: -moz-Dialog; overflow: hidden; - max-width: var(--tab-min-height); + max-width: calc(var(--tab-min-height) + var(--tab-block-margin) * 2); /* Makes the sidebar slide out from below */ position: relative; diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch index c01534a0..9cf002a9 100644 --- a/src/browser/themes/shared/browser-shared-css.patch +++ b/src/browser/themes/shared/browser-shared-css.patch @@ -1,12 +1,12 @@ diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css -index ea4e59523027b51ecea12a45dc3844f17136c918..b542ece71a64cfe8747f494e67362f188b618321 100644 +index b3f83092c310fe2378f79d5a07726ad8c215e2a3..c4b32e71b153a02c8505a2f879321c7006fd76a2 100644 --- a/browser/themes/shared/browser-shared.css +++ b/browser/themes/shared/browser-shared.css @@ -23,6 +23,8 @@ @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); -+@import url("chrome://browser/skin/sidebar_tabs.css"); ++@import url("chrome://browser/skin/pulse/sidebar_tabs.css"); + @namespace html url("http://www.w3.org/1999/xhtml"); diff --git a/src/browser/themes/shared/downloads/allDownloadsView-inc-css.patch b/src/browser/themes/shared/downloads/allDownloadsView-inc-css.patch new file mode 100644 index 00000000..99364b87 --- /dev/null +++ b/src/browser/themes/shared/downloads/allDownloadsView-inc-css.patch @@ -0,0 +1,12 @@ +diff --git a/browser/themes/shared/downloads/allDownloadsView.inc.css b/browser/themes/shared/downloads/allDownloadsView.inc.css +index 204e6a95a17a58789c5992983196542104f6cf84..43f7cae36b9b60d27d2442efe3f48f7cbea8bcaa 100644 +--- a/browser/themes/shared/downloads/allDownloadsView.inc.css ++++ b/browser/themes/shared/downloads/allDownloadsView.inc.css +@@ -4,6 +4,7 @@ + + @import "chrome://browser/skin/downloads/progressmeter.css"; + @import "chrome://browser/skin/downloads/download-blockedStates.css"; ++@import "chrome://browser/skin/pulse/downloads.css"; + + /*** View and outer controls ***/ + diff --git a/src/browser/themes/shared/jar-inc-mn.patch b/src/browser/themes/shared/jar-inc-mn.patch index d6ae8703..df095097 100644 --- a/src/browser/themes/shared/jar-inc-mn.patch +++ b/src/browser/themes/shared/jar-inc-mn.patch @@ -1,5 +1,5 @@ diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn -index 26f209ad704739db88ead4ccfc7075d23b4b666d..31a1e45a8f7729f50b95fb4ea68962faaee02446 100644 +index 14ef7ff731145a42b28cbb9afe192bf56f756ed5..25d12586b7e8ce29d694dd6c0028ad176da96b1d 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -7,6 +7,8 @@ @@ -9,5 +9,5 @@ index 26f209ad704739db88ead4ccfc7075d23b4b666d..31a1e45a8f7729f50b95fb4ea68962fa +#include ../pulse/jar.inc.mn + skin/classic/browser/aboutFrameCrashed.css (../shared/aboutFrameCrashed.css) - skin/classic/browser/aboutNetError.css (../shared/aboutNetError.css) skin/classic/browser/aboutRestartRequired.css (../shared/aboutRestartRequired.css) + skin/classic/browser/aboutSessionRestore.css (../shared/aboutSessionRestore.css) diff --git a/src/toolkit/modules/LightweightThemeConsumer-jsm.patch b/src/toolkit/modules/LightweightThemeConsumer-jsm.patch deleted file mode 100644 index 0d9cc539..00000000 --- a/src/toolkit/modules/LightweightThemeConsumer-jsm.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/toolkit/modules/LightweightThemeConsumer.jsm b/toolkit/modules/LightweightThemeConsumer.jsm -index b5b0da07cbcf503791bba1df9aa071181a857b70..e78b368532d2f8408d396585c1358218dc8b993a 100644 ---- a/toolkit/modules/LightweightThemeConsumer.jsm -+++ b/toolkit/modules/LightweightThemeConsumer.jsm -@@ -209,6 +209,14 @@ const toolkitVariableMap = [ - lwtProperty: "toolbar_field_highlight_text", - }, - ], -+ // Pulse browser: Sidebar colors -+ // Expose some light weight theme variables to be available for use within css -+ [ -+ '--lwt-sidebar-background-color', -+ { -+ lwtProperty: "sidebar", -+ } -+ ] - ]; - - function LightweightThemeConsumer(aDocument) { diff --git a/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch b/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch new file mode 100644 index 00000000..cc88b08c --- /dev/null +++ b/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch @@ -0,0 +1,19 @@ +diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs +index 3a3ac065afb636d6ceb1ca568c3eabd10a7127f6..db44fb7b9bc4c0f5b714154be0cc00d91e3ef44b 100644 +--- a/toolkit/modules/LightweightThemeConsumer.sys.mjs ++++ b/toolkit/modules/LightweightThemeConsumer.sys.mjs +@@ -183,6 +183,14 @@ const toolkitVariableMap = [ + lwtProperty: "toolbar_field_highlight_text", + }, + ], ++ // Pulse browser: Sidebar colors ++ // Expose some light weight theme variables to be available for use within css ++ [ ++ '--lwt-sidebar-background-color', ++ { ++ lwtProperty: "sidebar", ++ } ++ ] + ]; + + export function LightweightThemeConsumer(aDocument) { diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch index 9c5d6e1a..b6d46b5d 100644 --- a/src/toolkit/modules/moz-build.patch +++ b/src/toolkit/modules/moz-build.patch @@ -1,12 +1,12 @@ diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build -index 26acb92b37b7c0989a117a082de1861710ca65d7..ff7101147f0e14ec32ec2bd0d4afff535cd14a9a 100644 +index c0c6e76515978b05ae9ed0281f0106469df2b573..12f3a1820f79430f5baeaf7ad51dcf61c1bb0c29 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build -@@ -163,6 +163,7 @@ EXTRA_JS_MODULES += [ - "Color.jsm", +@@ -160,6 +160,7 @@ EXTRA_JS_MODULES += [ + "Color.sys.mjs", "Console.jsm", "ContentDOMReference.jsm", + "ContextMenu.jsm", - "CreditCard.jsm", - "DateTimePickerPanel.jsm", + "CreditCard.sys.mjs", + "DateTimePickerPanel.sys.mjs", "DeferredTask.jsm",