ensure we match all System._nodeRequire replacements

systemjs · Aug 26, 2015 · eb63a85 · eb63a85
1 parent bf96fd0
commit eb63a85
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/compilers/cjs.js b/compilers/cjs.js
@@ -133,8 +133,11 @@ exports.compile = function(load, opts, loader) {
 
   var output = compiler.write(tree, load.address);
 
+  // replace System._nodeRequire with $__System, ensuring we don't replace an existing $__System
   if (opts.sfx)
-    output = output.replace(/System\._nodeRequire/g, '$__System._nodeRequire');
+    output = output.replace(/(^|[^_])System\._nodeRequire/g, function(match, startArg) {
+      return startArg + '$__System._nodeRequire';
+    });
 
   return Promise.resolve({
     source: output,