cleanup

Author: BowlingX

index.js

@@ -320,7 +320,7 @@ ExtractTextPlugin.prototype.apply = function(compiler) {
 								}
 								if(meta.content) {
 									var ident = module.identifier();
-									extractCompilation.addResultToChunk(ident, meta.content, newModule, extractedChunk);
+									extractCompilation.addResultToChunk(ident, meta.content, module, extractedChunk);
 									// remove generated result from chunk
 									if(toRemoveModules[ident]) {
 										toRemoveModules[ident].chunks.push(chunk)

loader.js

@@ -128,17 +128,18 @@ module.exports.pitch = function (request) {
 if (module.hot) {
 	module.hot.accept();
 	if (module.hot.data) {
-		require(${loaderUtils.stringifyRequest(this, path.resolve('./hotModuleReplacement.js'))})("${publicPath}", "%%extracted-file%%");
+		require(${loaderUtils.stringifyRequest(this, path.join(__dirname, "hotModuleReplacement.js"))})("${publicPath}", "%%extracted-file%%");
 	}
 }`;
 				}
 			} catch (e) {
 				return callback(e);
 			}
 			if (resultSource) {
-				return callback(null, resultSource);
+				callback(null, resultSource);
+			} else {
+				callback();
 			}
-			callback();
 		}.bind(this));
 	}
 };

package.json

@@ -30,7 +30,6 @@
   },
   "dependencies": {
     "async": "^2.1.2",
-    "jsesc": "^2.5.1",
     "loader-utils": "^1.0.2",
     "schema-utils": "^0.3.0",
     "style-loader": "^0.18.2",

yarn.lock

@@ -2064,10 +2064,6 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
-
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -4121,9 +4117,9 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.0.tgz#7e650a92816abff5db5f43316b0b8b19b13d76c1"
+webpack@~2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"