Skip to content
This repository was archived by the owner on Jul 13, 2020. It is now read-only.

Commit e86e396

Browse files
committed
loader.load to match spec and not execute declarative modules
1 parent 6187526 commit e86e396

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

src/loader.js

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -710,18 +710,21 @@ function logloads(loads) {
710710
},
711711
// 26.3.3.9 keys not implemented
712712
// 26.3.3.10
713-
load: function(name, options) {
713+
load: function(name) {
714714
var loader = this._loader;
715-
if (loader.modules[name]) {
716-
doEnsureEvaluated(loader.modules[name], [], loader);
717-
return Promise.resolve(loader.modules[name].module);
718-
}
719-
return loader.importPromises[name] || createImportPromise(this, name,
720-
loadModule(loader, name, {})
721-
.then(function(load) {
722-
delete loader.importPromises[name];
723-
return evaluateLoadedModule(loader, load);
724-
}));
715+
if (loader.modules[name])
716+
return Promise.resolve();
717+
return loader.importPromises[name] || createImportPromise(this, name, new Promise(asyncStartLoadPartwayThrough({
718+
step: 'locate',
719+
loader: loader,
720+
moduleName: name,
721+
moduleMetadata: {},
722+
moduleSource: undefined,
723+
moduleAddress: undefined
724+
}))
725+
.then(function() {
726+
delete loader.importPromises[name];
727+
}));
725728
},
726729
// 26.3.3.11
727730
module: function(source, options) {

src/wrapper-start.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
function addToError(err, msg) {
3737
var newErr;
3838
if (err instanceof Error) {
39-
var newErr = new Error(err.message, err.fileName, err.lineNumber);
39+
newErr = new Error(err.message, err.fileName, err.lineNumber);
4040
if (isBrowser) {
4141
newErr.message = err.message + '\n\t' + msg;
4242
newErr.stack = err.stack;

0 commit comments

Comments
 (0)