Fix double slashes in file-loader URLs and fix client-side HMR.

RickWong · Feb 23, 2016 · d2cb263 · d2cb263
1 parent 42b50f2
commit d2cb263
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/configs/webpack.client-watch.js b/configs/webpack.client-watch.js
@@ -1,18 +1,33 @@
 var webpack = require("webpack");
 var config = require("./webpack.client.js");
-var hostname = process.env.HOSTNAME || "localhost";
-var port     = 8080;
+var wds = {
+	hostname: process.env.HOSTNAME || "localhost",
+	port: 8080
+};
 
 config.cache   = true;
 config.debug   = true;
 config.devtool = "cheap-module-eval-source-map";
 
 config.entry.unshift(
-	"webpack-dev-server/client?http://" + hostname + ":" + port,
+	"webpack-dev-server/client?http://" + wds.hostname + ":" + wds.port,
 	"webpack/hot/only-dev-server"
 );
 
-config.output.hotUpdateMainFilename = "update/[hash]/update.json";
+config.devServer = {
+	publicPath: "http://" + wds.hostname + ":" + wds.port + "/dist",
+	hot:        true,
+	inline:     false,
+	lazy:       false,
+	quiet:      true,
+	noInfo:     true,
+	headers:    {"Access-Control-Allow-Origin": "*"},
+	stats:      {colors: true},
+	host:       wds.hostname
+};
+
+config.output.publicPath             = config.devServer.publicPath;
+config.output.hotUpdateMainFilename  = "update/[hash]/update.json";
 config.output.hotUpdateChunkFilename = "update/[hash]/[id].update.js";
 
 config.plugins = [
@@ -25,16 +40,4 @@ config.module.postLoaders = [
 	{test: /\.js$/, loaders: ["babel?cacheDirectory&presets[]=es2015&presets[]=stage-0&presets[]=react&presets[]=react-hmre"], exclude: /node_modules/}
 ];
 
-config.devServer = {
-	publicPath: "http://" + hostname + ":" + port + "/dist/",
-	hot:        true,
-	inline:     false,
-	lazy:       false,
-	quiet:      true,
-	noInfo:     true,
-	headers:    {"Access-Control-Allow-Origin": "*"},
-	stats:      {colors: true},
-	host:       hostname
-};
-
 module.exports = config;
diff --git a/configs/webpack.client.js b/configs/webpack.client.js
@@ -23,7 +23,7 @@ module.exports = {
 	module:  {
 		loaders: [
 			{test: /\.json$/, loaders: ["json"]},
-			{test: /\.(ico|gif|png|jpg|jpeg|svg|webp)$/, loaders: ["file?context=static&name=/[path][name].[ext]"]}
+			{test: /\.(ico|gif|png|jpg|jpeg|svg|webp)$/, loaders: ["file?context=static&name=/[path][name].[ext]"], exclude: /node_modules/}
 		],
 		postLoaders: [
 			{test: /\.js$/, loaders: ["babel?presets[]=es2015&presets[]=stage-0&presets[]=react"], exclude: /node_modules/}

diff --git a/configs/webpack.server-watch.js b/configs/webpack.server-watch.js
@@ -1,13 +1,19 @@
 var webpack = require("webpack");
 var config = require("./webpack.server.js");
+var wds = {
+	hostname: process.env.HOSTNAME || "localhost",
+	port: 8080
+};
 
-config.cache   = true;
-config.debug   = true;
+config.cache = true;
+config.debug = true;
 
 config.entry.unshift(
 	"webpack/hot/poll?1000"
 );
 
+config.output.publicPath = "http://" + wds.hostname + ":" + wds.port + "/dist";
+
 config.plugins = [
 	new webpack.DefinePlugin({__CLIENT__: false, __SERVER__: true, __PRODUCTION__: false, __DEV__: true}),
 	new webpack.HotModuleReplacementPlugin(),

diff --git a/configs/webpack.server.js b/configs/webpack.server.js
@@ -21,10 +21,10 @@ module.exports = {
 	module:  {
 		loaders: [
 			{test: /\.json$/, loaders: ["json"]},
-			{test: /\.(ico|gif|png|jpg|jpeg|svg|webp)$/, loaders: ["file?context=static&name=/[path][name].[ext]"]}
+			{test: /\.(ico|gif|png|jpg|jpeg|svg|webp)$/, loaders: ["file?context=static&name=/[path][name].[ext]"], exclude: /node_modules/},
+			{test: /\.js$/, loaders: ["babel?presets[]=es2015&presets[]=stage-0&presets[]=react"], exclude: /node_modules/}
 		],
 		postLoaders: [
-			{test: /\.js$/, loaders: ["babel?presets[]=es2015&presets[]=stage-0&presets[]=react"], exclude: /node_modules/}
 		],
 		noParse: /\.min\.js/
 	},