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

@@ -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",

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

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;

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",

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",
 });
 
 /**

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 = {

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",
       });

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();
 

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",

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() {

browser/installer/package-manifest.in

@@ -203,6 +203,7 @@
 ; Modules
 @RESPATH@/browser/modules/*
 @RESPATH@/modules/*
+@RESPATH@/moz-src/*
 @RESPATH@/browser/actors/*
 @RESPATH@/actors/*
 

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/";

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 = {

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