Skip to content

Commit

Permalink
Bug 1938452 - Update a bunch of non-permalink references to browser/e…
Browse files Browse the repository at this point in the history
…xtensions/newtab. r=sylvestre,search-reviewers,tabbrowser-reviewers,omc-reviewers,android-reviewers,home-newtab-reviewers,frontend-codestyle-reviewers,mcheang,pdahiya,thecount,dao,pollymce

Differential Revision: https://phabricator.services.mozilla.com/D233874
  • Loading branch information
mikeconley committed Feb 3, 2025
1 parent 606e830 commit 44c6286
Show file tree
Hide file tree
Showing 19 changed files with 48 additions and 46 deletions.
8 changes: 4 additions & 4 deletions .eslintrc-ignores.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ module.exports = [
"!browser/components/storybook/.storybook/",
"!browser/components/storybook/.storybook/*.js",

// Ignore newtab files
"browser/components/newtab/data/",
"browser/components/newtab/logs/",

// Ignore webpack about:welcome files
"browser/components/aboutwelcome/webpack.aboutwelcome.config.js",

Expand All @@ -85,6 +81,10 @@ module.exports = [
"browser/extensions/webcompat/data/injections.js",
"browser/extensions/webcompat/data/ua_overrides.js",

// Ignore newtab files
"browser/extensions/newtab/data/",
"browser/extensions/newtab/logs/",

// Ignore devtools debugger files which aren't intended for linting.
"devtools/client/debugger/bin/",
"devtools/client/debugger/configs/",
Expand Down
2 changes: 2 additions & 0 deletions .eslintrc-rollouts.js
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ const rollouts = [
"browser/components/storybook/.storybook/**",
"browser/components/tabbrowser/**",
"browser/components/tests/browser/**",
"browser/extensions/newtab/**",
"browser/extensions/screenshots/**",
"browser/modules/**",
"devtools/**",
Expand Down Expand Up @@ -456,6 +457,7 @@ const rollouts = [
"browser/components/translations/**",
"browser/components/uitour/**",
"browser/extensions/formautofill/**",
"browser/extensions/newtab/**",
"browser/extensions/pictureinpicture/**",
"browser/extensions/report-site-issue/test/browser/head.js",
"browser/extensions/search-detection/extension/background.js",
Expand Down
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ module.exports = {
files: [
"browser/components/aboutwelcome/**",
"browser/components/asrouter/**",
"browser/components/newtab/**",
"browser/components/pocket/**",
"browser/extensions/newtab/**",
"devtools/**",
],
rules: {
Expand Down
2 changes: 1 addition & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ obj*/

# These files are generated in some way.
browser/components/pocket/content/panels/css/main.compiled.css
browser/components/newtab/**/*.css
browser/components/aboutwelcome/**/*.css
browser/components/asrouter/**/*.css
browser/extensions/newtab/**/*.css

# Note that the debugger has its own stylelint setup, but that currently
# produces errors. Bug 1831302 tracks making this better
Expand Down
2 changes: 1 addition & 1 deletion .stylelintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ module.exports = {
files: [
"browser/components/aboutwelcome/**",
"browser/components/asrouter/**",
"browser/components/newtab/**",
"browser/extensions/newtab/**",
],
customSyntax: "postcss-scss",
extends: "stylelint-config-standard-scss",
Expand Down
2 changes: 1 addition & 1 deletion browser/components/asrouter/bin/import-rollouts.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ async function main() {
Examples
$ node bin/import-rollouts.js --collection nimbus-preview
$ ./mach npm run import-rollouts --prefix=browser/components/newtab -- -e
$ ./mach npm run import-rollouts --prefix=browser/components/asrouter -- -e
`,
{
description: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const { DefaultBrowserCheck } = ChromeUtils.importESModule(
);

const PDF_TEST_URL =
"https://example.com/browser/browser/components/newtab/test/browser/file_pdf.PDF";
"https://example.com/browser/browser/extensions/newtab/test/browser/file_pdf.PDF";

async function openURLInWindow(window, url) {
const { selectedBrowser } = window.gBrowser;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const DEFAULT_OPTIONS = {
// Starting in newtab/bin/ and we want to write to newtab/prerendered/ so we
// go up one level.
addonPath: "..",
// depends on the registration in browser/components/newtab/jar.mn
// depends on the registration in browser/extensions/newtab/jar.mn
baseUrl: "resource://activity-stream/",
baseVendorUrl: "chrome://global/content/",
};
Expand Down
26 changes: 13 additions & 13 deletions browser/extensions/newtab/docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Firefox Home (New Tab)
======================

All files related to Firefox Home, which includes content that appears on ``about:home`` and
``about:newtab``, can be found in the ``browser/components/newtab`` directory.
``about:newtab``, can be found in the ``browser/extensions/newtab`` directory.
Some of these source files (such as ``.js``, ``.jsx``, and ``.scss``) require an additional build step.
We are working on migrating this to work with ``mach``, but in the meantime, please
follow the following steps if you need to make changes in this directory:
Expand All @@ -29,15 +29,15 @@ To install dependencies, run the following from the root of the mozilla-central

.. code-block:: shell
(cd browser/components/newtab && ../../../mach npm install)
(cd browser/extensions/newtab && ../../../mach npm install)
Which files should you edit?
````````````````````````````

You should not make changes to ``.js`` or ``.css`` files in ``browser/components/newtab/css`` or
``browser/components/newtab/data`` directory. Instead, you should edit the ``.jsx``, ``.js``, and ``.scss`` source files
in ``browser/components/newtab/content-src`` directory. These files will be compiled into the ``.js`` and ``.css`` files.
You should not make changes to ``.js`` or ``.css`` files in ``browser/extensions/newtab/css`` or
``browser/extensions/newtab/data`` directory. Instead, you should edit the ``.jsx``, ``.js``, and ``.scss`` source files
in ``browser/extensions/newtab/content-src`` directory. These files will be compiled into the ``.js`` and ``.css`` files.


Building assets and running Firefox
Expand All @@ -47,11 +47,11 @@ To build assets and run Firefox, run the following from the root of the mozilla-

.. code-block:: shell
./mach npm run bundle --prefix=browser/components/newtab && ./mach build && ./mach run
./mach npm run bundle --prefix=browser/extensions/newtab && ./mach build && ./mach run
Continuous development / debugging
----------------------------------
Running ``./mach npm run watchmc --prefix=browser/components/newtab`` will start a process that watches files in
Running ``./mach npm run watchmc --prefix=browser/extensions/newtab`` will start a process that watches files in
``activity-stream`` and rebuilds the bundled files when JS or CSS files change.

**IMPORTANT NOTE**: This task will add inline source maps to help with debugging, which changes the memory footprint.
Expand All @@ -68,7 +68,7 @@ red, these tests are what is failing. To execute them, do this:

.. code-block:: shell
./mach npm test --prefix=browser/components/newtab
./mach npm test --prefix=browser/extensions/newtab
These tests are not currently run by ``mach test``, but there's a
`task filed to fix that <https://bugzilla.mozilla.org/show_bug.cgi?id=1581165>`_.
Expand All @@ -80,9 +80,9 @@ To run newtab specific tests that aren't covered by ``mach lint`` and

.. code-block:: shell
./mach npm run lint:stylelint --prefix=browser/components/newtab
./mach npm run testmc:build --prefix=browser/components/newtab
./mach npm run testmc:unit --prefix=browser/components/newtab
./mach npm run lint:stylelint --prefix=browser/extensions/newtab
./mach npm run testmc:build --prefix=browser/extensions/newtab
./mach npm run testmc:unit --prefix=browser/extensions/newtab
Mochitests and xpcshell tests run normally, using ``mach test``.

Expand All @@ -96,8 +96,8 @@ running

.. code-block:: shell
./mach npm test --prefix=browser/components/newtab &&
./mach npm run debugcoverage --prefix=browser/components/newtab
./mach npm test --prefix=browser/extensions/newtab &&
./mach npm run debugcoverage --prefix=browser/extensions/newtab
Discovery Stream Developer tools
--------------------------------
Expand Down
2 changes: 1 addition & 1 deletion browser/extensions/newtab/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"repository": "mozilla/activity-stream",
"config": {
"mc_root": "../../..",
"newtab_path": "browser/components/newtab"
"newtab_path": "browser/extensions/newtab"
},
"scripts": {
"bundle": "npm-run-all bundle:*",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "browser/components/newtab/test/schemas/base_ping.schema.json",
"$id": "browser/extensions/newtab/test/schemas/base_ping.schema.json",
"title": "Base PingCentre ping",
"type": "object",
"properties": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "browser/components/newtab/test/schemas/session_ping.schema.json",
"$id": "browser/extensions/newtab/test/schemas/session_ping.schema.json",
"title": "Session PingCentre ping",
"type": "object",
"properties": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"$id": "browser/components/newtab/test/schemas/user_event_ping.schema.json",
"$id": "browser/extensions/newtab/test/schemas/user_event_ping.schema.json",
"title": "User event PingCentre ping",
"type": "object",
"properties": {
Expand Down
2 changes: 1 addition & 1 deletion browser/themes/shared/tabbrowser/content-area.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

:root {
/* --tabpanel-background-color matches $in-content-page-background in newtab
(browser/components/newtab/content-src/styles/_variables.scss) */
(browser/extensions/newtab/content-src/styles/_variables.scss) */
--tabpanel-background-color: #F9F9FB;
@media (-moz-content-prefers-color-scheme: dark) {
--tabpanel-background-color: #2B2A33;
Expand Down
8 changes: 4 additions & 4 deletions taskcluster/kinds/source-test/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ newtab-unit-tests:
cd /builds/worker/checkouts/gecko &&
rm -rf node_modules &&
npm ci &&
cd /builds/worker/checkouts/gecko/browser/components/newtab &&
cd /builds/worker/checkouts/gecko/browser/extensions/newtab &&
rm -rf node_modules &&
npm ci &&
node bin/try-runner.js
when:
files-changed:
- "browser/components/newtab/**"
- "browser/extensions/newtab/**"

newtab-unit-tests-ccov:
description: newtab unit tests code coverage
Expand All @@ -48,7 +48,7 @@ newtab-unit-tests-ccov:
worker:
artifacts:
- name: public/code-coverage-grcov.zip
path: /builds/worker/checkouts/gecko/browser/components/newtab/logs/coverage/code-coverage-grcov.zip
path: /builds/worker/checkouts/gecko/browser/extensions/newtab/logs/coverage/code-coverage-grcov.zip
type: file
require-build:
by-project:
Expand All @@ -61,7 +61,7 @@ newtab-unit-tests-ccov:
cd /builds/worker/checkouts/gecko &&
rm -rf node_modules &&
npm ci &&
cd /builds/worker/checkouts/gecko/browser/components/newtab &&
cd /builds/worker/checkouts/gecko/browser/extensions/newtab &&
rm -rf node_modules &&
npm ci &&
node bin/try-runner.js
Expand Down
6 changes: 3 additions & 3 deletions testing/runtimes/manifest-runtimes-unix.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@
"browser/components/enterprisepolicies/tests/browser/hardware_acceleration/browser.ini": 0.03,
"browser/components/extensions/test/browser/browser-private.ini": 1.46,
"browser/components/extensions/test/browser/browser.ini": 811.12,
"browser/components/newtab/test/browser/abouthomecache/browser.ini": 10.59,
"browser/components/newtab/test/browser/browser.ini": 74.49,
"browser/components/originattributes/test/browser/browser.ini": 116.79,
"browser/components/ion/test/browser/browser.ini": 0.49,
"browser/components/places/tests/browser/browser.ini": 145.76,
Expand Down Expand Up @@ -193,6 +191,8 @@
"browser/extensions/formautofill/test/browser/browser.ini": 55.03,
"browser/extensions/formautofill/test/browser/creditCard/browser.ini": 56.34,
"browser/extensions/formautofill/test/browser/focus-leak/browser.ini": 0.29,
"browser/extensions/newtab/test/browser/abouthomecache/browser.ini": 10.59,
"browser/extensions/newtab/test/browser/browser.ini": 74.49,
"browser/extensions/pdfjs/test/browser.ini": 19.44,
"browser/extensions/report-site-issue/test/browser/browser.ini": 11.62,
"browser/extensions/screenshots/test/browser/browser.ini": 1.81,
Expand Down Expand Up @@ -1992,7 +1992,6 @@
"browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini": 87.6,
"browser/components/extensions/test/xpcshell/xpcshell.ini": 691.27,
"browser/components/migration/tests/unit/xpcshell.ini": 44.24,
"browser/components/newtab/test/xpcshell/xpcshell.ini": 25.79,
"browser/components/places/tests/unit/xpcshell.ini": 54.79,
"browser/components/search/test/unit/xpcshell.ini": 2.55,
"browser/components/sessionstore/test/unit/xpcshell.ini": 24.7,
Expand All @@ -2004,6 +2003,7 @@
"browser/components/urlbar/tests/unit/xpcshell.ini": 269.97,
"browser/extensions/doh-rollout/test/unit/xpcshell.ini": 29.4,
"browser/extensions/formautofill/test/unit/xpcshell.ini": 1562.75,
"browser/extensions/newtab/test/xpcshell/xpcshell.ini": 25.79,
"browser/modules/test/unit/xpcshell.ini": 36.47,
"browser/tools/mozscreenshots/tests/xpcshell/xpcshell.ini": 2.07,
"caps/tests/unit/xpcshell.ini": 4.35,
Expand Down
8 changes: 4 additions & 4 deletions testing/runtimes/manifest-runtimes-windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@
"browser/components/enterprisepolicies/tests/browser/hardware_acceleration/browser.ini": 0.09,
"browser/components/extensions/test/browser/browser-private.ini": 0.85,
"browser/components/extensions/test/browser/browser.ini": 588.27,
"browser/components/newtab/test/browser/abouthomecache/browser.ini": 10.38,
"browser/components/newtab/test/browser/browser.ini": 52.48,
"browser/components/originattributes/test/browser/browser.ini": 58.43,
"browser/components/ion/test/browser/browser.ini": 1.63,
"browser/components/places/tests/browser/browser.ini": 106.52,
Expand Down Expand Up @@ -192,6 +190,8 @@
"browser/extensions/formautofill/test/browser/browser.ini": 42.02,
"browser/extensions/formautofill/test/browser/creditCard/browser.ini": 12.18,
"browser/extensions/formautofill/test/browser/focus-leak/browser.ini": 0.23,
"browser/extensions/newtab/test/browser/abouthomecache/browser.ini": 10.38,
"browser/extensions/newtab/test/browser/browser.ini": 52.48,
"browser/extensions/pdfjs/test/browser.ini": 7.41,
"browser/extensions/report-site-issue/test/browser/browser.ini": 10.17,
"browser/extensions/screenshots/test/browser/browser.ini": 1.04,
Expand Down Expand Up @@ -1988,7 +1988,6 @@
"browser/components/extensions/test/xpcshell/xpcshell.ini": 289.64,
"browser/components/installerprefs/test/unit/xpcshell.ini": 0.67,
"browser/components/migration/tests/unit/xpcshell.ini": 48.16,
"browser/components/newtab/test/xpcshell/xpcshell.ini": 10.78,
"browser/components/places/tests/unit/xpcshell.ini": 26.24,
"browser/components/search/test/unit/xpcshell.ini": 1.91,
"browser/components/sessionstore/test/unit/xpcshell.ini": 10.16,
Expand All @@ -1999,6 +1998,7 @@
"browser/components/urlbar/tests/unit/xpcshell.ini": 183.17,
"browser/extensions/doh-rollout/test/unit/xpcshell.ini": 23.05,
"browser/extensions/formautofill/test/unit/xpcshell.ini": 665.52,
"browser/extensions/newtab/test/xpcshell/xpcshell.ini": 10.78,
"browser/modules/test/unit/xpcshell.ini": 31.61,
"browser/tools/mozscreenshots/tests/xpcshell/xpcshell.ini": 2.02,
"caps/tests/unit/xpcshell.ini": 5.63,
Expand Down Expand Up @@ -2191,7 +2191,6 @@
"browser/components/extensions/test/xpcshell/xpcshell.ini": 289.64,
"browser/components/installerprefs/test/unit/xpcshell.ini": 0.67,
"browser/components/migration/tests/unit/xpcshell.ini": 48.16,
"browser/components/newtab/test/xpcshell/xpcshell.ini": 10.78,
"browser/components/places/tests/unit/xpcshell.ini": 26.24,
"browser/components/search/test/unit/xpcshell.ini": 1.91,
"browser/components/sessionstore/test/unit/xpcshell.ini": 10.16,
Expand All @@ -2202,6 +2201,7 @@
"browser/components/urlbar/tests/unit/xpcshell.ini": 183.17,
"browser/extensions/doh-rollout/test/unit/xpcshell.ini": 23.05,
"browser/extensions/formautofill/test/unit/xpcshell.ini": 665.52,
"browser/extensions/newtab/test/xpcshell/xpcshell.ini": 10.78,
"browser/modules/test/unit/xpcshell.ini": 31.61,
"browser/tools/mozscreenshots/tests/xpcshell/xpcshell.ini": 2.02,
"caps/tests/unit/xpcshell.ini": 5.63,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ add_task(async function check_matchPatternFailureCase() {

add_task(async function check_openArticleURL() {
const TEST_URL =
"https://example.com/browser/browser/components/newtab/test/browser/red_page.html";
"https://example.com/browser/browser/extensions/newtab/test/browser/red_page.html";
const articleTrigger = ASRouterTriggerListeners.get("openArticleURL");

// Previously initialized by the Router
Expand Down Expand Up @@ -75,7 +75,7 @@ add_task(async function check_openArticleURL() {

add_task(async function check_openURL_listener() {
const TEST_URL =
"https://example.com/browser/browser/components/newtab/test/browser/red_page.html";
"https://example.com/browser/browser/extensions/newtab/test/browser/red_page.html";

let urlVisitCount = 0;
const triggerHandler = () => urlVisitCount++;
Expand Down Expand Up @@ -158,7 +158,7 @@ add_task(async function check_openURL_listener() {

add_task(async function check_newSavedLogin_save_listener() {
const TEST_URL =
"https://example.com/browser/browser/components/newtab/test/browser/red_page.html";
"https://example.com/browser/browser/extensions/newtab/test/browser/red_page.html";

let triggerTypesHandled = {
save: 0,
Expand Down Expand Up @@ -209,7 +209,7 @@ add_task(async function check_newSavedLogin_save_listener() {

add_task(async function check_newSavedLogin_update_listener() {
const TEST_URL =
"https://example.com/browser/browser/components/newtab/test/browser/red_page.html";
"https://example.com/browser/browser/extensions/newtab/test/browser/red_page.html";

let triggerTypesHandled = {
save: 0,
Expand Down Expand Up @@ -260,7 +260,7 @@ add_task(async function check_newSavedLogin_update_listener() {

add_task(async function check_contentBlocking_listener() {
const TEST_URL =
"https://example.com/browser/browser/components/newtab/test/browser/red_page.html";
"https://example.com/browser/browser/extensions/newtab/test/browser/red_page.html";

const event1 = 0x0001;
const event2 = 0x0010;
Expand Down Expand Up @@ -401,7 +401,7 @@ add_task(async function check_contentBlocking_listener() {

add_task(async function check_contentBlockingMilestone_listener() {
const TEST_URL =
"https://example.com/browser/browser/components/newtab/test/browser/red_page.html";
"https://example.com/browser/browser/extensions/newtab/test/browser/red_page.html";

let observerEvent = 0;
const triggerHandler = (target, trigger) => {
Expand Down
2 changes: 1 addition & 1 deletion toolkit/content/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -4137,7 +4137,7 @@ <h1><a id="mit"></a>MIT License</h1>
<code>devtools/client/debugger/test/mochitest/examples/react/build/main.js</code></li>
<li><code>devtools/client/shared/vendor/react-router-dom.js</code></li>
<li><code>devtools/client/shared/vendor/reselect.js</code> and
<code>browser/components/newtab/data/content/activity-stream.bundle.js</code></li>
<code>browser/extensions/newtab/data/content/activity-stream.bundle.js</code></li>
<li><code>third_party/rlbox</code></li>
<li><code>devtools/client/netmonitor/src/components/messages/parsers/socket-io/binary.js</code>,
<code>devtools/client/netmonitor/src/components/messages/parsers/socket-io/index.js</code> and
Expand Down

0 comments on commit 44c6286

Please sign in to comment.