Make initial app middleware generic

Author: shakyShane

lib/default-config.js

@@ -194,7 +194,7 @@ module.exports = {
         whitelist: [],
         blacklist: [],
         rule: {
-            match: /<body[^>]*>/i,
+            match: /$/,
             fn: function (snippet, match) {
                 return match + snippet;
             }

lib/server/proxy-server.js

@@ -69,9 +69,6 @@ module.exports = function createProxyServer (bs, scripts) {
     var proxyRes    = getProxyResFunctions(opt.get("proxyRes"), opt);
     var app         = utils.getBaseApp(bs, scripts);
 
-    /**
-     * Add the proxy Middleware to the end of the stack
-     */
     app.stack.push({
         id: "Browsersync Proxy",
         route: opt.get("route"),

lib/server/utils.js

@@ -115,20 +115,32 @@ var utils = {
     getBaseApp: function (bs, scripts) {
 
         var app  = connect();
-        var rule = require("./proxy-utils").rewriteLinks(bs.options.getIn(["proxy", "url"]).toJS());
-
-        bs.snippetMw.opts.rules.push(rule);
-
-        /**
-         * Add the snippet middleware to the front of the stack
-         */
-        app.use(bs.snippetMw.middleware);
 
         /**
-         * Serve the Client-side JS from both version and static paths
+         * Add the proxy Middleware to the end of the stack
          */
-        app.use(bs.options.getIn(["scriptPaths", "versioned"]), scripts)
-            .use(bs.options.getIn(["scriptPaths", "path"]),     scripts);
+        app.stack.push(
+            {
+                id: "Browsersync IE8 Support",
+                route: "",
+                handle: utils.handleOldIE
+            },
+            {
+                id: "Browsersync Response Modifier",
+                route: "",
+                handle: utils.getSnippetMiddleware(bs)
+            },
+            {
+                id: "Browsersync Client - versioned",
+                route: bs.options.getIn(["scriptPaths", "versioned"]),
+                handle: scripts
+            },
+            {
+                id: "Browsersync Client",
+                route: bs.options.getIn(["scriptPaths", "path"]),
+                handle: scripts
+            }
+        );
 
         /**
          * Add user-provided middlewares
@@ -138,6 +150,13 @@ var utils = {
         });
 
         return app;
+    },
+    getSnippetMiddleware: function (bs) {
+        if (bs.options.get("proxy")) {
+            var rule = require("./proxy-utils").rewriteLinks(bs.options.getIn(["proxy", "url"]).toJS());
+            bs.snippetMw.opts.rules.push(rule);
+        }
+        return bs.snippetMw.middleware;
     }
 };
 

test/specs/e2e/proxy/e2e.proxy.proxy.options.js

@@ -43,7 +43,7 @@ describe("E2E proxy test with `proxyOptions`", function () {
 
     it("sets options for node-http-proxy", function (done) {
 
-        var expected = app.html.replace("BS", bs.options.get("snippet") + "BS");
+        var expected = app.html + bs.options.get("snippet");
         var headers;
 
         app.app.stack.unshift({

test/specs/e2e/proxy/e2e.proxy.req.headers.js

@@ -48,7 +48,7 @@ describe("E2E proxy test with custom req headers", function () {
 
     it("sets custom headers on proxy reqs", function (done) {
 
-        var expected = app.html.replace("BS", bs.options.get("snippet") + "BS");
+        var expected = app.html + bs.options.get("snippet");
         var headers;
 
         app.app.stack.unshift({

test/specs/e2e/proxy/e2e.proxy.req.headers.obj.js

@@ -46,7 +46,7 @@ describe("E2E proxy test with custom req headers as object", function () {
 
     it("sets custom headers on proxy reqs from an object", function (done) {
 
-        var expected = app.html.replace("BS", bs.options.get("snippet") + "BS");
+        var expected = app.html + bs.options.get("snippet");
         var headers;
 
         app.app.stack.unshift({

test/specs/e2e/proxy/e2e.proxy.secure.js

@@ -45,7 +45,7 @@ describe("E2E TLS proxy test", function () {
 
         assert.isString(bs.options.get("snippet"));
 
-        var expected = app.html.replace("BS", bs.options.get("snippet") + "BS");
+        var expected = app.html + bs.options.get("snippet");
 
         request(bs.options.getIn(["urls", "local"]))
             .get("/index.html")