Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for the Node v6 preserve-symlinks option #1742

Merged
merged 1 commit into from
Jan 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions bin/advanced.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ Advanced Options:

Register MODULE as a plugin.

--preserve-symlinks

Preserves symlinks when resolving modules.

Passing arguments to transforms and plugins:

For -t, -g, and -p, you may use subarg syntax to pass options to the
Expand Down
3 changes: 2 additions & 1 deletion bin/args.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = function (args, opts) {
'boolean': [
'deps', 'pack', 'ig', 'dg', 'im', 'd', 'list', 'builtins',
'commondir', 'bare', 'full-paths', 'bundle-external', 'bf',
'node'
'node', 'preserve-symlinks'
],
string: [ 's', 'r', 'u', 'x', 't', 'i', 'o', 'e', 'c', 'it' ],
alias: {
Expand Down Expand Up @@ -107,6 +107,7 @@ module.exports = function (args, opts) {
browserField: argv.browserField,
transformKey: argv['transform-key'] ? ['browserify', argv['transform-key']] : undefined,
dedupe: argv['dedupe'],
preserveSymlinks: argv['preserve-symlinks'],

detectGlobals: argv.detectGlobals,
insertGlobals: argv['insert-globals'] || argv.ig,
Expand Down
13 changes: 9 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,15 @@ Browserify.prototype._createDeps = function (opts) {
}
}
if (err) cb(err, file, pkg)
else if (file) fs.realpath(file, function (err, res) {
cb(err, res, pkg, file);
});
else cb(err, null, pkg)
else if (file) {
if (opts.preserveSymlinks && parent) {
return cb(err, path.resolve(file), pkg, file)
}

fs.realpath(file, function (err, res) {
cb(err, res, pkg, file);
});
} else cb(err, null, pkg)
});
};

Expand Down
15 changes: 15 additions & 0 deletions test/preserve-symlinks.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
var browserify = require('../');
var vm = require('vm');
var test = require('tap').test;

test('optionally preserves symlinks', function (t) {
t.plan(2);

var b = browserify(__dirname + '/preserve_symlinks/a/index.js', {preserveSymlinks: true});
b.bundle(function (err, buf) {
t.ok(!err);
t.ok(buf);
var src = buf.toString('utf8');
vm.runInNewContext(src, {});
});
});
1 change: 1 addition & 0 deletions test/preserve_symlinks/a/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('b');
1 change: 1 addition & 0 deletions test/preserve_symlinks/a/node_modules/b

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
1 change: 1 addition & 0 deletions test/preserve_symlinks/b/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
require('c');