Merge pull request #4617 from ricmatsui/rm-fix-hot-module-replacement

Fix hot module main flag for hot module replacement

lib/HotModuleReplacement.runtime.js

@@ -8,7 +8,7 @@ module.exports = function() {
 	var hotApplyOnUpdate = true;
 	var hotCurrentHash = $hash$; // eslint-disable-line no-unused-vars
 	var hotCurrentModuleData = {};
-	var hotMainModule = true; // eslint-disable-line no-unused-vars
+	var hotCurrentChildModule; // eslint-disable-line no-unused-vars
 	var hotCurrentParents = []; // eslint-disable-line no-unused-vars
 	var hotCurrentParentsTemp = []; // eslint-disable-line no-unused-vars
 
@@ -20,14 +20,16 @@ module.exports = function() {
 				if(installedModules[request]) {
 					if(installedModules[request].parents.indexOf(moduleId) < 0)
 						installedModules[request].parents.push(moduleId);
-				} else hotCurrentParents = [moduleId];
+				} else {
+					hotCurrentParents = [moduleId];
+					hotCurrentChildModule = request;
+				}
 				if(me.children.indexOf(request) < 0)
 					me.children.push(request);
 			} else {
 				console.warn("[HMR] unexpected require(" + request + ") from disposed module " + moduleId);
 				hotCurrentParents = [];
 			}
-			hotMainModule = false;
 			return $require$(request);
 		};
 		var ObjectFactory = function ObjectFactory(name) {
@@ -82,7 +84,7 @@ module.exports = function() {
 			_selfAccepted: false,
 			_selfDeclined: false,
 			_disposeHandlers: [],
-			_main: hotMainModule,
+			_main: hotCurrentChildModule !== moduleId,
 
 			// Module API
 			active: true,
@@ -135,7 +137,7 @@ module.exports = function() {
 			//inherit from previous dispose call
 			data: hotCurrentModuleData[moduleId]
 		};
-		hotMainModule = true;
+		hotCurrentChildModule = undefined;
 		return hot;
 	}
 

test/configCases/commons-chunk-plugin/hot-multi/common.js

@@ -0,0 +1 @@
+module.exports = "common";

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);
+});

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);
+});

test/configCases/commons-chunk-plugin/hot-multi/shared.js

@@ -0,0 +1 @@
+module.exports = "shared";

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"
+		]
+	}
+};

test/configCases/commons-chunk-plugin/hot-multi/vendor.js

@@ -0,0 +1,8 @@
+require("./common");
+
+module.exports = "vendor";
+
+it("should have the correct main flag for multi vendor module", function() {
+	var multiModule = __webpack_require__.c[module.parents[0]];
+	multiModule.hot._main.should.be.eql(true);
+});

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()
+	]
+};