diff --git a/.eslintrc-ignores.js b/.eslintrc-ignores.js index 213605df7096..0bd942c62367 100644 --- a/.eslintrc-ignores.js +++ b/.eslintrc-ignores.js @@ -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", @@ -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/", diff --git a/.eslintrc-rollouts.js b/.eslintrc-rollouts.js index 5af0d3299bcb..1981b8f8b9af 100644 --- a/.eslintrc-rollouts.js +++ b/.eslintrc-rollouts.js @@ -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/**", @@ -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", diff --git a/.eslintrc.js b/.eslintrc.js index 3bc04afe9d4c..8d1c9687d71d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -277,8 +277,8 @@ module.exports = { files: [ "browser/components/aboutwelcome/**", "browser/components/asrouter/**", - "browser/components/newtab/**", "browser/components/pocket/**", + "browser/extensions/newtab/**", "devtools/**", ], rules: { diff --git a/.stylelintignore b/.stylelintignore index 26c927799499..343e536673d3 100644 --- a/.stylelintignore +++ b/.stylelintignore @@ -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 diff --git a/.stylelintrc.js b/.stylelintrc.js index e98ec7753876..5ca5d081cc1a 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -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", diff --git a/browser/components/asrouter/bin/import-rollouts.js b/browser/components/asrouter/bin/import-rollouts.js index b8e4b3fff7cb..af3e11218f96 100644 --- a/browser/components/asrouter/bin/import-rollouts.js +++ b/browser/components/asrouter/bin/import-rollouts.js @@ -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, diff --git a/browser/components/asrouter/tests/browser/browser_feature_callout_in_chrome.js b/browser/components/asrouter/tests/browser/browser_feature_callout_in_chrome.js index e91f05199b73..a2a2f902b2e0 100644 --- a/browser/components/asrouter/tests/browser/browser_feature_callout_in_chrome.js +++ b/browser/components/asrouter/tests/browser/browser_feature_callout_in_chrome.js @@ -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; diff --git a/browser/extensions/newtab/bin/render-activity-stream-html.js b/browser/extensions/newtab/bin/render-activity-stream-html.js index 61895dcd00b6..2f7d46905976 100644 --- a/browser/extensions/newtab/bin/render-activity-stream-html.js +++ b/browser/extensions/newtab/bin/render-activity-stream-html.js @@ -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/", }; diff --git a/browser/extensions/newtab/docs/index.rst b/browser/extensions/newtab/docs/index.rst index 5a1168826722..38829b2c5066 100644 --- a/browser/extensions/newtab/docs/index.rst +++ b/browser/extensions/newtab/docs/index.rst @@ -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: @@ -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 @@ -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. @@ -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 `_. @@ -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``. @@ -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 -------------------------------- diff --git a/browser/extensions/newtab/package.json b/browser/extensions/newtab/package.json index 952d03d7cf6c..258d495aaeb2 100644 --- a/browser/extensions/newtab/package.json +++ b/browser/extensions/newtab/package.json @@ -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:*", diff --git a/browser/extensions/newtab/test/schemas/base_ping.schema.json b/browser/extensions/newtab/test/schemas/base_ping.schema.json index bf355b0c163c..d2b0e01246c2 100644 --- a/browser/extensions/newtab/test/schemas/base_ping.schema.json +++ b/browser/extensions/newtab/test/schemas/base_ping.schema.json @@ -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": { diff --git a/browser/extensions/newtab/test/schemas/session_ping.schema.json b/browser/extensions/newtab/test/schemas/session_ping.schema.json index 23e418fff7d0..509db2f9f0ed 100644 --- a/browser/extensions/newtab/test/schemas/session_ping.schema.json +++ b/browser/extensions/newtab/test/schemas/session_ping.schema.json @@ -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": { diff --git a/browser/extensions/newtab/test/schemas/user_event_ping.schema.json b/browser/extensions/newtab/test/schemas/user_event_ping.schema.json index 5b39006b85fe..5b7f9c321b64 100644 --- a/browser/extensions/newtab/test/schemas/user_event_ping.schema.json +++ b/browser/extensions/newtab/test/schemas/user_event_ping.schema.json @@ -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": { diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css index de98657503fe..c2fb6254a3f6 100644 --- a/browser/themes/shared/tabbrowser/content-area.css +++ b/browser/themes/shared/tabbrowser/content-area.css @@ -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; diff --git a/taskcluster/kinds/source-test/node.yml b/taskcluster/kinds/source-test/node.yml index a1a31b29c17b..66a15858c012 100644 --- a/taskcluster/kinds/source-test/node.yml +++ b/taskcluster/kinds/source-test/node.yml @@ -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 @@ -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: @@ -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 diff --git a/testing/runtimes/manifest-runtimes-unix.json b/testing/runtimes/manifest-runtimes-unix.json index 597a3ee97b7a..74af906d8ada 100644 --- a/testing/runtimes/manifest-runtimes-unix.json +++ b/testing/runtimes/manifest-runtimes-unix.json @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/testing/runtimes/manifest-runtimes-windows.json b/testing/runtimes/manifest-runtimes-windows.json index 2125d4002ca1..df1cb7d9ade6 100644 --- a/testing/runtimes/manifest-runtimes-windows.json +++ b/testing/runtimes/manifest-runtimes-windows.json @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, diff --git a/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_listeners.js b/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_listeners.js index 816c42775b8f..fd5930b45300 100644 --- a/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_listeners.js +++ b/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_listeners.js @@ -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 @@ -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++; @@ -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, @@ -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, @@ -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; @@ -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) => { diff --git a/toolkit/content/license.html b/toolkit/content/license.html index 70a8d6cda2b1..21a08b5b6fe4 100644 --- a/toolkit/content/license.html +++ b/toolkit/content/license.html @@ -4137,7 +4137,7 @@ product. devtools/client/debugger/test/mochitest/examples/react/build/main.js
  • devtools/client/shared/vendor/react-router-dom.js
  • devtools/client/shared/vendor/reselect.js and - browser/components/newtab/data/content/activity-stream.bundle.js
  • + browser/extensions/newtab/data/content/activity-stream.bundle.js
  • third_party/rlbox
  • devtools/client/netmonitor/src/components/messages/parsers/socket-io/binary.js, devtools/client/netmonitor/src/components/messages/parsers/socket-io/index.js and