HMR take 1

working, but double init

Author: cletusw

index.js

@@ -16,6 +16,13 @@ function ExtractTextPluginCompilation() {
 }
 
 ExtractTextPlugin.prototype.mergeNonInitialChunks = function(chunk, intoChunk, checkedChunks) {
+	if (chunk.chunks) {
+		// Fix error when hot module replacement used with CommonsChunkPlugin
+		chunk.chunks = chunk.chunks.filter(function(c) {
+			return typeof c !== 'undefined';
+		})
+	}
+
 	if(!intoChunk) {
 		checkedChunks = [];
 		chunk.chunks.forEach(function(c) {
@@ -285,7 +292,7 @@ ExtractTextPlugin.prototype.apply = function(compiler) {
 				callback();
 			}.bind(this));
 		}.bind(this));
-		compilation.plugin("additional-assets", function(callback) {
+		compilation.plugin("before-chunk-assets", function() {
 			extractedChunks.forEach(function(extractedChunk) {
 				if(extractedChunk.modules.length) {
 					extractedChunk.modules.sort(function(a, b) {
@@ -304,9 +311,15 @@ ExtractTextPlugin.prototype.apply = function(compiler) {
 					});
 					compilation.assets[file] = source;
 					chunk.files.push(file);
+
+					// Hot module replacement
+					extractedChunk.modules.forEach(function(module){
+						var originalModule = module.getOriginalModule();
+						originalModule._source._value = originalModule._source._value.replace('%%extracted-file%%', file);
+						originalModule._source._value = originalModule._source._value.replace('%%extracted-hash%%', compilation.hash);
+					});
 				}
 			}, this);
-			callback();
 		}.bind(this));
 	}.bind(this));
 };

loader.js

@@ -105,8 +105,11 @@ module.exports.pitch = function(request) {
 						});
 					});
 					this[__dirname](text, query);
-					if(text.locals && typeof resultSource !== "undefined") {
-						resultSource += "\nmodule.exports = " + JSON.stringify(text.locals) + ";";
+					if(typeof resultSource !== "undefined") {
+						if (text.locals) {
+							resultSource += "\nmodule.exports = " + JSON.stringify(text.locals) + ";";
+						}
+						resultSource += "\nfunction replaceStylesheet(styleSheet,url){styleSheet.href=url;console.log('[HMR]','Reload css: ',url)}\nfunction cssReload(compilationHash,publicPath,outputFilename){if(document){var styleSheets=document.getElementsByTagName('link');for(var i=0;i<styleSheets.length;i++){if(styleSheets[i].href){var hrefUrl=styleSheets[i].href.split('?');var href=hrefUrl[0];var hash=hrefUrl[1];if(hash!==compilationHash&&href===document.location.origin+publicPath+outputFilename){replaceStylesheet(styleSheets[i],href+'?'+compilationHash);break}}}}}\nif(module.hot){\nmodule.hot.accept();\ncssReload('%%extracted-hash%%','" + publicPath + "','%%extracted-file%%');}";
 					}
 				} catch(e) {
 					return callback(e);