From dcb8be8cff1ad89f0df8fe1d02e43ea29e69fcca Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Mon, 3 Mar 2025 12:47:49 +0000 Subject: [PATCH] Bug 1950871 - switch browser/components/tabbrowser to use moz-src, r=dao,tabbrowser-reviewers Differential Revision: https://phabricator.services.mozilla.com/D239926 --- browser/base/content/browser.js | 6 ++++-- browser/components/BrowserComponents.manifest | 4 ++-- .../test/browser/browser_ext_tabs_autoDiscardable.js | 2 +- browser/components/places/PlacesUIUtils.sys.mjs | 3 ++- browser/components/syncedtabs/TabListComponent.sys.mjs | 3 ++- .../components/tabbrowser/content/browser-allTabsMenu.js | 4 ++-- browser/components/tabbrowser/content/tabbrowser.js | 6 ++++-- browser/components/tabbrowser/content/tabgroup-menu.js | 2 +- browser/components/tabbrowser/moz.build | 2 +- browser/components/tabunloader/content/aboutUnloads.js | 2 +- browser/installer/package-manifest.in | 1 + browser/modules/test/browser/browser_TabUnloader.js | 2 +- browser/modules/test/unit/test_TabUnloader.js | 2 +- toolkit/components/ml/tests/browser/shared-head.js | 4 +++- 14 files changed, 26 insertions(+), 17 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index b89846a11038..96ec32305025 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -46,11 +46,13 @@ ChromeUtils.defineESModuleGetters(this, { LoginManagerParent: "resource://gre/modules/LoginManagerParent.sys.mjs", MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs", NetUtil: "resource://gre/modules/NetUtil.sys.mjs", - NewTabPagePreloading: "resource:///modules/NewTabPagePreloading.sys.mjs", + NewTabPagePreloading: + "moz-src:///browser/components/tabbrowser/NewTabPagePreloading.sys.mjs", NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs", NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", nsContextMenu: "chrome://browser/content/nsContextMenu.sys.mjs", - OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.sys.mjs", + OpenInTabsUtils: + "moz-src:///browser/components/tabbrowser/OpenInTabsUtils.sys.mjs", OpenSearchManager: "resource:///modules/OpenSearchManager.sys.mjs", PageActions: "resource:///modules/PageActions.sys.mjs", PageThumbs: "resource://gre/modules/PageThumbs.sys.mjs", diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest index 8bdb12e99fea..edca11338822 100644 --- a/browser/components/BrowserComponents.manifest +++ b/browser/components/BrowserComponents.manifest @@ -20,14 +20,14 @@ category browser-window-delayed-startup resource:///modules/ReportBrokenSite.sys category browser-window-delayed-startup resource:///modules/SearchUIUtils.sys.mjs SearchUIUtils.init category browser-window-unload resource:///modules/BrowserDOMWindow.sys.mjs BrowserDOMWindow.teardownInWindow -category browser-window-unload resource:///modules/NewTabPagePreloading.sys.mjs NewTabPagePreloading.removePreloadedBrowser +category browser-window-unload moz-src:///browser/components/tabbrowser/NewTabPagePreloading.sys.mjs NewTabPagePreloading.removePreloadedBrowser # App startup consumers category browser-idle-startup resource:///modules/PlacesUIUtils.sys.mjs PlacesUIUtils.unblockToolbars category browser-idle-startup resource:///modules/BuiltInThemes.sys.mjs BuiltInThemes.ensureBuiltInThemes category browser-idle-startup resource://gre/modules/RFPHelper.sys.mjs RFPHelper.init category browser-idle-startup resource://gre/modules/Blocklist.sys.mjs Blocklist.loadBlocklistAsync -category browser-idle-startup resource:///modules/TabUnloader.sys.mjs TabUnloader.init +category browser-idle-startup moz-src:///browser/components/tabbrowser/TabUnloader.sys.mjs TabUnloader.init category browser-idle-startup resource:///modules/GenAI.sys.mjs GenAI.init category browser-idle-startup resource:///modules/QuickSuggest.sys.mjs QuickSuggest.init category browser-idle-startup resource:///modules/UrlbarSearchTermsPersistence.sys.mjs UrlbarSearchTermsPersistence.init diff --git a/browser/components/extensions/test/browser/browser_ext_tabs_autoDiscardable.js b/browser/components/extensions/test/browser/browser_ext_tabs_autoDiscardable.js index ced8f80f071f..052502ce2567 100644 --- a/browser/components/extensions/test/browser/browser_ext_tabs_autoDiscardable.js +++ b/browser/components/extensions/test/browser/browser_ext_tabs_autoDiscardable.js @@ -19,7 +19,7 @@ add_task(async function test_autoDiscardable() { ]), "parent.js": () => { const { TabUnloader } = ChromeUtils.importESModule( - "resource:///modules/TabUnloader.sys.mjs" + "moz-src:///browser/components/tabbrowser/TabUnloader.sys.mjs" ); /* globals ExtensionAPI, ExtensionUtils */ const { ExtensionError } = ExtensionUtils; diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs index fbdd6a34b12d..710f755fe986 100644 --- a/browser/components/places/PlacesUIUtils.sys.mjs +++ b/browser/components/places/PlacesUIUtils.sys.mjs @@ -15,7 +15,8 @@ ChromeUtils.defineESModuleGetters(lazy, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs", CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs", MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs", - OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.sys.mjs", + OpenInTabsUtils: + "moz-src:///browser/components/tabbrowser/OpenInTabsUtils.sys.mjs", PlacesTransactions: "resource://gre/modules/PlacesTransactions.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", diff --git a/browser/components/syncedtabs/TabListComponent.sys.mjs b/browser/components/syncedtabs/TabListComponent.sys.mjs index cda3376dc2a7..e707715998fa 100644 --- a/browser/components/syncedtabs/TabListComponent.sys.mjs +++ b/browser/components/syncedtabs/TabListComponent.sys.mjs @@ -9,7 +9,8 @@ let log = ChromeUtils.importESModule( const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { - OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.sys.mjs", + OpenInTabsUtils: + "moz-src:///browser/components/tabbrowser/OpenInTabsUtils.sys.mjs", }); /** diff --git a/browser/components/tabbrowser/content/browser-allTabsMenu.js b/browser/components/tabbrowser/content/browser-allTabsMenu.js index 996edb31d667..a5426b60da93 100644 --- a/browser/components/tabbrowser/content/browser-allTabsMenu.js +++ b/browser/components/tabbrowser/content/browser-allTabsMenu.js @@ -7,9 +7,9 @@ ChromeUtils.defineESModuleGetters(this, { BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs", - GroupsPanel: "resource:///modules/GroupsList.sys.mjs", + GroupsPanel: "moz-src:///browser/components/tabbrowser/GroupsList.sys.mjs", NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs", - TabsPanel: "resource:///modules/TabsList.sys.mjs", + TabsPanel: "moz-src:///browser/components/tabbrowser/TabsList.sys.mjs", }); var gTabsPanel = { diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js index 06fec203dcac..c5fc0a43464b 100644 --- a/browser/components/tabbrowser/content/tabbrowser.js +++ b/browser/components/tabbrowser/content/tabbrowser.js @@ -106,9 +106,11 @@ ); ChromeUtils.defineESModuleGetters(this, { - AsyncTabSwitcher: "resource:///modules/AsyncTabSwitcher.sys.mjs", + AsyncTabSwitcher: + "moz-src:///browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs", PictureInPicture: "resource://gre/modules/PictureInPicture.sys.mjs", - SmartTabGroupingManager: "resource:///modules/SmartTabGrouping.sys.mjs", + SmartTabGroupingManager: + "moz-src:///browser/components/tabbrowser/SmartTabGrouping.sys.mjs", UrlbarProviderOpenTabs: "resource:///modules/UrlbarProviderOpenTabs.sys.mjs", }); diff --git a/browser/components/tabbrowser/content/tabgroup-menu.js b/browser/components/tabbrowser/content/tabgroup-menu.js index f6d5fb2ab250..12d8929edf96 100644 --- a/browser/components/tabbrowser/content/tabgroup-menu.js +++ b/browser/components/tabbrowser/content/tabgroup-menu.js @@ -408,7 +408,7 @@ ? "chrome://global/skin/icons/highlights.svg" : ""; const { SmartTabGroupingManager } = ChromeUtils.importESModule( - "resource:///modules/SmartTabGrouping.sys.mjs" + "moz-src:///browser/components/tabbrowser/SmartTabGrouping.sys.mjs" ); this.#smartTabGroupingManager = new SmartTabGroupingManager(); diff --git a/browser/components/tabbrowser/moz.build b/browser/components/tabbrowser/moz.build index fceab2d69faa..7a84ed8be976 100644 --- a/browser/components/tabbrowser/moz.build +++ b/browser/components/tabbrowser/moz.build @@ -7,7 +7,7 @@ with Files("**"): JAR_MANIFESTS += ["jar.mn"] -EXTRA_JS_MODULES += [ +MOZ_SRC_FILES += [ "AsyncTabSwitcher.sys.mjs", "GroupsList.sys.mjs", "NewTabPagePreloading.sys.mjs", diff --git a/browser/components/tabunloader/content/aboutUnloads.js b/browser/components/tabunloader/content/aboutUnloads.js index 635f1243d332..db4b85312056 100644 --- a/browser/components/tabunloader/content/aboutUnloads.js +++ b/browser/components/tabunloader/content/aboutUnloads.js @@ -4,7 +4,7 @@ "use strict"; const { TabUnloader } = ChromeUtils.importESModule( - "resource:///modules/TabUnloader.sys.mjs" + "moz-src:///browser/components/tabbrowser/TabUnloader.sys.mjs" ); async function refreshData() { diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 89cff6b562a8..c47e803ef1ff 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -203,6 +203,7 @@ ; Modules @RESPATH@/browser/modules/* @RESPATH@/modules/* +@RESPATH@/moz-src/* @RESPATH@/browser/actors/* @RESPATH@/actors/* diff --git a/browser/modules/test/browser/browser_TabUnloader.js b/browser/modules/test/browser/browser_TabUnloader.js index d564abb6205a..4b993cb768eb 100644 --- a/browser/modules/test/browser/browser_TabUnloader.js +++ b/browser/modules/test/browser/browser_TabUnloader.js @@ -2,7 +2,7 @@ http://creativecommons.org/publicdomain/zero/1.0/ */ const { TabUnloader } = ChromeUtils.importESModule( - "resource:///modules/TabUnloader.sys.mjs" + "moz-src:///browser/components/tabbrowser/TabUnloader.sys.mjs" ); const BASE_URL = "https://example.com/browser/browser/modules/test/browser/"; diff --git a/browser/modules/test/unit/test_TabUnloader.js b/browser/modules/test/unit/test_TabUnloader.js index 3d125828bb29..20527b67355f 100644 --- a/browser/modules/test/unit/test_TabUnloader.js +++ b/browser/modules/test/unit/test_TabUnloader.js @@ -4,7 +4,7 @@ "use strict"; const { TabUnloader } = ChromeUtils.importESModule( - "resource:///modules/TabUnloader.sys.mjs" + "moz-src:///browser/components/tabbrowser/TabUnloader.sys.mjs" ); let TestTabUnloaderMethods = { diff --git a/toolkit/components/ml/tests/browser/shared-head.js b/toolkit/components/ml/tests/browser/shared-head.js index f3e19aec7d3a..5183e885fe48 100644 --- a/toolkit/components/ml/tests/browser/shared-head.js +++ b/toolkit/components/ml/tests/browser/shared-head.js @@ -7,7 +7,9 @@ const { CLUSTER_METHODS, ANCHOR_METHODS, getBestAnchorClusterInfo, -} = ChromeUtils.importESModule("resource:///modules/SmartTabGrouping.sys.mjs"); +} = ChromeUtils.importESModule( + "moz-src:///browser/components/tabbrowser/SmartTabGrouping.sys.mjs" +); /** * Checks if numbers are close up to decimalPoints decimal points