commit 145105b746db2878851bacbfc232b041243f89b3 parent a8a7aa881515b664c23dd4fe0070e03c7bff22ca Author: Serban Stanca <sstanca@mozilla.com> Date: Tue, 4 Nov 2025 20:52:01 +0200 Revert "Bug 1997684 - use moz-src for browser/components/topsites, r=mconley" for causing newtab failures. This reverts commit 3c2d0ad5612be9316eb1d94d951bb6316357be76. Diffstat:
16 files changed, 34 insertions(+), 86 deletions(-)
diff --git a/browser/components/topsites/TopSites.sys.mjs b/browser/components/topsites/TopSites.sys.mjs @@ -5,9 +5,9 @@ import { getDomain, TippyTopProvider, -} from "moz-src:///browser/components/topsites/TippyTopProvider.sys.mjs"; +} from "resource:///modules/topsites/TippyTopProvider.sys.mjs"; import { Dedupe } from "resource:///modules/Dedupe.sys.mjs"; -import { TOP_SITES_MAX_SITES_PER_ROW } from "moz-src:///browser/components/topsites/constants.mjs"; +import { TOP_SITES_MAX_SITES_PER_ROW } from "resource:///modules/topsites/constants.mjs"; import { CUSTOM_SEARCH_SHORTCUTS, checkHasSearchEngine, diff --git a/browser/components/topsites/moz.build b/browser/components/topsites/moz.build @@ -4,7 +4,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/. -MOZ_SRC_FILES += [ +EXTRA_JS_MODULES.topsites += [ "constants.mjs", "TippyTopProvider.sys.mjs", "TopSites.sys.mjs", diff --git a/browser/components/topsites/test/unit/test_FaviconProvider.js b/browser/components/topsites/test/unit/test_FaviconProvider.js @@ -4,7 +4,7 @@ "use strict"; ChromeUtils.defineESModuleGetters(this, { - FaviconProvider: "moz-src:///browser/components/topsites/TopSites.sys.mjs", + FaviconProvider: "resource:///modules/topsites/TopSites.sys.mjs", HttpServer: "resource://testing-common/httpd.sys.mjs", NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs", NetUtil: "resource://gre/modules/NetUtil.sys.mjs", diff --git a/browser/components/topsites/test/unit/test_TippyTopProvider.js b/browser/components/topsites/test/unit/test_TippyTopProvider.js @@ -5,8 +5,7 @@ ChromeUtils.defineESModuleGetters(this, { sinon: "resource://testing-common/Sinon.sys.mjs", - TippyTopProvider: - "moz-src:///browser/components/topsites/TippyTopProvider.sys.mjs", + TippyTopProvider: "resource:///modules/topsites/TippyTopProvider.sys.mjs", }); /** diff --git a/browser/components/topsites/test/unit/test_top_sites.js b/browser/components/topsites/test/unit/test_top_sites.js @@ -4,9 +4,7 @@ "use strict"; const { TopSites, insertPinned, DEFAULT_TOP_SITES } = - ChromeUtils.importESModule( - "moz-src:///browser/components/topsites/TopSites.sys.mjs" - ); + ChromeUtils.importESModule("resource:///modules/topsites/TopSites.sys.mjs"); ChromeUtils.defineESModuleGetters(this, { FilterAdult: "resource:///modules/FilterAdult.sys.mjs", @@ -17,10 +15,8 @@ ChromeUtils.defineESModuleGetters(this, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", SearchService: "resource://gre/modules/SearchService.sys.mjs", TestUtils: "resource://testing-common/TestUtils.sys.mjs", - TOP_SITES_DEFAULT_ROWS: - "moz-src:///browser/components/topsites/constants.mjs", - TOP_SITES_MAX_SITES_PER_ROW: - "moz-src:///browser/components/topsites/constants.mjs", + TOP_SITES_DEFAULT_ROWS: "resource:///modules/topsites/constants.mjs", + TOP_SITES_MAX_SITES_PER_ROW: "resource:///modules/topsites/constants.mjs", }); const FAKE_FAVICON = "data987"; diff --git a/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs b/browser/components/urlbar/UrlbarProviderTopSites.sys.mjs @@ -18,11 +18,9 @@ const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", - TopSites: "moz-src:///browser/components/topsites/TopSites.sys.mjs", - TOP_SITES_DEFAULT_ROWS: - "moz-src:///browser/components/topsites/constants.mjs", - TOP_SITES_MAX_SITES_PER_ROW: - "moz-src:///browser/components/topsites/constants.mjs", + TopSites: "resource:///modules/topsites/TopSites.sys.mjs", + TOP_SITES_DEFAULT_ROWS: "resource:///modules/topsites/constants.mjs", + TOP_SITES_MAX_SITES_PER_ROW: "resource:///modules/topsites/constants.mjs", UrlbarPrefs: "moz-src:///browser/components/urlbar/UrlbarPrefs.sys.mjs", UrlbarProviderOpenTabs: "moz-src:///browser/components/urlbar/UrlbarProviderOpenTabs.sys.mjs", diff --git a/browser/components/urlbar/tests/browser/browser_top_sites.js b/browser/components/urlbar/tests/browser/browser_top_sites.js @@ -6,7 +6,7 @@ ChromeUtils.defineESModuleGetters(this, { AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs", NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs", - TopSites: "moz-src:///browser/components/topsites/TopSites.sys.mjs", + TopSites: "resource:///modules/topsites/TopSites.sys.mjs", }); const EN_US_TOPSITES = diff --git a/browser/components/urlbar/tests/browser/browser_top_sites_private.js b/browser/components/urlbar/tests/browser/browser_top_sites_private.js @@ -6,7 +6,7 @@ ChromeUtils.defineESModuleGetters(this, { AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs", NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs", - TopSites: "moz-src:///browser/components/topsites/TopSites.sys.mjs", + TopSites: "resource:///modules/topsites/TopSites.sys.mjs", }); const EN_US_TOPSITES = diff --git a/browser/components/urlbar/tests/browser/head-common.js b/browser/components/urlbar/tests/browser/head-common.js @@ -6,7 +6,7 @@ ChromeUtils.defineESModuleGetters(this, { PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", Preferences: "resource://gre/modules/Preferences.sys.mjs", sinon: "resource://testing-common/Sinon.sys.mjs", - TopSites: "moz-src:///browser/components/topsites/TopSites.sys.mjs", + TopSites: "resource:///modules/topsites/TopSites.sys.mjs", UrlbarProvider: "moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs", UrlbarProvidersManager: "moz-src:///browser/components/urlbar/UrlbarProvidersManager.sys.mjs", diff --git a/browser/extensions/newtab/common/Reducers.sys.mjs b/browser/extensions/newtab/common/Reducers.sys.mjs @@ -4,19 +4,11 @@ import { actionTypes as at } from "resource://newtab/common/Actions.mjs"; import { Dedupe } from "resource:///modules/Dedupe.sys.mjs"; -import { ImportHelper } from "resource://newtab/lib/ImportHelper.sys.mjs"; -/** - * @backward-compat { version 146 } - * - * Switch back to aggregate export for these constants once 146 hits release. - */ -const { TOP_SITES_DEFAULT_ROWS, TOP_SITES_MAX_SITES_PER_ROW } = - ImportHelper.import( - "moz-src:///browser/components/topsites/constants.mjs", - "resource:///modules/topsites/" - ); -export { TOP_SITES_DEFAULT_ROWS, TOP_SITES_MAX_SITES_PER_ROW }; +export { + TOP_SITES_DEFAULT_ROWS, + TOP_SITES_MAX_SITES_PER_ROW, +} from "resource:///modules/topsites/constants.mjs"; const dedupe = new Dedupe(site => site && site.url); diff --git a/browser/extensions/newtab/lib/FaviconFeed.sys.mjs b/browser/extensions/newtab/lib/FaviconFeed.sys.mjs @@ -3,17 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ import { actionTypes as at } from "resource://newtab/common/Actions.mjs"; -import { ImportHelper } from "resource://newtab/lib/ImportHelper.sys.mjs"; - -/** - * @backward-compat { version 146 } - * - * Switch back to a normal import once 146 hits release. - */ -const { FaviconProvider } = ImportHelper.import( - "moz-src:///browser/components/topsites/TopSites.sys.mjs", - "resource:///modules/topsites/" -); +import { FaviconProvider } from "resource:///modules/topsites/TopSites.sys.mjs"; export class FaviconFeed { constructor() { diff --git a/browser/extensions/newtab/lib/HighlightsFeed.sys.mjs b/browser/extensions/newtab/lib/HighlightsFeed.sys.mjs @@ -4,18 +4,10 @@ import { actionTypes as at } from "resource://newtab/common/Actions.mjs"; -import { ImportHelper } from "resource://newtab/lib/ImportHelper.sys.mjs"; - -/** - * @backward-compat { version 146 } - * - * Switch back to a normal import once 146 hits release. - */ -const { TOP_SITES_DEFAULT_ROWS, TOP_SITES_MAX_SITES_PER_ROW } = - ImportHelper.import( - "moz-src:///browser/components/topsites/constants.mjs", - "resource:///modules/topsites/" - ); +import { + TOP_SITES_DEFAULT_ROWS, + TOP_SITES_MAX_SITES_PER_ROW, +} from "resource:///modules/topsites/constants.mjs"; import { Dedupe } from "resource:///modules/Dedupe.sys.mjs"; const lazy = {}; diff --git a/browser/extensions/newtab/lib/TopSitesFeed.sys.mjs b/browser/extensions/newtab/lib/TopSitesFeed.sys.mjs @@ -6,26 +6,9 @@ import { actionCreators as ac, actionTypes as at, } from "resource://newtab/common/Actions.mjs"; - -import { ImportHelper } from "resource://newtab/lib/ImportHelper.sys.mjs"; - -/** - * @backward-compat { version 146 } - * - * Switch back to normal imports once 146 hits release. - */ -const { TippyTopProvider } = ImportHelper.import( - "moz-src:///browser/components/topsites/TippyTopProvider.sys.mjs", - "resource:///modules/topsites/" -); -const { insertPinned } = ImportHelper.import( - "moz-src:///browser/components/topsites/TopSites.sys.mjs", - "resource:///modules/topsites/" -); -const { TOP_SITES_MAX_SITES_PER_ROW } = ImportHelper.import( - "moz-src:///browser/components/topsites/constants.mjs", - "resource:///modules/topsites/" -); +import { TippyTopProvider } from "resource:///modules/topsites/TippyTopProvider.sys.mjs"; +import { insertPinned } from "resource:///modules/topsites/TopSites.sys.mjs"; +import { TOP_SITES_MAX_SITES_PER_ROW } from "resource:///modules/topsites/constants.mjs"; import { Dedupe } from "resource:///modules/Dedupe.sys.mjs"; import { diff --git a/browser/extensions/newtab/test/xpcshell/test_TopSitesFeed.js b/browser/extensions/newtab/test/xpcshell/test_TopSitesFeed.js @@ -16,10 +16,8 @@ ChromeUtils.defineESModuleGetters(this, { Screenshots: "resource://newtab/lib/Screenshots.sys.mjs", Sampling: "resource://gre/modules/components-utils/Sampling.sys.mjs", SearchService: "resource://gre/modules/SearchService.sys.mjs", - TOP_SITES_DEFAULT_ROWS: - "moz-src:///browser/components/topsites/constants.mjs", - TOP_SITES_MAX_SITES_PER_ROW: - "moz-src:///browser/components/topsites/constants.mjs", + TOP_SITES_DEFAULT_ROWS: "resource:///modules/topsites/constants.mjs", + TOP_SITES_MAX_SITES_PER_ROW: "resource:///modules/topsites/constants.mjs", TopSitesFeed: "resource://newtab/lib/TopSitesFeed.sys.mjs", }); diff --git a/tools/@types/generated/lib.gecko.modules.d.ts b/tools/@types/generated/lib.gecko.modules.d.ts @@ -509,9 +509,9 @@ export interface Modules { "resource:///modules/taskbartabs/TaskbarTabsRegistry.sys.mjs": typeof import("resource:///modules/taskbartabs/TaskbarTabsRegistry.sys.mjs"), "resource:///modules/taskbartabs/TaskbarTabsUtils.sys.mjs": typeof import("resource:///modules/taskbartabs/TaskbarTabsUtils.sys.mjs"), "resource:///modules/taskbartabs/TaskbarTabsWindowManager.sys.mjs": typeof import("resource:///modules/taskbartabs/TaskbarTabsWindowManager.sys.mjs"), - "moz-src:///browser/components/topsites/TippyTopProvider.sys.mjs": typeof import("moz-src:///browser/components/topsites/TippyTopProvider.sys.mjs"), - "moz-src:///browser/components/topsites/TopSites.sys.mjs": typeof import("moz-src:///browser/components/topsites/TopSites.sys.mjs"), - "moz-src:///browser/components/topsites/constants.mjs": typeof import("moz-src:///browser/components/topsites/constants.mjs"), + "resource:///modules/topsites/TippyTopProvider.sys.mjs": typeof import("resource:///modules/topsites/TippyTopProvider.sys.mjs"), + "resource:///modules/topsites/TopSites.sys.mjs": typeof import("resource:///modules/topsites/TopSites.sys.mjs"), + "resource:///modules/topsites/constants.mjs": typeof import("resource:///modules/topsites/constants.mjs"), "resource:///modules/webrtcUI.sys.mjs": typeof import("resource:///modules/webrtcUI.sys.mjs"), "resource://autofill/FormAutofill.sys.mjs": typeof import("resource://autofill/FormAutofill.sys.mjs"), "resource://autofill/FormAutofillChild.ios.sys.mjs": typeof import("resource://autofill/FormAutofillChild.ios.sys.mjs"), diff --git a/tools/@types/generated/tspaths.json b/tools/@types/generated/tspaths.json @@ -1421,13 +1421,13 @@ "resource:///modules/taskbartabs/TaskbarTabsWindowManager.sys.mjs": [ "browser/components/taskbartabs/TaskbarTabsWindowManager.sys.mjs" ], - "moz-src:///browser/components/topsites/TippyTopProvider.sys.mjs": [ + "resource:///modules/topsites/TippyTopProvider.sys.mjs": [ "browser/components/topsites/TippyTopProvider.sys.mjs" ], - "moz-src:///browser/components/topsites/TopSites.sys.mjs": [ + "resource:///modules/topsites/TopSites.sys.mjs": [ "browser/components/topsites/TopSites.sys.mjs" ], - "moz-src:///browser/components/topsites/constants.mjs": [ + "resource:///modules/topsites/constants.mjs": [ "browser/components/topsites/constants.mjs" ], "resource:///modules/webrtcUI.sys.mjs": [