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

Commit 6bf5f74

Browse files
committed
Fix node es6-promise require
1 parent bef7e2e commit 6bf5f74

File tree

6 files changed

+29
-713
lines changed

6 files changed

+29
-713
lines changed

dist/es6-module-loader-sans-promises.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
https://github.com/jorendorff/js-loaders/blob/e60d3651/specs/es6-modules-2013-12-02.pdf
88
with the only exceptions as described here
99
10-
- Abstract functions have been combined where possible, and their associated functions
10+
- Abstract functions have been combined where possible, and their associated functions
1111
commented
1212
1313
- When the traceur global is detected, declarative modules are transformed by Traceur
@@ -55,7 +55,7 @@ function logloads(loads) {
5555

5656
(function (global) {
5757
(function() {
58-
var Promise = global.Promise || require('./promise');
58+
var Promise = global.Promise || require('es6-promise').Promise;
5959

6060
var traceur;
6161

@@ -76,7 +76,7 @@ function logloads(loads) {
7676
console.assert = console.assert || function() {};
7777

7878
// Define an IE-friendly shim good-enough for purposes
79-
var indexOf = Array.prototype.indexOf || function(item) {
79+
var indexOf = Array.prototype.indexOf || function(item) {
8080
for (var i = 0, thisLen = this.length; i < thisLen; i++) {
8181
if (this[i] === item) {
8282
return i;
@@ -139,7 +139,7 @@ function logloads(loads) {
139139
);
140140
}
141141
function proceedToFetch(loader, load, p) {
142-
proceedToTranslate(loader, load,
142+
proceedToTranslate(loader, load,
143143
p
144144
// CallFetch
145145
.then(function(address) {
@@ -407,7 +407,7 @@ function logloads(loads) {
407407
// dynamic modules are evaluated during linking
408408
if (module.module)
409409
return module.module;
410-
410+
411411
// ensure all dependencies are evaluated first
412412
for (var m in module.dependencies) {
413413
var depName = module.dependencies[m];
@@ -505,7 +505,7 @@ function logloads(loads) {
505505
module: module
506506
};
507507
}
508-
508+
509509
load.status = 'linked';
510510
finishLoad(loader, load);
511511
}
@@ -722,7 +722,7 @@ function logloads(loads) {
722722
eval('var __moduleName = "' + (__moduleName || '').replace('"', '\"') + '"; with(global) { (function() { ' + __source + ' \n }).call(global); }');
723723
}
724724
catch(e) {
725-
if (e.name == 'SyntaxError')
725+
if (e.name == 'SyntaxError')
726726
e.message = 'Evaluating ' + (__sourceURL || __moduleName) + '\n\t' + e.message;
727727
throw e;
728728
}
@@ -745,7 +745,7 @@ function logloads(loads) {
745745
(function (global) {
746746
var isBrowser = typeof window != 'undefined';
747747
var Loader = global.Reflect && global.Reflect.Loader || require('./loader');
748-
var Promise = global.Promise || require('./promise');
748+
var Promise = global.Promise || require('es6-promise').Promise;
749749

750750
// Helpers
751751
// Absolute URL parsing, from https://gist.github.com/Yaffle/1088850
@@ -950,7 +950,7 @@ function logloads(loads) {
950950

951951
if (global.System && global.traceur)
952952
global.traceurSystem = global.System;
953-
953+
954954
global.System = System;
955955

956956
// <script type="module"> support

dist/es6-module-loader-sans-promises.min.js

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

0 commit comments

Comments
 (0)