nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1873969 - Convert HighlightsFeed.jsm to an ESM. r=thecount

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D198323
This commit is contained in:
Mike Conley 2024-01-22 14:22:35 +00:00
parent f6aeb7e743
commit ed80de1a2d
4 changed files with 16 additions and 33 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
browser/components/newtab/lib/ActivityStream.jsm
View file

@ -12,6 +12,7 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
DEFAULT_SITES: "resource://activity-stream/lib/DefaultSites.sys.mjs",
DefaultPrefs: "resource://activity-stream/lib/ActivityStreamPrefs.sys.mjs",
HighlightsFeed: "resource://activity-stream/lib/HighlightsFeed.sys.mjs",
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
Region: "resource://gre/modules/Region.sys.mjs",
TelemetryFeed: "resource://activity-stream/lib/TelemetryFeed.sys.mjs",
@ -77,11 +78,6 @@ ChromeUtils.defineModuleGetter(
"TopStoriesFeed",
"resource://activity-stream/lib/TopStoriesFeed.jsm"
);
ChromeUtils.defineModuleGetter(
lazy,
"HighlightsFeed",
"resource://activity-stream/lib/HighlightsFeed.jsm"
);
ChromeUtils.defineModuleGetter(
lazy,
"DiscoveryStreamFeed",

40
browser/components/newtab/lib/HighlightsFeed.jsm → browser/components/newtab/lib/HighlightsFeed.sys.mjs
View file

@ -1,11 +1,8 @@
/* 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/. */
"use strict";
const { actionTypes: at } = ChromeUtils.importESModule(
"resource://activity-stream/common/Actions.sys.mjs"
);
import { actionTypes as at } from "resource://activity-stream/common/Actions.sys.mjs";
const { shortURL } = ChromeUtils.import(
"resource://activity-stream/lib/ShortURL.jsm"
@ -13,13 +10,11 @@ const { shortURL } = ChromeUtils.import(
const { SectionsManager } = ChromeUtils.import(
"resource://activity-stream/lib/SectionsManager.jsm"
);
const { TOP_SITES_DEFAULT_ROWS, TOP_SITES_MAX_SITES_PER_ROW } =
ChromeUtils.importESModule(
"resource://activity-stream/common/Reducers.sys.mjs"
);
const { Dedupe } = ChromeUtils.importESModule(
"resource://activity-stream/common/Dedupe.sys.mjs"
);
import {
TOP_SITES_DEFAULT_ROWS,
TOP_SITES_MAX_SITES_PER_ROW,
} from "resource://activity-stream/common/Reducers.sys.mjs";
import { Dedupe } from "resource://activity-stream/common/Dedupe.sys.mjs";
const lazy = {};
@ -45,16 +40,18 @@ ChromeUtils.defineModuleGetter(
);
const HIGHLIGHTS_MAX_LENGTH = 16;
const MANY_EXTRA_LENGTH =
export const MANY_EXTRA_LENGTH =
HIGHLIGHTS_MAX_LENGTH * 5 +
TOP_SITES_DEFAULT_ROWS * TOP_SITES_MAX_SITES_PER_ROW;
const SECTION_ID = "highlights";
const SYNC_BOOKMARKS_FINISHED_EVENT = "weave:engine:sync:applied";
const BOOKMARKS_RESTORE_SUCCESS_EVENT = "bookmarks-restore-success";
const BOOKMARKS_RESTORE_FAILED_EVENT = "bookmarks-restore-failed";
export const SECTION_ID = "highlights";
export const SYNC_BOOKMARKS_FINISHED_EVENT = "weave:engine:sync:applied";
export const BOOKMARKS_RESTORE_SUCCESS_EVENT = "bookmarks-restore-success";
export const BOOKMARKS_RESTORE_FAILED_EVENT = "bookmarks-restore-failed";
const RECENT_DOWNLOAD_THRESHOLD = 36 * 60 * 60 * 1000;
class HighlightsFeed {
export class HighlightsFeed {
constructor() {
this.dedupe = new Dedupe(this._dedupeKey);
this.linksCache = new lazy.LinksCache(
@ -339,12 +336,3 @@ class HighlightsFeed {
}
}
}
const EXPORTED_SYMBOLS = [
"HighlightsFeed",
"SECTION_ID",
"MANY_EXTRA_LENGTH",
"SYNC_BOOKMARKS_FINISHED_EVENT",
"BOOKMARKS_RESTORE_SUCCESS_EVENT",
"BOOKMARKS_RESTORE_FAILED_EVENT",
];

2
browser/components/newtab/test/unit/lib/ActivityStream.test.js
View file

@ -15,7 +15,7 @@ import { TelemetryFeed } from "lib/TelemetryFeed.sys.mjs";
import { FaviconFeed } from "lib/FaviconFeed.jsm";
import { TopSitesFeed } from "lib/TopSitesFeed.jsm";
import { TopStoriesFeed } from "lib/TopStoriesFeed.jsm";
import { HighlightsFeed } from "lib/HighlightsFeed.jsm";
import { HighlightsFeed } from "lib/HighlightsFeed.sys.mjs";
import { DiscoveryStreamFeed } from "lib/DiscoveryStreamFeed.jsm";
import { LinksCache } from "lib/LinksCache.sys.mjs";

1
tools/esmify/map.json
View file

@ -302,7 +302,6 @@
"resource://activity-stream/lib/FaviconFeed.jsm": "browser/components/newtab/lib/FaviconFeed.jsm",
"resource://activity-stream/lib/FeatureCalloutMessages.jsm": "browser/components/newtab/lib/FeatureCalloutMessages.jsm",
"resource://activity-stream/lib/FilterAdult.jsm": "browser/components/newtab/lib/FilterAdult.jsm",
"resource://activity-stream/lib/HighlightsFeed.jsm": "browser/components/newtab/lib/HighlightsFeed.jsm",
"resource://activity-stream/lib/InfoBar.jsm": "browser/components/newtab/lib/InfoBar.jsm",
"resource://activity-stream/lib/LinksCache.jsm": "browser/components/newtab/lib/LinksCache.jsm",
"resource://activity-stream/lib/MomentsPageHub.jsm": "browser/components/newtab/lib/MomentsPageHub.jsm",