diff --git a/lib/browser-sync.js b/lib/browser-sync.js index 767e53034..fd34c592c 100644 --- a/lib/browser-sync.js +++ b/lib/browser-sync.js @@ -423,7 +423,7 @@ BrowserSync.prototype.addMiddleware = function (route, handle, opts) { entry.override = true; } - bs.options = bs.options.update('middleware', function (mw) { + bs.options = bs.options.update("middleware", function (mw) { return mw.concat(entry); }); @@ -443,14 +443,14 @@ BrowserSync.prototype.removeMiddleware = function (id) { return; } - bs.options = bs.options.update('middleware', function (mw) { + bs.options = bs.options.update("middleware", function (mw) { return mw.filter(function (mw) { return mw.id !== id; }); }); -}; - + bs.resetMiddlewareStack(); +}; /** * Middleware for socket connection (external usage) @@ -591,7 +591,7 @@ BrowserSync.prototype.setMany = function (fn, opts) { BrowserSync.prototype.addRewriteRule = function (rule) { var bs = this; - bs.options = bs.options.update('rewriteRules', function (rules) { + bs.options = bs.options.update("rewriteRules", function (rules) { return rules.concat(rule); }); @@ -600,7 +600,7 @@ BrowserSync.prototype.addRewriteRule = function (rule) { BrowserSync.prototype.removeRewriteRule = function (id) { var bs = this; - bs.options = bs.options.update('rewriteRules', function (rules) { + bs.options = bs.options.update("rewriteRules", function (rules) { return rules.filter(function (rule) { return rule.id !== id; }); @@ -615,7 +615,7 @@ BrowserSync.prototype.removeRewriteRule = function (id) { BrowserSync.prototype.resetMiddlewareStack = function () { var bs = this; - var middlewares = require('./server/utils').getMiddlewares(bs, bs.options); + var middlewares = require("./server/utils").getMiddlewares(bs, bs.options); bs.app.stack = middlewares; }; diff --git a/lib/server/proxy-server.js b/lib/server/proxy-server.js index f2d5471e4..eb86cac7c 100644 --- a/lib/server/proxy-server.js +++ b/lib/server/proxy-server.js @@ -72,7 +72,7 @@ module.exports = function createProxyServer (bs) { var proxyReq = getProxyReqFunctions(opt.get("proxyReq"), opt, bs); var proxyRes = getProxyResFunctions(opt.get("proxyRes"), opt); var proxyResWs = opt.get("proxyReqWs"); - bs.options = bs.options.update('middleware', function (mw) { + bs.options = bs.options.update("middleware", function (mw) { return mw.concat({ id: "Browsersync Proxy", route: opt.get("route"), diff --git a/lib/server/utils.js b/lib/server/utils.js index 46ae59084..7a748e7a4 100644 --- a/lib/server/utils.js +++ b/lib/server/utils.js @@ -71,7 +71,7 @@ var serverUtils = { var defaultMiddlewares = [ { - id: 'Browsersync HTTP Protocol', + id: "Browsersync HTTP Protocol", route: require("../config").httpProtocol.path, handle: require("../http-protocol").middleware(bs) }, @@ -193,7 +193,6 @@ var serverUtils = { var whitelist = List([]) .concat(bs.options.getIn(["snippetOptions", "whitelist"])); - // Snippet rules.push(snippetUtils.getRegex(bs.options.get("snippet"), bs.options.get("snippetOptions"))); @@ -204,7 +203,7 @@ var serverUtils = { } // User - bs.options.get('rewriteRules').forEach(function (rule) { + bs.options.get("rewriteRules").forEach(function (rule) { if (Map.isMap(rule)) { rules.push(rule.toJS()); } diff --git a/package.json b/package.json index 913a5342f..7c9481dbf 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "chai": "3.5.0", "chalk": "1.1.3", "compression": "1.6.2", - "eslint": "3.4.0", + "eslint": "3.7.1", "graceful-fs": "4.1.6", "gulp": "3.9.1", "gulp-contribs": "0.0.3", diff --git a/test/specs/e2e/middleware/middleware.option.js b/test/specs/e2e/middleware/middleware.option.js index 5658a0c9f..f364c1f24 100644 --- a/test/specs/e2e/middleware/middleware.option.js +++ b/test/specs/e2e/middleware/middleware.option.js @@ -33,7 +33,7 @@ describe("Accepting middleware as an option (1)", function () { }); it("should accept middlewares when given as top-level", function () { - assert.equal(bs.options.get("middleware").size, 2, '1 custom + 1 serve static'); + assert.equal(bs.options.get("middleware").size, 2, "1 custom + 1 serve static"); }); }); @@ -69,7 +69,7 @@ describe("Accepting middleware as an option (2)", function () { }); it("should accept middlewares when given as top-level", function () { - assert.equal(bs.options.get("middleware").size, 3, '2 custom + 1 serve static'); + assert.equal(bs.options.get("middleware").size, 3, "2 custom + 1 serve static"); }); }); diff --git a/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js b/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js index 2016dfd31..b939586e6 100644 --- a/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js +++ b/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js @@ -7,7 +7,7 @@ var serveStatic = require("serve-static"); var request = require("supertest"); var assert = require("chai").assert; var Rx = require("rx"); -var utils = require('../../../utils'); +var utils = require("../../../utils"); describe("E2E proxy test with adding rewrite rules dynamically", function () { @@ -19,9 +19,9 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () { var server = app.listen(); var proxytarget = "http://localhost:" + server.address().port; - app.use('/index.html', function (req, res) { - res.setHeader('content-type', 'text/html'); - res.end('Browsersync'); + app.use("/index.html", function (req, res) { + res.setHeader("content-type", "text/html"); + res.end("Browsersync"); }); var config = { @@ -41,7 +41,7 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () { browserSync.init([], config, function (err, bs) { var reqs = utils.getRequests([ - ['/index.html', 'BROWSERSYNC'] + ["/index.html", "BROWSERSYNC"] ], bs.server); var obs = Rx.Observable.concat(reqs); @@ -62,9 +62,9 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () { var server = app.listen(); var proxytarget = "http://localhost:" + server.address().port; - app.use('/index.html', function (req, res) { - res.setHeader('content-type', 'text/html'); - res.end('Browsersync'); + app.use("/index.html", function (req, res) { + res.setHeader("content-type", "text/html"); + res.end("Browsersync"); }); var config = { @@ -84,19 +84,19 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () { browserSync.init([], config, function (err, bs) { var reqs = utils.getRequests([ - ['/index.html', 'BROWSERSYNC'], + ["/index.html", "BROWSERSYNC"], function () { bs.addRewriteRule({ match: /BROWSERSYNC/, - replace: 'shane', - id: 'my-rewrite-rule' + replace: "shane", + id: "my-rewrite-rule" }); }, - ['/index.html', 'shane'], + ["/index.html", "shane"], function () { - bs.removeRewriteRule('my-rewrite-rule'); + bs.removeRewriteRule("my-rewrite-rule"); }, - ['/index.html', 'BROWSERSYNC'] + ["/index.html", "BROWSERSYNC"] ], bs.server); var obs = Rx.Observable.concat(reqs); diff --git a/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.replace.js b/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.replace.js index 62e850ee8..ed395ad5a 100644 --- a/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.replace.js +++ b/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.replace.js @@ -55,8 +55,8 @@ describe("E2E proxy test with replacing rewrite rules dynamically", function () assert.include(res.text, "BROWSERSYNC"); - bs.options = bs.options.update('rewriteRules', function () { - return require('immutable').List([]); + bs.options = bs.options.update("rewriteRules", function () { + return require("immutable").List([]); }); bs.resetMiddlewareStack(); diff --git a/test/specs/plugins/hooks.js b/test/specs/plugins/hooks.js index 673191a1c..d4c36803c 100644 --- a/test/specs/plugins/hooks.js +++ b/test/specs/plugins/hooks.js @@ -62,10 +62,7 @@ describe("Plugins: Registering Hooks:", function () { it("adds an item to the clientEvents array", function () { assert.include(instance.options.get("clientEvents").toJS(), "cp:goto"); }); - it("adds an item to the Server Middleware array", function () { - assert.include(instance.clientJs, "SHANE123456"); - }); - it("adds an item to the Server Middleware array", function (done) { + it("adds an item to the Server Middleware array (2)", function (done) { request(instance.server) .get("/")