mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-09 21:00:42 +02:00
e930b89c34
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
101 lines
2.6 KiB
JavaScript
101 lines
2.6 KiB
JavaScript
"use strict";
|
|
|
|
var {ExtensionCommon} = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
|
|
|
|
// eslint-disable-next-line no-unused-vars
|
|
ChromeUtils.defineModuleGetter(this, "Services",
|
|
"resource://gre/modules/Services.jsm");
|
|
|
|
// These are defined on "global" which is used for the same scopes as the other
|
|
// ext-c-*.js files.
|
|
/* exported EventManager */
|
|
/* global EventManager: false */
|
|
|
|
global.EventManager = ExtensionCommon.EventManager;
|
|
|
|
extensions.registerModules({
|
|
backgroundPage: {
|
|
url: "chrome://extensions/content/child/ext-backgroundPage.js",
|
|
scopes: ["addon_child"],
|
|
manifest: ["background"],
|
|
paths: [
|
|
["extension", "getBackgroundPage"],
|
|
["runtime", "getBackgroundPage"],
|
|
],
|
|
},
|
|
contentScripts: {
|
|
url: "chrome://extensions/content/child/ext-contentScripts.js",
|
|
scopes: ["addon_child"],
|
|
paths: [
|
|
["contentScripts"],
|
|
],
|
|
},
|
|
extension: {
|
|
url: "chrome://extensions/content/child/ext-extension.js",
|
|
scopes: ["addon_child", "content_child", "devtools_child", "proxy_script"],
|
|
paths: [
|
|
["extension"],
|
|
],
|
|
},
|
|
i18n: {
|
|
url: "chrome://extensions/content/parent/ext-i18n.js",
|
|
scopes: ["addon_child", "content_child", "devtools_child", "proxy_script"],
|
|
paths: [
|
|
["i18n"],
|
|
],
|
|
},
|
|
runtime: {
|
|
url: "chrome://extensions/content/child/ext-runtime.js",
|
|
scopes: ["addon_child", "content_child", "devtools_child", "proxy_script"],
|
|
paths: [
|
|
["runtime"],
|
|
],
|
|
},
|
|
storage: {
|
|
url: "chrome://extensions/content/child/ext-storage.js",
|
|
scopes: ["addon_child", "content_child", "devtools_child", "proxy_script"],
|
|
paths: [
|
|
["storage"],
|
|
],
|
|
},
|
|
test: {
|
|
url: "chrome://extensions/content/child/ext-test.js",
|
|
scopes: ["addon_child", "content_child", "devtools_child", "proxy_script"],
|
|
paths: [
|
|
["test"],
|
|
],
|
|
},
|
|
userScripts: {
|
|
url: "chrome://extensions/content/child/ext-userScripts.js",
|
|
scopes: ["addon_child"],
|
|
paths: [
|
|
["userScripts"],
|
|
],
|
|
},
|
|
userScriptsContent: {
|
|
url: "chrome://extensions/content/child/ext-userScripts-content.js",
|
|
scopes: ["content_child"],
|
|
paths: [
|
|
["userScripts", "onBeforeScript"],
|
|
],
|
|
},
|
|
webRequest: {
|
|
url: "chrome://extensions/content/child/ext-webRequest.js",
|
|
scopes: ["addon_child"],
|
|
paths: [
|
|
["webRequest"],
|
|
],
|
|
},
|
|
});
|
|
|
|
if (AppConstants.MOZ_BUILD_APP === "browser") {
|
|
extensions.registerModules({
|
|
identity: {
|
|
url: "chrome://extensions/content/child/ext-identity.js",
|
|
scopes: ["addon_child"],
|
|
paths: [
|
|
["identity"],
|
|
],
|
|
},
|
|
});
|
|
}
|