@umijs/plugins 4.0.79 → 4.0.80

package/dist/qiankun/master.js

@@ -48,14 +48,14 @@ function isMasterEnable(opts) {
   }
   return !!process.env.INITIAL_QIANKUN_MASTER_OPTIONS;
 }
-function getCustomLoader(api) {
+function getDefaultMicroAppProps(api, key) {
   var _a, _b, _c;
-  const loader = (_b = (_a = api.config.qiankun) == null ? void 0 : _a.master) == null ? void 0 : _b.loader;
+  const microAppProps = (_b = (_a = api.config.qiankun) == null ? void 0 : _a.master) == null ? void 0 : _b[key];
   (0, import_assert.default)(
-    !loader || ((_c = loader.startsWith) == null ? void 0 : _c.call(loader, "@/")),
-    "[@umijs/plugin-qiankun]: loader only support root path, eg: @/loading"
+    !microAppProps || ((_c = microAppProps.startsWith) == null ? void 0 : _c.call(microAppProps, "@/")),
+    `[@umijs/plugin-qiankun]: ${key} only support src path, eg: @/${key}`
   );
-  return loader;
+  return microAppProps;
 }
 var master_default = (api) => {
   api.describe({
@@ -144,14 +144,31 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
     });
     api.writeTmpFile({
       path: "MicroAppLoader.tsx",
-      content: getCustomLoader(api) ? (
-        // 用户自定义的 loading 优先级最高
-        `export { default } from '${getCustomLoader(api)}';`
-      ) : api.isPluginEnable("antd") ? getFileContent("AntdLoader.tsx") : (
+      content: api.isPluginEnable("antd") ? getFileContent("AntdLoader.tsx") : (
         // 开启了 antd 插件的时候，使用 antd 的 loader 组件，否则提示用户必须设置一个自定义的 loader 组件
         `export default function Loader() { console.warn(\`[plugins/qiankun]: Seems like you'r not using @umijs/plugin-antd, you need to provide a custom loader or set autoSetLoading false to shut down this warning!\`); return null; }`
       )
     });
+    api.writeTmpFile({
+      path: "defaultErrorBoundary.tsx",
+      content: getDefaultMicroAppProps(api, "defaultErrorBoundary") ? `export { default } from '${getDefaultMicroAppProps(
+        api,
+        "defaultErrorBoundary"
+      )}';` : (
+        // 返回 null
+        `export default null;`
+      )
+    });
+    api.writeTmpFile({
+      path: "defaultLoader.tsx",
+      content: getDefaultMicroAppProps(api, "defaultLoader") ? `export { default } from '${getDefaultMicroAppProps(
+        api,
+        "defaultLoader"
+      )}';` : (
+        // 返回 null
+        `export default null;`
+      )
+    });
     [
       "common.ts",
       "constants.ts",

package/dist/tailwindcss.js

@@ -104,5 +104,3 @@ function getTailwindBinPath(opts) {
   const tailwindPath = require(pkgPath).bin["tailwind"];
   return (0, import_path.join)((0, import_path.dirname)(pkgPath), tailwindPath);
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/libs/qiankun/master/MicroApp.tsx

@@ -2,8 +2,8 @@
 /* eslint-disable */
 __USE_MODEL__;
 import concat from 'lodash/concat';
-import mergeWith from 'lodash/mergeWith';
 import isEqual from 'lodash/isEqual';
+import mergeWith from 'lodash/mergeWith';
 import noop from 'lodash/noop';
 import {
   FrameworkConfiguration,
@@ -20,6 +20,8 @@ import React, {
   useState,
 } from 'react';
 import { qiankunStateForSlaveModelNamespace } from './constants';
+import defaultErrorBoundary from './defaultErrorBoundary';
+import defaultLoader from './defaultLoader';
 import { ErrorBoundary } from './ErrorBoundary';
 import { getMasterOptions } from './masterOptions';
 import MicroAppLoader from './MicroAppLoader';
@@ -117,6 +119,7 @@ export const MicroApp = forwardRef(
     // 未配置自定义 errorBoundary 且开启了 autoCaptureError 场景下，使用插件默认的 errorBoundary，否则使用自定义 errorBoundary
     const microAppErrorBoundary =
       errorBoundary ||
+      defaultErrorBoundary ||
       (propsFromParams.autoCaptureError
         ? (e) => <ErrorBoundary error={e} />
         : null);
@@ -144,8 +147,12 @@ export const MicroApp = forwardRef(
       if (!appConfig) {
         setComponentError(
           new Error(
-            `[@umijs/plugin-qiankun]: Can not find the configuration of ${name} app! Currently, only the following apps are configured:\n${JSON.stringify(apps, null, 2)}`
-          )
+            `[@umijs/plugin-qiankun]: Can not find the configuration of ${name} app! Currently, only the following apps are configured:\n${JSON.stringify(
+              apps,
+              null,
+              2,
+            )}`,
+          ),
         );
       }
       return noop;
@@ -155,7 +162,10 @@ export const MicroApp = forwardRef(
     const stateForSlave = (useModel || noop)(
       qiankunStateForSlaveModelNamespace,
     );
-    const { entry, props: { settings: settingsFromConfig = {}, ...propsFromConfig } = {} } = appConfig || {};
+    const {
+      entry,
+      props: { settings: settingsFromConfig = {}, ...propsFromConfig } = {},
+    } = appConfig || {};
 
     useEffect(() => {
       setComponentError(null);
@@ -245,7 +255,9 @@ export const MicroApp = forwardRef(
           // 确保 microApp.update 调用是跟组件状态变更顺序一致的，且后一个微应用更新必须等待前一个更新完成
           microApp._updatingPromise = microApp._updatingPromise.then(() => {
             const canUpdate = (microApp?: MicroAppType) =>
-              microApp?.update && microApp.getStatus() === 'MOUNTED' && !microApp._unmounting;
+              microApp?.update &&
+              microApp.getStatus() === 'MOUNTED' &&
+              !microApp._unmounting;
             if (canUpdate(microApp)) {
               const props = {
                 ...propsFromConfig,
@@ -285,6 +297,7 @@ export const MicroApp = forwardRef(
     // 未配置自定义 loader 且开启了 autoSetLoading 场景下，使用插件默认的 loader，否则使用自定义 loader
     const microAppLoader =
       loader ||
+      defaultLoader ||
       (propsFromParams.autoSetLoading
         ? (loading) => <MicroAppLoader loading={loading} />
         : null);

package/libs/qiankun/master/types.ts

@@ -24,7 +24,6 @@ export type MicroAppRoute = {
 
 export type MasterOptions = {
   enable?: boolean;
-  loader?: string;
   apps?: App[];
   routes?: MicroAppRoute[];
   lifeCycles?: FrameworkLifeCycles<object>;
@@ -38,6 +37,10 @@ export type MasterOptions = {
   appNameKeyAlias?: string;
   // 预加载应用阈值
   prefetchThreshold?: number;
+  // 子应用默认的错误捕获组件，值为文件路径
+  defaultErrorBoundary?: string;
+  // 子应用默认的加载动画，值为文件路径
+  defaultLoader?: string;
 } & FrameworkConfiguration;
 
 export type SlaveOptions = {

package/libs/qiankun/slave/lifecycles.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { getPluginManager } from '@@/core/plugin';
 import ReactDOM from 'react-dom';
-import { ApplyPluginsType, __getRoot, history } from 'umi';
+import { ApplyPluginsType, history, __getRoot } from 'umi';
 import { setModelState } from './qiankunModel';
 
 const noop = () => {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.79",
+  "version": "4.0.80",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -44,12 +44,12 @@
     "styled-components": "6.0.0-rc.0",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.0.79",
+    "@umijs/bundler-utils": "4.0.80",
     "@umijs/valtio": "1.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.79"
+    "umi": "4.0.80"
   },
   "publishConfig": {
     "access": "public"