added CI build with beautify and linting

Author: sokra

.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*.js]
+indent_style=tab
+trim_trailing_whitespace=true

.eslintrc

@@ -0,0 +1,28 @@
+{
+	"env": {
+		"node": true
+	},
+	"plugins": [
+		"nodeca"
+	],
+	"rules": {
+		"strict": 0,
+		"camelcase": 0,
+		"curly": 0,
+		"indent": [0, "tab"],
+		"nodeca/indent": [2, "tabs", 1],
+		"eol-last": 2,
+		"no-shadow": 0,
+		"no-redeclare": 2,
+		"no-extra-bind": 2,
+		"no-empty": 0,
+		"no-process-exit": 2,
+		"no-underscore-dangle": 0,
+		"no-use-before-define": 0,
+		"no-unused-vars": 0,
+		"consistent-return": 0,
+		"no-inner-declarations": 2,
+		"no-loop-func": 2,
+		"space-before-function-paren": [2, "never"]
+	}
+}

.jsbeautifyrc

@@ -0,0 +1,25 @@
+{
+  "js": {
+    "allowed_file_extensions": ["js", "json", "jshintrc", "jsbeautifyrc"],
+    "brace_style": "collapse",
+    "break_chained_methods": false,
+    "e4x": true,
+    "eval_code": false,
+    "end_with_newline": true,
+    "indent_char": "\t",
+    "indent_level": 0,
+    "indent_size": 1,
+    "indent_with_tabs": true,
+    "jslint_happy": false,
+    "jslint_happy_align_switch_case": true,
+    "space_after_anon_function": false,
+    "keep_array_indentation": false,
+    "keep_function_indentation": false,
+    "max_preserve_newlines": 2,
+    "preserve_newlines": true,
+    "space_before_conditional": false,
+    "space_in_paren": false,
+    "unescape_strings": false,
+    "wrap_line_length": 0
+  }
+}

.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: node_js
+node_js:
+  - node
+script: npm run travis

bin/webpack-dev-server.js

@@ -18,47 +18,48 @@ var webpack = require("webpack");
 
 var optimist = require("optimist")
 
-	.usage("webpack-dev-server " + require("../package.json").version + "\n" +
-			"Usage: http://webpack.github.io/docs/webpack-dev-server.html")
+.usage("webpack-dev-server " + require("../package.json").version + "\n" +
+	"Usage: http://webpack.github.io/docs/webpack-dev-server.html")
 
-	.boolean("lazy").describe("lazy")
+.boolean("lazy").describe("lazy")
 
-	.boolean("stdin").describe("stdin", "close when stdin ends")
+.boolean("stdin").describe("stdin", "close when stdin ends")
 
-	.boolean("info").describe("info").default("info", true)
+.boolean("info").describe("info").default("info", true)
 
-	.boolean("quiet").describe("quiet")
+.boolean("quiet").describe("quiet")
 
-	.boolean("inline").describe("inline", "Inline the webpack-dev-server logic into the bundle.")
+.boolean("inline").describe("inline", "Inline the webpack-dev-server logic into the bundle.")
 
-	.boolean("https").describe("https")
+.boolean("https").describe("https")
 
-	.string("key").describe("key", "Path to a SSL key.")
+.string("key").describe("key", "Path to a SSL key.")
 
-	.string("cert").describe("cert", "Path to a SSL certificate.")
+.string("cert").describe("cert", "Path to a SSL certificate.")
 
-	.string("cacert").describe("cacert", "Path to a SSL CA certificate.")
+.string("cacert").describe("cacert", "Path to a SSL CA certificate.")
 
-	.string("content-base").describe("content-base", "A directory or URL to serve HTML content from.")
+.string("content-base").describe("content-base", "A directory or URL to serve HTML content from.")
 
-	.string("content-base-target").describe("content-base-target", "Proxy requests to this target.")
+.string("content-base-target").describe("content-base-target", "Proxy requests to this target.")
 
-	.boolean("history-api-fallback").describe("history-api-fallback", "Fallback to /index.html for Single Page Applications.")
+.boolean("history-api-fallback").describe("history-api-fallback", "Fallback to /index.html for Single Page Applications.")
 
-	.boolean("compress").describe("compress", "enable gzip compression")
+.boolean("compress").describe("compress", "enable gzip compression")
 
-	.boolean("open").describe("open", "Open default browser")
+.boolean("open").describe("open", "Open default browser")
 
-	.describe("port", "The port").default("port", 8080)
+.describe("port", "The port").default("port", 8080)
 
