global var insertion fixes

bin/args.js

@@ -71,12 +71,21 @@ module.exports = function (args, opts) {
     if (argv.bare) {
         argv.builtins = false;
         argv.commondir = false;
-        argv.detectGlobals = false;
         if (argv.igv === undefined) {
             argv.igv = '__filename,__dirname';
         }
     }
-
+
+    if (argv.igv) {
+        var insertGlobalVars = {};
+        var wantedGlobalVars = argv.igv.split(',');
+        Object.keys(insertGlobals.vars).forEach(function (x) {
+            if (wantedGlobalVars.indexOf(x) === -1) {
+                insertGlobalVars[x] = undefined;
+            }
+        });
+    }
+
     var ignoreTransform = argv['ignore-transform'] || argv.it;
     var b = browserify(xtend({
         noParse: Array.isArray(argv.noParse) ? argv.noParse : [argv.noParse],
@@ -234,14 +243,6 @@ module.exports = function (args, opts) {
         return b;
     }
 
-    var insertGlobalVars;
-    if (argv.igv) {
-        insertGlobalVars = argv.igv.split(',').reduce(function (vars, x) {
-            vars[x] = insertGlobals.vars[x];
-            return vars;
-        }, {});
-    }
-
     return b;
 };
 

index.js

@@ -552,8 +552,8 @@ Browserify.prototype._createDeps = function (opts) {
         }, opts.insertGlobalVars);
 
         if (opts.bundleExternal === false) {
-            delete vars.process;
-            delete vars.buffer;
+            vars.process = undefined;
+            vars.buffer = undefined;
         }
 
         return insertGlobals(file, xtend(opts, {

test/bare.js

@@ -37,3 +37,34 @@ test('bare', function (t) {
         t.equal(code, 0);
     });
 });
+
+test('bare inserts __filename,__dirname but not process,global,Buffer', function (t) {
+    t.plan(2);
+
+    var ps = spawn(process.execPath, [
+        path.resolve(__dirname, '../bin/cmd.js'),
+        path.resolve(__dirname, 'bare/main.js'),
+        '--bare'
+    ]);
+
+    ps.stdout.pipe(concat(function (body) {
+        vm.runInNewContext(body, {
+            console: {
+                log: function (msg) {
+                    t.same(msg, [
+                        path.join(__dirname, 'bare'),
+                        path.join(__dirname, 'bare/main.js'),
+                        'undefined',
+                        'undefined',
+                        'undefined'
+                    ]);
+                }
+            }
+        });
+    }));
+    ps.stdin.end();
+
+    ps.on('exit', function (code) {
+        t.equal(code, 0);
+    });
+});

test/bare/main.js

@@ -0,0 +1,7 @@
+console.log([
+  __dirname,
+  __filename,
+  typeof process,
+  typeof global,
+  typeof Buffer
+]);

test/bundle_external_global.js

@@ -18,7 +18,7 @@ test('bundle external global', function (t) {
             process: process
         });
         function log (msg) {
-            t.equal(typeof msg.nextTick, 'function');
+            t.equal(msg, process);
         }
     });
 });