browserify
Advanced tools
Comparing version 16.2.0 to 16.2.1
16
index.js
@@ -33,3 +33,4 @@ var path = require('path'); | ||
var path = require('path'); | ||
var relativePath = require('cached-path-relative') | ||
var cachedPathRelative = require('cached-path-relative'); | ||
var paths = { | ||
@@ -140,3 +141,2 @@ empty: path.join(__dirname, 'lib/_empty.js') | ||
expose = '/' + relativePath(basedir, expose); | ||
expose = expose.replace(/\\/g, '/'); | ||
} | ||
@@ -148,3 +148,2 @@ if (expose === undefined && this._options.exposeAll) { | ||
expose = '/' + relativePath(basedir, file); | ||
expose = expose.replace(/\\/g, '/'); | ||
} | ||
@@ -504,3 +503,3 @@ | ||
if (file && self._ignore.length) { | ||
var nm = file.split('/node_modules/')[1]; | ||
var nm = file.replace(/\\/g, '/').split('/node_modules/')[1]; | ||
if (nm) { | ||
@@ -583,3 +582,3 @@ nm = nm.split('/')[0]; | ||
var parts = file.split('/node_modules/'); | ||
var parts = file.replace(/\\/g, '/').split('/node_modules/'); | ||
for (var i = 0; i < no.length; i++) { | ||
@@ -797,4 +796,3 @@ if (typeof no[i] === 'function' && no[i](file)) { | ||
row.sourceRoot = 'file://localhost'; | ||
row.sourceFile = relativePath(basedir, row.file) | ||
.replace(/\\/g, '/'); | ||
row.sourceFile = relativePath(basedir, row.file); | ||
} | ||
@@ -864,1 +862,5 @@ this.push(row); | ||
} | ||
function relativePath (from, to) { | ||
// Replace \ with / for OS-independent behavior | ||
return cachedPathRelative(from, to).replace(/\\/g, '/'); | ||
} |
{ | ||
"name": "browserify", | ||
"version": "16.2.0", | ||
"version": "16.2.1", | ||
"description": "browser-side require() the node way", | ||
@@ -84,2 +84,3 @@ "main": "index.js", | ||
"make-generator-function": "^1.1.0", | ||
"semver": "^5.5.0", | ||
"seq": "0.3.5", | ||
@@ -86,0 +87,0 @@ "tap": "^10.7.2", |
@@ -5,4 +5,8 @@ var browserify = require('../'); | ||
var path = require('path') | ||
var semver = require('semver'); | ||
test('function transform', function (t) { | ||
// TODO this should be fixable I guess | ||
var flaky = process.platform === 'win32' && semver.satisfies(process.version, 'v0.10.x'); | ||
test('function transform', { skip: flaky }, function (t) { | ||
t.plan(3); | ||
@@ -9,0 +13,0 @@ var ps = spawn(process.execPath, [ |
var browserify = require('../'); | ||
var vm = require('vm'); | ||
var path = require('path'); | ||
var test = require('tap').test; | ||
@@ -12,4 +13,4 @@ var through = require('through2'); | ||
if (row.file) { | ||
t.equal(row.file, __dirname + '/delay/main.js'); | ||
row.file = __dirname + '/delay/diverted.js'; | ||
t.equal(row.file, path.join(__dirname, 'delay/main.js')); | ||
row.file = path.join(__dirname, 'delay/diverted.js'); | ||
} | ||
@@ -16,0 +17,0 @@ this.push(row); |
var test = require('tap').test; | ||
var browserify = require('../'); | ||
var path = require('path'); | ||
var vm = require('vm'); | ||
@@ -5,0 +4,0 @@ |
var browserify = require('../'); | ||
var vm = require('vm'); | ||
var path = require('path'); | ||
var test = require('tap').test; | ||
@@ -12,3 +13,3 @@ | ||
b.on('dep', function(row) { | ||
if (row.entry) t.equal(row.file, __dirname + '/entry/main.js'); | ||
if (row.entry) t.equal(row.file, path.join(__dirname, 'entry/main.js')); | ||
}); | ||
@@ -33,3 +34,3 @@ b.bundle(function (err, src) { | ||
b.on('dep', function(row) { | ||
if (row.entry) t.equal(row.file, __dirname + '/entry/main.js'); | ||
if (row.entry) t.equal(row.file, path.join(__dirname, 'entry/main.js')); | ||
}); | ||
@@ -36,0 +37,0 @@ b.bundle(function (err, src) { |
var browserify = require('../'); | ||
var vm = require('vm'); | ||
var path = require('path'); | ||
var test = require('tap').test; | ||
@@ -10,3 +11,3 @@ | ||
b.on('dep', function(row) { | ||
if (row.entry) t.equal(row.file, __dirname + '/entry/main.js'); | ||
if (row.entry) t.equal(row.file, path.join(__dirname, 'entry/main.js')); | ||
}); | ||
@@ -31,3 +32,3 @@ b.bundle(function (err, src) { | ||
b.on('dep', function(row) { | ||
if (row.entry) t.equal(row.file, __dirname + '/entry/main.js'); | ||
if (row.entry) t.equal(row.file, path.join(__dirname, 'entry/main.js')); | ||
}); | ||
@@ -34,0 +35,0 @@ b.bundle(function (err, src) { |
var test = require('tap').test; | ||
var spawn = require('child_process').spawn; | ||
var path = require('path'); | ||
var semver = require('semver'); | ||
test('error code', function (t) { | ||
// TODO this should be fixable I guess | ||
var knownFailure = process.platform === 'win32' && semver.satisfies(process.version, 'v0.10.x'); | ||
test('error code', { skip: knownFailure }, function (t) { | ||
t.plan(2); | ||
@@ -7,0 +11,0 @@ |
@@ -6,2 +6,3 @@ var browserify = require('../'); | ||
test('requiring a shimmed module name from an external bundle', function (t) { | ||
t.plan(1); | ||
var b1 = browserify(); | ||
@@ -16,3 +17,2 @@ var b2 = browserify(); | ||
b2.bundle(function (err, src2) { | ||
t.plan(1); | ||
@@ -19,0 +19,0 @@ var c = { |
@@ -11,3 +11,3 @@ var browserify = require('../'); | ||
var files = { | ||
'main.js': __dirname + '/entry/main.js', | ||
'main.js': path.join(__dirname, 'entry/main.js'), | ||
'one.js': './one', | ||
@@ -14,0 +14,0 @@ 'two.js': './two' |
var browserify = require('../'); | ||
var vm = require('vm'); | ||
var path = require('path'); | ||
var test = require('tap').test; | ||
@@ -87,3 +88,3 @@ | ||
noParse: function(file) { | ||
return file === __dirname + '/global/filename.js'; | ||
return file === path.join(__dirname, 'global/filename.js'); | ||
} | ||
@@ -90,0 +91,0 @@ }); |
var browserify = require('../'); | ||
var test = require('tap').test; | ||
var vm = require('vm'); | ||
var path = require('path'); | ||
@@ -10,3 +11,3 @@ test('ignore', function (t) { | ||
b.add(__dirname + '/ignore/main.js'); | ||
b.ignore( __dirname + '/ignore/skip.js'); | ||
b.ignore(path.join(__dirname, 'ignore/skip.js')); | ||
@@ -25,4 +26,4 @@ b.bundle(function (err, src) { | ||
b.ignore([ | ||
__dirname + '/ignore/skip.js', | ||
__dirname + '/ignore/skip2.js' | ||
path.join(__dirname, 'ignore/skip.js'), | ||
path.join(__dirname, 'ignore/skip2.js') | ||
]); | ||
@@ -29,0 +30,0 @@ |
var browserify = require('../'); | ||
var fs = require('fs'); | ||
var vm = require('vm'); | ||
var semver = require('semver'); | ||
var test = require('tap').test; | ||
@@ -21,3 +22,6 @@ | ||
test('verify evil json', function(t) { | ||
// This works in Node v10 and up thanks to the JSON superset proposal, which | ||
// allows the evil chars in javascript strings. | ||
// https://github.com/tc39/proposal-json-superset | ||
test('verify evil json', { skip: semver.gte(process.version, 'v10.0.0') }, function(t) { | ||
t.plan(1); | ||
@@ -24,0 +28,0 @@ fs.readFile(__dirname + '/json/evil-chars.json', function(err, data) { |
var browserify = require('../'); | ||
var vm = require('vm'); | ||
var path = require('path'); | ||
var test = require('tap').test; | ||
var testFiles = [ | ||
__dirname + '/multi_entry_cross_require/a.js', | ||
__dirname + '/multi_entry_cross_require/lib/b.js', | ||
__dirname + '/multi_entry_cross_require/c.js' | ||
path.join(__dirname, 'multi_entry_cross_require/a.js'), | ||
path.join(__dirname, 'multi_entry_cross_require/lib/b.js'), | ||
path.join(__dirname, 'multi_entry_cross_require/c.js') | ||
]; | ||
@@ -10,0 +11,0 @@ |
var browserify = require('../'); | ||
var vm = require('vm'); | ||
var path = require('path'); | ||
var test = require('tap').test; | ||
@@ -7,5 +8,5 @@ var fs = require('fs'); | ||
var testFiles = [ | ||
__dirname + '/multi_entry/a.js', | ||
__dirname + '/multi_entry/b.js', | ||
__dirname + '/multi_entry/c.js' | ||
path.join(__dirname, 'multi_entry/a.js'), | ||
path.join(__dirname, 'multi_entry/b.js'), | ||
path.join(__dirname, 'multi_entry/c.js') | ||
]; | ||
@@ -109,3 +110,3 @@ | ||
row.file, | ||
RegExp(__dirname + '/multi_entry/_stream_[\\d].js'), | ||
RegExp(path.join(__dirname, 'multi_entry/_stream_').replace(/\\/g, '\\\\') + '[\\d].js'), | ||
'should be full entry path' | ||
@@ -112,0 +113,0 @@ ); |
@@ -5,3 +5,3 @@ var browserify = require('../'); | ||
test('multiple symlink execution', function (t) { | ||
test('multiple symlink execution', { skip: process.platform === 'win32' }, function (t) { | ||
t.plan(1); | ||
@@ -8,0 +8,0 @@ var b = browserify(__dirname + '/multi_symlink/main.js'); |
@@ -21,4 +21,4 @@ var browserify = require('../'); | ||
noParse: [ | ||
__dirname + '/noparse/dir1/1.js', | ||
__dirname + '/noparse/node_modules/robot/main.js' | ||
path.join(__dirname, 'noparse/dir1/1.js'), | ||
path.join(__dirname, 'noparse/node_modules/robot/main.js') | ||
] | ||
@@ -25,0 +25,0 @@ }); |
@@ -5,3 +5,3 @@ var browserify = require('../'); | ||
test('optionally preserves symlinks', function (t) { | ||
test('optionally preserves symlinks', { skip: process.platform === 'win32' }, function (t) { | ||
t.plan(2); | ||
@@ -11,3 +11,3 @@ | ||
b.bundle(function (err, buf) { | ||
t.ok(!err); | ||
t.ifError(err); | ||
t.ok(buf); | ||
@@ -19,3 +19,3 @@ var src = buf.toString('utf8'); | ||
test('always resolve entry point symlink', function (t) { | ||
test('always resolve entry point symlink', { skip: process.platform === 'win32' }, function (t) { | ||
t.plan(2); | ||
@@ -25,3 +25,3 @@ | ||
b.bundle(function (err, buf) { | ||
t.ok(!err); | ||
t.ifError(err); | ||
t.ok(buf); | ||
@@ -28,0 +28,0 @@ var src = buf.toString('utf8'); |
@@ -7,3 +7,3 @@ // https://github.com/substack/node-browserify/issues/1325 | ||
test('shared symlink', function (t) { | ||
test('shared symlink', { skip: process.platform === 'win32' }, function (t) { | ||
t.plan(1); | ||
@@ -10,0 +10,0 @@ var b = browserify(__dirname + '/shared_symlink/main.js'); |
@@ -5,3 +5,3 @@ var browserify = require('../'); | ||
test('hash instances with hashed contexts', function (t) { | ||
test('hash instances with hashed contexts', { skip: process.platform === 'win32' }, function (t) { | ||
t.plan(5); | ||
@@ -8,0 +8,0 @@ |
@@ -9,3 +9,3 @@ // based on this scenario: | ||
test('transform symlink', function (t) { | ||
test('transform symlink', { skip: process.platform === 'win32' }, function (t) { | ||
t.plan(4); | ||
@@ -12,0 +12,0 @@ var expected = [ 9, 555, 777 ]; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
458068
582
6787
13