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

Commit 374e016

Browse files
committed
Switch to ES6 Promise polyfill
1 parent 7a4c870 commit 374e016

File tree

7 files changed

+544
-1692
lines changed

7 files changed

+544
-1692
lines changed

Gruntfile.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@ module.exports = function (grunt) {
1515
},
1616
dist: [
1717
'lib/index.js',
18-
'lib/promise.js',
1918
'lib/loader.js',
2019
'lib/system.js'
2120
]
2221
},
2322
concat: {
2423
dist: {
2524
src: [
26-
'lib/promise.js',
25+
'node_modules/es6-promise/dist/promise-1.0.0.js',
2726
'lib/module.js',
2827
'lib/loader.js',
2928
'lib/system.js'

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ For use in NodeJS, the `Module`, `Loader` and `System` globals are provided as e
284284
index.js:
285285
```javascript
286286
var System = require('es6-module-loader').System;
287-
287+
288288
System.import('some-module').then(function(m) {
289289
console.log(m.p);
290290
});
@@ -415,7 +415,7 @@ _Also, please don't edit files in the "dist" subdirectory as they are generated
415415
## Credit
416416
Copyright (c) 2014 Luke Hoban, Addy Osmani, Guy Bedford
417417

418-
ES6 Promises integration from [when.js](https://github.com/cujojs/when/blob/master/docs/es6-promise-shim.md), Copyright (c) 2010-2014 Brian Cavalier, John Hann, MIT License
418+
ES6 Promises integration from [es6-promise](https://github.com/jakearchibald/es6-promise).
419419

420420
## License
421421
Licensed under the MIT license.

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)