Merge pull request #1700 from linoleum-js/master

require: warn invalid json

index.js

@@ -662,7 +662,16 @@ Browserify.prototype._recorder = function (opts) {
 Browserify.prototype._json = function () {
     return through.obj(function (row, enc, next) {
         if (/\.json$/.test(row.file)) {
-            row.source = 'module.exports=' + sanitize(row.source);
+            var sanitizedString = sanitize(row.source);
+            try {
+                // check json validity
+                JSON.parse(sanitizedString);
+                row.source = 'module.exports=' + sanitizedString;
+            } catch (err) {
+                err.message = 'While parsing ' + (row.file || row.id) + ': ' + err.message
+                this.emit('error', err);
+                return;
+            }
         }
         this.push(row);
         next();

test/json.js

@@ -46,3 +46,12 @@ test('evil json', function (t) {
         vm.runInNewContext(src, c);
     });
 });
+
+test('invalid json', function (t) {
+    var b = browserify();
+    t.plan(1);
+    b.add(__dirname + '/json/invalid.js');
+    b.bundle(function (err, src) {
+        t.ok(err);
+    });
+});

test/json/invalid.js

@@ -0,0 +1,2 @@
+ex(require('./invalid.json'));
+ex(require('./invalid'));

test/json/invalid.json

@@ -0,0 +1,3 @@
+{
+  key: "value"
+}