Merge pull request #2905 from m90/derequire

Apply derequire to generated bundles

Author: etpinard

Diff for: package-lock.json

@@ -122,6 +122,7 @@
     "browserify-transform-tools": "^1.7.0",
     "check-node-version": "^3.2.0",
     "deep-equal": "^1.0.1",
+    "derequire": "^2.0.6",
     "ecstatic": "^3.2.0",
     "eslint": "^4.19.1",
     "falafel": "^2.0.0",

Diff for: package.json

@@ -3,6 +3,8 @@ var path = require('path');
 
 var browserify = require('browserify');
 var minify = require('minify-stream');
+var derequire = require('derequire');
+var through = require('through2');
 
 var constants = require('./constants');
 var compressAttributes = require('./compress_attributes');
@@ -60,6 +62,7 @@ module.exports = function _bundle(pathToIndex, pathToBundle, opts, cb) {
 
     if(pathToMinBundle) {
         bundleStream
+            .pipe(applyDerequire())
             .pipe(minify(constants.uglifyOptions))
             .pipe(fs.createWriteStream(pathToMinBundle))
             .on('finish', function() {
@@ -69,6 +72,7 @@ module.exports = function _bundle(pathToIndex, pathToBundle, opts, cb) {
     }
 
     bundleStream
+        .pipe(applyDerequire())
         .pipe(fs.createWriteStream(pathToBundle))
         .on('finish', function() {
             logger(pathToBundle);
@@ -80,3 +84,14 @@ function logger(pathToOutput) {
     var log = 'ok ' + path.basename(pathToOutput);
     console.log(log);
 }
+
+function applyDerequire() {
+    var buf = '';
+    return through(function(chunk, enc, next) {
+        buf += chunk.toString();
+        next();
+    }, function(done) {
+        this.push(derequire(buf));
+        done();
+    });
+}