зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1392602 - Remove module boilerplate from DevTools loader. r=jdescottes
This file is now only loaded as a JSM. Expose symbols directly instead of putting them on `Loader` symbol. No longer exports it as a fake 'toolkit/loader' module and always import it as JSM. MozReview-Commit-ID: 6J3IxHpk9ct --HG-- extra : rebase_source : f6ef6aef6d8682f18950a9b22d259347644250f2
This commit is contained in:
Alexandre Poirot
Родитель
67e0287de3
Коммит
71e4f1790c
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
const {Ci, Cu} = require("chrome");
|
||||
const protocol = require("devtools/shared/protocol");
|
||||
const {serializeStack, parseStack} = require("toolkit/loader");
|
||||
const {serializeStack, parseStack} = Cu.import("resource://devtools/shared/base-loader.js", {});
|
||||
|
||||
const { functionCallSpec, callWatcherSpec } = require("devtools/shared/specs/call-watcher");
|
||||
const { CallWatcherFront } = require("devtools/shared/fronts/call-watcher");
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@
|
|||
|
||||
var { utils: Cu } = Components;
|
||||
var { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
|
||||
var { Loader, descriptor, resolveURI } = Cu.import("resource://devtools/shared/base-loader.js", {});
|
||||
var { Loader, Require, descriptor, resolveURI, unload } =
|
||||
Cu.import("resource://devtools/shared/base-loader.js", {});
|
||||
var { requireRawId } = Cu.import("resource://devtools/shared/loader-plugin-raw.jsm", {});
|
||||
|
||||
this.EXPORTED_SYMBOLS = ["DevToolsLoader", "devtools", "BuiltinProvider",
|
||||
|
|
@ -67,7 +68,7 @@ BuiltinProvider.prototype = {
|
|||
if (this.invisibleToDebugger) {
|
||||
paths.promise = "resource://gre/modules/Promise-backend.js";
|
||||
}
|
||||
this.loader = new Loader.Loader({
|
||||
this.loader = new Loader({
|
||||
id: "fx-devtools",
|
||||
paths,
|
||||
invisibleToDebugger: this.invisibleToDebugger,
|
||||
|
|
@ -85,7 +86,7 @@ BuiltinProvider.prototype = {
|
|||
},
|
||||
|
||||
unload: function (reason) {
|
||||
Loader.unload(this.loader, reason);
|
||||
unload(this.loader, reason);
|
||||
delete this.loader;
|
||||
},
|
||||
};
|
||||
|
|
@ -168,7 +169,7 @@ DevToolsLoader.prototype = {
|
|||
this._provider.invisibleToDebugger = this.invisibleToDebugger;
|
||||
|
||||
this._provider.load();
|
||||
this.require = Loader.Require(this._provider.loader, { id: "devtools" });
|
||||
this.require = Require(this._provider.loader, { id: "devtools" });
|
||||
|
||||
// Fetch custom pseudo modules and globals
|
||||
let { modules, globals } = this.require("devtools/shared/builtin-modules");
|
||||
|
|
|
|||
|
|
@ -2,26 +2,9 @@
|
|||
* 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/. */
|
||||
|
||||
;((factory) => { // Module boilerplate :(
|
||||
if (typeof(require) === 'function') { // CommonJS
|
||||
require("chrome").Cu.import(module.uri, exports);
|
||||
}
|
||||
else if (~String(this).indexOf('BackstagePass')) { // JSM
|
||||
let module = { uri: __URI__, id: "toolkit/loader", exports: Object.create(null) }
|
||||
factory(module);
|
||||
Object.assign(this, module.exports);
|
||||
this.EXPORTED_SYMBOLS = Object.getOwnPropertyNames(module.exports);
|
||||
}
|
||||
else {
|
||||
throw Error("Loading environment is not supported");
|
||||
}
|
||||
})(module => {
|
||||
|
||||
'use strict';
|
||||
|
||||
module.metadata = {
|
||||
"stability": "unstable"
|
||||
};
|
||||
this.EXPORTED_SYMBOLS = ["Loader", "resolveURI", "Module", "Require"]
|
||||
|
||||
const { classes: Cc, Constructor: CC, interfaces: Ci, utils: Cu,
|
||||
results: Cr, manager: Cm } = Components;
|
||||
|
|
@ -131,7 +114,6 @@ const descriptor = iced(function descriptor(object) {
|
|||
value[name] = getOwnPropertyDescriptor(object, name)
|
||||
return value;
|
||||
});
|
||||
Loader.descriptor = descriptor;
|
||||
|
||||
// Freeze important built-ins so they can't be used by untrusted code as a
|
||||
// message passing channel.
|
||||
|
|
@ -168,15 +150,12 @@ const override = iced(function override(target, source) {
|
|||
|
||||
return Object.defineProperties({}, properties);
|
||||
});
|
||||
Loader.override = override;
|
||||
|
||||
function sourceURI(uri) { return String(uri).split(" -> ").pop(); }
|
||||
Loader.sourceURI = iced(sourceURI);
|
||||
|
||||
function isntLoaderFrame(frame) { return frame.fileName !== module.uri }
|
||||
function isntLoaderFrame(frame) { return frame.fileName !== __URI__ }
|
||||
|
||||
function parseURI(uri) { return String(uri).split(" -> ").pop(); }
|
||||
Loader.parseURI = parseURI;
|
||||
|
||||
function parseStack(stack) {
|
||||
let lines = String(stack).split("\n");
|
||||
|
|
@ -199,7 +178,6 @@ function parseStack(stack) {
|
|||
return frames;
|
||||
}, []);
|
||||
}
|
||||
Loader.parseStack = parseStack;
|
||||
|
||||
function serializeStack(frames) {
|
||||
return frames.reduce(function(stack, frame) {
|
||||
|
|
@ -210,7 +188,6 @@ function serializeStack(frames) {
|
|||
stack;
|
||||
}, "");
|
||||
}
|
||||
Loader.serializeStack = serializeStack;
|
||||
|
||||
class DefaultMap extends Map {
|
||||
constructor(createItem, items = undefined) {
|
||||
|
|
@ -393,7 +370,6 @@ function join(base, ...paths) {
|
|||
|
||||
return normalize([base, ...paths].join("/"));
|
||||
}
|
||||
Loader.join = join;
|
||||
|
||||
// Function takes set of options and returns a JS sandbox. Function may be
|
||||
// passed set of options:
|
||||
|
|
@ -446,7 +422,6 @@ const Sandbox = iced(function Sandbox(options) {
|
|||
|
||||
return sandbox;
|
||||
});
|
||||
Loader.Sandbox = Sandbox;
|
||||
|
||||
// Evaluates code from the given `uri` into given `sandbox`. If
|
||||
// `options.source` is passed, then that code is evaluated instead.
|
||||
|
|
@ -466,7 +441,6 @@ const evaluate = iced(function evaluate(sandbox, uri, options) {
|
|||
return source ? Cu.evalInSandbox(source, sandbox, version, uri, line)
|
||||
: loadSubScript(uri, sandbox, encoding);
|
||||
});
|
||||
Loader.evaluate = evaluate;
|
||||
|
||||
// Populates `exports` of the given CommonJS `module` object, in the context
|
||||
// of the given `loader` by evaluating code associated with it.
|
||||
|
|
@ -594,7 +568,6 @@ const load = iced(function load(loader, module) {
|
|||
|
||||
return module;
|
||||
});
|
||||
Loader.load = load;
|
||||
|
||||
// Utility function to normalize module `uri`s so they have `.js` extension.
|
||||
function normalizeExt(uri) {
|
||||
|
|
@ -626,7 +599,6 @@ const resolve = iced(function resolve(id, base) {
|
|||
|
||||
return resolved;
|
||||
});
|
||||
Loader.resolve = resolve;
|
||||
|
||||
// Attempts to load `path` and then `path.js`
|
||||
// Returns `path` with valid file, or `undefined` otherwise
|
||||
|
|
@ -698,7 +670,7 @@ function* getNodeModulePaths(rootURI, start) {
|
|||
// http://nodejs.org/api/modules.html#modules_all_together
|
||||
const nodeResolve = iced(function nodeResolve(id, requirer, { rootURI }) {
|
||||
// Resolve again
|
||||
id = Loader.resolve(id, requirer);
|
||||
id = resolve(id, requirer);
|
||||
|
||||
// If this is already an absolute URI then there is no resolution to do
|
||||
if (isAbsoluteURI(id)) {
|
||||
|
|
@ -733,8 +705,6 @@ const nodeResolve = iced(function nodeResolve(id, requirer, { rootURI }) {
|
|||
return null;
|
||||
});
|
||||
|
||||
Loader.nodeResolve = nodeResolve;
|
||||
|
||||
function addTrailingSlash(path) {
|
||||
return path.replace(/\/*$/, "/");
|
||||
}
|
||||
|
|
@ -791,7 +761,6 @@ const resolveURI = iced(function resolveURI(id, mapping) {
|
|||
|
||||
return normalizeExt(mapping(id))
|
||||
});
|
||||
Loader.resolveURI = resolveURI;
|
||||
|
||||
/**
|
||||
* Defines lazy getters on the given object, which lazily require the
|
||||
|
|
@ -858,7 +827,7 @@ const Require = iced(function Require(loader, requirer) {
|
|||
// algorithm used by SDK add-ons, so give them the more efficient standard
|
||||
// resolve instead.
|
||||
isNative = false;
|
||||
loaderResolve = Loader.resolve;
|
||||
loaderResolve = resolve;
|
||||
}
|
||||
|
||||
function require(id) {
|
||||
|
|
@ -982,7 +951,7 @@ const Require = iced(function Require(loader, requirer) {
|
|||
// found in the paths most likely, like `sdk/tabs`, which should
|
||||
// be resolved relatively if needed using traditional resolve
|
||||
if (!requirement) {
|
||||
requirement = isRelative(id) ? Loader.resolve(id, requirer.id) : id;
|
||||
requirement = isRelative(id) ? resolve(id, requirer.id) : id;
|
||||
}
|
||||
}
|
||||
else if (modules[id]) {
|
||||
|
|
@ -1033,7 +1002,6 @@ const Require = iced(function Require(loader, requirer) {
|
|||
require.main = loader.main === requirer ? requirer : undefined;
|
||||
return iced(require);
|
||||
});
|
||||
Loader.Require = Require;
|
||||
|
||||
const main = iced(function main(loader, id) {
|
||||
// If no main entry provided, and native loader is used,
|
||||
|
|
@ -1044,7 +1012,6 @@ const main = iced(function main(loader, id) {
|
|||
let module = loader.main = loader.modules[uri] = Module(id, uri);
|
||||
return loader.load(loader, module).exports;
|
||||
});
|
||||
Loader.main = main;
|
||||
|
||||
// Makes module object that is made available to CommonJS modules when they
|
||||
// are evaluated, along with `exports` and `require`.
|
||||
|
|
@ -1056,7 +1023,6 @@ const Module = iced(function Module(id, uri) {
|
|||
uri: { value: uri }
|
||||
});
|
||||
});
|
||||
Loader.Module = Module;
|
||||
|
||||
// Takes `loader`, and unload `reason` string and notifies all observers that
|
||||
// they should cleanup after them-self.
|
||||
|
|
@ -1071,7 +1037,6 @@ const unload = iced(function unload(loader, reason) {
|
|||
let subject = { wrappedJSObject: loader.destructor };
|
||||
notifyObservers(subject, 'sdk:loader:destroy', reason);
|
||||
});
|
||||
Loader.unload = unload;
|
||||
|
||||
// Function makes new loader that can be used to load CommonJS modules
|
||||
// described by a given `options.manifest`. Loader takes following options:
|
||||
|
|
@ -1114,8 +1079,8 @@ function Loader(options) {
|
|||
checkCompatibility: false,
|
||||
resolve: options.isNative ?
|
||||
// Make the returned resolve function have the same signature
|
||||
(id, requirer) => Loader.nodeResolve(id, requirer, { rootURI: normalizeRootURI(rootURI) }) :
|
||||
Loader.resolve,
|
||||
(id, requirer) => nodeResolve(id, requirer, { rootURI: normalizeRootURI(rootURI) }) :
|
||||
resolve,
|
||||
sharedGlobalBlocklist: ["sdk/indexed-db"],
|
||||
waiveIntereposition: false
|
||||
}, options);
|
||||
|
|
@ -1250,7 +1215,6 @@ function Loader(options) {
|
|||
|
||||
return freeze(Object.create(null, returnObj));
|
||||
};
|
||||
Loader.Loader = Loader;
|
||||
|
||||
var isSystemURI = uri => /^resource:\/\/(gre|devtools|testing-common)\//.test(uri);
|
||||
|
||||
|
|
@ -1266,6 +1230,3 @@ function getManifestMain(manifest) {
|
|||
let main = manifest.main || './index.js';
|
||||
return isRelative(main) ? main : './' + main;
|
||||
}
|
||||
|
||||
module.exports = iced(Loader);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
*/
|
||||
|
||||
const { Cu, CC, Cc, Ci } = require("chrome");
|
||||
const { Loader } = Cu.import("resource://devtools/shared/base-loader.js", {});
|
||||
const promise = Cu.import("resource://gre/modules/Promise.jsm", {}).Promise;
|
||||
const jsmScope = Cu.import("resource://gre/modules/Services.jsm", {});
|
||||
const { Services } = jsmScope;
|
||||
|
|
@ -172,7 +171,6 @@ function lazyRequireGetter(obj, property, module, destructure) {
|
|||
// List of pseudo modules exposed to all devtools modules.
|
||||
exports.modules = {
|
||||
"Services": Object.create(Services),
|
||||
"toolkit/loader": Loader,
|
||||
promise,
|
||||
PromiseDebugging,
|
||||
ChromeUtils,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче