Dynamically calculate __dirname and __filename when --node is passed

index.js

@@ -1,3 +1,4 @@
+var path = require('path');
 var mdeps = require('module-deps');
 var depsSort = require('deps-sort');
 var bpack = require('browser-pack');
@@ -551,6 +552,19 @@ Browserify.prototype._createDeps = function (opts) {
                 return through();
             }
         }
+
+        if (opts.commondir === false && opts.builtins === false) {
+          opts.insertGlobalVars = xtend({
+            __dirname: function(file, basedir) {
+              var dir = path.dirname(path.relative(basedir, file));
+              return 'require("path").join(__dirname,' + dir.split(path.sep).map(JSON.stringify).join(',') + ')';
+            },
+            __filename: function(file, basedir) {
+              var filename = path.relative(basedir, file);
+              return 'require("path").join(__dirname,' + filename.split(path.sep).map(JSON.stringify).join(',') + ')';
+            }
+          }, opts.insertGlobalVars);
+        }
 
         var vars = xtend({
             process: function () { return "require('_process')" },
@@ -560,11 +574,11 @@ Browserify.prototype._createDeps = function (opts) {
             vars.process = undefined;
             vars.buffer = undefined;
         }
-        
+
         return insertGlobals(file, xtend(opts, {
             debug: opts.debug,
             always: opts.insertGlobals,
-            basedir: opts.commondir === false
+            basedir: opts.commondir === false && isArray(opts.builtins)
                 ? '/'
                 : opts.basedir || process.cwd()
             ,

test/bare.js

@@ -3,6 +3,10 @@ var spawn = require('child_process').spawn;
 var path = require('path');
 var concat = require('concat-stream');
 var vm = require('vm');
+var fs = require('fs');
+var temp = require('temp');
+temp.track();
+var tmpdir = temp.mkdirSync({prefix: 'browserify-test'});
 
 test('bare', function (t) {
     t.plan(4);
@@ -41,14 +45,17 @@ test('bare', function (t) {
 test('bare inserts __filename,__dirname but not process,global,Buffer', function (t) {
     t.plan(2);
 
+    var file = path.resolve(__dirname, 'bare/main.js');
     var ps = spawn(process.execPath, [
         path.resolve(__dirname, '../bin/cmd.js'),
-        path.resolve(__dirname, 'bare/main.js'),
+        file,
         '--bare'
     ]);
 
     ps.stdout.pipe(concat(function (body) {
         vm.runInNewContext(body, {
+            require: require,
+            __dirname: process.cwd(),
             console: {
                 log: function (msg) {
                     t.same(msg, [
@@ -68,3 +75,72 @@ test('bare inserts __filename,__dirname but not process,global,Buffer', function
         t.equal(code, 0);
     });
 });
+
+test('bare inserts dynamic __filename,__dirname', function (t) {
+    t.plan(2);
+
+    var file = path.join(tmpdir, 'dirname-filename.js');
+
+    fs.writeFileSync(
+        file,
+        fs.readFileSync(path.resolve(__dirname, 'bare/dirname-filename.js'))
+    );
+
+    var ps = spawn(process.execPath, [
+        path.resolve(__dirname, '../bin/cmd.js'),
+        file,
+        '--bare'
+    ]);
+
+    ps.stdout.pipe(concat(function (body) {
+        vm.runInNewContext(body, {
+            require: require,
+            __dirname: path.dirname(file),
+            console: {
+                log: function (msg) {
+                    t.same(msg, [
+                        path.dirname(file),
+                        file
+                    ]);
+                }
+            }
+        });
+    }));
+    ps.stdin.end();
+
+    ps.on('exit', function (code) {
+        t.equal(code, 0);
+    });
+});
+
+test('bare inserts dynamic __filename,__dirname with basedir', function (t) {
+    t.plan(2);
+
+    var file = 'dirname-filename.js';
+    var ps = spawn(process.execPath, [
+        path.resolve(__dirname, '../bin/cmd.js'),
+        file,
+        '--bare',
+        '--basedir=' + path.join(__dirname, 'bare')
+    ]);
+
+    ps.stdout.pipe(concat(function (body) {
+        vm.runInNewContext(body, {
+            require: require,
+            __dirname: process.cwd(),
+            console: {
+                log: function (msg) {
+                    t.same(msg, [
+                        __dirname,
+                        path.join(__dirname, file)
+                    ]);
+                }
+            }
+        });
+    }));
+    ps.stdin.end();
+
+    ps.on('exit', function (code) {
+        t.equal(code, 0);
+    });
+});

test/bare/dirname-filename.js

@@ -0,0 +1,4 @@
+console.log([
+  __dirname,
+  __filename
+]);

test/no_builtins.js

@@ -1,12 +1,14 @@
 var browserify = require('../');
 var test = require('tap').test;
+var path = require('path');
 var vm = require('vm');
 
 test('builtins false', function (t) {
     t.plan(1);
-
+
+    var file = __dirname + '/no_builtins/main.js';
     var b = browserify({
-        entries: [ __dirname + '/no_builtins/main.js' ],
+        entries: [ file ],
         commondir: false,
         builtins: false
     });
@@ -15,7 +17,8 @@ test('builtins false', function (t) {
             console: { log: function (msg) {
                 t.equal(msg, 'beep boop\n');
             } },
-            require: require
+            require: require,
+            __dirname: process.cwd()
         };
         vm.runInNewContext(src, c);
     });