From d7264d0cb6f59fcb4f098d0806ffcc8716a0314f Mon Sep 17 00:00:00 2001 From: Tom <214997474@qq.com> Date: Fri, 11 Mar 2022 20:43:44 +0800 Subject: [PATCH 1/4] fix(container): __webpack_modules__[id] => __webpack_require__.m[id] --- lib/container/RemoteRuntimeModule.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/container/RemoteRuntimeModule.js b/lib/container/RemoteRuntimeModule.js index 90948f273..b8eade801 100644 --- a/lib/container/RemoteRuntimeModule.js +++ b/lib/container/RemoteRuntimeModule.js @@ -73,7 +73,7 @@ class RemoteRuntimeModule extends RuntimeModule { Template.indent( `error.message += '\\nwhile loading "' + data[1] + '" from ' + data[2];` ), - `__webpack_modules__[id] = ${runtimeTemplate.basicFunction("", [ + `__webpack_require__.m[id] = ${runtimeTemplate.basicFunction("", [ "throw error;" ])}`, "data.p = 0;" @@ -111,7 +111,7 @@ class RemoteRuntimeModule extends RuntimeModule { )};`, `var onFactory = ${runtimeTemplate.basicFunction("factory", [ "data.p = 1;", - `__webpack_modules__[id] = ${runtimeTemplate.basicFunction( + `__webpack_require__.m[id] = ${runtimeTemplate.basicFunction( "module", ["module.exports = factory();"] )}` From 69a0c52008b9c259d5eccd62e9ea36964d2d27eb Mon Sep 17 00:00:00 2001 From: jinyangwang <214997474@qq.com> Date: Fri, 1 Apr 2022 21:01:09 +0800 Subject: [PATCH 2/4] Update lib/container/RemoteRuntimeModule.js Co-authored-by: Tobias Koppers --- lib/container/RemoteRuntimeModule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/container/RemoteRuntimeModule.js b/lib/container/RemoteRuntimeModule.js index b8eade801..2acb3a468 100644 --- a/lib/container/RemoteRuntimeModule.js +++ b/lib/container/RemoteRuntimeModule.js @@ -73,7 +73,7 @@ class RemoteRuntimeModule extends RuntimeModule { Template.indent( `error.message += '\\nwhile loading "' + data[1] + '" from ' + data[2];` ), - `__webpack_require__.m[id] = ${runtimeTemplate.basicFunction("", [ + `${RuntimeGlobals.moduleFactories}[id] = ${runtimeTemplate.basicFunction("", [ "throw error;" ])}`, "data.p = 0;" From 5afbaf6857e89228ab3c54b8ff6d733abf9bdfe4 Mon Sep 17 00:00:00 2001 From: jinyangwang <214997474@qq.com> Date: Fri, 1 Apr 2022 21:01:24 +0800 Subject: [PATCH 3/4] Update lib/container/RemoteRuntimeModule.js Co-authored-by: Tobias Koppers --- lib/container/RemoteRuntimeModule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/container/RemoteRuntimeModule.js b/lib/container/RemoteRuntimeModule.js index 2acb3a468..112a5e775 100644 --- a/lib/container/RemoteRuntimeModule.js +++ b/lib/container/RemoteRuntimeModule.js @@ -111,7 +111,7 @@ class RemoteRuntimeModule extends RuntimeModule { )};`, `var onFactory = ${runtimeTemplate.basicFunction("factory", [ "data.p = 1;", - `__webpack_require__.m[id] = ${runtimeTemplate.basicFunction( + `${RuntimeGlobals.moduleFactories}[id] = ${runtimeTemplate.basicFunction( "module", ["module.exports = factory();"] )}` From ceed937ef0cf104a68f9c18ed5f17bc833401fb5 Mon Sep 17 00:00:00 2001 From: Tom <214997474@qq.com> Date: Sat, 2 Apr 2022 09:00:08 +0800 Subject: [PATCH 4/4] fix: pretty-lint error "RuntimeGlobals.moduleFactories" --- lib/container/RemoteRuntimeModule.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/container/RemoteRuntimeModule.js b/lib/container/RemoteRuntimeModule.js index 112a5e775..7f4d15b29 100644 --- a/lib/container/RemoteRuntimeModule.js +++ b/lib/container/RemoteRuntimeModule.js @@ -73,9 +73,9 @@ class RemoteRuntimeModule extends RuntimeModule { Template.indent( `error.message += '\\nwhile loading "' + data[1] + '" from ' + data[2];` ), - `${RuntimeGlobals.moduleFactories}[id] = ${runtimeTemplate.basicFunction("", [ - "throw error;" - ])}`, + `${ + RuntimeGlobals.moduleFactories + }[id] = ${runtimeTemplate.basicFunction("", ["throw error;"])}`, "data.p = 0;" ])};`, `var handleFunction = ${runtimeTemplate.basicFunction( @@ -111,10 +111,11 @@ class RemoteRuntimeModule extends RuntimeModule { )};`, `var onFactory = ${runtimeTemplate.basicFunction("factory", [ "data.p = 1;", - `${RuntimeGlobals.moduleFactories}[id] = ${runtimeTemplate.basicFunction( - "module", - ["module.exports = factory();"] - )}` + `${ + RuntimeGlobals.moduleFactories + }[id] = ${runtimeTemplate.basicFunction("module", [ + "module.exports = factory();" + ])}` ])};`, "handleFunction(__webpack_require__, data[2], 0, 0, onExternal, 1);" ])});`