Merge pull request #1244 from substack/remove-json-dedupe

Remove unnecessary "isDedupe" json check
browserify · May 14, 2015 · 52867a9 · 52867a9
2 parents 1ff88d5 + 2a08528
commit 52867a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -594,7 +594,7 @@ Browserify.prototype._recorder = function (opts) {
 
 Browserify.prototype._json = function () {
     return through.obj(function (row, enc, next) {
-        if (/\.json$/.test(row.file) && !isdedupe(row.source)) {
+        if (/\.json$/.test(row.file)) {
             row.source = 'module.exports=' + sanitize(row.source);
         }
         this.push(row);
@@ -631,12 +631,6 @@ Browserify.prototype._syntax = function () {
     });
 };
 
-function isdedupe (src) { // mega-hack
-    return /^arguments\[4\]\[/.test(src)
-        && /\]\[0\]\.apply\(exports,arguments\)$/.test(src)
-    ;
-}
-
 Browserify.prototype._dedupe = function () {
     return through.obj(function (row, enc, next) {
         if (!row.dedupeIndex && row.dedupe) {

diff --git a/test/double_bundle_json.js b/test/double_bundle_json.js
@@ -1,6 +1,8 @@
 var browserify = require('../');
 var vm = require('vm');
 var test = require('tap').test;
+var through = require('through2');
+var xtend = require('xtend');
 
 test('double bundle json', function (t) {
     t.plan(6);
@@ -12,11 +14,16 @@ test('double bundle json', function (t) {
 
     var cache = {};
     var b = browserify(__dirname + '/double_bundle_json/index.js', {
-        cache: cache, fullPaths: true
-    });
-    b.on('dep', function (row) {
-        cache[row.id] = row;
+        cache: cache
     });
+    b.pipeline.get('deps').push(through.obj(function(row, enc, next) {
+        cache[row.file] = {
+            source: row.source,
+            deps: xtend(row.deps)
+        };
+        this.push(row);
+        next();
+    }));
     b.bundle(function (err, src0) {
         t.ifError(err);
         vm.runInNewContext(src0, { console: { log: log0 } });