fix: history is undefined on render (#9871)

umijs · Dec 8, 2022 · c4465e0 · c4465e0
1 parent 34d223a
commit c4465e0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/packages/plugins/libs/qiankun/slave/slaveRuntimePlugin.ts b/packages/plugins/libs/qiankun/slave/slaveRuntimePlugin.ts
@@ -1,13 +1,21 @@
 // @ts-nocheck
 import qiankunRender, { contextOptsStack } from './lifecycles';
+import { createHistory } from '@@/core/history';
 
 export function render(oldRender: any) {
   return qiankunRender().then(oldRender);
 }
 
-export function modifyContextOpts(memo: any) {
+export function modifyClientRenderOpts(memo: any) {
   // 每次应用 render 的时候会调 modifyClientRenderOpts，这时尝试从队列中取 render 的配置
   const clientRenderOpts = contextOptsStack.shift();
+  if (clientRenderOpts) {
+    clientRenderOpts.history = createHistory({
+      type: clientRenderOpts.historyType,
+      basename: clientRenderOpts.basename,
+      ...clientRenderOpts.historyOpts,
+    });
+  }
   return {
     ...memo,
     ...clientRenderOpts,

diff --git a/packages/preset-umi/templates/umi.tpl b/packages/preset-umi/templates/umi.tpl
@@ -27,16 +27,24 @@ async function render() {
     },
   });
 
+  const contextOpts = pluginManager.applyPlugins({
+    key: 'modifyContextOpts',
+    type: ApplyPluginsType.modify,
+    initialValue: {},
+  });
+
+  const basename = contextOpts.basename || '{{{ basename }}}';
+
+  const history = createHistory({
+    type: contextOpts.historyType || '{{{ historyType }}}',
+    basename,
+    ...contextOpts.historyOpts,
+  });
+
   return (pluginManager.applyPlugins({
     key: 'render',
     type: ApplyPluginsType.compose,
     initialValue() {
-      const contextOpts = pluginManager.applyPlugins({
-        key: 'modifyContextOpts',
-        type: ApplyPluginsType.modify,
-        initialValue: {},
-      });
-      const basename = contextOpts.basename || '{{{ basename }}}';
       const context = {
 {{#hydrate}}
         hydrate: true,
@@ -53,11 +61,7 @@ async function render() {
 {{/loadingComponent}}
         publicPath,
         runtimePublicPath,
-        history: createHistory({
-          type: contextOpts.historyType || '{{{ historyType }}}',
-          basename,
-          ...contextOpts.historyOpts,
-        }),
+        history,
         basename,
         callback: contextOpts.callback,
       };