browserify - npm Package Compare versions

Comparing version 0.4.6 to 0.4.7

index.js

@@ -66,8 +66,6 @@ var fs = require('fs');
     else if (Array.isArray(req)) {
-        if (req.length) src += exports.wrap(req).source;
+        src += exports.wrap(req).source;
     }
     else if (typeof req === 'object') {
-        src += '\n' + Object.keys(req).map(function (name) {
-            return exports.wrap([ { name : name, target : req[name] } ]).source;
-        }).join('\n');
+        src += exports.wrap([ req ]).source;
     }
@@ -202,7 +200,13 @@ else throw new Error('Unsupported type ' + typeof req);
             if (typeof name === 'object') {
-                var lib = exports.wrap(
-                    name.target,
-                    { name : name.name, required : reqs }
-                );
-                reqs.push(name.target);
+                var lib = { source : '', dependencies : [] };
+                Object.keys(name).forEach(function (key) {
+                    var sublib = exports.wrap(
+                        name[key],
+                        { name : key, required : reqs }
+                    );
+                    reqs.push(key);
+                    lib.source += sublib.source;
+                    lib.dependencies = lib.dependencies
+                        .concat(sublib.dependencies);
+                });
             }
@@ -240,3 +244,18 @@ else {
     else if (opts.required && opts.required.indexOf(libname) >= 0) {
-        return { source : '', dependencies : [] };
+        if (opts.name && opts.required.indexOf(opts.name) < 0) {
+            opts.required.push(opts.name);
+            return {
+                source :
+                    '_browserifyRequire.modules['
+                    + JSON.stringify(opts.name)
+                    + '] = _browserifyRequire.modules['
+                    + JSON.stringify(libname)
+                    + '];\n'
+                ,
+                dependencies : [],
+            };
+        }
+        else {
+            return { source : '', dependencies : [] };
+        }
     }
@@ -243,0 +262,0 @@ else if (libname.match(/^[.\/]/)) {

package.json

 {
     "name" : "browserify",
-    "version" : "0.4.6",
+    "version" : "0.4.7",
     "description" : "Browser-side require() for js directories and npm modules",
@@ -5,0 +5,0 @@ "main" : "./index.js",

test/req.js

@@ -56,1 +56,40 @@ var assert = require('assert');
 };
+
+exports.mixedRequire = function () {
+    var src = browserify.bundle({
+        require : [
+            'hashish',
+            { 'jquery' : 'jquery-browserify' },
+        ]
+    });
+    
+    var c = {};
+    vm.runInNewContext(src, c);
+    verifyHashish(c.require('hashish'));
+    assert.ok(c.require.modules.jquery);
+    assert.ok(!c.require.modules['jquery-browserify']);
+};
+
+exports.multiMixedRequire = function () {
+    var src = browserify.bundle({
+        require : [
+            'traverse',
+            'seq',
+            {
+                'jquery' : 'jquery-browserify',
+                'h' : 'hashish',
+            },
+            { par : 'seq' },
+        ],
+    });
+    
+    var c = {};
+    vm.runInNewContext(src, c);
+    verifyHashish(c.require('h'));
+    assert.ok(c.require.modules.seq);
+    assert.ok(c.require.modules.par);
+    assert.equal(c.require('seq'), c.require('par'));
+    assert.ok(c.require.modules.traverse);
+    assert.ok(c.require.modules.jquery);
+    assert.ok(!c.require.modules['jquery-browserify']);
+};

test/watch/a.js

@@ -1,1 +0,1 @@
-module.exports = 6454
+module.exports = 1308

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

79926

increased by2.46%

Lines of code

1981

increased by2.8%

Number of lines in readme file

296

increased by4.59%

No dependency changes