		@@ -5,26 +5,33 @@ #!/usr/bin/env node
		var Server = require("../lib/Server");
		var webpack = require("webpack");

		var argv = require("optimist")
		var optimist = require("optimist")

		.usage("webpack-dev-server " + require("../package.json").version + "\n" +
		"webpack-dev-server <webpack entry point>")
		"Usage: https://github.com/webpack/docs/wiki/webpack-detailed-usage")

		.string("content-page")
		.describe("content-page", "A html page to load")
		.boolean("colors").alias("colors", "c").describe("colors")

		.string("content-url")
		.describe("content-url", "A url to load")
		.boolean("info").describe("info").default("info", true)

		.string("options")
		.describe("options", "webpack options")
		.boolean("quiet").describe("quiet")

		.describe("port", "The port")
		.default("port", 8080)
		.string("content-page").describe("content-page", "A html page to load")

		.demand(1)
		.string("content-url").describe("content-url", "A url to load")

		.argv;
		.describe("port", "The port").default("port", 8080);

		require("webpack/bin/config-optimist")(optimist);

		var argv = optimist.argv;

		var options = {};

		var wpOpt = require("webpack/bin/convert-argv")(optimist, argv, { outputFilename: "/bundle.js" });

		options.publicPath = wpOpt.output.publicPath;
		options.path = wpOpt.output.path;
		options.filename = wpOpt.output.filename;

		if(argv["content-page"])
		@@ -36,7 +43,11 @@ options.content = path.resolve(argv["content-page"]);

		if(argv.options)
		options.webpack = require(path.resolve(argv.options));
		if(argv["colors"])
		options.stats = { colors: true };

		var arg = argv._[0].split("!");
		arg.push(path.resolve(arg.pop()));
		new Server(arg.join("!"), options).listen(argv.port);
		if(!argv["info"])
		options.noInfo = true;

		if(argv["quiet"])
		options.quiet = true;

		new Server(webpack(wpOpt), options).listen(argv.port);

client/live.js

@@ -0,0 +0,0 @@ var $ = require("jquery");

client/web_modules/jquery/index.js

		require("./jquery-1.8.1");
		module.exports = jQuery;

client/web_modules/socket.io/index.js

module.exports = require("./socket.io");

example/app.js

@@ -0,0 +0,0 @@ require("./style.less");

example/README.md

		@@ -6,3 +6,3 @@ # example
		``` text
		webpack-dev-server app.js
		webpack-dev-server ./app.js --colors
		```
		@@ -13,3 +13,3 @@
		``` text
		webpack-dev-server app.js --content-page index.html
		webpack-dev-server ./app.js --colors --content-page index.html
		```
		@@ -21,3 +21,3 @@
		``` text
		webpack-dev-server app.js --options webpackOptions.js
		webpack-dev-server ./app.js --colors --config alternative.config.js
		```
		@@ -28,3 +28,3 @@
		``` text
		webpack-dev-server app.js --content-page example\index.html --options webpackOptions.js
		webpack-dev-server ./app.js --colors --content-page index.html --config alternative.config.js
		```
		@@ -31,0 +31,0 @@

lib/Server.js

		var fs = require("fs");
		var path = require("path");
		var EventEmitter = require("events").EventEmitter;
		var webpackDevMiddleware = require("webpack-dev-middleware");
		@@ -9,3 +8,3 @@ var express = require("express");

		function Server(entry, options) {
		function Server(compiler, options) {

		@@ -17,20 +16,12 @@ // Default options
		this.contentUrl = options.contentUrl;
		this.webpackOptions = options.webpack \|\| {
		output: "bundle.js",
		publicPrefix: "/",
		debug: true,
		filenames: true,
		watch: true
		};
		this.middlewareOptions = options.middleware \|\| {};
		this.middlewareOptions.webpack = this.webpackOptions;

		// Listening for events
		this.webpackOptions.events = this.webpackOptions.events \|\| new EventEmitter();
		this.webpackOptions.events.on("bundle-invalid", function() {
		var invalidPlugin = function() {
		if(this.io) this.io.sockets.emit("invalid");
		}.bind(this));
		this.webpackOptions.events.on("bundle", function(stats) {
		}.bind(this);
		compiler.plugin("compile", invalidPlugin);
		compiler.plugin("invalid", invalidPlugin);
		compiler.plugin("done", function(stats) {
		if(!this.io) return;
		this._sendStats(this.io.sockets, stats);
		this._sendStats(this.io.sockets, stats.toJson());
		this._stats = stats;
		@@ -52,3 +43,3 @@ }.bind(this));
		// serve webpack bundle
		app.use(webpackDevMiddleware(entry, this.middlewareOptions));
		app.use(webpackDevMiddleware(compiler, options));
		}.bind(this));
		@@ -77,3 +68,3 @@
		if(!this._stats) return;
		this._sendStats(socket, this._stats);
		this._sendStats(socket, this._stats.toJson());
		}.bind(this));
		@@ -80,0 +71,0 @@ }

package.json

		{
		"name": "webpack-dev-server",
		"version": "0.8.2",
		"version": "0.9.0",
		"author": "Tobias Koppers @sokra",
		"description": "Serves a webpack app. Updates the browser on changes.",
		"dependencies": {
		"webpack-dev-middleware": "0.8.x",
		"webpack": "0.8.x",
		"express": "3.0.x",
		"webpack-dev-middleware": "0.9.x",
		"webpack": "0.9.x",
		"css-loader": "0.5.x",
		"style-loader": "0.5.x",
		"jade-loader": "0.5.x",
		"express": "3.1.x",
		"socket.io": "0.9.x",
		@@ -24,6 +27,4 @@ "optimist": "0.3.x",
		"scripts": {
		"postinstall": "node ./bin/webpack client/live.js client/live.bundle.js --colors",
		"postupdate": "node ./bin/webpack client/live.js client/live.bundle.js --colors"
		},
		"license": "MIT"
		"prepublish": "webpack ./client/live.js client/live.bundle.js --colors --config client/webpack.config.js"
		}
		}

README.md

@@ -0,0 +0,0 @@ # webpack-dev-server

bin/webpack.js

example/webpackOptions.js

.gitattributes