@umijs/plugins 4.0.74 → 4.0.75

package/dist/qiankun/master.js

@@ -33,6 +33,7 @@ __export(master_exports, {
   isMasterEnable: () => isMasterEnable
 });
 module.exports = __toCommonJS(master_exports);
+var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
 var import_path = require("path");
 var import_umi = require("umi");
@@ -47,6 +48,15 @@ function isMasterEnable(opts) {
   }
   return !!process.env.INITIAL_QIANKUN_MASTER_OPTIONS;
 }
+function getCustomLoader(api) {
+  var _a, _b, _c;
+  const loader = (_b = (_a = api.config.qiankun) == null ? void 0 : _a.master) == null ? void 0 : _b.loader;
+  (0, import_assert.default)(
+    !loader || ((_c = loader.startsWith) == null ? void 0 : _c.call(loader, "@/")),
+    "[@umijs/plugin-qiankun]: loader only support root path, eg: @/loading"
+  );
+  return loader;
+}
 var master_default = (api) => {
   api.describe({
     key: "qiankun-master",
@@ -134,8 +144,13 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
     });
     api.writeTmpFile({
       path: "MicroAppLoader.tsx",
-      // 开启了 antd 插件的时候，使用 antd 的 loader 组件，否则提示用户必须设置一个自定义的 loader 组件
-      content: api.isPluginEnable("antd") ? getFileContent("AntdLoader.tsx") : `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; }`
+      content: getCustomLoader(api) ? (
+        // 用户自定义的 loading 优先级最高
+        `export { default } from '${getCustomLoader(api)}';`
+      ) : 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; }`
+      )
     });
     [
       "common.ts",

package/libs/qiankun/master/types.ts

@@ -24,6 +24,7 @@ export type MicroAppRoute = {
 
 export type MasterOptions = {
   enable?: boolean;
+  loader?: string;
   apps?: App[];
   routes?: MicroAppRoute[];
   lifeCycles?: FrameworkLifeCycles<object>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.74",
+  "version": "4.0.75",
   "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/valtio": "1.0.3",
-    "@umijs/bundler-utils": "4.0.74"
+    "@umijs/bundler-utils": "4.0.75",
+    "@umijs/valtio": "1.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.74"
+    "umi": "4.0.75"
   },
   "publishConfig": {
     "access": "public"