Merge pull request #4 from chuckdumont/work

Fix compiler hang issue when using webpack-hot-middleware
chuckdumont · Aug 15, 2018 · 0f8d29c · 0f8d29c
2 parents 8985b65 + a6d62d8
commit 0f8d29c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -93,12 +93,17 @@ module.exports = class PreamblePlugin {
 	}
 
 	getResolver(compiler, callback) {
-		if (compiler.resolverFactory) {
+		if (this.resolver) {
+			callback(this.resolver);
+		}
+		else if (compiler.resolverFactory) {
 			// Webpack V4
-			tap(compiler.resolverFactory, "resolver normal", callback);
+			tap(compiler.resolverFactory, "resolver normal", resolver => {
+				callback(this.resolver = resolver);
+			});
 		} else {
 			// Webpack V3
-			callback(compiler.resolvers.normal);
+			callback(this.resolver = compiler.resolvers.normal);
 		}
 	}
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack-preamble-plugin",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "peerDependencies": {
     "webpack": ">= 2.2.0"
   },