Skip to content
Snippets Groups Projects
Commit fb0974ff authored by Nicholas Nethercote's avatar Nicholas Nethercote
Browse files

Bug 1572354 - Fix erroneous prefs-related entries in .prettierignore. r=vporof

This patch removes two entries:

- devtools/client/netmonitor/launchpad.js: this file no longer exists.
- devtools/client/webconsole/test/mocha-test-setup.js: this file is a proper JS
  file, not a prefs file.

The patch also reformats mocha-test-setup.js.

Differential Revision: https://phabricator.services.mozilla.com/D41150

--HG--
extra : moz-landing-system : lando
parent ee21b9ff
No related branches found
No related tags found
No related merge requests found
......@@ -14,10 +14,8 @@ browser/branding/aurora/pref/firefox-branding.js
browser/branding/nightly/pref/firefox-branding.js
browser/branding/official/pref/firefox-branding.js
browser/branding/unofficial/pref/firefox-branding.js
devtools/client/netmonitor/launchpad.js
devtools/client/preferences/debugger.js
devtools/client/preferences/devtools-client.js
devtools/client/webconsole/test/mocha-test-setup.js
devtools/client/webide/preferences/webide.js
devtools/shared/preferences/devtools-shared.js
devtools/startup/preferences/devtools-startup.js
......
......@@ -8,7 +8,9 @@
const mcRoot = `${__dirname}/../../../../`;
const getModule = mcPath => `module.exports = require("${mcRoot}${mcPath}");`;
const { Services: { pref } } = require("devtools-modules");
const {
Services: { pref },
} = require("devtools-modules");
pref("devtools.debugger.remote-timeout", 10000);
pref("devtools.hud.loglimit", 10000);
pref("devtools.webconsole.filter.error", true);
......@@ -32,12 +34,12 @@ pref("devtools.webconsole.input.editorWidth", 800);
global.loader = {
lazyServiceGetter: () => {},
lazyGetter: (context, name, fn) => {
},
lazyGetter: (context, name, fn) => {},
lazyRequireGetter: (context, name, path, destruct) => {
if (path === "devtools/shared/async-storage") {
global[name] = require("devtools/client/webconsole/test/fixtures/async-storage");
global[
name
] = require("devtools/client/webconsole/test/fixtures/async-storage");
}
const excluded = [
"Debugger",
......@@ -59,7 +61,7 @@ global.loader = {
// Setting up globals used in some modules.
global.isWorker = false;
global.indexedDB = {open: () => ({})};
global.indexedDB = { open: () => ({}) };
// URLSearchParams was added to the global object in Node 10.0.0. To not cause any issue
// with prior versions, we add it to the global object if it is not defined there.
......@@ -92,7 +94,9 @@ requireHacker.global_hook("default", (path, module) => {
case "react-dom/server":
return getModule("devtools/client/shared/vendor/react-dom-server");
case "react-dom/test-utils":
return getModule("devtools/client/shared/vendor/react-dom-test-utils-dev");
return getModule(
"devtools/client/shared/vendor/react-dom-test-utils-dev"
);
case "react-redux":
return getModule("devtools/client/shared/vendor/react-redux");
// Use react-dev. This would be handled by browserLoader in Firefox.
......@@ -108,10 +112,10 @@ requireHacker.global_hook("default", (path, module) => {
switch (path) {
case "devtools/shared/l10n":
return getModule(
"devtools/client/webconsole/test/fixtures/LocalizationHelper");
"devtools/client/webconsole/test/fixtures/LocalizationHelper"
);
case "devtools/shared/plural-form":
return getModule(
"devtools/client/webconsole/test/fixtures/PluralForm");
return getModule("devtools/client/webconsole/test/fixtures/PluralForm");
case "Services":
case "Services.default":
return `module.exports = require("devtools-modules/src/Services")`;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment