@umijs/plugins 4.0.10 → 4.0.13

package/dist/layout.js

@@ -253,7 +253,7 @@ const { formatMessage } = useIntl();
            type InitDataType = ReturnType<typeof InitialStateType>;
         ` : "type InitDataType = any;"}
 
-    import { IConfigFromPlugins } from '@@/core/pluginConfig';
+    import type { IConfigFromPlugins } from '@@/core/pluginConfig';
 
     export type RunTimeLayoutConfig = (initData: InitDataType) => Omit<
       ProLayoutProps,

package/dist/request.js

@@ -342,6 +342,7 @@ export {
   useRequest,
   UseRequestProvider,
   request,
+  getRequestInstance,
 } from './request';
 `
     });

package/libs/qiankun/master/MicroApp.tsx

@@ -18,13 +18,12 @@ import React, {
   useRef,
   useState,
 } from 'react';
+import { qiankunStateForSlaveModelNamespace } from './constants';
 import { ErrorBoundary } from './ErrorBoundary';
 import { getMasterOptions } from './masterOptions';
 import MicroAppLoader from './MicroAppLoader';
 import { MasterOptions } from './types';
 
-const qiankunStateForSlaveModelNamespace = '@@qiankunStateForSlave';
-
 type HashHistory = {
   type?: 'hash';
 } & any;

package/libs/qiankun/master/common.ts

@@ -6,7 +6,7 @@
  */
 
 import React, { ReactComponentElement } from 'react';
-import type { IRouteProps } from 'umi';
+import { Navigate, type IRouteProps } from 'umi';
 
 export const defaultMountContainerId = 'root-subapp';
 
@@ -94,19 +94,30 @@ export function patchMicroAppRoute(
       routeProps,
     };
     route.element = React.createElement(getMicroAppRouteComponent(opts), null);
+  } else if (route.redirect) {
+    // patchClientRoutes 插入的 redirect 不会被转换，所以这里需要手动处理成重定向组件
+    route.element = React.createElement(Navigate, {
+      to: route.redirect,
+      replace: true,
+    });
   }
 }
 
 const recursiveSearch = (
   routes: IRouteProps[],
   path: string,
-): IRouteProps | null => {
+  parentPath: string,
+): [IRouteProps, IRouteProps[], number, string] | null => {
   for (let i = 0; i < routes.length; i++) {
     if (routes[i].path === path) {
-      return routes[i];
+      return [routes[i], routes, i, parentPath];
     }
     if (routes[i].children && routes[i].children?.length) {
-      const found = recursiveSearch(routes[i].children || [], path);
+      const found = recursiveSearch(
+        routes[i].children || [],
+        path,
+        routes[i].path,
+      );
       if (found) {
         return found;
       }
@@ -116,23 +127,48 @@ const recursiveSearch = (
 };
 
 export function insertRoute(routes: IRouteProps[], microAppRoute: IRouteProps) {
-  const found = recursiveSearch(routes, microAppRoute.insert);
+  const mod =
+    microAppRoute.appendChildTo || microAppRoute.insert
+      ? 'appendChildTo'
+      : microAppRoute.insertBefore
+      ? 'insertBefore'
+      : undefined;
+  const target =
+    microAppRoute.appendChildTo ||
+    microAppRoute.insert ||
+    microAppRoute.insertBefore;
+  const [found, foundParentRoutes = [], index = 0, parentPath] =
+    recursiveSearch(routes, target, '/') || [];
   if (found) {
-    if (
-      !microAppRoute.path ||
-      !found.path ||
-      !microAppRoute.path.startsWith(found.path)
-    ) {
-      throw new Error(
-        `[plugin-qiankun]: path "${microAppRoute.path}" need to starts with "${found.path}"`,
-      );
+    switch (mod) {
+      case 'appendChildTo':
+        if (
+          !microAppRoute.path ||
+          !found.path ||
+          !microAppRoute.path.startsWith(found.path)
+        ) {
+          throw new Error(
+            `[plugin-qiankun]: path "${microAppRoute.path}" need to starts with "${found.path}"`,
+          );
+        }
+        found.exact = false;
+        found.children = found.children || [];
+        found.children.push(microAppRoute);
+        break;
+      case 'insertBefore':
+        if (
+          !microAppRoute.path ||
+          !found.path ||
+          !microAppRoute.path.startsWith(parentPath)
+        ) {
+          throw new Error(
+            `[plugin-qiankun]: path "${microAppRoute.path}" need to starts with "${parentPath}"`,
+          );
+        }
+        foundParentRoutes.splice(index, 0, microAppRoute);
+        break;
     }
-    found.exact = false;
-    found.children = found.children || [];
-    found.children.push(microAppRoute);
   } else {
-    throw new Error(
-      `[plugin-qiankun]: path "${microAppRoute.insert}" not found`,
-    );
+    throw new Error(`[plugin-qiankun]: path "${target}" not found`);
   }
 }

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -24,7 +24,9 @@ async function getMasterRuntime() {
 
 // modify route with "microApp" attribute to use real component
 function patchMicroAppRouteComponent(routes: any[]) {
-  const insertRoutes = microAppRuntimeRoutes.filter((r) => r.insert);
+  const insertRoutes = microAppRuntimeRoutes.filter(
+    (r) => r.insert || r.insertBefore || r.appendChildTo,
+  );
   // 先处理 insert 配置
   insertRoutes.forEach((route) => {
     insertRoute(routes, route);
@@ -60,7 +62,13 @@ function patchMicroAppRouteComponent(routes: any[]) {
       };
 
       patchRoute(microAppRoute);
-      !microAppRoute.insert && rootRoutes.unshift(microAppRoute);
+      if (
+        !microAppRoute.insert &&
+        !microAppRoute.insertBefore &&
+        !microAppRoute.appendChildTo
+      ) {
+        rootRoutes.unshift(microAppRoute);
+      }
     });
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.10",
+  "version": "4.0.13",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -25,7 +25,7 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^7.0.1-beta.28",
-    "@umijs/bundler-utils": "4.0.10",
+    "@umijs/bundler-utils": "4.0.13",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.10"
+    "umi": "4.0.13"
   },
   "publishConfig": {
     "access": "public"