@umijs/plugins 4.0.33 → 4.0.34

package/libs/qiankun/slave/lifecycles.ts

@@ -23,22 +23,22 @@ let hasMountedAtLeastOnce = false;
 export default () => defer.promise;
 export const contextOptsStack: any[] = [];
 
-// function normalizeHistory(
-//   history?: 'string' | Record<string, any>,
-//   base?: string,
-// ) {
-//   let normalizedHistory: Record<string, any> = {};
-//   if (base) normalizedHistory.basename = base;
-//   if (history) {
-//     if (typeof history === 'string') {
-//       normalizedHistory.type = history;
-//     } else {
-//       normalizedHistory = history;
-//     }
-//   }
-//
-//   return normalizedHistory;
-// }
+function normalizeHistory(
+  history?: 'string' | Record<string, any>,
+  base?: string,
+) {
+  let normalizedHistory: Record<string, any> = {};
+  if (base) normalizedHistory.basename = base;
+  if (history) {
+    if (typeof history === 'string') {
+      normalizedHistory.type = history;
+    } else {
+      normalizedHistory = history;
+    }
+  }
+
+  return normalizedHistory;
+}
 
 async function getSlaveRuntime() {
   const config = await getPluginManager().applyPlugins({
@@ -73,21 +73,24 @@ export function genMount(mountElementId: string) {
         await slaveRuntime.mount(props);
       }
 
-      const { type, ...historyOpts } = props?.history || {};
+      const { type, ...historyOpts } = normalizeHistory(
+        props?.history || {},
+        props?.base,
+      );
 
       // 更新 clientRender 配置
       const clientRenderOpts = {
-        // 默认开启
-        // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
         callback: () => {
+          // 默认开启
+          // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
           if (props.autoSetLoading && typeof props.setLoading === 'function') {
             props.setLoading(false);
           }
 
-          // // 支持将子应用的 history 回传给父应用
-          // if (typeof props?.onHistoryInit === 'function') {
-          //   props.onHistoryInit(history);
-          // }
+          // 支持将子应用的 history 回传给父应用
+          if (typeof props?.onHistoryInit === 'function') {
+            props.onHistoryInit(history);
+          }
         },
         // 支持通过 props 注入 container 来限定子应用 mountElementId 的查找范围
         // 避免多个子应用出现在同一主应用时出现 mount 冲突
@@ -125,14 +128,6 @@ export function genMount(mountElementId: string) {
       defer.resolve();
     }
 
-    // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
-    // 考虑到 react 18 之后 callback 不再准
-    // 所以在这里直接返回，而不使用 ReactDOM.render 的第三个参数
-    if (typeof props !== 'undefined') {
-      if (props.autoSetLoading && typeof props.setLoading === 'function') {
-        props.setLoading(false);
-      }
-    }
     hasMountedAtLeastOnce = true;
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.33",
+  "version": "4.0.34",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,7 +27,7 @@
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-components": "^2.0.1",
-    "@umijs/bundler-utils": "4.0.33",
+    "@umijs/bundler-utils": "4.0.34",
     "@umijs/valtio": "^1.0.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.33"
+    "umi": "4.0.34"
   },
   "publishConfig": {
     "access": "public"