-
-	.describe("host", "The hostname/ip address the server will bind to").default("host", "localhost");
+.describe("host", "The hostname/ip address the server will bind to").default("host", "localhost");
 
 require("webpack/bin/config-optimist")(optimist);
 
 var argv = optimist.argv;
 
-var wpOpt = require("webpack/bin/convert-argv")(optimist, argv, { outputFilename: "/bundle.js" });
+var wpOpt = require("webpack/bin/convert-argv")(optimist, argv, {
+	outputFilename: "/bundle.js"
+});
 var firstWpOpt = Array.isArray(wpOpt) ? wpOpt[0] : wpOpt;
 
 var options = wpOpt.devServer || firstWpOpt.devServer || {};
@@ -106,7 +107,9 @@ if(argv["content-base"]) {
 	else if(!/^(https?:)?\/\//.test(options.contentBase))
 		options.contentBase = path.resolve(options.contentBase);
 } else if(argv["content-base-target"]) {
-	options.contentBase = { target: argv["content-base-target"] };
+	options.contentBase = {
+		target: argv["content-base-target"]
+	};
 } else if(!options.contentBase) {
 	options.contentBase = process.cwd();
 }
@@ -186,6 +189,6 @@ new Server(webpack(wpOpt), options).listen(options.port, options.host, function(
 		console.log("content is served from " + options.contentBase);
 	if(options.historyApiFallback)
 		console.log("404s will fallback to %s", options.historyApiFallback.index || "/index.html");
-	if (options.open)
+	if(options.open)
 		open(uri);
 });

lib/Server.js

@@ -15,7 +15,7 @@ function Server(compiler, options) {
 	// Default options
 	if(!options) options = {};
 
-	if (options.lazy && !options.filename) {
+	if(options.lazy && !options.filename) {
 		throw new Error("'filename' option must be set in lazy mode.");
 	}
 
@@ -72,6 +72,7 @@ function Server(compiler, options) {
 		res.write('<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body>');
 		var path = this.middleware.getFilenameFromUrl(options.publicPath || "/");
 		var fs = this.middleware.fileSystem;
+
 		function writeDirectory(baseUrl, basePath) {
 			var content = fs.readdirSync(basePath);
 			res.write("<ul>");
@@ -111,14 +112,14 @@ function Server(compiler, options) {
 
 	var features = {
 		compress: function() {
-			if (options.compress) {
+			if(options.compress) {
 				// Enable gzip compression.
 				app.use(compress());
 			}
-		}.bind(this),
+		},
 
 		proxy: function() {
-			if (options.proxy) {
+			if(options.proxy) {
 				/**
 				 * Assume a proxy configuration specified as:
 				 * proxy: 'a url'
@@ -139,17 +140,16 @@ function Server(compiler, options) {
 				 *   'context': 'target'
 				 * }
 				 */
-			 	if(!Array.isArray(options.proxy)) {
-					options.proxy = Object.keys(options.proxy).map(function (context) {
+				if(!Array.isArray(options.proxy)) {
+					options.proxy = Object.keys(options.proxy).map(function(context) {
 						var proxyOptions;
 
 						if(typeof options.proxy[context] === 'string') {
 							proxyOptions = {
 								context: context,
 								target: options.proxy[target]
 							};
-						}
-						else {
+						} else {
 							proxyOptions = options.proxy[context];
 							proxyOptions.context = context;
 						}
@@ -167,7 +167,7 @@ function Server(compiler, options) {
 				 *   }
 				 * ]
 				 */
-				options.proxy.forEach(function (proxyConfig) {
+				options.proxy.forEach(function(proxyConfig) {
 					var context = proxyConfig.context || proxyConfig.path;
 
 					app.use(function(req, res, next) {
@@ -183,14 +183,14 @@ function Server(compiler, options) {
 					}, httpProxyMiddleware(context, proxyConfig));
 				});
 			}
-		}.bind(this),
+		},
 
 		historyApiFallback: function() {
-			if (options.historyApiFallback) {
+			if(options.historyApiFallback) {
 				// Fall back to /index.html if nothing else matches.
 				app.use(historyApiFallback(typeof options.historyApiFallback === 'object' ? options.historyApiFallback : null));
 			}
-		}.bind(this),
+		},
 
 		contentBase: function() {
 			if(options.contentBase !== false) {
@@ -215,15 +215,15 @@ function Server(compiler, options) {
 							'Location': contentBase + req.path + (req._parsedUrl.search || "")
 						});
 						res.end();
-					}.bind(this));
+					});
 				} else if(typeof contentBase === "number") {
 					// Redirect every request to the port contentBase
 					app.get("*", function(req, res) {
 						res.writeHead(302, {
 							'Location': "//localhost:" + contentBase + req.path + (req._parsedUrl.search || "")
 						});
 						res.end();
-					}.bind(this));
+					});
 				} else {
 					// route content request
 					app.get("*", express.static(contentBase), serveIndex(contentBase));
@@ -247,7 +247,7 @@ function Server(compiler, options) {
 		setup: function() {
 			if(typeof options.setup === "function")
 				options.setup(app);
-		}.bind(this)
+		}
 	};
 
 	var defaultFeatures = ["setup", "headers", "middleware"];
@@ -266,9 +266,9 @@ function Server(compiler, options) {
 		features[feature]();
 	}, this);
 
-	if (options.https) {
+	if(options.https) {
 		// for keep supporting CLI parameters
-		if (typeof options.https === 'boolean') {
+		if(typeof options.https === 'boolean') {
 			options.https = {
 				key: options.key,
 				cert: options.cert,
@@ -307,7 +307,7 @@ Server.prototype.listen = function() {
 	var sockServer = sockjs.createServer({
 		// Limit useless logs
 		log: function(severity, line) {
-			if (severity === "error") {
+			if(severity === "error") {
 				console.log(line);
 			}
 		}
@@ -318,7 +318,7 @@ Server.prototype.listen = function() {
 		// Remove the connection when it's closed
 		conn.on("close", function() {
 			var connIndex = this.sockets.indexOf(conn);
-			if (connIndex >= 0) {
+			if(connIndex >= 0) {
 				this.sockets.splice(connIndex, 1);
 			}
 		}.bind(this));
@@ -344,7 +344,10 @@ Server.prototype.close = function() {
 
 Server.prototype.sockWrite = function(sockets, type, data) {
 	sockets.forEach(function(sock) {
-		sock.write(JSON.stringify({type: type, data: data}));
+		sock.write(JSON.stringify({
+			type: type,
+			data: data
+		}));
 	});
 }
 
@@ -359,14 +362,22 @@ Server.prototype.serveMagicHtml = function(req, res, next) {
 		res.write('.js');
 		res.write(req._parsedUrl.search || "");
 		res.end('"></script></body></html>');
-	} catch(e) { return next(); }
+	} catch(e) {
+		return next();
+	}
 }
 
 // send stats to a socket or multiple sockets
 Server.prototype._sendStats = function(sockets, stats, force) {
-	if(!force && stats && (!stats.errors || stats.errors.length === 0) && stats.assets && stats.assets.every(function(asset) {
-		return !asset.emitted;
-	})) return this.sockWrite(sockets, "still-ok");
+	if(!force &&
+		stats &&
+		(!stats.errors || stats.errors.length === 0) &&
+		stats.assets &&
+		stats.assets.every(function(asset) {
+			return !asset.emitted;
+		})
+	)
+		return this.sockWrite(sockets, "still-ok");
 	this.sockWrite(sockets, "hash", stats.hash);
 	if(stats.errors.length > 0)
 		this.sockWrite(sockets, "errors", stats.errors);

package.json

@@ -22,10 +22,14 @@
     "http-proxy-middleware": "~0.9.0"
   },
   "devDependencies": {
+    "beautify-lint": "^1.0.4",
     "css-loader": "~0.23.0",
+    "eslint": "^1.10.3",
+    "eslint-plugin-nodeca": "^1.0.3",
     "file-loader": "~0.8.4",
     "jade": "^1.11.0",
     "jade-loader": "~0.8.0",
+    "jsbeautify": "^0.3.6",
     "less": "^2.5.1",
     "less-loader": "~2.2.0",
     "style-loader": "~0.13.0",
@@ -47,6 +51,10 @@
     "ssl/"
   ],
   "scripts": {
-    "prepublish": "webpack ./client/live.js client/live.bundle.js --colors --config client/webpack.config.js -p && webpack ./client/index.js client/index.bundle.js --colors --config client/webpack.config.js -p"
+    "prepublish": "webpack ./client/live.js client/live.bundle.js --colors --config client/webpack.config.js -p && webpack ./client/index.js client/index.bundle.js --colors --config client/webpack.config.js -p",
+    "lint": "eslint lib test",
+    "beautify-lint": "beautify-lint lib/**.js bin/**.js",
+    "beautify": "beautify-rewrite lib/**.js bin/**.js",
+    "travis": "npm run lint && npm run beautify-lint && node lib/Server.js"
   }
 }