@umijs/plugins 4.0.42 → 4.0.43

package/dist/unocss.js

@@ -31,9 +31,12 @@ var unocss_default = (api) => {
     key: "unocss",
     config: {
       schema(Joi) {
-        return Joi.alternatives().try(Joi.object({
-          watch: Joi.array()
-        }), Joi.boolean().invalid(true));
+        return Joi.alternatives().try(
+          Joi.object({
+            watch: Joi.array()
+          }),
+          Joi.boolean().invalid(true)
+        );
       }
     },
     enableBy: api.EnableBy.config
@@ -43,11 +46,16 @@ var unocss_default = (api) => {
     if (process.env.IS_UMI_BUILD_WORKER)
       return;
     if (!(0, import_fs.existsSync)((0, import_path.join)(api.paths.cwd, "unocss.config.ts")))
-      api.logger.warn("\u8BF7\u5728\u9879\u76EE\u76EE\u5F55\u4E2D\u6DFB\u52A0 unocss.config.ts \u6587\u4EF6\uFF0C\u5E76\u914D\u7F6E\u9700\u8981\u7684 unocss presets\uFF0C\u5426\u5219\u63D2\u4EF6\u5C06\u6CA1\u6709\u6548\u679C\uFF01");
+      api.logger.warn(
+        "请在项目目录中添加 unocss.config.ts 文件，并配置需要的 unocss presets，否则插件将没有效果！"
+      );
     const generatedPath = (0, import_path.join)(api.paths.absTmpPath, outputPath);
     const binPath = (0, import_path.join)(api.cwd, "node_modules/.bin/unocss");
     const watchDirs = api.config.unocss.watch;
-    const unocss = (0, import_child_process.exec)(`${binPath} ${watchDirs.join(" ")} --out-file ${generatedPath} ${api.env === "development" ? "--watch" : ""}`, { cwd: api.cwd });
+    const unocss = (0, import_child_process.exec)(
+      `${binPath} ${watchDirs.join(" ")} --out-file ${generatedPath} ${api.env === "development" ? "--watch" : ""}`,
+      { cwd: api.cwd }
+    );
     unocss.on("error", (m) => {
       api.logger.error("unocss service encounter an error: " + m);
     });

package/dist/utils/astUtils.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/utils/astUtils.ts

package/dist/utils/localeUtils.js

@@ -32,7 +32,9 @@ var import_plugin_utils = require("umi/plugin-utils");
 var getMomentLocale = (lang, country, resolveKey) => {
   var _a, _b;
   const momentLocation = require.resolve(`${resolveKey}/locale/zh-cn`).replace(/zh\-cn\.js$/, "");
-  if ((0, import_fs.existsSync)((0, import_path.join)(momentLocation, `${lang}-${(_a = country == null ? void 0 : country.toLocaleLowerCase) == null ? void 0 : _a.call(country)}.js`))) {
+  if ((0, import_fs.existsSync)(
+    (0, import_path.join)(momentLocation, `${lang}-${(_a = country == null ? void 0 : country.toLocaleLowerCase) == null ? void 0 : _a.call(country)}.js`)
+  )) {
     const momentLocale = `${lang}-${(_b = country == null ? void 0 : country.toLocaleLowerCase) == null ? void 0 : _b.call(country)}`;
     return {
       momentLocale
@@ -63,12 +65,16 @@ var getLocaleList = async (opts) => {
     addAntdLocales,
     resolveKey = "moment"
   } = opts;
-  const localeFileMath = new RegExp(`^([a-z]{2})${separator}?([A-Z]{2})?.(js|json|ts)$`);
+  const localeFileMath = new RegExp(
+    `^([a-z]{2})${separator}?([A-Z]{2})?.(js|json|ts)$`
+  );
   const localeFiles = import_plugin_utils.glob.sync("*.{ts,js,json}", {
     cwd: (0, import_plugin_utils.winPath)((0, import_path.join)(absSrcPath, localeFolder))
-  }).map((name) => (0, import_plugin_utils.winPath)((0, import_path.join)(absSrcPath, localeFolder, name))).concat(import_plugin_utils.glob.sync(`**/${localeFolder}/*.{ts,js,json}`, {
-    cwd: absPagesPath
-  }).map((name) => (0, import_plugin_utils.winPath)((0, import_path.join)(absPagesPath, name)))).filter((p) => localeFileMath.test((0, import_path.basename)(p)) && (0, import_fs.existsSync)(p)).map((fullName) => {
+  }).map((name) => (0, import_plugin_utils.winPath)((0, import_path.join)(absSrcPath, localeFolder, name))).concat(
+    import_plugin_utils.glob.sync(`**/${localeFolder}/*.{ts,js,json}`, {
+      cwd: absPagesPath
+    }).map((name) => (0, import_plugin_utils.winPath)((0, import_path.join)(absPagesPath, name)))
+  ).filter((p) => localeFileMath.test((0, import_path.basename)(p)) && (0, import_fs.existsSync)(p)).map((fullName) => {
     var _a, _b;
     const fileName = (0, import_path.basename)(fullName);
     const fileInfo = (_b = (_a = localeFileMath.exec(fileName)) == null ? void 0 : _a.slice(1, 3)) == null ? void 0 : _b.filter(Boolean);

package/dist/utils/modelUtils.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/utils/modelUtils.ts
@@ -40,7 +43,9 @@ function getNamespace(absFilePath, absSrcPath) {
   const parts = relPath.split("/");
   const dirs = parts.slice(0, -1);
   const file = parts[parts.length - 1];
-  const validDirs = dirs.filter((dir) => !["src", "pages", "models"].includes(dir));
+  const validDirs = dirs.filter(
+    (dir) => !["src", "pages", "models"].includes(dir)
+  );
   let normalizedFile = file;
   normalizedFile = (0, import_path.basename)(file, (0, import_path.extname)(file));
   if (normalizedFile.endsWith(".model")) {
@@ -113,15 +118,24 @@ var _ModelUtils = class {
       }),
       ...opts.extraModels
     ].map((file) => {
-      return new Model(file, this.api.paths.absSrcPath, opts.sort, this.count++);
+      return new Model(
+        file,
+        this.api.paths.absSrcPath,
+        opts.sort,
+        this.count++
+      );
     });
     const namespaces = models.map((model) => model.namespace);
     if (new Set(namespaces).size !== namespaces.length) {
-      throw new Error(`Duplicate namespace in models: ${namespaces.sort().join(", ")}`);
+      throw new Error(
+        `Duplicate namespace in models: ${namespaces.sort().join(", ")}`
+      );
     }
     if (opts.sort) {
       const namespaces2 = _ModelUtils.topologicalSort(models);
-      models.sort((a, b) => namespaces2.indexOf(a.namespace) - namespaces2.indexOf(b.namespace));
+      models.sort(
+        (a, b) => namespaces2.indexOf(a.namespace) - namespaces2.indexOf(b.namespace)
+      );
     }
     return models;
   }
@@ -170,16 +184,22 @@ var _ModelUtils = class {
     const imports = [];
     const modelProps = [];
     models.forEach((model) => {
-      const fileWithoutExt = (0, import_plugin_utils.winPath)((0, import_path.format)({
-        dir: (0, import_path.dirname)(model.file),
-        base: (0, import_path.basename)(model.file, (0, import_path.extname)(model.file))
-      }));
+      const fileWithoutExt = (0, import_plugin_utils.winPath)(
+        (0, import_path.format)({
+          dir: (0, import_path.dirname)(model.file),
+          base: (0, import_path.basename)(model.file, (0, import_path.extname)(model.file))
+        })
+      );
       if (model.exportName !== "default") {
-        imports.push(`import { ${model.exportName} as ${model.id} } from '${fileWithoutExt}';`);
+        imports.push(
+          `import { ${model.exportName} as ${model.id} } from '${fileWithoutExt}';`
+        );
       } else {
         imports.push(`import ${model.id} from '${fileWithoutExt}';`);
       }
-      modelProps.push(`${model.id}: { namespace: '${model.namespace}', model: ${model.id} },`);
+      modelProps.push(
+        `${model.id}: { namespace: '${model.namespace}', model: ${model.id} },`
+      );
     });
     return `
 ${imports.join("\n")}
@@ -234,7 +254,9 @@ ModelUtils.topologicalSort = (models) => {
   }
   const leftNodes = graph.filter(Boolean);
   if (leftNodes.length > 0) {
-    throw new Error(`Circle dependency detected in models: ${leftNodes.map((m) => import_plugin_utils.chalk.red(m.namespace)).join(", ")}`);
+    throw new Error(
+      `Circle dependency detected in models: ${leftNodes.map((m) => import_plugin_utils.chalk.red(m.namespace)).join(", ")}`
+    );
   }
   return queue;
 };

package/dist/utils/resolveProjectDep.js

@@ -27,9 +27,11 @@ var import_plugin_utils = require("umi/plugin-utils");
 function resolveProjectDep(opts) {
   var _a, _b;
   if (((_a = opts.pkg.dependencies) == null ? void 0 : _a[opts.dep]) || ((_b = opts.pkg.devDependencies) == null ? void 0 : _b[opts.dep])) {
-    return (0, import_path.dirname)(import_plugin_utils.resolve.sync(`${opts.dep}/package.json`, {
-      basedir: opts.cwd
-    }));
+    return (0, import_path.dirname)(
+      import_plugin_utils.resolve.sync(`${opts.dep}/package.json`, {
+        basedir: opts.cwd
+      })
+    );
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/utils/withTmpPath.js

@@ -25,7 +25,13 @@ module.exports = __toCommonJS(withTmpPath_exports);
 var import_path = require("path");
 var import_plugin_utils = require("umi/plugin-utils");
 function withTmpPath(opts) {
-  return (0, import_plugin_utils.winPath)((0, import_path.join)(opts.api.paths.absTmpPath, opts.api.plugin.key && !opts.noPluginDir ? `plugin-${opts.api.plugin.key}` : "", opts.path));
+  return (0, import_plugin_utils.winPath)(
+    (0, import_path.join)(
+      opts.api.paths.absTmpPath,
+      opts.api.plugin.key && !opts.noPluginDir ? `plugin-${opts.api.plugin.key}` : "",
+      opts.path
+    )
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/valtio.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/valtio.ts
@@ -37,7 +40,9 @@ var valtio_default = (api) => {
     },
     enableBy: api.EnableBy.config
   });
-  const libPath = (0, import_utils.winPath)((0, import_path.dirname)(require.resolve("@umijs/valtio/package.json")));
+  const libPath = (0, import_utils.winPath)(
+    (0, import_path.dirname)(require.resolve("@umijs/valtio/package.json"))
+  );
   api.onGenerateFiles(() => {
     api.writeTmpFile({
       path: "index.ts",

package/libs/qiankun/master/MicroApp.tsx

@@ -163,6 +163,12 @@ export const MicroApp = forwardRef(
             ...propsFromConfig,
             ...stateForSlave,
             ...propsFromParams,
+            __globalRoutesInfo: {
+              appNameKeyAlias,
+              masterHistoryType,
+              base: globalSettings.base,
+              microAppRoutes: globalSettings.microAppRoutes,
+            },
             setLoading,
           },
         },
@@ -225,6 +231,12 @@ export const MicroApp = forwardRef(
                 ...propsFromConfig,
                 ...stateForSlave,
                 ...propsFromParams,
+                __globalRoutesInfo: {
+                  appNameKeyAlias,
+                  masterHistoryType,
+                  base: globalSettings.base,
+                  microAppRoutes: globalSettings.microAppRoutes,
+                },
                 setLoading,
               };
 

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -8,6 +8,7 @@ import { insertRoute, noop, patchMicroAppRoute } from './common';
 import { getMicroAppRouteComponent } from './getMicroAppRouteComponent';
 import { getMasterOptions, setMasterOptions } from './masterOptions';
 import { MasterOptions, MicroAppRoute } from './types';
+import { deepFilterLeafRoutes } from './routeUtils';
 
 let microAppRuntimeRoutes: MicroAppRoute[];
 
@@ -137,6 +138,15 @@ export async function render(oldRender: typeof noop) {
 }
 
 export function patchClientRoutes({ routes }: { routes: any[] }) {
+  const microAppRoutes = [].concat(
+    deepFilterLeafRoutes(routes),
+    deepFilterLeafRoutes(microAppRuntimeRoutes),
+  );
+  // 微应用的 routes 存到 masterOptions.microAppRoutes 下以供 MicroAppLink 使用
+  const masterOptions = getMasterOptions();
+  masterOptions.microAppRoutes = microAppRoutes;
+  setMasterOptions(masterOptions);
+
   if (microAppRuntimeRoutes) {
     patchMicroAppRouteComponent(routes);
   }

package/libs/qiankun/master/routeUtils.ts

@@ -0,0 +1,26 @@
+interface Route extends Record<string, any> {
+  children: Route[];
+  microApp?: string;
+}
+
+export function deepFilterLeafRoutes(routeTree: Route[]) {
+  if (!routeTree?.length) {
+    return [];
+  }
+
+  const leafRoutes: Route[] = [];
+
+  const findLeafRoutes = (routes: Route[]) => {
+    for (let i = 0; i < routes.length; i++) {
+      const r = routes[i];
+      if (r.children) {
+        findLeafRoutes(r.children);
+      }
+      leafRoutes.push(r);
+    }
+  };
+
+  findLeafRoutes(routeTree);
+
+  return leafRoutes.filter((r) => r.microApp);
+}

package/libs/qiankun/slave/MicroAppLink.tsx

@@ -0,0 +1,122 @@
+// @ts-nocheck
+/* eslint-disable */
+__USE_MODEL__;
+import React, {
+  forwardRef,
+  FC,
+  useImperativeHandle,
+  useRef,
+  MouseEvent,
+  HTMLAttributes,
+  useCallback,
+} from 'react';
+import noop from 'lodash/noop';
+import find from 'lodash/find';
+import {
+  qiankunStateFromMasterModelNamespace,
+  defaultHistoryType,
+} from './constants';
+
+const COMPONENT_NAME = 'qiankun-microapp-link';
+
+interface MicroAppLinkProps {
+  // 应用名称
+  name?: string;
+
+  // 相对路由，不包含应用前缀，以为 `/` 开头
+  to: string;
+
+  // 是否主应用下的路由，默认false
+  isMaster?: boolean;
+}
+
+const urlFactory =
+  (base: string, routes: Record<string, any>[]) =>
+  ({ name, to, isMaster }: MicroAppLinkProps) => {
+    if (isMaster) {
+      return to;
+    }
+
+    if (!to?.startsWith('/')) {
+      throw new Error(`[${COMPONENT_NAME}] props "to" should start with "/"`);
+    }
+
+    const app = find(routes, ({ microApp }) => microApp === name);
+    if (!app) {
+      console.error(`[${COMPONENT_NAME}] microapp "${name}" is not found`);
+      return to;
+    }
+
+    const prefix =
+      base === '/'
+        ? app.path.replace('/*', '')
+        : `${base}${app.path.replace('/*', '')}`;
+    return `${prefix}${to}`;
+  };
+
+export const MicroAppLink: FC<
+  MicroAppLinkProps & HTMLAttributes<HTMLAnchorElement>
+> = forwardRef((props, ref) => {
+  const { children, name, to, isMaster = false, ...anchorProps } = props;
+  const stateFromMaster = (useModel || noop)(
+    qiankunStateFromMasterModelNamespace,
+  );
+  const linkRef = useRef<HTMLAnchorElement>();
+
+  const {
+    masterHistoryType,
+    microAppRoutes,
+    base,
+    appNameKeyAlias = 'name',
+  } = stateFromMaster?.__globalRoutesInfo || {};
+  // ref: https://github.com/umijs/plugins/pull/866 基于 name 或 appNameKeyAlias 取到 appName 的逻辑
+  const appName =
+    name && props[appNameKeyAlias] ? name : props[appNameKeyAlias] || name;
+
+  const linkProps = { name: appName, to, isMaster };
+  const createHerf = urlFactory(base, microAppRoutes);
+
+  const linkUrl =
+    masterHistoryType === 'browser'
+      ? createHerf(linkProps)
+      : `#${createHerf(linkProps)}`;
+
+  useImperativeHandle(ref, () => linkRef.current);
+
+  const handleClick = useCallback(
+    (e: MouseEvent<HTMLAnchorElement>) => {
+      if (anchorProps.onClick) {
+        return anchorProps.onClick(e);
+      }
+
+      // hash路由 使用 a标签 默认行为
+      if (masterHistoryType === 'hash') {
+        return;
+      }
+
+      if (masterHistoryType === 'browser') {
+        e?.stopPropagation();
+        e?.preventDefault();
+        return window.history.pushState({}, '', linkUrl);
+      }
+
+      console.error(
+        `[${COMPONENT_NAME}] not support "masterHistoryType = '${masterHistoryType}'"`,
+      );
+      return;
+    },
+    [anchorProps.onClick, masterHistoryType],
+  );
+
+  return (
+    <a
+      {...anchorProps}
+      ref={linkRef}
+      className={`${COMPONENT_NAME} ${anchorProps.className}`}
+      href={linkUrl}
+      onClick={handleClick}
+    >
+      {children}
+    </a>
+  );
+});

package/libs/qiankun/slave/constants.ts

@@ -0,0 +1,5 @@
+// @ts-nocheck
+/* eslint-disable */
+
+export const defaultHistoryType = 'browser';
+export const qiankunStateFromMasterModelNamespace = '@@qiankunStateFromMaster';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.42",
+  "version": "4.0.43",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,12 +27,14 @@
     "@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.42",
+    "@tanstack/react-query": "^4.22.0",
+    "@tanstack/react-query-devtools": "^4.22.0",
+    "@umijs/bundler-utils": "4.0.43",
     "@umijs/valtio": "^1.0.2",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
-    "babel-plugin-import": "^1.13.5",
-    "dayjs": "^1.11.2",
+    "babel-plugin-import": "^1.13.6",
+    "dayjs": "^1.11.7",
     "dva-core": "^2.0.4",
     "dva-immer": "^1.0.0",
     "dva-loading": "^3.0.22",
@@ -40,17 +42,18 @@
     "fast-deep-equal": "3.1.3",
     "intl": "1.2.5",
     "lodash": "^4.17.21",
-    "moment": "^2.29.3",
-    "qiankun": "^2.7.0",
+    "moment": "^2.29.4",
+    "qiankun": "^2.8.4",
     "react-intl": "3.12.1",
-    "react-redux": "^8.0.2",
+    "react-redux": "^8.0.5",
     "redux": "^4.2.0",
-    "styled-components": "6.0.0-beta.6",
+    "styled-components": "^5.3.6",
+    "tslib": "^2",
     "warning": "^4.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.42"
+    "umi": "4.0.43"
   },
   "publishConfig": {
     "access": "public"

package/dist/icons.js

@@ -1,29 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/icons.ts
-var icons_exports = {};
-__export(icons_exports, {
-  default: () => icons_default
-});
-module.exports = __toCommonJS(icons_exports);
-var icons_default = (api) => {
-  api;
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});