Skip to content

Commit 9c998f7

Browse files
shakyShaneshakyShane
committed
lint
1 parent 54be976 commit 9c998f7

8 files changed

Lines changed: 30 additions & 34 deletions

File tree

‎lib/browser-sync.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ BrowserSync.prototype.addMiddleware = function (route, handle, opts) {
423423
entry.override = true;
424424
}
425425

426-
bs.options = bs.options.update('middleware', function (mw) {
426+
bs.options = bs.options.update("middleware", function (mw) {
427427
return mw.concat(entry);
428428
});
429429

@@ -443,14 +443,14 @@ BrowserSync.prototype.removeMiddleware = function (id) {
443443
return;
444444
}
445445

446-
bs.options = bs.options.update('middleware', function (mw) {
446+
bs.options = bs.options.update("middleware", function (mw) {
447447
return mw.filter(function (mw) {
448448
return mw.id !== id;
449449
});
450450
});
451-
};
452-
453451

452+
bs.resetMiddlewareStack();
453+
};
454454

455455
/**
456456
* Middleware for socket connection (external usage)
@@ -591,7 +591,7 @@ BrowserSync.prototype.setMany = function (fn, opts) {
591591
BrowserSync.prototype.addRewriteRule = function (rule) {
592592
var bs = this;
593593

594-
bs.options = bs.options.update('rewriteRules', function (rules) {
594+
bs.options = bs.options.update("rewriteRules", function (rules) {
595595
return rules.concat(rule);
596596
});
597597

@@ -600,7 +600,7 @@ BrowserSync.prototype.addRewriteRule = function (rule) {
600600

601601
BrowserSync.prototype.removeRewriteRule = function (id) {
602602
var bs = this;
603-
bs.options = bs.options.update('rewriteRules', function (rules) {
603+
bs.options = bs.options.update("rewriteRules", function (rules) {
604604
return rules.filter(function (rule) {
605605
return rule.id !== id;
606606
});
@@ -615,7 +615,7 @@ BrowserSync.prototype.removeRewriteRule = function (id) {
615615
BrowserSync.prototype.resetMiddlewareStack = function () {
616616

617617
var bs = this;
618-
var middlewares = require('./server/utils').getMiddlewares(bs, bs.options);
618+
var middlewares = require("./server/utils").getMiddlewares(bs, bs.options);
619619

620620
bs.app.stack = middlewares;
621621
};

‎lib/server/proxy-server.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ module.exports = function createProxyServer (bs) {
7272
var proxyReq = getProxyReqFunctions(opt.get("proxyReq"), opt, bs);
7373
var proxyRes = getProxyResFunctions(opt.get("proxyRes"), opt);
7474
var proxyResWs = opt.get("proxyReqWs");
75-
bs.options = bs.options.update('middleware', function (mw) {
75+
bs.options = bs.options.update("middleware", function (mw) {
7676
return mw.concat({
7777
id: "Browsersync Proxy",
7878
route: opt.get("route"),

‎lib/server/utils.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var serverUtils = {
7171

7272
var defaultMiddlewares = [
7373
{
74-
id: 'Browsersync HTTP Protocol',
74+
id: "Browsersync HTTP Protocol",
7575
route: require("../config").httpProtocol.path,
7676
handle: require("../http-protocol").middleware(bs)
7777
},
@@ -193,7 +193,6 @@ var serverUtils = {
193193
var whitelist = List([])
194194
.concat(bs.options.getIn(["snippetOptions", "whitelist"]));
195195

196-
197196
// Snippet
198197
rules.push(snippetUtils.getRegex(bs.options.get("snippet"), bs.options.get("snippetOptions")));
199198

@@ -204,7 +203,7 @@ var serverUtils = {
204203
}
205204

206205
// User
207-
bs.options.get('rewriteRules').forEach(function (rule) {
206+
bs.options.get("rewriteRules").forEach(function (rule) {
208207
if (Map.isMap(rule)) {
209208
rules.push(rule.toJS());
210209
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"chai": "3.5.0",
6868
"chalk": "1.1.3",
6969
"compression": "1.6.2",
70-
"eslint": "3.4.0",
70+
"eslint": "3.7.1",
7171
"graceful-fs": "4.1.6",
7272
"gulp": "3.9.1",
7373
"gulp-contribs": "0.0.3",

‎test/specs/e2e/middleware/middleware.option.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe("Accepting middleware as an option (1)", function () {
3333
});
3434

3535
it("should accept middlewares when given as top-level", function () {
36-
assert.equal(bs.options.get("middleware").size, 2, '1 custom + 1 serve static');
36+
assert.equal(bs.options.get("middleware").size, 2, "1 custom + 1 serve static");
3737
});
3838
});
3939

@@ -69,7 +69,7 @@ describe("Accepting middleware as an option (2)", function () {
6969
});
7070

7171
it("should accept middlewares when given as top-level", function () {
72-
assert.equal(bs.options.get("middleware").size, 3, '2 custom + 1 serve static');
72+
assert.equal(bs.options.get("middleware").size, 3, "2 custom + 1 serve static");
7373
});
7474
});
7575

‎test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var serveStatic = require("serve-static");
77
var request = require("supertest");
88
var assert = require("chai").assert;
99
var Rx = require("rx");
10-
var utils = require('../../../utils');
10+
var utils = require("../../../utils");
1111

1212
describe("E2E proxy test with adding rewrite rules dynamically", function () {
1313

@@ -19,9 +19,9 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () {
1919
var server = app.listen();
2020
var proxytarget = "http://localhost:" + server.address().port;
2121

22-
app.use('/index.html', function (req, res) {
23-
res.setHeader('content-type', 'text/html');
24-
res.end('<a href="'+proxytarget+'/my-link">Browsersync</a>');
22+
app.use("/index.html", function (req, res) {
23+
res.setHeader("content-type", "text/html");
24+
res.end("<a href=\""+proxytarget+"/my-link\">Browsersync</a>");
2525
});
2626

2727
var config = {
@@ -41,7 +41,7 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () {
4141
browserSync.init([], config, function (err, bs) {
4242

4343
var reqs = utils.getRequests([
44-
['/index.html', '<a href="//127.0.0.1:3000/my-link">BROWSERSYNC</a>']
44+
["/index.html", "<a href=\"//127.0.0.1:3000/my-link\">BROWSERSYNC</a>"]
4545
], bs.server);
4646

4747
var obs = Rx.Observable.concat(reqs);
@@ -62,9 +62,9 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () {
6262
var server = app.listen();
6363
var proxytarget = "http://localhost:" + server.address().port;
6464

65-
app.use('/index.html', function (req, res) {
66-
res.setHeader('content-type', 'text/html');
67-
res.end('<a href="'+proxytarget+'/my-link">Browsersync</a>');
65+
app.use("/index.html", function (req, res) {
66+
res.setHeader("content-type", "text/html");
67+
res.end("<a href=\""+proxytarget+"/my-link\">Browsersync</a>");
6868
});
6969

7070
var config = {
@@ -84,19 +84,19 @@ describe("E2E proxy test with adding rewrite rules dynamically", function () {
8484
browserSync.init([], config, function (err, bs) {
8585

8686
var reqs = utils.getRequests([
87-
['/index.html', '<a href="//127.0.0.1:3000/my-link">BROWSERSYNC</a>'],
87+
["/index.html", "<a href=\"//127.0.0.1:3000/my-link\">BROWSERSYNC</a>"],
8888
function () {
8989
bs.addRewriteRule({
9090
match: /BROWSERSYNC/,
91-
replace: 'shane',
92-
id: 'my-rewrite-rule'
91+
replace: "shane",
92+
id: "my-rewrite-rule"
9393
});
9494
},
95-
['/index.html', '<a href="//127.0.0.1:3000/my-link">shane</a>'],
95+
["/index.html", "<a href=\"//127.0.0.1:3000/my-link\">shane</a>"],
9696
function () {
97-
bs.removeRewriteRule('my-rewrite-rule');
97+
bs.removeRewriteRule("my-rewrite-rule");
9898
},
99-
['/index.html', '<a href="//127.0.0.1:3000/my-link">BROWSERSYNC</a>']
99+
["/index.html", "<a href=\"//127.0.0.1:3000/my-link\">BROWSERSYNC</a>"]
100100
], bs.server);
101101

102102
var obs = Rx.Observable.concat(reqs);

‎test/specs/e2e/proxy/e2e.proxy.rewrite.rules.replace.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ describe("E2E proxy test with replacing rewrite rules dynamically", function ()
5555

5656
assert.include(res.text, "BROWSERSYNC");
5757

58-
bs.options = bs.options.update('rewriteRules', function () {
59-
return require('immutable').List([]);
58+
bs.options = bs.options.update("rewriteRules", function () {
59+
return require("immutable").List([]);
6060
});
6161

6262
bs.resetMiddlewareStack();

‎test/specs/plugins/hooks.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ describe("Plugins: Registering Hooks:", function () {
6262
it("adds an item to the clientEvents array", function () {
6363
assert.include(instance.options.get("clientEvents").toJS(), "cp:goto");
6464
});
65-
it("adds an item to the Server Middleware array", function () {
66-
assert.include(instance.clientJs, "SHANE123456");
67-
});
68-
it("adds an item to the Server Middleware array", function (done) {
65+
it("adds an item to the Server Middleware array (2)", function (done) {
6966

7067
request(instance.server)
7168
.get("/")

0 commit comments

Comments
 (0)