fix(server-middleware): allow res.end -> next() in middeware flow whe…

…n no serveStatic exists - fixes #1481
BrowserSync · Jan 5, 2018 · 620e9ae · 620e9ae
1 parent 148ac02
commit 620e9ae
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 9 deletions.
diff --git a/lib/server/utils.js b/lib/server/utils.js
@@ -241,20 +241,23 @@ var serverUtils = {
                 return !x.override;
             })
             .concat(
-                bs.options.get("mode") !== "proxy" && {
-                    id: "Browsersync 404/index support",
-                    route: "",
-                    handle: serveIndex(bs.options.get("cwd"), {
-                        icons: true,
-                        view: "details"
-                    })
-                }
+                bs.options.get("mode") !== "proxy" &&
+                    userMiddlewares.length === 0 && {
+                        id: "Browsersync 404/index support",
+                        route: "",
+                        handle: serveIndex(bs.options.get("cwd"), {
+                            icons: true,
+                            view: "details"
+                        })
+                    }
             );
 
-        return []
+        const mwStack = []
             .concat(beforeMiddlewares, defaultMiddlewares, afterMiddlewares)
             .filter(Boolean);
 
+        return mwStack;
+
         function normaliseMiddleware(item) {
             /**
              * Object given in options, which

diff --git a/test/specs/e2e/middleware/middleware.server.option.js b/test/specs/e2e/middleware/middleware.server.option.js
@@ -189,3 +189,40 @@ describe("Accepting multiple server middlewares as top-level option", function()
             });
     });
 });
+
+describe("Allow middlewares to call next() after res.end if no server provided", function() {
+    var bs;
+
+    before(function(done) {
+        browserSync.reset();
+
+        var fn = function(req, res, next) {
+            res.write('bs');
+            res.end();
+            next();
+        };
+
+        var config = {
+            logLevel: "silent",
+            open: false,
+            middleware: fn
+        };
+
+        bs = browserSync.init(config, done).instance;
+    });
+
+    after(function() {
+        bs.cleanup();
+    });
+
+    it("should call the middlewares", function(done) {
+        request(bs.server)
+            .get("/")
+            .set("accept", "text/html")
+            .expect(200)
+            .end(function(err, res) {
+                assert.include(res.text, 'bs');
+                done();
+            });
+    });
+});