From b9004fc3a0092cdfa0b18e196ab25a79e582b2d1 Mon Sep 17 00:00:00 2001
From: Fotis Koutoupas <fotis.koutoupas@gmail.com>
Date: Mon, 1 Jan 2018 03:45:27 +0200
Subject: [PATCH] Make bundler middleware usage intuitive (#449)

* Make bundler middleware usage intuitive

* Fix middleware test

Specifically bundling `/commonjs/index.js` in the middleware test before running
the `should produce two bundles when importing a CSS file` one
seems to cause `bunde()` in the latter to throw.
---
 src/Bundler.js                               |  1 +
 test/bundler.js                              | 14 ++++++++++++++
 test/integration/bundler-middleware/index.js |  5 +++++
 test/integration/bundler-middleware/local.js |  2 ++
 4 files changed, 22 insertions(+)
 create mode 100644 test/bundler.js
 create mode 100644 test/integration/bundler-middleware/index.js
 create mode 100644 test/integration/bundler-middleware/local.js

diff --git a/src/Bundler.js b/src/Bundler.js
index 1530aca4060..de60f3d1f97 100644
--- a/src/Bundler.js
+++ b/src/Bundler.js
@@ -473,6 +473,7 @@ class Bundler extends EventEmitter {
   }
 
   middleware() {
+    this.bundle();
     return Server.middleware(this);
   }
 
diff --git a/test/bundler.js b/test/bundler.js
new file mode 100644
index 00000000000..ca369fd88c9
--- /dev/null
+++ b/test/bundler.js
@@ -0,0 +1,14 @@
+const assert = require('assert');
+const {bundler} = require('./utils');
+
+describe('bundler', function() {
+  it('should bundle once before exporting middleware', function(done) {
+    let b = bundler(__dirname + '/integration/bundler-middleware/index.js');
+    b.middleware();
+
+    setTimeout(() => {
+      assert(b.mainAsset);
+      done();
+    }, 300);
+  });
+});
diff --git a/test/integration/bundler-middleware/index.js b/test/integration/bundler-middleware/index.js
new file mode 100644
index 00000000000..bdea52a6e55
--- /dev/null
+++ b/test/integration/bundler-middleware/index.js
@@ -0,0 +1,5 @@
+var local = require('./local');
+
+module.exports = function () {
+  return local.a + local.b;
+};
diff --git a/test/integration/bundler-middleware/local.js b/test/integration/bundler-middleware/local.js
new file mode 100644
index 00000000000..59aa6ffd125
--- /dev/null
+++ b/test/integration/bundler-middleware/local.js
@@ -0,0 +1,2 @@
+exports.a = 1;
+exports.b = 2;