0.9.1

README.md

@@ -23,7 +23,7 @@ Basic Configuration
 
 ### Setup
 
-Download [`es6-module-loader.js`](https://github.com/ModuleLoader/es6-module-loader/blob/v0.9.1/dist/es6-module-loader.js) and [`traceur.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.66/traceur.js) and locate them in the same folder as `system.js` from this repo.
+Download [`es6-module-loader.js`](https://github.com/ModuleLoader/es6-module-loader/blob/v0.9.2/dist/es6-module-loader.js) and [`traceur.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.66/traceur.js) and locate them in the same folder as `system.js` from this repo.
 
 We then include `dist/system.js` with a script tag in the page.
 

bower.json

@@ -1,9 +1,9 @@
 {
   "name": "system.js",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "main": "dist/system.js",
   "dependencies": {
-    "es6-module-loader": "~0.9.1"
+    "es6-module-loader": "~0.9.2"
   },
   "devDependencies": {
     "qunit": "~1.12.0"

dist/system-csp.src.js

@@ -565,7 +565,7 @@ function register(loader) {
     if (!entry) {
       exports = loader.get(name);
       if (!exports)
-        throw "System Register: The module requested " + name + " but this was not declared as a dependency";
+        throw "Unable to load dependency " + name + ".";
     }
 
     else {
@@ -610,6 +610,7 @@ function register(loader) {
           continue;
         return getModule(entry.normalizedDeps[i], loader);
       }
+      throw 'Module ' + name + ' not declared as a dependency.';
     }, exports, module);
 
     if (output)
@@ -735,6 +736,9 @@ function register(loader) {
       if (anonRegister)
         entry = anonRegister;
 
+      if (!entry && System.defined[load.name])
+        entry = System.defined[load.name];
+
       if (!calledRegister && !load.metadata.registered)
         throw load.name + " detected as System.register but didn't execute.";
     }
@@ -932,16 +936,12 @@ function core(loader) {
         }
       };
     }
-    if (load.metadata.format == 'alias') {
-      return Promise.resolve(loader.normalize(load.metadata.alias, load.name, load.address))
-      .then(function(alias) {
-        return {
-          deps: [alias],
-          execute: function() {
-            return System.get(alias);
-          }
-        };
-      });
+    if (load.metadata.alias) {
+      var alias = load.metadata.alias;
+      load.metadata.deps = [alias];
+      load.metadata.execute = function(require) {
+        return require(alias);
+      }
     }
     return loaderInstantiate.call(loader, load);
   }
@@ -1107,8 +1107,9 @@ function cjs(loader) {
 
     var deps = [];
 
-    // remove comments from the source first
-    var source = source.replace(commentRegEx, '');
+    // remove comments from the source first, if not minified
+    if (source.length / source.split('\n').length < 200)
+      source = source.replace(commentRegEx, '');
 
     var match;
 

dist/system.src.js

@@ -499,7 +499,7 @@ function register(loader) {
     if (!entry) {
       exports = loader.get(name);
       if (!exports)
-        throw "System Register: The module requested " + name + " but this was not declared as a dependency";
+        throw "Unable to load dependency " + name + ".";
     }
 
     else {
@@ -544,6 +544,7 @@ function register(loader) {
           continue;
         return getModule(entry.normalizedDeps[i], loader);
       }
+      throw 'Module ' + name + ' not declared as a dependency.';
     }, exports, module);
 
     if (output)
@@ -669,6 +670,9 @@ function register(loader) {
       if (anonRegister)
         entry = anonRegister;
 
+      if (!entry && System.defined[load.name])
+        entry = System.defined[load.name];
+
       if (!calledRegister && !load.metadata.registered)
         throw load.name + " detected as System.register but didn't execute.";
     }
@@ -866,16 +870,12 @@ function core(loader) {
         }
       };
     }
-    if (load.metadata.format == 'alias') {
-      return Promise.resolve(loader.normalize(load.metadata.alias, load.name, load.address))
-      .then(function(alias) {
-        return {
-          deps: [alias],
-          execute: function() {
-            return System.get(alias);
-          }
-        };
-      });
+    if (load.metadata.alias) {
+      var alias = load.metadata.alias;
+      load.metadata.deps = [alias];
+      load.metadata.execute = function(require) {
+        return require(alias);
+      }
     }
     return loaderInstantiate.call(loader, load);
   }
@@ -1041,8 +1041,9 @@ function cjs(loader) {
 
     var deps = [];
 
-    // remove comments from the source first
-    var source = source.replace(commentRegEx, '');
+    // remove comments from the source first, if not minified
+    if (source.length / source.split('\n').length < 200)
+      source = source.replace(commentRegEx, '');
 
     var match;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "systemjs",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "System loader extension for flexible AMD & CommonJS support",
   "main": "dist/system.src.js",
   "repository": {
@@ -10,7 +10,7 @@
   "author": "Guy Bedford",
   "license": "MIT",
   "dependencies": {
-    "es6-module-loader": "~0.9.1"
+    "es6-module-loader": "~0.9.2"
   },
   "devDependencies": {
     "qunit": "^0.6.2",