From 8c703a7db2b9672e7328d912f45fe3791f4044db Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Tue, 4 Mar 2025 21:20:35 +0000 Subject: [PATCH] Bug 1951072 - switch reader mode modules to use moz-src URLs, r=firefox-desktop-core-reviewers ,sync-reviewers,urlbar-reviewers,mossop,jteow,markh Differential Revision: https://phabricator.services.mozilla.com/D240004 --- browser/actors/AboutReaderChild.sys.mjs | 4 ++-- browser/actors/AboutReaderParent.sys.mjs | 2 +- browser/base/content/browser.js | 2 +- browser/base/content/nsContextMenu.sys.mjs | 2 +- browser/components/pocket/content/pktUI.js | 2 +- browser/components/urlbar/UrlbarInput.sys.mjs | 2 +- services/sync/modules/engines/tabs.sys.mjs | 2 +- toolkit/actors/PrintingChild.sys.mjs | 2 +- toolkit/components/reader/AboutReader.sys.mjs | 2 +- toolkit/components/reader/Reader.worker.js | 4 ++-- toolkit/components/reader/ReaderMode.sys.mjs | 2 +- toolkit/components/reader/ReaderWorker.sys.mjs | 2 +- toolkit/components/reader/moz.build | 13 +++++-------- .../reader/tests/browser/browser_readerMode.js | 2 +- toolkit/modules/BrowserUtils.sys.mjs | 2 +- 15 files changed, 21 insertions(+), 24 deletions(-) diff --git a/browser/actors/AboutReaderChild.sys.mjs b/browser/actors/AboutReaderChild.sys.mjs index b92078aaecee..d9e4936a8a29 100644 --- a/browser/actors/AboutReaderChild.sys.mjs +++ b/browser/actors/AboutReaderChild.sys.mjs @@ -6,8 +6,8 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - AboutReader: "resource://gre/modules/AboutReader.sys.mjs", - ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", + AboutReader: "moz-src:///toolkit/components/reader/AboutReader.sys.mjs", + ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs", Readerable: "resource://gre/modules/Readerable.sys.mjs", }); diff --git a/browser/actors/AboutReaderParent.sys.mjs b/browser/actors/AboutReaderParent.sys.mjs index c2b78382a97d..16801ea514fe 100644 --- a/browser/actors/AboutReaderParent.sys.mjs +++ b/browser/actors/AboutReaderParent.sys.mjs @@ -8,7 +8,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PageActions: "resource:///modules/PageActions.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", - ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", + ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs", }); // A set of all of the AboutReaderParent actors that exist. diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 16116d1ebd54..a78d7060c165 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -67,7 +67,7 @@ ChromeUtils.defineESModuleGetters(this, { PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.sys.mjs", PromptUtils: "resource://gre/modules/PromptUtils.sys.mjs", - ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", + ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs", ResetPBMPanel: "resource:///modules/ResetPBMPanel.sys.mjs", SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs", Sanitizer: "resource:///modules/Sanitizer.sys.mjs", diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs index 4e975cd22dd7..e70b7e27ec4a 100644 --- a/browser/base/content/nsContextMenu.sys.mjs +++ b/browser/base/content/nsContextMenu.sys.mjs @@ -20,7 +20,7 @@ ChromeUtils.defineESModuleGetters(lazy, { NetUtil: "resource://gre/modules/NetUtil.sys.mjs", PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", - ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", + ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs", ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs", TranslationsParent: "resource://gre/actors/TranslationsParent.sys.mjs", WebsiteFilter: "resource:///modules/policies/WebsiteFilter.sys.mjs", diff --git a/browser/components/pocket/content/pktUI.js b/browser/components/pocket/content/pktUI.js index 05e31b5c30a6..954fd416a627 100644 --- a/browser/components/pocket/content/pktUI.js +++ b/browser/components/pocket/content/pktUI.js @@ -49,7 +49,7 @@ ChromeUtils.defineESModuleGetters(this, { pktApi: "chrome://pocket/content/pktApi.sys.mjs", pktTelemetry: "chrome://pocket/content/pktTelemetry.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", - ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", + ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs", SaveToPocket: "chrome://pocket/content/SaveToPocket.sys.mjs", }); diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs index e7a2e772079e..4ef482f1ea75 100644 --- a/browser/components/urlbar/UrlbarInput.sys.mjs +++ b/browser/components/urlbar/UrlbarInput.sys.mjs @@ -19,7 +19,7 @@ ChromeUtils.defineESModuleGetters(lazy, { ObjectUtils: "resource://gre/modules/ObjectUtils.sys.mjs", PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", - ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", + ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs", SearchModeSwitcher: "resource:///modules/SearchModeSwitcher.sys.mjs", SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", diff --git a/services/sync/modules/engines/tabs.sys.mjs b/services/sync/modules/engines/tabs.sys.mjs index 9bd9f3d0aeca..9f1054b772df 100644 --- a/services/sync/modules/engines/tabs.sys.mjs +++ b/services/sync/modules/engines/tabs.sys.mjs @@ -28,7 +28,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", - ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", + ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs", getTabsStore: "resource://services-sync/TabsStore.sys.mjs", RemoteTabRecord: "resource://gre/modules/RustTabs.sys.mjs", }); diff --git a/toolkit/actors/PrintingChild.sys.mjs b/toolkit/actors/PrintingChild.sys.mjs index 182784cfe74b..8dc99953ff5b 100644 --- a/toolkit/actors/PrintingChild.sys.mjs +++ b/toolkit/actors/PrintingChild.sys.mjs @@ -7,7 +7,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { DeferredTask: "resource://gre/modules/DeferredTask.sys.mjs", - ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", + ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs", setTimeout: "resource://gre/modules/Timer.sys.mjs", }); diff --git a/toolkit/components/reader/AboutReader.sys.mjs b/toolkit/components/reader/AboutReader.sys.mjs index 5baf142627d2..9661ce2e7cca 100644 --- a/toolkit/components/reader/AboutReader.sys.mjs +++ b/toolkit/components/reader/AboutReader.sys.mjs @@ -2,7 +2,7 @@ * 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/. */ -import { ReaderMode } from "resource://gre/modules/ReaderMode.sys.mjs"; +import { ReaderMode } from "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs"; import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; diff --git a/toolkit/components/reader/Reader.worker.js b/toolkit/components/reader/Reader.worker.js index 148c57534c86..ded94d1c4958 100644 --- a/toolkit/components/reader/Reader.worker.js +++ b/toolkit/components/reader/Reader.worker.js @@ -13,8 +13,8 @@ /* import-globals-from /toolkit/components/reader/readability/Readability.js */ importScripts( "resource://gre/modules/workers/require.js", - "resource://gre/modules/reader/JSDOMParser.js", - "resource://gre/modules/reader/Readability.js" + "moz-src:///toolkit/components/reader/readability/JSDOMParser.js", + "moz-src:///toolkit/components/reader/readability/Readability.js" ); var PromiseWorker = require("resource://gre/modules/workers/PromiseWorker.js"); diff --git a/toolkit/components/reader/ReaderMode.sys.mjs b/toolkit/components/reader/ReaderMode.sys.mjs index 112adb9b646a..3c54eda6d3bb 100644 --- a/toolkit/components/reader/ReaderMode.sys.mjs +++ b/toolkit/components/reader/ReaderMode.sys.mjs @@ -35,7 +35,7 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { LanguageDetector: "resource://gre/modules/translations/LanguageDetector.sys.mjs", - ReaderWorker: "resource://gre/modules/reader/ReaderWorker.sys.mjs", + ReaderWorker: "moz-src:///toolkit/components/reader/ReaderWorker.sys.mjs", Readerable: "resource://gre/modules/Readerable.sys.mjs", }); diff --git a/toolkit/components/reader/ReaderWorker.sys.mjs b/toolkit/components/reader/ReaderWorker.sys.mjs index 16c47c45ddae..ec542d99231c 100644 --- a/toolkit/components/reader/ReaderWorker.sys.mjs +++ b/toolkit/components/reader/ReaderWorker.sys.mjs @@ -9,5 +9,5 @@ import { BasePromiseWorker } from "resource://gre/modules/PromiseWorker.sys.mjs"; export var ReaderWorker = new BasePromiseWorker( - "resource://gre/modules/reader/Reader.worker.js" + "moz-src:///toolkit/components/reader/Reader.worker.js" ); diff --git a/toolkit/components/reader/moz.build b/toolkit/components/reader/moz.build index dba7a5a2efa8..acf23ac474f0 100644 --- a/toolkit/components/reader/moz.build +++ b/toolkit/components/reader/moz.build @@ -6,22 +6,19 @@ JAR_MANIFESTS += ["jar.mn"] -EXTRA_JS_MODULES += [ +MOZ_SRC_FILES += [ "AboutReader.sys.mjs", + "readability/JSDOMParser.js", + "readability/Readability.js", + "Reader.worker.js", "ReaderMode.sys.mjs", + "ReaderWorker.sys.mjs", ] EXTRA_PP_JS_MODULES += [ "Readerable.sys.mjs", ] -EXTRA_JS_MODULES.reader = [ - "readability/JSDOMParser.js", - "readability/Readability.js", - "Reader.worker.js", - "ReaderWorker.sys.mjs", -] - BROWSER_CHROME_MANIFESTS += ["tests/browser/browser.toml"] MOCHITEST_CHROME_MANIFESTS += ["tests/chrome/chrome.toml"] diff --git a/toolkit/components/reader/tests/browser/browser_readerMode.js b/toolkit/components/reader/tests/browser/browser_readerMode.js index 9093aa7fc1cd..74230ca42f4e 100644 --- a/toolkit/components/reader/tests/browser/browser_readerMode.js +++ b/toolkit/components/reader/tests/browser/browser_readerMode.js @@ -185,7 +185,7 @@ add_task(async function test_reader_button() { add_task(async function test_getOriginalUrl() { let { ReaderMode } = ChromeUtils.importESModule( - "resource://gre/modules/ReaderMode.sys.mjs" + "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs" ); let url = "https://foo.com/article.html"; diff --git a/toolkit/modules/BrowserUtils.sys.mjs b/toolkit/modules/BrowserUtils.sys.mjs index b2310a29b23a..d4068f284b0a 100644 --- a/toolkit/modules/BrowserUtils.sys.mjs +++ b/toolkit/modules/BrowserUtils.sys.mjs @@ -9,7 +9,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", + ReaderMode: "moz-src:///toolkit/components/reader/ReaderMode.sys.mjs", Region: "resource://gre/modules/Region.sys.mjs", });