Skip to content

Commit b456e57

Browse files
committed
Merge branch 'ts'
2 parents 22052d8 + 1a8ac77 commit b456e57

133 files changed

Lines changed: 6563 additions & 6511 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 8 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ before.json
1919
after.json
2020
bs-config.js
2121
/lodash.custom.min.js
22+
/dist

examples/404.js

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@
1515

1616
var browserSync = require("browser-sync").create();
1717

18-
browserSync.init({
19-
files: ["app/css/*.css"],
20-
server: {
21-
baseDir: "app"
22-
}
23-
}, function (err, bs) {
24-
bs.addMiddleware("*", function (req, res) {
25-
res.writeHead(302, {
26-
"location": "404.html"
18+
browserSync.init(
19+
{
20+
files: ["app/css/*.css"],
21+
server: {
22+
baseDir: "app"
23+
}
24+
},
25+
function(err, bs) {
26+
bs.addMiddleware("*", function(req, res) {
27+
res.writeHead(302, {
28+
location: "404.html"
29+
});
30+
res.end("Redirecting!");
2731
});
28-
res.end("Redirecting!");
29-
});
30-
});
32+
}
33+
);

examples/callback.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var config = {
1919
files: ["app/css/*.css"]
2020
};
2121

22-
browserSync.init(config, function (err, bs) {
22+
browserSync.init(config, function(err, bs) {
2323
// Full access to Browsersync object here
2424
console.log(bs.getOption("urls"));
2525
});

examples/express.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313

1414
"use strict";
1515

16-
var bs = require("browser-sync").create();
16+
var bs = require("browser-sync").create();
1717
var express = require("express");
18-
var router = express.Router();
19-
var app = express();
18+
var router = express.Router();
19+
var app = express();
2020

2121
/**
2222
* Catch a route like /user/2324
2323
* and send a JSON response
2424
*/
25-
router.get("/user/:id", function (req, res) {
25+
router.get("/user/:id", function(req, res) {
2626
res.send({
2727
name: "shane",
2828
pets: ["cat", "hippo"],
29-
id: req.params.id
29+
id: req.params.id
3030
});
3131
});
3232

examples/middleware.css.injection.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ browserSync.init({
3535
* Catch all requests, if any are for .less files, recompile on the fly and
3636
* send back a CSS response
3737
*/
38-
middleware: function (req, res, next) {
38+
middleware: function(req, res, next) {
3939
var parsed = require("url").parse(req.url);
4040
if (parsed.pathname.match(/\.less$/)) {
41-
return less(parsed.pathname).then(function (o) {
41+
return less(parsed.pathname).then(function(o) {
4242
res.setHeader("Content-Type", "text/css");
4343
res.end(o.css);
4444
});
@@ -48,6 +48,8 @@ browserSync.init({
4848
});
4949

5050
function less(src) {
51-
var f = require("fs").readFileSync("src/" + src).toString();
51+
var f = require("fs")
52+
.readFileSync("src/" + src)
53+
.toString();
5254
return require("less").render(f);
5355
}

examples/proxy.headers.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ browserSync.init({
1818
files: ["app/css/*.css"],
1919
proxy: {
2020
target: "localhost:8000",
21-
reqHeaders: function (config) {
21+
reqHeaders: function(config) {
2222
/**
2323
* These are the default headers as a guide for you.
2424
* You can set whatever you want here.
2525
*/
2626
return {
27-
"host": config.urlObj.host,
27+
host: config.urlObj.host,
2828
"accept-encoding": "identity",
29-
"agent": false
29+
agent: false
3030
};
3131
}
3232
}

examples/proxy.middleware.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ browserSync.init({
1818
files: ["app/css/*.css"],
1919
proxy: {
2020
target: "http://yourlocal.dev",
21-
middleware: function (req, res, next) {
21+
middleware: function(req, res, next) {
2222
console.log(req.url);
2323
next();
2424
}

examples/proxy.middleware.multi.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
var browserSync = require("browser-sync").create();
1616

17-
var fn1 = function (req, res, next) {
17+
var fn1 = function(req, res, next) {
1818
console.log(req.url);
1919
next();
2020
};
2121

22-
var fn2 = function (req, res, next) {
22+
var fn2 = function(req, res, next) {
2323
console.log(req.headers);
2424
next();
2525
};

0 commit comments

Comments
 (0)