0.8.1

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.55](https://github.com/google/traceur-compiler/tree/0.0.55)**._
+_The current version is tested against **[Traceur 0.0.56](https://github.com/google/traceur-compiler/tree/0.0.56)**._
 
 _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.8.0/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.8.1/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.55/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.56/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.55/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.56/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.8.0",
+  "version": "0.8.1",
   "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.55"
+    "traceur": "0.0.56"
   },
   "keywords": [
     "es6",

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

@@ -1065,6 +1065,8 @@ function logloads(loads) {
         var compiler = new traceur.Compiler();
         var options = System.traceurOptions || {};
         options.modules = 'instantiate';
+        options.sourceMaps = true;
+        options.filename = load.address;
         var output = compiler.stringToTree({content: load.source, options: options});
         checkForErrors(output);
 
@@ -1073,6 +1075,7 @@ function logloads(loads) {
 
         output = compiler.treeToString(output);
         checkForErrors(output);
+
         var source = output.js;
         var sourceMap = output.generatedSourceMap;
 

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

@@ -820,37 +820,26 @@ define(function() {
 		};
 
 		/**
-		 * Abstract base for handler that delegates to another handler
+		 * Wrap another handler and force it into a future stack
 		 * @param {object} handler
 		 * @constructor
 		 */
-		function Delegating(handler) {
+		function Async(handler) {
 			this.handler = handler;
 		}
 
-		inherit(Handler, Delegating);
+		inherit(Handler, Async);
 
-		Delegating.prototype._report = function(context) {
-			this.join()._report(context);
+		Async.prototype.when = function(continuation) {
+			tasks.enqueue(new ContinuationTask(continuation, this));
 		};
 
-		Delegating.prototype._unreport = function() {
-			this.join()._unreport();
+		Async.prototype._report = function(context) {
+			this.join()._report(context);
 		};
 
-		/**
-		 * Wrap another handler and force it into a future stack
-		 * @param {object} handler
-		 * @constructor
-		 */
-		function Async(handler) {
-			Delegating.call(this, handler);
-		}
-
-		inherit(Delegating, Async);
-
-		Async.prototype.when = function(continuation) {
-			tasks.enqueue(new ContinuationTask(continuation, this));
+		Async.prototype._unreport = function() {
+			this.join()._unreport();
 		};
 
 		/**
@@ -2239,6 +2228,8 @@ function logloads(loads) {
         var compiler = new traceur.Compiler();
         var options = System.traceurOptions || {};
         options.modules = 'instantiate';
+        options.sourceMaps = true;
+        options.filename = load.address;
         var output = compiler.stringToTree({content: load.source, options: options});
         checkForErrors(output);
 
@@ -2247,6 +2238,7 @@ function logloads(loads) {
 
         output = compiler.treeToString(output);
         checkForErrors(output);
+
         var source = output.js;
         var sourceMap = output.generatedSourceMap;
 

dist/es6-module-loader.js

@@ -1,7 +1,7 @@
 {
   "name": "es6-module-loader",
   "description": "An ES6 Module Loader shim",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "homepage": "https://github.com/ModuleLoader/es6-module-loader",
   "author": {
     "name": "Guy Bedford, Luke Hoban, Addy Osmani",
@@ -41,7 +41,7 @@
     "test": "cd test && node test"
   },
   "dependencies": {
-    "traceur": "0.0.55",
+    "traceur": "0.0.56",
     "when": "^3.4.2"
   }
 }