0.9.3 with dependency updates

Author: guybedford

README.md

@@ -17,15 +17,15 @@ See the [demo folder](https://github.com/ModuleLoader/es6-module-loader/blob/mas
 
 For an example of a universal module loader based on this polyfill for loading AMD, CommonJS and globals, see [SystemJS](https://github.com/systemjs/systemjs).
 
-_The current version is tested against **[Traceur 0.0.66](https://github.com/google/traceur-compiler/tree/0.0.66)**._
+_The current version is tested against **[Traceur 0.0.72](https://github.com/google/traceur-compiler/tree/0.0.72)**._
 
 _Note the ES6 module specification is still in draft, and subject to change._
 
 ### Basic Use
 
-Download both [es6-module-loader.js](https://raw.githubusercontent.com/ModuleLoader/es6-module-loader/v0.9.2/dist/es6-module-loader.js) and traceur.js into the same folder.
+Download both [es6-module-loader.js](https://raw.githubusercontent.com/ModuleLoader/es6-module-loader/v0.9.3/dist/es6-module-loader.js) and traceur.js into the same folder.
 
-If using ES6 syntax (optional), include [`traceur.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.66/traceur.js) in the page first then include `es6-module-loader.js`:
+If using ES6 syntax (optional), include [`traceur.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.72/traceur.js) in the page first then include `es6-module-loader.js`:
 
 ```html
   <script src="traceur.js"></script>
@@ -177,7 +177,7 @@ A basic example of using this extension with a build would be the following:
     traceur --out app-build.js app/app.js --modules=instantiate
   ```
 
-2. If using additional ES6 features apart from modules syntax, load [`traceur-runtime.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.66/traceur-runtime.js) (also included in the `bin` folder when installing Traceur through Bower or npm). Then include `es6-module-loader.js` and then apply the register extension before doing the import or loading the bundle as a script:
+2. If using additional ES6 features apart from modules syntax, load [`traceur-runtime.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.72/traceur-runtime.js) (also included in the `bin` folder when installing Traceur through Bower or npm). Then include `es6-module-loader.js` and then apply the register extension before doing the import or loading the bundle as a script:
 
   ```html
     <script src="traceur-runtime.js"></script>

bower.json

@@ -1,11 +1,11 @@
 {
   "name": "es6-module-loader",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "An ES6 Module Loader polyfill based on the latest spec.",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "main": "dist/es6-module-loader-sans-promises.js",
   "dependencies": {
-    "traceur": "0.0.66"
+    "traceur": "0.0.72"
   },
   "keywords": [
     "es6",

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

@@ -1077,6 +1077,7 @@ function logloads(loads) {
 
       var options = traceur.options || {};
       options.modules = 'instantiate';
+      options.script = false;
       options.sourceMaps = true;
       options.filename = load.address;
 
@@ -1184,6 +1185,10 @@ function logloads(loads) {
         xhr.onload = load;
         xhr.onerror = error;
         xhr.ontimeout = error;
+        // IE8/IE9 bug may hang requests unless all properties are defined. 
+        // See: http://stackoverflow.com/a/9928073/3949247
+        xhr.onprogress = function() {};
+        xhr.timeout = 0;
       }
       function load() {
         fulfill(xhr.responseText);
@@ -1424,6 +1429,7 @@ function logloads(loads) {
   }
 })();
 
+
 // Define our eval outside of the scope of any other reference defined in this
 // file to avoid adding those references to the evaluation scope.
 function __eval(__source, __global, load) {

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

@@ -428,6 +428,7 @@ define(function() {
 			}
 
 			/**
+			 * @deprecated
 			 * Issue a progress event, notifying all progress listeners
 			 * @param {*} x progress event payload to pass to all listeners
 			 */
@@ -571,8 +572,7 @@ define(function() {
 						results[i] = h.value;
 						--pending;
 					} else {
-						unreportRemaining(promises, i+1, h);
-						resolver.become(h);
+						resolveAndObserveRemaining(promises, i+1, h, resolver);
 						break;
 					}
 
@@ -597,14 +597,15 @@ define(function() {
 			}
 		}
 
-		function unreportRemaining(promises, start, rejectedHandler) {
+		function resolveAndObserveRemaining(promises, start, handler, resolver) {
+			resolver.become(handler);
+
 			var i, h, x;
 			for(i=start; i<promises.length; ++i) {
 				x = promises[i];
 				if(maybeThenable(x)) {
 					h = getHandlerMaybeThenable(x);
-
-					if(h !== rejectedHandler) {
+					if(h !== handler) {
 						h.visit(h, void 0, h._unreport);
 					}
 				}
@@ -632,15 +633,23 @@ define(function() {
 				return never();
 			}
 
-			var h = new Pending();
-			var i, x;
+			var resolver = new Pending();
+			var i, x, h;
 			for(i=0; i<promises.length; ++i) {
 				x = promises[i];
-				if (x !== void 0 && i in promises) {
-					getHandler(x).visit(h, h.resolve, h.reject);
+				if (x === void 0 && !(i in promises)) {
+					continue;
+				}
+
+				h = getHandler(x);
+				if(h.state() !== 0) {
+					resolveAndObserveRemaining(promises, i+1, h, resolver);
+					break;
 				}
+
+				h.visit(resolver, resolver.resolve, resolver.reject);
 			}
-			return new Promise(Handler, h);
+			return new Promise(Handler, resolver);
 		}
 
 		// Promise internals
@@ -692,7 +701,7 @@ define(function() {
 
 		Handler.prototype.when
 			= Handler.prototype.become
-			= Handler.prototype.notify
+			= Handler.prototype.notify // deprecated
 			= Handler.prototype.fail
 			= Handler.prototype._unreport
 			= Handler.prototype._report
@@ -835,6 +844,9 @@ define(function() {
 			}
 		};
 
+		/**
+		 * @deprecated
+		 */
 		Pending.prototype.notify = function(x) {
 			if(!this.resolved) {
 				tasks.enqueue(new ProgressTask(x, this));
@@ -1107,6 +1119,9 @@ define(function() {
 			Promise.exitContext();
 		}
 
+		/**
+		 * @deprecated
+		 */
 		function runNotify(f, x, h, receiver, next) {
 			if(typeof f !== 'function') {
 				return next.notify(x);
@@ -1141,6 +1156,7 @@ define(function() {
 		}
 
 		/**
+		 * @deprecated
 		 * Return f.call(thisArg, x), or if it throws, *return* the exception
 		 */
 		function tryCatchReturn(f, x, thisArg, next) {
@@ -1173,12 +1189,17 @@ define(function(require) {
 	/*global setTimeout,clearTimeout*/
 	var cjsRequire, vertx, setTimer, clearTimer;
 
+	// Check for vertx environment by attempting to load vertx module.
+	// Doing the check in two steps ensures compatibility with RaveJS,
+	// which will return an empty module when browser: { vertx: false }
+	// is set in package.json
 	cjsRequire = require;
 
 	try {
 		vertx = cjsRequire('vertx');
-	} catch (e) { }
+	} catch (ignored) {}
 
+	// If vertx loaded and has the timer features we expect, try to support it
 	if (vertx && typeof vertx.setTimer === 'function') {
 		setTimer = function (f, ms) { return vertx.setTimer(ms, f); };
 		clearTimer = vertx.cancelTimer;
@@ -2280,6 +2301,7 @@ function logloads(loads) {
 
       var options = traceur.options || {};
       options.modules = 'instantiate';
+      options.script = false;
       options.sourceMaps = true;
       options.filename = load.address;
 
@@ -2387,6 +2409,10 @@ function logloads(loads) {
         xhr.onload = load;
         xhr.onerror = error;
         xhr.ontimeout = error;
+        // IE8/IE9 bug may hang requests unless all properties are defined. 
+        // See: http://stackoverflow.com/a/9928073/3949247
+        xhr.onprogress = function() {};
+        xhr.timeout = 0;
       }
       function load() {
         fulfill(xhr.responseText);
@@ -2627,6 +2653,7 @@ function logloads(loads) {
   }
 })();
 
+
 // Define our eval outside of the scope of any other reference defined in this
 // file to avoid adding those references to the evaluation scope.
 function __eval(__source, __global, load) {

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

@@ -1,7 +1,7 @@
 {
   "name": "es6-module-loader",
   "description": "An ES6 Module Loader shim",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "author": {
     "name": "Guy Bedford, Luke Hoban, Addy Osmani",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "grunt-contrib-uglify": "^0.6.0",
-    "traceur": "0.0.66",
+    "traceur": "0.0.72",
     "when": "^3.4.6"
   }
 }