Merge pull request webpack#7498 from webpack/bugfix/hmr-parent-import

sokra · web-flow · commit 31b755a49376 · 2018-06-07T12:49:01.000+02:00
add parents correctly when creating namespace objects
diff --git a/lib/HotModuleReplacement.runtime.js b/lib/HotModuleReplacement.runtime.js
@@ -55,7 +55,8 @@ module.exports = function() {
 		for (var name in $require$) {
 			if (
 				Object.prototype.hasOwnProperty.call($require$, name) &&
-				name !== "e"
+				name !== "e" &&
+				name !== "t"
 			) {
 				Object.defineProperty(fn, name, ObjectFactory(name));
 			}
@@ -80,6 +81,10 @@ module.exports = function() {
 				}
 			}
 		};
+		fn.t = function(value, mode) {
+			if (mode & 1) value = fn(value);
+			return $require$.t(value, mode & ~1);
+		};
 		return fn;
 	}
 
diff --git a/test/hotCases/runtime/bubble-async/file.js b/test/hotCases/runtime/bubble-async/file.js
@@ -0,0 +1,3 @@
+module.exports = 1;
+---
+module.exports = 2;
diff --git a/test/hotCases/runtime/bubble-async/index.js b/test/hotCases/runtime/bubble-async/index.js
@@ -0,0 +1,16 @@
+import { load } from "./parent-file";
+import update from "../../update";
+
+it("should bubble update from a nested dependency", () => {
+	return load().then(value => {
+		expect(value).toBe(1);
+		return new Promise((resolve, reject) => {
+			module.hot.accept("./parent-file", () => {
+				resolve(load().then(value => {
+					expect(value).toBe(2);
+				}));
+			});
+			NEXT(update(reject));
+		});
+	})
+});
diff --git a/test/hotCases/runtime/bubble-async/parent-file.js b/test/hotCases/runtime/bubble-async/parent-file.js
@@ -0,0 +1,3 @@
+export function load() {
+	return import("./file").then(file => file.default);
+}

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ module.exports = function() {`
`55`	`55`	`for (var name in $require$) {`
`56`	`56`	`if (`
`57`	`57`	`Object.prototype.hasOwnProperty.call($require$, name) &&`
`58`		`- name !== "e"`
	`58`	`+ name !== "e" &&`
	`59`	`+ name !== "t"`
`59`	`60`	`) {`
`60`	`61`	`Object.defineProperty(fn, name, ObjectFactory(name));`
`61`	`62`	`}`
`@@ -80,6 +81,10 @@ module.exports = function() {`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`	`};`
	`84`	`+ fn.t = function(value, mode) {`
	`85`	`+ if (mode & 1) value = fn(value);`
	`86`	`+ return $require$.t(value, mode & ~1);`
	`87`	`+ };`
`83`	`88`	`return fn;`
`84`	`89`	`}`
`85`	`90`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export function load() {`
	`2`	`+ return import("./file").then(file => file.default);`
	`3`	`+}`