@umijs/plugins 4.0.0-rc.2 → 4.0.0-rc.20

package/dist/utils/modelUtils.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -25,13 +29,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelUtils = exports.Model = void 0;
 const parser = __importStar(require("@umijs/bundler-utils/compiled/babel/parser"));
 const traverse_1 = __importDefault(require("@umijs/bundler-utils/compiled/babel/traverse"));
+const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
 const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
-const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 const astUtils_1 = require("./astUtils");
 class Model {
-    constructor(file, id) {
+    constructor(file, sort, id) {
         let namespace;
         let exportName;
         const [_file, meta] = file.split('#');
@@ -44,6 +49,36 @@ class Model {
         this.id = `model_${id}`;
         this.namespace = namespace || (0, path_1.basename)(file, (0, path_1.extname)(file));
         this.exportName = exportName || 'default';
+        this.deps = sort ? this.findDeps(sort) : [];
+    }
+    findDeps(sort) {
+        const content = (0, fs_1.readFileSync)(this.file, 'utf-8');
+        // transform with esbuild first
+        // to reduce unexpected ast problem
+        const loader = (0, path_1.extname)(this.file).slice(1);
+        const result = (0, esbuild_1.transformSync)(content, {
+            loader,
+            sourcemap: false,
+            minify: false,
+        });
+        // transform with babel
+        const deps = new Set();
+        const ast = parser.parse(result.code, {
+            sourceType: 'module',
+            sourceFilename: this.file,
+            plugins: [],
+        });
+        // TODO: use sort
+        sort;
+        (0, traverse_1.default)(ast, {
+            CallExpression: (path) => {
+                if (t.isIdentifier(path.node.callee, { name: 'useModel' }) &&
+                    t.isStringLiteral(path.node.arguments[0])) {
+                    deps.add(path.node.arguments[0].value);
+                }
+            },
+        });
+        return [...deps];
     }
 }
 exports.Model = Model;
@@ -57,7 +92,7 @@ class ModelUtils {
     getAllModels(opts) {
         // reset count
         this.count = 1;
-        return [
+        const models = [
             ...this.getModels({
                 base: (0, path_1.join)(this.api.paths.absSrcPath, 'models'),
                 pattern: '**/*.{ts,tsx,js,jsx}',
@@ -72,16 +107,67 @@ class ModelUtils {
             }),
             ...opts.extraModels,
         ].map((file) => {
-            return new Model(file, this.count++);
+            return new Model(file, opts.sort, this.count++);
+        });
+        // check duplicate
+        const namespaces = models.map((model) => model.namespace);
+        if (new Set(namespaces).size !== namespaces.length) {
+            throw new Error(`Duplicate namespace in models: ${namespaces.join(', ')}`);
+        }
+        // sort models by deps
+        if (opts.sort) {
+            const namespaces = this.getSortedNamespaces(models);
+            models.sort((a, b) => namespaces.indexOf(a.namespace) - namespaces.indexOf(b.namespace));
+        }
+        return models;
+    }
+    getSortedNamespaces(models) {
+        let final = [];
+        models.forEach((model, index) => {
+            const { deps, namespace } = model;
+            if (deps && deps.length) {
+                const itemGroup = [...deps, namespace];
+                const cannotUse = [namespace];
+                for (let i = 0; i <= index; i += 1) {
+                    if (models[i].deps.filter((v) => cannotUse.includes(v)).length) {
+                        if (!cannotUse.includes(models[i].namespace)) {
+                            cannotUse.push(models[i].namespace);
+                            i = -1;
+                        }
+                    }
+                }
+                const errorList = deps.filter((v) => cannotUse.includes(v));
+                if (errorList.length) {
+                    throw Error(`Circular dependencies: ${namespace} can't use ${errorList.join(', ')}`);
+                }
+                const intersection = final.filter((v) => itemGroup.includes(v));
+                if (intersection.length) {
+                    // first intersection
+                    const finalIndex = final.indexOf(intersection[0]);
+                    // replace with groupItem
+                    final = final
+                        .slice(0, finalIndex)
+                        .concat(itemGroup)
+                        .concat(final.slice(finalIndex + 1));
+                }
+                else {
+                    final.push(...itemGroup);
+                }
+            }
+            if (!final.includes(namespace)) {
+                // first occurrence append to the end
+                final.push(namespace);
+            }
         });
+        return [...new Set(final)];
     }
     getModels(opts) {
-        return utils_1.glob
+        return plugin_utils_1.glob
             .sync(opts.pattern || '**/*.{ts,js}', {
             cwd: opts.base,
             absolute: true,
         })
-            .map(utils_1.winPath)
+            .map(plugin_utils_1.winPath)
             .filter((file) => {
             if (/\.d.ts$/.test(file))
                 return false;

package/dist/utils/withTmpPath.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withTmpPath = void 0;
-const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
+const plugin_utils_1 = require("umi/plugin-utils");
 function withTmpPath(opts) {
-    return (0, utils_1.winPath)((0, path_1.join)(opts.api.paths.absTmpPath, opts.api.plugin.key && !opts.noPluginDir
+    return (0, plugin_utils_1.winPath)((0, path_1.join)(opts.api.paths.absTmpPath, opts.api.plugin.key && !opts.noPluginDir
         ? `plugin-${opts.api.plugin.key}`
         : '', opts.path));
 }

package/libs/locale/localeExports.tpl

@@ -163,9 +163,9 @@ export const getLocale = () => {
   // please clear localStorage if you change the baseSeparator config
   // because changing will break the app
   const lang =
-    typeof localStorage !== 'undefined' && useLocalStorage
-      ? window.localStorage.getItem('umi_locale')
-      : '';
+      navigator.cookieEnabled && typeof localStorage !== 'undefined' && useLocalStorage
+        ? window.localStorage.getItem('umi_locale')
+        : '';
   // support baseNavigator, default true
   let browserLang;
   {{#BaseNavigator}}
@@ -207,9 +207,9 @@ export const setLocale = (lang: string, realReload: boolean = true) => {
 
   const updater = () => {
     if (getLocale() !== lang) {
-      if (typeof window.localStorage !== 'undefined' && useLocalStorage) {
-        window.localStorage.setItem('umi_locale', lang || '');
-      }
+       if (navigator.cookieEnabled && typeof window.localStorage !== 'undefined' && useLocalStorage) {
+          window.localStorage.setItem('umi_locale', lang || '');
+       }
       setIntl(lang);
       if (realReload) {
         window.location.reload();

package/libs/qiankun/master/MicroApp.tsx

@@ -139,6 +139,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,

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) {
         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/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.2",
+  "version": "4.0.0-rc.20",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -17,32 +17,34 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
-    "dev": "pnpm build -- --watch"
+    "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.32.14",
-    "@umijs/bundler-utils": "4.0.0-rc.2",
-    "antd": "^4.18.7",
+    "@ant-design/pro-layout": "^6.38.0",
+    "@umijs/bundler-utils": "4.0.0-rc.20",
     "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.26.0",
+    "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.3",
-    "dayjs": "^1.10.7",
+    "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.1",
+    "redux": "^4.2.0",
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.2"
+    "umi": "4.0.0-rc.20"
   },
   "publishConfig": {
     "access": "public"