Merge pull request #136 from josh/es6-promise

Switch to ES6 Polyfill

Author: guybedford

Gruntfile.js

@@ -15,15 +15,14 @@ module.exports = function (grunt) {
       },
       dist: [
         'lib/index.js',
-        'lib/promise.js',
         'lib/loader.js',
         'lib/system.js'
       ]
     },
     concat: {
       dist: {
         src: [
-          'lib/promise.js',
+          'node_modules/es6-promise/dist/promise-1.0.0.js',
           'lib/module.js',
           'lib/loader.js',
           'lib/system.js'

README.md

@@ -284,7 +284,7 @@ For use in NodeJS, the `Module`, `Loader` and `System` globals are provided as e
 index.js:
 ```javascript
   var System = require('es6-module-loader').System;
-  
+
   System.import('some-module').then(function(m) {
     console.log(m.p);
   });
@@ -415,7 +415,7 @@ _Also, please don't edit files in the "dist" subdirectory as they are generated
 ## Credit
 Copyright (c) 2014 Luke Hoban, Addy Osmani, Guy Bedford
 
-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
+ES6 Promises integration from [es6-promise](https://github.com/jakearchibald/es6-promise).
 
 ## License
 Licensed under the MIT license.

bower.json

@@ -3,8 +3,9 @@
   "version": "0.5.4",
   "description": "An ES6 Module Loader polyfill based on the latest spec.",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
-  "main": "dist/es6-module-loader.js",
+  "main": "dist/es6-module-loader-sans-promises.js",
   "dependencies": {
+    "es6-promise": "^1.0",
     "traceur": "0.0.32"
   },
   "keywords": [

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

@@ -7,7 +7,7 @@
       https://github.com/jorendorff/js-loaders/blob/e60d3651/specs/es6-modules-2013-12-02.pdf
       with the only exceptions as described here
 
-    - Abstract functions have been combined where possible, and their associated functions 
+    - Abstract functions have been combined where possible, and their associated functions
       commented
 
     - When the traceur global is detected, declarative modules are transformed by Traceur
@@ -55,7 +55,7 @@ function logloads(loads) {
 
 (function (global) {
   (function() {
-    var Promise = global.Promise || require('./promise');
+    var Promise = global.Promise || require('es6-promise').Promise;
 
     var traceur;
 
@@ -76,7 +76,7 @@ function logloads(loads) {
     console.assert = console.assert || function() {};
 
     // Define an IE-friendly shim good-enough for purposes
-    var indexOf = Array.prototype.indexOf || function(item) { 
+    var indexOf = Array.prototype.indexOf || function(item) {
       for (var i = 0, thisLen = this.length; i < thisLen; i++) {
         if (this[i] === item) {
           return i;
@@ -139,7 +139,7 @@ function logloads(loads) {
       );
     }
     function proceedToFetch(loader, load, p) {
-      proceedToTranslate(loader, load, 
+      proceedToTranslate(loader, load,
         p
         // CallFetch
         .then(function(address) {
@@ -407,7 +407,7 @@ function logloads(loads) {
       // dynamic modules are evaluated during linking
       if (module.module)
         return module.module;
-      
+
       // ensure all dependencies are evaluated first
       for (var m in module.dependencies) {
         var depName = module.dependencies[m];
@@ -505,7 +505,7 @@ function logloads(loads) {
               module: module
             };
           }
-          
+
           load.status = 'linked';
           finishLoad(loader, load);
         }
@@ -722,7 +722,7 @@ function logloads(loads) {
       eval('var __moduleName = "' + (__moduleName || '').replace('"', '\"') + '"; with(global) { (function() { ' + __source + ' \n }).call(global); }');
     }
     catch(e) {
-      if (e.name == 'SyntaxError') 
+      if (e.name == 'SyntaxError')
         e.message = 'Evaluating ' + (__sourceURL || __moduleName) + '\n\t' + e.message;
       throw e;
     }
@@ -745,7 +745,7 @@ function logloads(loads) {
 (function (global) {
   var isBrowser = typeof window != 'undefined';
   var Loader = global.Reflect && global.Reflect.Loader || require('./loader');
-  var Promise = global.Promise || require('./promise');
+  var Promise = global.Promise || require('es6-promise').Promise;
 
   // Helpers
   // Absolute URL parsing, from https://gist.github.com/Yaffle/1088850
@@ -950,7 +950,7 @@ function logloads(loads) {
 
   if (global.System && global.traceur)
     global.traceurSystem = global.System;
-  
+
   global.System = System;
 
   // <script type="module"> support