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

Commit 0d96992

Browse files
guybedfordguybedford
committed
v0.17.10
1 parent 45aad0b commit 0d96992

7 files changed

+52
-42
lines changed

‎dist/es6-module-loader-dev.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/es6-module-loader-dev.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/es6-module-loader-dev.src.js

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ global.URLPolyfill = URLPolyfill;
7272

7373
var isWorker = typeof window == 'undefined' && typeof self != 'undefined' && typeof importScripts != 'undefined';
7474
var isBrowser = typeof window != 'undefined' && typeof document != 'undefined';
75-
var isWindows = typeof process != 'undefined' && !!process.platform.match(/^win/);
75+
var isWindows = typeof process != 'undefined' && typeof process.platform != 'undefined' && !!process.platform.match(/^win/);
7676

7777
if (!__global.console)
7878
__global.console = { assert: function() {} };
@@ -106,7 +106,7 @@ global.URLPolyfill = URLPolyfill;
106106
function addToError(err, msg) {
107107
var newErr;
108108
if (err instanceof Error) {
109-
var newErr = new Error(err.message, err.fileName, err.lineNumber);
109+
newErr = new Error(err.message, err.fileName, err.lineNumber);
110110
if (isBrowser) {
111111
newErr.message = err.message + '\n\t' + msg;
112112
newErr.stack = err.stack;
@@ -873,18 +873,21 @@ function logloads(loads) {
873873
},
874874
// 26.3.3.9 keys not implemented
875875
// 26.3.3.10
876-
load: function(name, options) {
876+
load: function(name) {
877877
var loader = this._loader;
878-
if (loader.modules[name]) {
879-
doEnsureEvaluated(loader.modules[name], [], loader);
880-
return Promise.resolve(loader.modules[name].module);
881-
}
882-
return loader.importPromises[name] || createImportPromise(this, name,
883-
loadModule(loader, name, {})
884-
.then(function(load) {
885-
delete loader.importPromises[name];
886-
return evaluateLoadedModule(loader, load);
887-
}));
878+
if (loader.modules[name])
879+
return Promise.resolve();
880+
return loader.importPromises[name] || createImportPromise(this, name, new Promise(asyncStartLoadPartwayThrough({
881+
step: 'locate',
882+
loader: loader,
883+
moduleName: name,
884+
moduleMetadata: {},
885+
moduleSource: undefined,
886+
moduleAddress: undefined
887+
}))
888+
.then(function() {
889+
delete loader.importPromises[name];
890+
}));
888891
},
889892
// 26.3.3.11
890893
module: function(source, options) {
@@ -1119,7 +1122,7 @@ function logloads(loads) {
11191122

11201123
module.locked = false;
11211124
return value;
1122-
}, load.name);
1125+
}, { id: load.name });
11231126

11241127
// setup our setters and execution function
11251128
module.setters = registryEntry.setters;
@@ -1306,8 +1309,12 @@ var transpile = (function() {
13061309
return compiler.compile(source, filename);
13071310
}
13081311
catch(e) {
1309-
// traceur throws an error array
1310-
throw e[0];
1312+
// on older versions of traceur (<0.9.3), an array of errors is thrown
1313+
// rather than a single error.
1314+
if (e.length) {
1315+
throw e[0];
1316+
}
1317+
throw e;
13111318
}
13121319
}
13131320

@@ -1390,7 +1397,7 @@ function applyPaths(paths, name) {
13901397
}
13911398
}
13921399

1393-
var outPath = paths[pathMatch] || name;
1400+
var outPath = paths[pathMatch];
13941401
if (typeof wildcard == 'string')
13951402
outPath = outPath.replace('*', wildcard);
13961403

@@ -1412,7 +1419,7 @@ SystemLoader.prototype.normalize = function(name, parentName, parentAddress) {
14121419

14131420
// not absolute or relative -> apply paths (what will be sites)
14141421
if (!name.match(absURLRegEx) && name[0] != '.')
1415-
name = new URL(applyPaths(this.paths, name), baseURI).href;
1422+
name = new URL(applyPaths(this.paths, name) || name, baseURI).href;
14161423
// apply parent-relative normalization, parentAddress is already normalized
14171424
else
14181425
name = new URL(name, parentName || baseURI).href;

‎dist/es6-module-loader.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/es6-module-loader.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/es6-module-loader.src.js

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ global.URLPolyfill = URLPolyfill;
7272

7373
var isWorker = typeof window == 'undefined' && typeof self != 'undefined' && typeof importScripts != 'undefined';
7474
var isBrowser = typeof window != 'undefined' && typeof document != 'undefined';
75-
var isWindows = typeof process != 'undefined' && !!process.platform.match(/^win/);
75+
var isWindows = typeof process != 'undefined' && typeof process.platform != 'undefined' && !!process.platform.match(/^win/);
7676

7777
if (!__global.console)
7878
__global.console = { assert: function() {} };
@@ -106,7 +106,7 @@ global.URLPolyfill = URLPolyfill;
106106
function addToError(err, msg) {
107107
var newErr;
108108
if (err instanceof Error) {
109-
var newErr = new Error(err.message, err.fileName, err.lineNumber);
109+
newErr = new Error(err.message, err.fileName, err.lineNumber);
110110
if (isBrowser) {
111111
newErr.message = err.message + '\n\t' + msg;
112112
newErr.stack = err.stack;
@@ -873,18 +873,21 @@ function logloads(loads) {
873873
},
874874
// 26.3.3.9 keys not implemented
875875
// 26.3.3.10
876-
load: function(name, options) {
876+
load: function(name) {
877877
var loader = this._loader;
878-
if (loader.modules[name]) {
879-
doEnsureEvaluated(loader.modules[name], [], loader);
880-
return Promise.resolve(loader.modules[name].module);
881-
}
882-
return loader.importPromises[name] || createImportPromise(this, name,
883-
loadModule(loader, name, {})
884-
.then(function(load) {
885-
delete loader.importPromises[name];
886-
return evaluateLoadedModule(loader, load);
887-
}));
878+
if (loader.modules[name])
879+
return Promise.resolve();
880+
return loader.importPromises[name] || createImportPromise(this, name, new Promise(asyncStartLoadPartwayThrough({
881+
step: 'locate',
882+
loader: loader,
883+
moduleName: name,
884+
moduleMetadata: {},
885+
moduleSource: undefined,
886+
moduleAddress: undefined
887+
}))
888+
.then(function() {
889+
delete loader.importPromises[name];
890+
}));
888891
},
889892
// 26.3.3.11
890893
module: function(source, options) {
@@ -1048,7 +1051,7 @@ function applyPaths(paths, name) {
10481051
}
10491052
}
10501053

1051-
var outPath = paths[pathMatch] || name;
1054+
var outPath = paths[pathMatch];
10521055
if (typeof wildcard == 'string')
10531056
outPath = outPath.replace('*', wildcard);
10541057

@@ -1070,7 +1073,7 @@ SystemLoader.prototype.normalize = function(name, parentName, parentAddress) {
10701073

10711074
// not absolute or relative -> apply paths (what will be sites)
10721075
if (!name.match(absURLRegEx) && name[0] != '.')
1073-
name = new URL(applyPaths(this.paths, name), baseURI).href;
1076+
name = new URL(applyPaths(this.paths, name) || name, baseURI).href;
10741077
// apply parent-relative normalization, parentAddress is already normalized
10751078
else
10761079
name = new URL(name, parentName || baseURI).href;

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "es6-module-loader",
33
"description": "An ES6 Module Loader shim",
4-
"version": "0.17.9",
4+
"version": "0.17.10",
55
"homepage": "https://github.com/ModuleLoader/es6-module-loader",
66
"author": {
77
"name": "Guy Bedford, Luke Hoban, Addy Osmani",

0 commit comments

Comments
 (0)