Merge pull request #5862 from Slashgear/fix-hmr-es6-bundles

[fix] error on HMR with es6 bundles
webpack · Nov 27, 2017 · 801a253 · 801a253
2 parents 9c1f9fe + 00daab2
commit 801a253
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/JsonpMainTemplatePlugin.js b/lib/JsonpMainTemplatePlugin.js
@@ -195,8 +195,8 @@ class JsonpMainTemplatePlugin {
 function hotDisposeChunk(chunkId) {
 	delete installedChunks[chunkId];
 }
-var parentHotUpdateCallback = this[${JSON.stringify(hotUpdateFunction)}];
-this[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
+var parentHotUpdateCallback = window[${JSON.stringify(hotUpdateFunction)}];
+window[${JSON.stringify(hotUpdateFunction)}] = ${runtimeSource}`;
 		});
 		mainTemplate.plugin("hash", function(hash) {
 			hash.update("jsonp");

diff --git a/lib/webworker/WebWorkerMainTemplatePlugin.js b/lib/webworker/WebWorkerMainTemplatePlugin.js
@@ -82,8 +82,8 @@ class WebWorkerMainTemplatePlugin {
 			});
 
 			return source + "\n" +
-				`var parentHotUpdateCallback = this[${JSON.stringify(hotUpdateFunction)}];\n` +
-				`this[${JSON.stringify(hotUpdateFunction)}] = ` +
+				`var parentHotUpdateCallback = self[${JSON.stringify(hotUpdateFunction)}];\n` +
+				`self[${JSON.stringify(hotUpdateFunction)}] = ` +
 				Template.getFunctionContent(require("./WebWorkerMainTemplate.runtime.js"))
 				.replace(/\/\/\$semicolon/g, ";")
 				.replace(/\$require\$/g, this.requireFn)

diff --git a/test/WebWorkerMainTemplatePlugin.unittest.js b/test/WebWorkerMainTemplatePlugin.unittest.js
@@ -188,8 +188,8 @@ installedChunks[chunkIds.pop()] = 1;
 				it("returns the original source with hot update callback", () => {
 					env.source.should.be.exactly(`
 moduleSource()
-var parentHotUpdateCallback = this["webpackHotUpdate"];
-this["webpackHotUpdate"] = function webpackHotUpdateCallback(chunkId, moreModules) { // eslint-disable-line no-unused-vars
+var parentHotUpdateCallback = self["webpackHotUpdate"];
+self["webpackHotUpdate"] = function webpackHotUpdateCallback(chunkId, moreModules) { // eslint-disable-line no-unused-vars
 	hotAddUpdateChunk(chunkId, moreModules);
 	if(parentHotUpdateCallback) parentHotUpdateCallback(chunkId, moreModules);
 } ;