Merge pull request #514 from stealjs/roll

Fix problems caused by recent system-npm release

bower.json

@@ -10,7 +10,7 @@
   ],
   "devDependencies": {
     "qunit": "~1.12.0",
-    "systemjs": "bitovi/systemjs#0.16.6-bitovi.8",
+    "systemjs": "bitovi/systemjs#0.16.6-bitovi.13",
     "traceur": "0.0.91",
     "system-bower": "^0.2.1",
     "es6-module-loader": "bitovi/es6-module-loader#v0.16.3-bitovi.5",

ext/npm-extension.js

@@ -3,6 +3,11 @@
 var utils = require("./npm-utils");
 exports.includeInBuild = true;
 
+var isNode = typeof process === "object" && {}.toString.call(process) ===
+	"[object process]";
+var isWorker = typeof WorkerGlobalScope !== "undefined" && (self instanceof WorkerGlobalScope);
+var isBrowser = typeof window !== "undefined" && !isNode && !isWorker;
+
 exports.addExtension = function(System){
 	/**
 	 * Normalize has to deal with a "tricky" situation.  There are module names like
@@ -107,7 +112,10 @@ exports.addExtension = function(System){
 				return oldLocate.call(this, load).then(function(address){
 					var expectedAddress = utils.path.joinURIs(
 						System.baseURL, load.name
-					).replace(/#/g, "%23");
+					);
+					if(isBrowser) {
+						expectedAddress = expectedAddress.replace(/#/g, "%23");
+					}
 
 					// If locate didn't do the expected thing then we're going
 					// to guess that we shouldn't perform NPM lookup on this

main.js

@@ -1044,16 +1044,16 @@ if (typeof System !== "undefined") {
 }
 
 	if( isNode ) {
-		require('systemjs');
-			
+		require('steal-systemjs');
+
 		global.steal = makeSteal(System);
 		global.steal.System = System;
 		global.steal.dev = require("./ext/dev.js");
 		steal.clone = cloneSteal;
 		module.exports = global.steal;
 		global.steal.addSteal = addSteal;
 		require("system-json");
-		
+
 	} else {
 		var oldSteal = global.steal;
 		global.steal = makeSteal(System);
@@ -1064,6 +1064,6 @@ if (typeof System !== "undefined") {
 			});
 		global.steal.clone = cloneSteal;
 		global.steal.addSteal = addSteal;
-	} 
-    
+	}
+
 })(typeof window == "undefined" ? (typeof global === "undefined" ? this : global) : window);

package.json

@@ -12,14 +12,14 @@
     "test-windows": "grunt test-windows --stack"
   },
   "dependencies": {
-    "systemjs": "git://github.com/stealjs/systemjs#0.16.6-bitovi.9",
     "less": "^2.4.0",
+    "steal-systemjs": "^0.16.6-bitovi.13",
     "system-json": "^0.0.3"
   },
   "devDependencies": {
     "steal-css": "^0.0.5",
     "steal-less": "^0.0.1",
-    "system-npm": "0.3.6",
+    "system-npm": "0.3.7",
     "system-live-reload": "1.4.0",
     "system-trace": "0.1.7",
     "bower": "1.3.8",

src/end.js

@@ -1,14 +1,14 @@
 	if( isNode ) {
-		require('systemjs');
-			
+		require('steal-systemjs');
+
 		global.steal = makeSteal(System);
 		global.steal.System = System;
 		global.steal.dev = require("./ext/dev.js");
 		steal.clone = cloneSteal;
 		module.exports = global.steal;
 		global.steal.addSteal = addSteal;
 		require("system-json");
-		
+
 	} else {
 		var oldSteal = global.steal;
 		global.steal = makeSteal(System);
@@ -19,6 +19,6 @@
 			});
 		global.steal.clone = cloneSteal;
 		global.steal.addSteal = addSteal;
-	} 
-    
+	}
+
 })(typeof window == "undefined" ? (typeof global === "undefined" ? this : global) : window);

steal.js

@@ -4847,7 +4847,7 @@ var $__curScript, __eval;
       var curPath = $__curScript.src;
       var basePath = curPath.substr(0, curPath.lastIndexOf('/') + 1);
       document.write(
-        '<' + 'script type="text/javascript" src="' + basePath + 'es6-module-loader.js" data-init="upgradeSystemLoader">' + '<' + '/script>'
+        '<' + 'script type="text/javascript" src="' + basePath + 'steal-es6-module-loader.js" data-init="upgradeSystemLoader">' + '<' + '/script>'
       );
     }
     else {
@@ -4872,14 +4872,14 @@ var $__curScript, __eval;
           basePath = url.replace(/\/[^\/]*$/, '/');
         });
       }
-      importScripts(basePath + 'es6-module-loader.js');
+      importScripts(basePath + 'steal-es6-module-loader.js');
       $__global.upgradeSystemLoader();
     } else {
       $__global.upgradeSystemLoader();
     }
   }
   else {
-    var es6ModuleLoader = require('es6-module-loader');
+    var es6ModuleLoader = require('steal-es6-module-loader');
     $__global.System = es6ModuleLoader.System;
     $__global.Loader = es6ModuleLoader.Loader;
     $__global.upgradeSystemLoader();
@@ -6018,16 +6018,16 @@ if (typeof System !== "undefined") {
 }
 
 	if( isNode ) {
-		require('systemjs');
-			
+		require('steal-systemjs');
+
 		global.steal = makeSteal(System);
 		global.steal.System = System;
 		global.steal.dev = require("./ext/dev.js");
 		steal.clone = cloneSteal;
 		module.exports = global.steal;
 		global.steal.addSteal = addSteal;
 		require("system-json");
-		
+
 	} else {
 		var oldSteal = global.steal;
 		global.steal = makeSteal(System);
@@ -6038,6 +6038,6 @@ if (typeof System !== "undefined") {
 			});
 		global.steal.clone = cloneSteal;
 		global.steal.addSteal = addSteal;
-	} 
-    
+	}
+
 })(typeof window == "undefined" ? (typeof global === "undefined" ? this : global) : window);