Merge branch 'splitOnColon' of https://github.com/ElNounch/node-brows…

…erify
browserify · Apr 1, 2015 · 9ed2faa · 9ed2faa
2 parents 0035454 + e420a32
commit 9ed2faa
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/bin/args.js b/bin/args.js
@@ -134,16 +134,16 @@ module.exports = function (args, opts) {
 
     [].concat(argv.require).filter(Boolean)
         .forEach(function (r) {
-            var xs = r.split(':');
+            var xs = _splitOnColon(r);
             b.require(xs[0], { expose: xs.length === 1 ? xs[0] : xs[1] })
         })
     ;
 
     // resolve any external files and add them to the bundle as externals
     [].concat(argv.external).filter(Boolean)
         .forEach(function (x) {
-            if (/:/.test(x)) {
-                var xs = x.split(':');
+            var xs = _splitOnColon(x);
+            if (xs.length === 2) {
                 add(xs[0], { expose: xs[1] });
             }
             else if (/\*/.test(x)) {
@@ -242,3 +242,16 @@ function copy (obj) {
         return acc;
     }, {});
 }
+
+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)];
+        }
+    }
+}
diff --git a/test/args.js b/test/args.js
@@ -54,3 +54,19 @@ test('numeric module names', function(t) {
         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);
+    })
+});