Merge pull request webpack#6962 from justinhelmer/bug/6919

sokra · web-flow · commit aee24915aed3 · 2018-04-17T11:11:31.000+02:00
hot.accept tap interceptor returns T/F based on the number of args
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
@@ -343,13 +343,17 @@ module.exports = class HotModuleReplacementPlugin {
 										parser.state.module.addDependency(dep);
 										requests.push(request);
 									});
-									if (expr.arguments.length > 1)
+									if (expr.arguments.length > 1) {
 										parser.hooks.hotAcceptCallback.call(
 											expr.arguments[1],
 											requests
 										);
-									else
+										parser.walkExpression(expr.arguments[1]); // other args are ignored
+										return true;
+									} else {
 										parser.hooks.hotAcceptWithoutCallback.call(expr, requests);
+										return true;
+									}
 								}
 							}
 						});
diff --git a/test/hotCases/define/issue-6962/a.js b/test/hotCases/define/issue-6962/a.js
@@ -0,0 +1,3 @@
+export default 1;
+---
+export default 2;
diff --git a/test/hotCases/define/issue-6962/index.js b/test/hotCases/define/issue-6962/index.js
@@ -0,0 +1 @@
+import "./module";
diff --git a/test/hotCases/define/issue-6962/module.js b/test/hotCases/define/issue-6962/module.js
@@ -0,0 +1,19 @@
+import value1 from "./a";
+
+it("should have the expected static path defined", function() {
+	DEFINE_PATH.should.be.eql('./a');
+});
+
+it("should hot.accept the module located at the static file path without breaking the compiler", function() {
+	module.hot.accept("./a");
+	value1.should.be.eql(1);
+});
+
+it("should hot.accept the module located at the defined file path without breaking the compiler, when one argument is passed to hot.accept", function() {
+	module.hot.accept(DEFINE_PATH);
+});
+
+it("should hot.accept the module located at the defined file path without breaking the compiler, when multiple arguments are passed to hot.accept", function(done) {
+	module.hot.accept(DEFINE_PATH, () => done());
+	NEXT(require("../../update")(done));
+});
diff --git a/test/hotCases/define/issue-6962/webpack.config.js b/test/hotCases/define/issue-6962/webpack.config.js
@@ -0,0 +1,11 @@
+"use strict";
+
+const webpack = require("../../../../");
+
+module.exports = {
+	plugins: [
+		new webpack.DefinePlugin({
+			DEFINE_PATH: JSON.stringify("./a")
+		})
+	]
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default 1;`
	`2`	`+---`
	`3`	`+export default 2;`