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

Commit 8e73d6a

Browse files
committed
v0.17.5
1 parent c518b8c commit 8e73d6a

7 files changed

+19
-15
lines changed

dist/es6-module-loader-dev.js

Lines changed: 2 additions & 2 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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,13 +534,15 @@ function logloads(loads) {
534534
proceedToTranslate(loader, existingLoad, Promise.resolve(stepState.moduleSource));
535535
}
536536

537-
return existingLoad.linkSets[0].done.then(function() {
538-
resolve(existingLoad);
539-
});
537+
// a primary load -> use that existing linkset
538+
if (existingLoad.linkSets.length)
539+
return existingLoad.linkSets[0].done.then(function() {
540+
resolve(existingLoad);
541+
});
540542
}
541543
}
542544

543-
var load = createLoad(name);
545+
var load = existingLoad || createLoad(name);
544546

545547
load.metadata = stepState.moduleMetadata;
546548

dist/es6-module-loader.js

Lines changed: 2 additions & 2 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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -534,13 +534,15 @@ function logloads(loads) {
534534
proceedToTranslate(loader, existingLoad, Promise.resolve(stepState.moduleSource));
535535
}
536536

537-
return existingLoad.linkSets[0].done.then(function() {
538-
resolve(existingLoad);
539-
});
537+
// a primary load -> use that existing linkset
538+
if (existingLoad.linkSets.length)
539+
return existingLoad.linkSets[0].done.then(function() {
540+
resolve(existingLoad);
541+
});
540542
}
541543
}
542544

543-
var load = createLoad(name);
545+
var load = existingLoad || createLoad(name);
544546

545547
load.metadata = stepState.moduleMetadata;
546548

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.4",
4+
"version": "0.17.5",
55
"homepage": "https://github.com/ModuleLoader/es6-module-loader",
66
"author": {
77
"name": "Guy Bedford, Luke Hoban, Addy Osmani",

0 commit comments

Comments
 (0)