@umijs/plugins 4.0.0-canary.20220506.3 → 4.0.0-canary.20220507.2

package/dist/qiankun/master.js

@@ -113,13 +113,16 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
                 });
             }
             else {
+                let content = getFileContent(file);
+                if (!api.config.qiankun.externalQiankun) {
+                    content = content.replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`);
+                }
                 api.writeTmpFile({
                     path: file.replace(/\.tpl$/, ''),
-                    content: getFileContent(file)
+                    content: content
                         .replace('__USE_MODEL__', api.isPluginEnable('model')
                         ? `import { useModel } from '@@/plugin-model'`
                         : `const useModel = null;`)
-                        .replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`)
                         .replace(/from 'lodash\//g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('lodash/package')))}/`),
                 });
             }

package/dist/qiankun.js

@@ -7,6 +7,7 @@ exports.default = (api) => {
                 return joi.object().keys({
                     slave: joi.object(),
                     master: joi.object(),
+                    externalQiankun: joi.boolean(),
                 });
             },
         },

package/libs/qiankun/master/common.ts

@@ -105,8 +105,8 @@ const recursiveSearch = (
     if (routes[i].path === path) {
       return routes[i];
     }
-    if (routes[i].chidlren && routes[i].chidlren?.length) {
-      const found = recursiveSearch(routes[i].chidlren || [], path);
+    if (routes[i].children && routes[i].children?.length) {
+      const found = recursiveSearch(routes[i].children || [], path);
       if (found) {
         return found;
       }
@@ -128,8 +128,8 @@ export function insertRoute(routes: IRouteProps[], microAppRoute: IRouteProps) {
       );
     }
     found.exact = false;
-    found.chidlren = found.chidlren || [];
-    found.chidlren.push(microAppRoute);
+    found.children = found.children || [];
+    found.children.push(microAppRoute);
   } else {
     throw new Error(
       `[plugin-qiankun]: path "${microAppRoute.insert}" not found`,

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -34,10 +34,10 @@ function patchMicroAppRouteComponent(routes: any[]) {
     const rootRoute = routes.find((route) => route.path === '/');
     if (rootRoute) {
       // 如果根路由是叶子节点，则直接返回其父节点
-      if (!rootRoute.chidlren) {
+      if (!rootRoute.children) {
         return routes;
       }
-      return getRootRoutes(rootRoute.chidlren);
+      return getRootRoutes(rootRoute.children);
     }
     return routes;
   };
@@ -54,8 +54,8 @@ function patchMicroAppRouteComponent(routes: any[]) {
           masterHistoryType,
           routeBindingAlias,
         });
-        if (route.chidlren?.length) {
-          route.chidlren.forEach(patchRoute);
+        if (route.children?.length) {
+          route.children.forEach(patchRoute);
         }
       };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220506.3",
+  "version": "4.0.0-canary.20220507.2",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -24,12 +24,12 @@
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.35.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220506.3",
+    "@ant-design/pro-layout": "^6.38.0",
+    "@umijs/bundler-utils": "4.0.0-canary.20220507.2",
     "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.26.1",
+    "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.3",
-    "dayjs": "^1.11.0",
+    "dayjs": "^1.11.2",
     "dva-core": "^2.0.4",
     "dva-immer": "^1.0.0",
     "dva-loading": "^3.0.22",
@@ -39,12 +39,12 @@
     "moment": "^2.29.3",
     "qiankun": "^2.7.0",
     "react-intl": "3.12.1",
-    "react-redux": "^8.0.0",
+    "react-redux": "^8.0.1",
     "redux": "^4.2.0",
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220506.3"
+    "umi": "4.0.0-canary.20220507.2"
   },
   "publishConfig": {
     "access": "public"