Fix hot module main flag for hot module replacement

ricmatsui · ricmatsui · commit fb93f626e45b · 2017-04-02T00:46:33.000-07:00
When a main module is loaded after a module which is already installed,
the main module should still be marked as a main module.
diff --git a/lib/HotModuleReplacement.runtime.js b/lib/HotModuleReplacement.runtime.js
@@ -27,7 +27,7 @@ module.exports = function() {
 				console.warn("[HMR] unexpected require(" + request + ") from disposed module " + moduleId);
 				hotCurrentParents = [];
 			}
-			hotMainModule = false;
+			hotMainModule = !!installedModules[request];
 			return $require$(request);
 		};
 		var ObjectFactory = function ObjectFactory(name) {
diff --git a/test/configCases/commons-chunk-plugin/hot-multi/common.js b/test/configCases/commons-chunk-plugin/hot-multi/common.js
@@ -0,0 +1 @@
+module.exports = "common";
diff --git a/test/configCases/commons-chunk-plugin/hot-multi/first.js b/test/configCases/commons-chunk-plugin/hot-multi/first.js
@@ -0,0 +1,8 @@
+require("should");
+
+require("./common");
+
+it("should have the correct main flag for multi first module", function() {
+	var multiModule = __webpack_require__.c[module.parents[0]];
+	multiModule.hot._main.should.be.eql(true);
+});
diff --git a/test/configCases/commons-chunk-plugin/hot-multi/second.js b/test/configCases/commons-chunk-plugin/hot-multi/second.js
@@ -0,0 +1,8 @@
+require("should");
+
+require("./common");
+
+it("should have the correct main flag for multi second module", function() {
+	var multiModule = __webpack_require__.c[module.parents[0]];
+	multiModule.hot._main.should.be.eql(true);
+});
diff --git a/test/configCases/commons-chunk-plugin/hot-multi/shared.js b/test/configCases/commons-chunk-plugin/hot-multi/shared.js
@@ -0,0 +1 @@
+module.exports = "shared";
diff --git a/test/configCases/commons-chunk-plugin/hot-multi/test.config.js b/test/configCases/commons-chunk-plugin/hot-multi/test.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+	findBundle: function(i, options) {
+		return [
+			"./vendor.js",
+			"./first.js",
+			"./second.js"
+		]
+	}
+};
diff --git a/test/configCases/commons-chunk-plugin/hot-multi/vendor.js b/test/configCases/commons-chunk-plugin/hot-multi/vendor.js
@@ -0,0 +1,3 @@
+require("./common");
+
+module.exports = "vendor";
diff --git a/test/configCases/commons-chunk-plugin/hot-multi/webpack.config.js b/test/configCases/commons-chunk-plugin/hot-multi/webpack.config.js
@@ -0,0 +1,19 @@
+var CommonsChunkPlugin = require("../../../../lib/optimize/CommonsChunkPlugin");
+var HotModuleReplacementPlugin = require("../../../../lib/HotModuleReplacementPlugin");
+module.exports = {
+	entry: {
+		vendor: ["./vendor"],
+		first: ["./shared", "./first"],
+		second: ["./shared", "./second"]
+	},
+	target: "web",
+	output: {
+		filename: "[name].js"
+	},
+	plugins: [
+		new CommonsChunkPlugin({
+			name: "vendor"
+		}),
+		new HotModuleReplacementPlugin()
+	]
+};

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ module.exports = function() {`
`27`	`27`	`console.warn("[HMR] unexpected require(" + request + ") from disposed module " + moduleId);`
`28`	`28`	`hotCurrentParents = [];`
`29`	`29`	`}`
`30`		`- hotMainModule = false;`
	`30`	`+ hotMainModule = !!installedModules[request];`
`31`	`31`	`return $require$(request);`
`32`	`32`	`};`
`33`	`33`	`var ObjectFactory = function ObjectFactory(name) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+require("./common");`
	`2`	`+`
	`3`	`+module.exports = "vendor";`