0.13.2

systemjs · Feb 12, 2015 · f1fa837 · f1fa837
1 parent a725cdd
commit f1fa837
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 bower_components
+.DS_Store
diff --git a/dist/system-csp.js b/dist/system-csp.js
diff --git a/dist/system-csp.js.map b/dist/system-csp.js.map
diff --git a/dist/system-csp.src.js b/dist/system-csp.src.js
@@ -1,5 +1,5 @@
 /*
- * SystemJS v0.13.1
+ * SystemJS v0.13.2
  */
 
 (function($__global) {
@@ -1775,7 +1775,7 @@ function plugins(loader) {
         else
           return Promise.resolve(loader.locate(load))
           .then(function(address) {
-            return address.substr(0, address.length - 3);
+            return address.replace(/\.js$/, '');
           });
       });
     }
@@ -1801,7 +1801,7 @@ function plugins(loader) {
     var loader = this;
     if (load.metadata.plugin && load.metadata.plugin.translate)
       return Promise.resolve(load.metadata.plugin.translate.call(loader, load)).then(function(result) {
-        if (result)
+        if (typeof result == 'string')
           load.source = result;
         return loaderTranslate.call(loader, load);
       });
@@ -2142,8 +2142,7 @@ function versions(loader) {
 
     // strip the version before applying map config
     var stripVersion, stripSubPathLength;
-    var pluginIndex = name.lastIndexOf('!');
-    var versionIndex = (pluginIndex == -1 ? name : name.substr(0, pluginIndex)).lastIndexOf('@');
+    var versionIndex = name.indexOf('!') != -1 ? 0 : name.lastIndexOf('@');
     if (versionIndex > 0) {
       var parts = name.substr(versionIndex + 1, name.length - versionIndex - 1).split('/');
       stripVersion = parts[0];
@@ -2154,7 +2153,7 @@ function versions(loader) {
     // run all other normalizers first
     return Promise.resolve(loaderNormalize.call(this, name, parentName, parentAddress)).then(function(normalized) {
 
-      var index = normalized.indexOf('@');
+      var index = normalized.indexOf('!') != -1 ? 0 : normalized.indexOf('@');
 
       // if we stripped a version, and it still has no version, add it back
       if (stripVersion && (index == -1 || index == 0)) {

diff --git a/dist/system.js b/dist/system.js
diff --git a/dist/system.js.map b/dist/system.js.map
diff --git a/dist/system.src.js b/dist/system.src.js
@@ -1,5 +1,5 @@
 /*
- * SystemJS v0.13.1
+ * SystemJS v0.13.2
  */
 
 (function($__global) {
@@ -1707,7 +1707,7 @@ function plugins(loader) {
         else
           return Promise.resolve(loader.locate(load))
           .then(function(address) {
-            return address.substr(0, address.length - 3);
+            return address.replace(/\.js$/, '');
           });
       });
     }
@@ -1733,7 +1733,7 @@ function plugins(loader) {
     var loader = this;
     if (load.metadata.plugin && load.metadata.plugin.translate)
       return Promise.resolve(load.metadata.plugin.translate.call(loader, load)).then(function(result) {
-        if (result)
+        if (typeof result == 'string')
           load.source = result;
         return loaderTranslate.call(loader, load);
       });
@@ -2074,8 +2074,7 @@ function versions(loader) {
 
     // strip the version before applying map config
     var stripVersion, stripSubPathLength;
-    var pluginIndex = name.lastIndexOf('!');
-    var versionIndex = (pluginIndex == -1 ? name : name.substr(0, pluginIndex)).lastIndexOf('@');
+    var versionIndex = name.indexOf('!') != -1 ? 0 : name.lastIndexOf('@');
     if (versionIndex > 0) {
       var parts = name.substr(versionIndex + 1, name.length - versionIndex - 1).split('/');
       stripVersion = parts[0];
@@ -2086,7 +2085,7 @@ function versions(loader) {
     // run all other normalizers first
     return Promise.resolve(loaderNormalize.call(this, name, parentName, parentAddress)).then(function(normalized) {
 
-      var index = normalized.indexOf('@');
+      var index = normalized.indexOf('!') != -1 ? 0 : normalized.indexOf('@');
 
       // if we stripped a version, and it still has no version, add it back
       if (stripVersion && (index == -1 || index == 0)) {

diff --git a/lib/banner.js b/lib/banner.js
@@ -1,4 +1,4 @@
 /*
- * SystemJS v0.13.1
+ * SystemJS v0.13.2
  */
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "systemjs",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "System loader extension for flexible AMD & CommonJS support",
   "main": "dist/system.src.js",
   "repository": {
@@ -10,10 +10,10 @@
   "author": "Guy Bedford",
   "license": "MIT",
   "dependencies": {
-    "es6-module-loader": "~0.13.0"
+    "es6-module-loader": "~0.13.1"
   },
   "devDependencies": {
-    "6to5-core": "~3.3.2",
+    "6to5-core": "~3.5.3",
     "qunit": "^0.6.2",
     "uglify-js": "~2.4.13",
     "traceur": "0.0.82"