browserify - npm Package Compare versions

Comparing version 9.0.3 to 9.0.4

bin/args.js

@@ -137,3 +137,3 @@ var browserify = require('../');
         .forEach(function (r) {
-            var xs = r.split(':');
+            var xs = splitOnColon(r);
             b.require(xs[0], { expose: xs.length === 1 ? xs[0] : xs[1] })
@@ -146,4 +146,4 @@ })
         .forEach(function (x) {
-            if (/:/.test(x)) {
-                var xs = x.split(':');
+            var xs = splitOnColon(x);
+            if (xs.length === 2) {
                 add(xs[0], { expose: xs[1] });
@@ -247,1 +247,14 @@ }
 }
+
+function splitOnColon (f) {
+    var pos = f.lastIndexOf(':');
+    if (pos == -1) {
+        return [f]; // No colon
+    } else {
+        if ((/[a-zA-Z]:[\\/]/.test(f)) && (pos == 1)){
+            return [f]; // Windows path and colon is part of drive name
+        } else {
+            return [f.substr(0, pos), f.substr(pos + 1)];
+        }
+    }
+}

index.js

@@ -63,3 +63,3 @@ var mdeps = require('module-deps');
     var ignoreTransform = [].concat(opts.ignoreTransform).filter(Boolean);
-    self._filterTransform = function(tr) {
+    self._filterTransform = function (tr) {
         if (Array.isArray(tr)) {
@@ -69,4 +69,4 @@ return ignoreTransform.indexOf(tr[0]) === -1;
         return ignoreTransform.indexOf(tr) === -1;
-    }
-    
+    };
+
     self.pipeline = self._createPipeline(opts);
@@ -281,6 +281,7 @@
 
-    function resolved() {
+    function resolved () {
+      self._transforms[order] = rec;
       -- self._pending;
       if (-- self._transformPending === 0) {
-          self._transforms.forEach(function(transform) {
+          self._transforms.forEach(function (transform) {
             self.pipeline.write(transform);
@@ -302,2 +303,9 @@ });
     self._transformPending ++;
+
+    var rec = {
+        transform: tr,
+        options: opts,
+        global: opts.global
+    };
+
     if (typeof tr === 'string') {
@@ -312,20 +320,7 @@ var topts = {
             if (err) return self.emit('error', err);
-            var rec = {
-                transform: res,
-                options: opts,
-                global: opts.global
-            };
-            self._transforms[order] = rec;
+            rec.transform = res;
             resolved();
         });
     }
-    else {
-        var rec = {
-            transform: tr,
-            options: opts,
-            global: opts.global
-        };
-        self._transforms[order] = rec;
-        process.nextTick(resolved);
-    }
+    else process.nextTick(resolved);
     return this;
@@ -776,3 +771,2 @@ };
 
-function has (obj, key) { return Object.hasOwnProperty.call(obj, key) }
 function isStream (s) { return s && typeof s.pipe === 'function' }
@@ -779,0 +773,0 @@ function isAbsolutePath (file) {

package.json

 {
   "name": "browserify",
-  "version": "9.0.3",
+  "version": "9.0.4",
   "description": "browser-side require() the node way",
@@ -79,6 +79,5 @@ "main": "index.js",
     "es6ify": "~0.4.8",
-    "mkdirp": "~0.3.3",
-    "osenv": "^0.1.0",
     "seq": "0.3.3",
     "tap": "~0.4.0",
+    "temp": "^0.8.1",
     "through": "^2.3.4"
@@ -85,0 +84,0 @@ },

test/args.js

@@ -29,3 +29,3 @@ var test = require('tap').test;
 test('bundle from an arguments with --insert-global-vars', function (t) {
-    t.plan(3)
+    t.plan(4);
 
@@ -39,8 +39,10 @@ var b = fromArgs([
     b.bundle(function (err, src) {
-        t.ifError(err);
-        var c = {};
+        t.ifError(err, 'b.bundle()');
+        var c = {}, x;
         vm.runInNewContext(src, c);
-        var x = c.require('x');
-        t.equal(x.filename, '/global/filename.js');
-        t.equal(x.dirname, '/global');
+        t.doesNotThrow(function() {
+            x = c.require('x');
+        }, 'x = c.require(\'x\')');
+        t.equal(x && x.filename, '/global/filename.js', 'x.filename');
+        t.equal(x && x.dirname, '/global', 'x.dirname');
     })
@@ -54,4 +56,20 @@ });
     b.bundle(function (err, src) {
-        t.notOk(err);
+        t.ifError(err);
     });
 });
+
+test('entry expose', function (t) {
+    t.plan(3)
+    
+    var b = fromArgs([
+        path.join(__dirname, '/entry_expose/main.js'),
+        '--require', path.join(__dirname, '/entry_expose/main.js') + ':x',
+    ]);
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        var c = { console: { log: log } };
+        function log (msg) { t.equal(msg, 'wow') }
+        vm.runInNewContext(src, c);
+        t.equal(c.require('x'), 555);
+    })
+});

test/coffee_bin.js

@@ -14,3 +14,3 @@ var test = require('tap').test;
         path.resolve(__dirname, '../bin/cmd.js'),
-        '-c', __dirname + '/../node_modules/.bin/coffee -sc',
+        '-c', '"' + process.execPath + '" "' + __dirname + '/../node_modules/coffee-script/bin/coffee" -sc',
         'coffee_bin/main.coffee'
@@ -17,0 +17,0 @@ ]);

test/crypto_ig.js

@@ -8,5 +8,5 @@ var test = require('tap').test;
 
-var mkdirp = require('mkdirp');
-var tmpdir = '/tmp/browserify-test/' + Math.random().toString(16).slice(2);
-mkdirp.sync(tmpdir);
+var temp = require('temp');
+temp.track();
+var tmpdir = temp.mkdirSync({prefix: 'browserify-test'});
 
@@ -19,3 +19,3 @@ fs.writeFileSync(tmpdir + '/main.js', 'beep(require("crypto"))\n');
     var bin = __dirname + '/../bin/cmd.js';
-    var ps = spawn(bin, [ 'main.js', '--ig' ], { cwd : tmpdir });
+    var ps = spawn(process.execPath, [ bin, 'main.js', '--ig' ], { cwd : tmpdir });
     
@@ -22,0 +22,0 @@ ps.stderr.pipe(process.stderr, { end : false });

test/crypto.js

@@ -8,5 +8,5 @@ var test = require('tap').test;
 
-var mkdirp = require('mkdirp');
-var tmpdir = '/tmp/browserify-test/' + Math.random().toString(16).slice(2);
-mkdirp.sync(tmpdir);
+var temp = require('temp');
+temp.track();
+var tmpdir = temp.mkdirSync({prefix: 'browserify-test'});
 
@@ -13,0 +13,0 @@ fs.writeFileSync(tmpdir + '/main.js', 'beep(require("crypto"))\n');

test/externalize.js

@@ -5,13 +5,11 @@ var test = require('tap').test;
 var path = require('path');
-var mkdirp = require('mkdirp');
 var fs = require('fs');
 var vm = require('vm');
 
-var tmpdir = path.join(
-    require('osenv').tmpdir(),
-    'browserify-test-' + Math.random()
-);
+var temp = require('temp');
+temp.track();
+var tmpdir = temp.mkdirSync({prefix: 'browserify-test'});
 var pubdir = path.join(tmpdir, 'public');
 
-mkdirp.sync(pubdir);
+fs.mkdirSync(pubdir);
 fs.writeFileSync(
@@ -18,0 +16,0 @@ path.join(tmpdir, 'robot.js'),

test/file_event.js

@@ -18,3 +18,3 @@ var browserify = require('../');
         var key = path.basename(file);
-        t.equal(file, __dirname + '/entry/' + key);
+        t.equal(file, path.join(__dirname, 'entry', key));
         t.equal(id, files[key]);
@@ -21,0 +21,0 @@ delete files[key];

test/full_paths.js

@@ -5,7 +5,8 @@ var unpack = require('browser-unpack');
 var vm = require('vm');
+var path = require('path');
 
 var deps = [
-    __dirname + '/entry/main.js',
-    __dirname + '/entry/one.js',
-    __dirname + '/entry/two.js'
+    path.join(__dirname, '/entry/main.js'),
+    path.join(__dirname, '/entry/one.js'),
+    path.join(__dirname, '/entry/two.js')
 ];
@@ -12,0 +13,0 @@

test/pkg.js

 var browserify = require('../');
 var vm = require('vm');
 var test = require('tap').test;
+var path = require('path');
 
 var pkg = require('./pkg/package.json');
-pkg.__dirname = __dirname + '/pkg';
+pkg.__dirname = path.join(__dirname, 'pkg');
 
@@ -8,0 +9,0 @@ test('package', function (t) {

test/stream_file.js

@@ -6,8 +6,9 @@ var browserify = require('../');
 var through = require('through2');
+var path = require('path');
 
 test('stream file', function (t) {
     var expected = {};
-    expected[__dirname + '/stream/fake.js'] = true;
-    expected[__dirname + '/stream/bar.js'] = true;
-    expected[__dirname + '/stream/foo.js'] = true;
+    expected[ path.join(__dirname, 'stream/fake.js') ] = true;
+    expected[ path.join(__dirname, 'stream/bar.js' ) ] = true;
+    expected[ path.join(__dirname, 'stream/foo.js' ) ] = true;
     
@@ -17,3 +18,3 @@ t.plan(5);
     var stream = fs.createReadStream(__dirname + '/stream/main.js');
-    stream.file = __dirname + '/stream/fake.js';
+    stream.file = path.join(__dirname, '/stream/fake.js');
     
@@ -20,0 +21,0 @@ var b = browserify(stream, { basedir: __dirname + '/stream' });

test/tr_once.js

@@ -5,2 +5,3 @@ var browserify = require('../');
 var through = require('through2');
+var path = require('path');
 
@@ -12,3 +13,3 @@ test('transform exactly once', function (t) {
         transform: function (file) {
-        t.equal(file, __dirname + '/tr_once/main.js');
+        t.equal(file, path.join(__dirname, 'tr_once/main.js') );
             return through();
@@ -15,0 +16,0 @@ }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

205926

increased by1.18%

Dev dependency count

9

decreased by-10%

Number of package files

323

increased by1.25%

Lines of code

4457

increased by1.27%

Number of lines in readme file

755

increased by0.67%

No dependency changes