alternative detection for #866

systemjs · Nov 18, 2015 · 98bb018 · 98bb018
1 parent fce3cd6
commit 98bb018
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/cjs.js b/lib/cjs.js
@@ -53,7 +53,7 @@
     var windowOrigin = location.protocol + '//' + location.hostname + (location.port ? ':' + location.port : '');
 
   // include the node require since we're overriding it
-  if (typeof require != 'undefined' && require.resolve && typeof process != 'undefined')
+  if (typeof require != 'undefined' && typeof process != 'undefined' && !process.browser)
     SystemJSLoader.prototype._nodeRequire = require;
 
   var nodeCoreModules = ['assert', 'buffer', 'child_process', 'cluster', 'console', 'constants',