Skip to content

Commit c1ce93a

Browse files
sokrasokra
authored
Merge pull request webpack#4617 from ricmatsui/rm-fix-hot-module-replacement
Fix hot module main flag for hot module replacement
2 parents c95fe7c + f730570 commit c1ce93a

8 files changed

Lines changed: 61 additions & 5 deletions

File tree

‎lib/HotModuleReplacement.runtime.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = function() {
88
var hotApplyOnUpdate = true;
99
var hotCurrentHash = $hash$; // eslint-disable-line no-unused-vars
1010
var hotCurrentModuleData = {};
11-
var hotMainModule = true; // eslint-disable-line no-unused-vars
11+
var hotCurrentChildModule; // eslint-disable-line no-unused-vars
1212
var hotCurrentParents = []; // eslint-disable-line no-unused-vars
1313
var hotCurrentParentsTemp = []; // eslint-disable-line no-unused-vars
1414

@@ -20,14 +20,16 @@ module.exports = function() {
2020
if(installedModules[request]) {
2121
if(installedModules[request].parents.indexOf(moduleId) < 0)
2222
installedModules[request].parents.push(moduleId);
23-
} else hotCurrentParents = [moduleId];
23+
} else {
24+
hotCurrentParents = [moduleId];
25+
hotCurrentChildModule = request;
26+
}
2427
if(me.children.indexOf(request) < 0)
2528
me.children.push(request);
2629
} else {
2730
console.warn("[HMR] unexpected require(" + request + ") from disposed module " + moduleId);
2831
hotCurrentParents = [];
2932
}
30-
hotMainModule = false;
3133
return $require$(request);
3234
};
3335
var ObjectFactory = function ObjectFactory(name) {
@@ -82,7 +84,7 @@ module.exports = function() {
8284
_selfAccepted: false,
8385
_selfDeclined: false,
8486
_disposeHandlers: [],
85-
_main: hotMainModule,
87+
_main: hotCurrentChildModule !== moduleId,
8688

8789
// Module API
8890
active: true,
@@ -135,7 +137,7 @@ module.exports = function() {
135137
//inherit from previous dispose call
136138
data: hotCurrentModuleData[moduleId]
137139
};
138-
hotMainModule = true;
140+
hotCurrentChildModule = undefined;
139141
return hot;
140142
}
141143

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "common";

‎test/configCases/commons-chunk-plugin/hot-multi/first.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
require("should");
2+
3+
require("./common");
4+
5+
it("should have the correct main flag for multi first module", function() {
6+
var multiModule = __webpack_require__.c[module.parents[0]];
7+
multiModule.hot._main.should.be.eql(true);
8+
});

‎test/configCases/commons-chunk-plugin/hot-multi/second.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
require("should");
2+
3+
require("./common");
4+
5+
it("should have the correct main flag for multi second module", function() {
6+
var multiModule = __webpack_require__.c[module.parents[0]];
7+
multiModule.hot._main.should.be.eql(true);
8+
});

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = "shared";

‎test/configCases/commons-chunk-plugin/hot-multi/test.config.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = {
2+
findBundle: function(i, options) {
3+
return [
4+
"./vendor.js",
5+
"./first.js",
6+
"./second.js"
7+
]
8+
}
9+
};

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
require("./common");
2+
3+
module.exports = "vendor";
4+
5+
it("should have the correct main flag for multi vendor module", function() {
6+
var multiModule = __webpack_require__.c[module.parents[0]];
7+
multiModule.hot._main.should.be.eql(true);
8+
});

‎test/configCases/commons-chunk-plugin/hot-multi/webpack.config.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
var CommonsChunkPlugin = require("../../../../lib/optimize/CommonsChunkPlugin");
2+
var HotModuleReplacementPlugin = require("../../../../lib/HotModuleReplacementPlugin");
3+
module.exports = {
4+
entry: {
5+
vendor: ["./vendor"],
6+
first: ["./shared", "./first"],
7+
second: ["./shared", "./second"]
8+
},
9+
target: "web",
10+
output: {
11+
filename: "[name].js"
12+
},
13+
plugins: [
14+
new CommonsChunkPlugin({
15+
name: "vendor"
16+
}),
17+
new HotModuleReplacementPlugin()
18+
]
19+
};

0 commit comments

Comments
 (0)