@umijs/plugins 4.0.0-rc.9 → 4.0.2

package/libs/model.tsx

@@ -1,14 +1,25 @@
 // @ts-ignore
+import type { models as rawModels } from '@@/plugin-model/model';
 import isEqual from 'fast-deep-equal';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 
+type Models = typeof rawModels;
+
+type GetNamespaces<M> = {
+  [K in keyof M]: M[K] extends { namespace: string }
+    ? M[K]['namespace']
+    : never;
+}[keyof M];
+
+type Namespaces = GetNamespaces<Models>;
+
 // @ts-ignore
 const Context = React.createContext<{ dispatcher: Dispatcher }>(null);
 
 class Dispatcher {
-  callbacks: Record<string, Set<Function>> = {};
-  data: Record<string, unknown> = {};
-  update = (namespace: string) => {
+  callbacks: Record<Namespaces, Set<Function>> = {};
+  data: Record<Namespaces, unknown> = {};
+  update = (namespace: Namespaces) => {
     if (this.callbacks[namespace]) {
       this.callbacks[namespace].forEach((cb) => {
         try {
@@ -87,7 +98,34 @@ export function Provider(props: {
   );
 }
 
-export function useModel(namespace: string, selector?: any) {
+type GetModelByNamespace<M, N> = {
+  [K in keyof M]: M[K] extends { namespace: string; model: unknown }
+    ? M[K]['namespace'] extends N
+      ? M[K]['model'] extends (...args: any) => any
+        ? ReturnType<M[K]['model']>
+        : never
+      : never
+    : never;
+}[keyof M];
+
+type Model<N> = GetModelByNamespace<Models, N>;
+type Selector<N, S> = (model: Model<N>) => S;
+
+type SelectedModel<N, T> = T extends (...args: any) => any
+  ? ReturnType<NonNullable<T>>
+  : Model<N>;
+
+export function useModel<N extends Namespaces>(namespace: N): Model<N>;
+
+export function useModel<N extends Namespaces, S>(
+  namespace: N,
+  selector: Selector<N, S>,
+): SelectedModel<N, typeof selector>;
+
+export function useModel<N extends Namespaces, S>(
+  namespace: N,
+  selector?: Selector<N, S>,
+): SelectedModel<N, typeof selector> {
   const { dispatcher } = useContext<{ dispatcher: Dispatcher }>(Context);
   const selectorRef = useRef(selector);
   selectorRef.current = selector;
@@ -127,7 +165,7 @@ export function useModel(namespace: string, selector?: any) {
       }
     };
 
-    dispatcher.callbacks[namespace] ||= new Set();
+    dispatcher.callbacks[namespace] ||= new Set() as any; // rawModels 是 umi 动态生成的文件，导致前面 callback[namespace] 的类型无法推导出来，所以用 as any 来忽略掉
     dispatcher.callbacks[namespace].add(handler);
     dispatcher.update(namespace);
 

package/libs/qiankun/master/MicroApp.tsx

@@ -74,11 +74,11 @@ export const MicroApp = forwardRef(
       apps = [],
       lifeCycles: globalLifeCycles,
       prefetch = true,
+      appNameKeyAlias = 'name',
       ...globalSettings
     } = getMasterOptions() as MasterOptions;
 
     const {
-      name,
       settings: settingsFromProps = {},
       loader,
       errorBoundary,
@@ -88,6 +88,10 @@ export const MicroApp = forwardRef(
       ...propsFromParams
     } = componentProps;
 
+    // 优先使用 alias 名匹配，fallback 到 name 匹配
+    const name = componentProps[appNameKeyAlias] || componentProps.name;
+    const isCurrentApp = (app: any) => app[appNameKeyAlias] === name || app.name === name;
+
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState<any>(null);
     // 未配置自定义 errorBoundary 且开启了 autoCaptureError 场景下，使用插件默认的 errorBoundary，否则使用自定义 errorBoundary
@@ -117,7 +121,7 @@ export const MicroApp = forwardRef(
 
     useImperativeHandle(componentRef, () => microAppRef.current);
 
-    const appConfig = apps.find((app: any) => app.name === name);
+    const appConfig = apps.find((app: any) => isCurrentApp(app));
     useEffect(() => {
       if (!appConfig) {
         setComponentError(
@@ -139,6 +143,13 @@ export const MicroApp = forwardRef(
       setComponentError(null);
       setLoading(true);
       const configuration = {
+        fetch(url) {
+          return window.fetch(url, {
+            headers: {
+              accept: 'text/html',
+            },
+          });
+        },
         globalContext: window,
         ...globalSettings,
         ...settingsFromProps,
@@ -167,13 +178,11 @@ export const MicroApp = forwardRef(
           if (noneMounted) {
             if (Array.isArray(prefetch)) {
               const specialPrefetchApps = apps.filter(
-                (app) => app.name !== name && prefetch.indexOf(app.name) !== -1,
+                (app) => !isCurrentApp(app) && (prefetch.indexOf(app[appNameKeyAlias]) !== -1 || prefetch.indexOf(app.name) !== -1)
               );
               prefetchApps(specialPrefetchApps, configuration);
             } else {
-              const otherNotMountedApps = apps.filter(
-                (app) => app.name !== name,
-              );
+              const otherNotMountedApps = apps.filter((app) => !isCurrentApp(app));
               prefetchApps(otherNotMountedApps, configuration);
             }
             noneMounted = false;

package/libs/qiankun/master/common.ts

@@ -5,7 +5,7 @@
  * @since 2019-06-20
  */
 
-import { ReactComponentElement } from 'react';
+import React, { ReactComponentElement } from 'react';
 import type { IRouteProps } from 'umi';
 
 export const defaultMountContainerId = 'root-subapp';
@@ -48,6 +48,7 @@ export function patchMicroAppRoute(
   getMicroAppRouteComponent: (opts: {
     appName: string;
     base: string;
+    routePath: string;
     masterHistoryType: string;
     routeProps?: any;
   }) => string | ReactComponentElement<any>,
@@ -63,9 +64,9 @@ export function patchMicroAppRoute(
   const microAppProps =
     route[`${routeBindingAlias}Props`] || route.microAppProps || {};
   if (microAppName) {
-    if (route.routes?.length) {
-      const childrenRouteHasComponent = route.routes.some(
-        (r: any) => r.component,
+    if (route.children?.length) {
+      const childrenRouteHasComponent = route.children.some(
+        (r: any) => r.element,
       );
       if (childrenRouteHasComponent) {
         throw new Error(
@@ -74,7 +75,10 @@ export function patchMicroAppRoute(
       }
     }
 
-    route.exact = false;
+    // 自动追加通配符，匹配子应用的路由
+    if (!route.path.endsWith('/*')) {
+      route.path = route.path.replace(/\/?$/, '/*');
+    }
 
     const { settings = {}, ...componentProps } = microAppProps;
     const routeProps = {
@@ -85,10 +89,11 @@ export function patchMicroAppRoute(
     const opts = {
       appName: microAppName,
       base,
+      routePath: route.path,
       masterHistoryType,
       routeProps,
     };
-    route.component = getMicroAppRouteComponent(opts);
+    route.element = React.createElement(getMicroAppRouteComponent(opts), null);
   }
 }
 
@@ -100,8 +105,8 @@ const recursiveSearch = (
     if (routes[i].path === path) {
       return routes[i];
     }
-    if (routes[i].routes && routes[i].routes?.length) {
-      const found = recursiveSearch(routes[i].routes || [], path);
+    if (routes[i].children && routes[i].children?.length) {
+      const found = recursiveSearch(routes[i].children || [], path);
       if (found) {
         return found;
       }
@@ -123,8 +128,8 @@ export function insertRoute(routes: IRouteProps[], microAppRoute: IRouteProps) {
       );
     }
     found.exact = false;
-    found.routes = found.routes || [];
-    found.routes.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/getMicroAppRouteComponent.tsx.tpl

@@ -1,31 +1,20 @@
 import React from 'react';
 import { MicroApp } from './MicroApp';
-{{#runtimeHistory}}
-import { getCreateHistoryOptions } from 'umi';
-{{/runtimeHistory}}
-import { useLocation } from 'umi';
 
 export function getMicroAppRouteComponent(opts: {
   appName: string;
   base: string;
+  routePath: string;
   masterHistoryType: string;
   routeProps?: any;
 }) {
-  const { base, masterHistoryType, appName, routeProps } = opts;
-  const RouteComponent = ({ match }: any) => {
-    const url = useLocation().pathname;
-
+  const { base, masterHistoryType, appName, routeProps, routePath } = opts;
+  const RouteComponent = () => {
     // 默认取静态配置的 base
     let umiConfigBase = base === '/' ? '' : base;
 
-    {{#runtimeHistory}}
-    // 存在 getCreateHistoryOptions 说明当前应用开启了 runtimeHistory，此时取运行时的 history 配置的 basename
-    const { basename = '/' } = getCreateHistoryOptions();
-    umiConfigBase = basename === '/' ? '' : basename;
-    {{/runtimeHistory}}
-
-    let runtimeMatchedBase =
-      umiConfigBase + (url.endsWith('/') ? url.substr(0, url.length - 1) : url);
+    // 拼接子应用挂载路由
+    let runtimeMatchedBase = umiConfigBase + routePath.replace('/*', '');
 
     {{#dynamicRoot}}
     // @see https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/htmlUtils.ts#L102

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.routes) {
+      if (!rootRoute.children?.length) {
         return routes;
       }
-      return getRootRoutes(rootRoute.routes);
+      return getRootRoutes(rootRoute.children);
     }
     return routes;
   };
@@ -50,11 +50,12 @@ function patchMicroAppRouteComponent(routes: any[]) {
       const patchRoute = (route: any) => {
         patchMicroAppRoute(route, getMicroAppRouteComponent, {
           base,
+          routePath: route.path,
           masterHistoryType,
           routeBindingAlias,
         });
-        if (route.routes?.length) {
-          route.routes.forEach(patchRoute);
+        if (route.children?.length) {
+          route.children.forEach(patchRoute);
         }
       };
 
@@ -123,7 +124,7 @@ export async function render(oldRender: typeof noop) {
   }
 }
 
-export function patchRoutes({ routes }: { routes: any[] }) {
+export function patchClientRoutes({ routes }: { routes: any[] }) {
   if (microAppRuntimeRoutes) {
     patchMicroAppRouteComponent(routes);
   }

package/libs/qiankun/master/types.ts

@@ -31,6 +31,8 @@ export type MasterOptions = {
   routeBindingAlias?: string;
   // 导出的组件别名，默认 MicroApp
   exportComponentAlias?: string;
+  // MicroApp 寻址时使用的应用名唯一键，默认是 name
+  appNameKeyAlias?: string;
 } & FrameworkConfiguration;
 
 export type SlaveOptions = {

package/libs/qiankun/slave/connectMaster.tsx

@@ -1,5 +1,4 @@
 // @ts-nocheck
-/* eslint-disable */
 __USE_MODEL__;
 import React from 'react';
 

package/libs/qiankun/slave/lifecycles.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-/* eslint-disable */
 import { getPluginManager } from '@@/core/plugin';
 import ReactDOM from 'react-dom';
 import { ApplyPluginsType } from 'umi';
@@ -22,7 +21,7 @@ let render = noop;
 let hasMountedAtLeastOnce = false;
 
 export default () => defer.promise;
-export const clientRenderOptsStack: any[] = [];
+export const contextOptsStack: any[] = [];
 
 // function normalizeHistory(
 //   history?: 'string' | Record<string, any>,
@@ -79,10 +78,7 @@ export function genMount(mountElementId: string) {
         // 默认开启
         // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
         callback: () => {
-          if (
-            props?.autoSetLoading &&
-            typeof props?.setLoading === 'function'
-          ) {
+          if (props.autoSetLoading && typeof props.setLoading === 'function') {
             props.setLoading(false);
           }
 
@@ -94,9 +90,11 @@ export function genMount(mountElementId: string) {
         // 支持通过 props 注入 container 来限定子应用 mountElementId 的查找范围
         // 避免多个子应用出现在同一主应用时出现 mount 冲突
         rootElement:
-          props?.container?.querySelector(`#${mountElementId}`) ||
+          props.container?.querySelector(`#${mountElementId}`) ||
           mountElementId,
 
+        basename: props.base,
+
         // 当存在同一个 umi 子应用在同一个页面被多实例渲染的场景时（比如一个页面里，同时展示了这个子应用的多个路由页面）
         // mount 钩子会被调用多次，但是具体什么时候对应的实例开始 render 则是不定的，即它调用 applyPlugins('modifyClientRenderOpts') 的时机是不确定的
         // 为了保证每次 applyPlugins('modifyClientRenderOpts') 调用是生成正确的 history，我们需要这里通过闭包上下文维持 mount 调用时的一些配置信息
@@ -111,7 +109,7 @@ export function genMount(mountElementId: string) {
         // },
       };
 
-      clientRenderOptsStack.push(clientRenderOpts);
+      contextOptsStack.push(clientRenderOpts);
     }
 
     // 第一次 mount defer 被 resolve 后umi 会自动触发 render，非第一次 mount 则需手动触发
@@ -121,6 +119,14 @@ 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/libs/qiankun/slave/qiankunModel.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-/* eslint-disable */
 import { useState } from 'react';
 
 let initState: any;

package/libs/qiankun/slave/slaveRuntimePlugin.ts

@@ -1,21 +1,15 @@
 // @ts-nocheck
-/* eslint-disable */
-import qiankunRender from './lifecycles';
+import qiankunRender, { contextOptsStack } from './lifecycles';
 
 export function render(oldRender: any) {
   return qiankunRender().then(oldRender);
 }
 
-// export function modifyClientRenderOpts(memo: any) {
-//   // 每次应用 render 的时候会调 modifyClientRenderOpts，这时尝试从队列中取 render 的配置
-//   const clientRenderOpts = clientRenderOptsStack.shift();
-//   if (clientRenderOpts) {
-//     const history = clientRenderOpts.getHistory();
-//     delete clientRenderOpts.getHistory;
-//     clientRenderOpts.history = history;
-//   }
-//   return {
-//     ...memo,
-//     ...clientRenderOpts,
-//   };
-// }
+export function modifyContextOpts(memo: any) {
+  // 每次应用 render 的时候会调 modifyClientRenderOpts，这时尝试从队列中取 render 的配置
+  const clientRenderOpts = contextOptsStack.shift();
+  return {
+    ...memo,
+    ...clientRenderOpts,
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-rc.9",
+  "version": "4.0.2",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -17,34 +17,34 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "build:deps": "umi-scripts bundleDeps",
+    "dev": "pnpm build --watch",
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.34.6",
-    "@umijs/bundler-utils": "4.0.0-rc.9",
+    "@ant-design/pro-layout": "^7.0.1-beta.20",
+    "@umijs/bundler-utils": "4.0.2",
     "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.26.1",
-    "babel-plugin-import": "^1.13.3",
-    "dayjs": "^1.11.0",
+    "axios": "^0.27.2",
+    "babel-plugin-import": "^1.13.5",
+    "dayjs": "^1.11.2",
     "dva-core": "^2.0.4",
     "dva-immer": "^1.0.0",
     "dva-loading": "^3.0.22",
     "event-emitter": "~0.3.5",
     "fast-deep-equal": "3.1.3",
     "lodash": "^4.17.21",
-    "moment": "^2.29.1",
-    "qiankun": "^2.6.3",
+    "moment": "^2.29.3",
+    "qiankun": "^2.7.0",
     "react-intl": "3.12.1",
-    "react-redux": "^7.2.6",
-    "redux": "^4.1.2",
+    "react-redux": "^8.0.2",
+    "redux": "^4.2.0",
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.9"
+    "umi": "4.0.2"
   },
   "publishConfig": {
     "access": "public"