@umijs/plugins 4.0.8 → 4.0.11

package/dist/access.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// access.ts
+// src/access.ts
 var access_exports = {};
 __export(access_exports, {
   default: () => access_default
@@ -31,8 +31,8 @@ var import_withTmpPath = require("./utils/withTmpPath");
 var access_default = (api) => {
   api.describe({
     config: {
-      schema(joi) {
-        return joi.object();
+      schema(Joi) {
+        return Joi.alternatives().try(Joi.object(), Joi.boolean().invalid(true));
       }
     },
     enableBy: api.EnableBy.config

package/dist/analytics.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// analytics.ts
+// src/analytics.ts
 var analytics_exports = {};
 __export(analytics_exports, {
   default: () => analytics_default
@@ -30,8 +30,8 @@ var analytics_default = (api) => {
   api.describe({
     key: "analytics",
     config: {
-      schema(joi) {
-        return joi.object();
+      schema(Joi) {
+        return Joi.alternatives().try(Joi.object(), Joi.boolean().invalid(true));
       },
       onChange: api.ConfigChangeType.reload
     },

package/dist/antd.js

@@ -33,7 +33,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// antd.ts
+// src/antd.ts
 var antd_exports = {};
 __export(antd_exports, {
   default: () => antd_default
@@ -56,13 +56,13 @@ var antd_default = (api) => {
   api.describe({
     config: {
       schema(Joi) {
-        return Joi.object({
+        return Joi.alternatives().try(Joi.object({
           configProvider: Joi.object(),
           dark: Joi.boolean(),
           compact: Joi.boolean(),
           import: Joi.boolean(),
           style: Joi.string().allow("less", "css")
-        });
+        }), Joi.boolean().invalid(true));
       }
     },
     enableBy({ userConfig }) {
@@ -85,10 +85,10 @@ var antd_default = (api) => {
   });
   api.modifyConfig((memo) => {
     checkPkgPath();
-    const antd = memo.antd || {};
+    let antd = memo.antd || {};
     if (process.env.UMI_PLUGIN_ANTD_ENABLE) {
       const { defaultConfig } = JSON.parse(process.env.UMI_PLUGIN_ANTD_ENABLE);
-      Object.assign(antd, defaultConfig);
+      antd = Object.assign(defaultConfig, antd);
     }
     memo.alias.antd = pkgPath;
     if (antd.dayjs) {

package/dist/dva.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// dva.ts
+// src/dva.ts
 var dva_exports = {};
 __export(dva_exports, {
   default: () => dva_default,
@@ -30,6 +30,7 @@ module.exports = __toCommonJS(dva_exports);
 var t = __toESM(require("@umijs/bundler-utils/compiled/babel/types"));
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_modelUtils = require("./utils/modelUtils");
 var import_withTmpPath = require("./utils/withTmpPath");
@@ -38,10 +39,10 @@ var dva_default = (api) => {
   api.describe({
     config: {
       schema(Joi) {
-        return Joi.object({
+        return Joi.alternatives().try(Joi.object({
           extraModels: Joi.array().items(Joi.string()),
           immer: Joi.object()
-        });
+        }), Joi.boolean().invalid(true));
       }
     },
     enableBy: api.EnableBy.config
@@ -65,6 +66,28 @@ var dva_default = (api) => {
       path: "models.ts",
       content: import_modelUtils.ModelUtils.getModelsContent(models)
     });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+export interface IRuntimeConfig {
+  dva?: {
+    config?: {
+        initialState?: Record<string, any>;
+        onError?: any;
+        onStateChange?: any;
+        onAction?: any;
+        onHmr?: any;
+        onReducer?: any;
+        onEffect?: any;
+        extraReducers?: any;
+        extraEnhancers?: any;
+        [key: string]: any;
+    },
+    plugins?: string[];
+  }
+}
+      `
+    });
     api.writeTmpFile({
       path: "dva.tsx",
       tpl: `

package/dist/icons.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// icons.ts
+// src/icons.ts
 var icons_exports = {};
 __export(icons_exports, {
   default: () => icons_default

package/dist/initial-state.js

@@ -16,20 +16,21 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// initial-state.ts
+// src/initial-state.ts
 var initial_state_exports = {};
 __export(initial_state_exports, {
   default: () => initial_state_default
 });
 module.exports = __toCommonJS(initial_state_exports);
+var import_umi = require("umi");
 var import_withTmpPath = require("./utils/withTmpPath");
 var initial_state_default = (api) => {
   api.describe({
     config: {
       schema(Joi) {
-        return Joi.object({
+        return Joi.alternatives().try(Joi.object({
           loading: Joi.string()
-        });
+        }), Joi.boolean().invalid(true));
       }
     },
     enableBy: api.EnableBy.config
@@ -132,6 +133,14 @@ import React from 'react';
 import Provider from './Provider';
 export function dataflowProvider(container) {
   return <Provider>{ container }</Provider>;
+}
+      `
+    });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+export interface IRuntimeConfig {
+  getInitialState?: () => Promise<Record<string, any>>
 }
       `
     });

package/dist/layout.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// layout.ts
+// src/layout.ts
 var layout_exports = {};
 __export(layout_exports, {
   default: () => layout_default
@@ -28,14 +28,15 @@ module.exports = __toCommonJS(layout_exports);
 var allIcons = __toESM(require("@ant-design/icons"));
 var import_fs = require("fs");
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_withTmpPath = require("./utils/withTmpPath");
 var layout_default = (api) => {
   api.describe({
     key: "layout",
     config: {
-      schema(joi) {
-        return joi.object();
+      schema(Joi) {
+        return Joi.alternatives().try(Joi.object(), Joi.boolean().invalid(true));
       },
       onChange: api.ConfigChangeType.regenerateTmpFiles
     },
@@ -247,20 +248,49 @@ const { formatMessage } = useIntl();
     api.writeTmpFile({
       path: "types.d.ts",
       content: `
-    import type { ProLayoutProps } from "${pkgPath || "@ant-design/pro-layout"}";
+    import type { ProLayoutProps, HeaderProps } from "${pkgPath || "@ant-design/pro-layout"}";
     ${hasInitialStatePlugin ? `import type InitialStateType from '@@/plugin-initialState/@@initialState';
            type InitDataType = ReturnType<typeof InitialStateType>;
         ` : "type InitDataType = any;"}
 
-    export type RunTimeLayoutConfig = (
-      initData: InitDataType,
-    ) => ProLayoutProps & {
-      childrenRender?: (dom: JSX.Element, props: ProLayoutProps) => React.ReactNode,
-      unAccessible?: JSX.Element,
-      noFound?: JSX.Element,
+    import { IConfigFromPlugins } from '@@/core/pluginConfig';
+
+    export type RunTimeLayoutConfig = (initData: InitDataType) => Omit<
+      ProLayoutProps,
+      'rightContentRender'
+    > & {
+      childrenRender?: (dom: JSX.Element, props: ProLayoutProps) => React.ReactNode;
+      unAccessible?: JSX.Element;
+      noFound?: JSX.Element;
+      logout?: (initialState: InitDataType['initialState']) => Promise<void> | void;
+      rightContentRender?: (
+        headerProps: HeaderProps,
+        dom: JSX.Element,
+        props: {
+          userConfig: IConfigFromPlugins['layout'];
+          runtimeConfig: RunTimeLayoutConfig;
+          loading: InitDataType['loading'];
+          initialState: InitDataType['initialState'];
+          setInitialState: InitDataType['setInitialState'];
+        },
+      ) => JSX.Element;
+      rightRender?: (
+        initialState: InitDataType['initialState'],
+        setInitialState: InitDataType['setInitialState'],
+        runtimeConfig: RunTimeLayoutConfig,
+      ) => JSX.Element;
     };
     `
     });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+import type { RunTimeLayoutConfig } from './types.d';
+export interface IRuntimeConfig {
+  layout?: RunTimeLayoutConfig
+}
+      `
+    });
     const iconsMap = Object.keys(api.appData.routes).reduce((memo, id) => {
       const { icon } = api.appData.routes[id];
       if (icon) {
@@ -560,11 +590,13 @@ const Exception: React.FC<{
   route?: IRoute;
   notFound?: React.ReactNode;
   noAccessible?: React.ReactNode;
+  unAccessible?: React.ReactNode;
+  noFound?: React.ReactNode;
 }> = (props) => (
   // render custom 404
-  (!props.route && props.notFound) ||
+  (!props.route && (props.noFound || props.notFound)) ||
   // render custom 403
-  (props.route.unaccessible && props.noAccessible) ||
+  (props.route.unaccessible && (props.unAccessible || props.noAccessible)) ||
   // render default exception
   ((!props.route || props.route.unaccessible) && (
     <Result

package/dist/locale.js

@@ -36,7 +36,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// locale.ts
+// src/locale.ts
 var locale_exports = {};
 __export(locale_exports, {
   default: () => locale_default,
@@ -65,15 +65,15 @@ var locale_default = (api) => {
   api.describe({
     key: "locale",
     config: {
-      schema(joi) {
-        return joi.object({
-          default: joi.string(),
-          useLocalStorage: joi.boolean(),
-          baseNavigator: joi.boolean(),
-          title: joi.boolean(),
-          antd: joi.boolean(),
-          baseSeparator: joi.string()
-        });
+      schema(Joi) {
+        return Joi.alternatives().try(Joi.object({
+          default: Joi.string(),
+          useLocalStorage: Joi.boolean(),
+          baseNavigator: Joi.boolean(),
+          title: Joi.boolean(),
+          antd: Joi.boolean(),
+          baseSeparator: Joi.string()
+        }), Joi.boolean().invalid(true));
       }
     },
     enableBy: api.EnableBy.config
@@ -202,8 +202,8 @@ var locale_default = (api) => {
     api.writeTmpFile({
       path: "index.ts",
       content: `
-export { addLocale, setLocale, getLocale, getIntl, useIntl, injectIntl, formatMessage, FormattedMessage, getAllLocales } from './localeExports.ts';
-export { SelectLang } from './SelectLang.tsx';
+export { addLocale, setLocale, getLocale, getIntl, useIntl, injectIntl, formatMessage, FormattedMessage, getAllLocales, FormattedDate, FormattedDateParts, FormattedDisplayName, FormattedHTMLMessage, FormattedList, FormattedNumber, FormattedNumberParts, FormattedPlural, FormattedRelativeTime, FormattedTime, FormattedTimeParts, IntlProvider, RawIntlProvider } from './localeExports';
+export { SelectLang } from './SelectLang';
 `
     });
   });

package/dist/mf.d.ts

@@ -0,0 +1,2 @@
+import type { IApi } from 'umi';
+export default function mf(api: IApi): void;

package/dist/mf.js

@@ -0,0 +1,197 @@
+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/mf.ts
+var mf_exports = {};
+__export(mf_exports, {
+  default: () => mf
+});
+module.exports = __toCommonJS(mf_exports);
+var import_fs = require("fs");
+var import_path = require("path");
+var import_plugin_utils = require("umi/plugin-utils");
+var { isEmpty } = import_plugin_utils.lodash;
+var mfSetupPathFileName = "_mf_setup-public-path.js";
+var mfAsyncEntryFileName = "asyncEntry.ts";
+function mf(api) {
+  api.describe({
+    key: "mf",
+    config: {
+      schema(Joi) {
+        return Joi.object({
+          name: Joi.string(),
+          remotes: Joi.array().items(Joi.object({
+            aliasName: Joi.string(),
+            name: Joi.string().required(),
+            entry: Joi.string(),
+            entries: Joi.object(),
+            keyResolver: Joi.string()
+          })),
+          shared: Joi.object(),
+          library: Joi.object()
+        });
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  api.modifyWebpackConfig(async (config, { webpack }) => {
+    const exposes = await constructExposes();
+    const remotes = formatRemotes();
+    const shared = getShared();
+    if (isEmpty(remotes) && isEmpty(exposes)) {
+      api.logger.warn("ModuleFederation exposes and remotes are empty, plugin will not work");
+      return config;
+    }
+    if (!isEmpty(remotes)) {
+      if (!api.config.mfsu) {
+        changeUmiEntry(config);
+      }
+    }
+    let name = "_";
+    if (!isEmpty(exposes)) {
+      name = mfName();
+      addMFEntry(config, name, (0, import_path.join)(api.paths.absTmpPath, "plugin-mf", mfSetupPathFileName));
+    }
+    const mfConfig = {
+      name,
+      remotes,
+      filename: "remote.js",
+      exposes,
+      shared,
+      library: api.config.mf.library
+    };
+    const { ModuleFederationPlugin } = webpack.container;
+    config.plugins.push(new ModuleFederationPlugin(mfConfig));
+    api.logger.debug(`ModuleFederationPlugin is enabled with config ${JSON.stringify(mfConfig)}`);
+    return config;
+  });
+  api.onGenerateFiles(() => {
+    api.writeTmpFile({
+      content: `/* infer remote public */;
+      __webpack_public_path__ = document.currentScript.src + '/../';`,
+      path: mfSetupPathFileName
+    });
+    if (api.env === "development" && api.config.mfsu) {
+      return;
+    }
+    api.writeTmpFile({
+      content: `import('${(0, import_plugin_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, "umi.ts"))}')`,
+      path: mfAsyncEntryFileName
+    });
+  });
+  function formatRemotes() {
+    const { remotes = [] } = api.config.mf;
+    const memo = {};
+    remotes.forEach((remote) => {
+      const aliasName = remote.aliasName || remote.name;
+      const r = formatRemote(remote);
+      if (memo[aliasName]) {
+        return api.logger.error(`${aliasName} already set as ${memo[aliasName]}, new value ${r} will be ignored`);
+      }
+      memo[aliasName] = r;
+    });
+    return memo;
+  }
+  function formatRemote(remote) {
+    if (remote.entry) {
+      return `${remote.name}@${remote.entry}`;
+    }
+    if (remote.entries && remote.keyResolver) {
+      const dynamicUrl = `promise new Promise(resolve => {
+  const entries = ${JSON.stringify(remote.entries)};
+  const key = ${remote.keyResolver};
+
+  const remoteUrlWithVersion = entries[key];
+  const script = document.createElement('script')
+  script.src = remoteUrlWithVersion
+  script.onload = () => {
+    // the injected script has loaded and is available on window
+    // we can now resolve this Promise
+    const proxy = {
+      get: (request) => window.${remote.name}.get(request),
+      init: (arg) => {
+        try {
+          return window.${remote.name}.init(arg)
+        } catch(e) {
+          console.log('remote container already initialized')
+        }
+      }
+    }
+    resolve(proxy)
+  }
+  // inject this script with the src set to the versioned remoteEntry.js
+  document.head.appendChild(script);
+})
+`;
+      return dynamicUrl;
+    } else {
+      api.logger.error("you should provider entry or entries and keyResolver");
+      throw Error("Wrong MF#remotes config");
+    }
+  }
+  async function constructExposes() {
+    const exposes = {};
+    const exposesPath = (0, import_path.join)(api.paths.absSrcPath, "exposes");
+    if (!(0, import_fs.existsSync)(exposesPath)) {
+      return exposes;
+    }
+    const dir = (0, import_fs.opendirSync)(exposesPath);
+    for await (const dirent of dir) {
+      if (dirent.isDirectory()) {
+        exposes["./" + dirent.name] = (0, import_plugin_utils.winPath)((0, import_path.join)(api.paths.absSrcPath, "exposes", dirent.name));
+      } else {
+        api.logger.warn(`${dirent.name} is not a directory, ignore in ModuleFederation expose`);
+      }
+    }
+    return exposes;
+  }
+  function mfName() {
+    const name = api.config.mf.name;
+    if (!name) {
+      api.logger.warn(`module federation name is not defined , "unNamedMF" will be used`);
+    }
+    return name || "unNamedMF";
+  }
+  function getShared() {
+    const { shared = {} } = api.config.mf;
+    return shared;
+  }
+  function changeUmiEntry(config) {
+    const { entry } = config;
+    const asyncEntryPath = (0, import_plugin_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, "plugin-mf", mfAsyncEntryFileName));
+    if (entry.umi) {
+      if (typeof entry.umi === "string") {
+        entry.umi = asyncEntryPath;
+      } else if (Array.isArray(entry.umi)) {
+        const i = entry.umi.findIndex((f) => f.endsWith("umi.ts"));
+        if (i >= 0) {
+          entry.umi[i] = asyncEntryPath;
+        } else {
+          api.logger.info(`umi.ts not found in entry.umi ${JSON.stringify(entry.umi)}`);
+        }
+      }
+    } else {
+      api.logger.warn("umi entry not found");
+    }
+  }
+  function addMFEntry(config, mfName2, path) {
+    config.entry[mfName2] = path;
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/model.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// model.ts
+// src/model.ts
 var model_exports = {};
 __export(model_exports, {
   default: () => model_default
@@ -35,9 +35,9 @@ var model_default = (api) => {
   api.describe({
     config: {
       schema(Joi) {
-        return Joi.object({
+        return Joi.alternatives().try(Joi.object({
           extraModels: Joi.array().items(Joi.string())
-        });
+        }), Joi.boolean().invalid(true));
       }
     },
     enableBy: api.EnableBy.config

package/dist/moment2dayjs.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// moment2dayjs.ts
+// src/moment2dayjs.ts
 var moment2dayjs_exports = {};
 __export(moment2dayjs_exports, {
   default: () => moment2dayjs_default
@@ -31,11 +31,11 @@ var moment2dayjs_default = (api) => {
   api.describe({
     key: "moment2dayjs",
     config: {
-      schema(joi) {
-        return joi.object({
-          preset: joi.string(),
-          plugins: joi.array()
-        });
+      schema(Joi) {
+        return Joi.alternatives().try(Joi.object({
+          preset: Joi.string(),
+          plugins: Joi.array()
+        }), Joi.boolean().invalid(true));
       }
     },
     enableBy: api.EnableBy.config

package/dist/qiankun/constants.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// constants.ts
+// src/qiankun/constants.ts
 var constants_exports = {};
 __export(constants_exports, {
   MODEL_EXPORT_NAME: () => MODEL_EXPORT_NAME,

package/dist/qiankun/master.js

@@ -36,7 +36,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// master.ts
+// src/qiankun/master.ts
 var master_exports = {};
 __export(master_exports, {
   default: () => master_default,
@@ -45,6 +45,7 @@ __export(master_exports, {
 module.exports = __toCommonJS(master_exports);
 var import_fs = require("fs");
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_withTmpPath = require("../utils/withTmpPath");
 var import_constants = require("./constants");
@@ -103,6 +104,21 @@ var master_default = (api) => {
   }
   api.onGenerateFiles(() => {
     var _a;
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+import { MasterOptions } from './types'
+type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
+type XOR<T, U> = (Without<T, U> & U) | (Without<U, T> & T);
+interface Config {
+  master?: MasterOptions;
+}
+export interface IRuntimeConfig {
+  qiankun?: XOR<MasterOptions, Config>;
+  ${import_constants.MODEL_EXPORT_NAME}?: () => Record<string, any>;
+}
+      `
+    });
     api.writeTmpFile({
       path: "masterOptions.ts",
       content: `

package/dist/qiankun/slave.js

@@ -36,7 +36,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// slave.ts
+// src/qiankun/slave.ts
 var slave_exports = {};
 __export(slave_exports, {
   default: () => slave_default
@@ -45,6 +45,7 @@ module.exports = __toCommonJS(slave_exports);
 var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_withTmpPath = require("../utils/withTmpPath");
 var import_constants = require("./constants");
@@ -75,6 +76,30 @@ var slave_default = (api) => {
       ];
     }
   });
+  api.onGenerateFiles(() => {
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+interface LifeCycles {
+    bootstrap?: (props?: any) => Promise<any>;
+    mount?: (props?: any) => Promise<any>;
+    unmount?: (props?: any) => Promise<any>;
+    update?: (props?: any) => Promise<any>;
+}
+type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
+type XOR<T, U> = (Without<T, U> & U) | (Without<U, T> & T);
+interface SlaveOption extends LifeCycles {
+    enable?: boolean;
+}
+interface Config {
+    slave?: SlaveOption;
+}
+export interface IRuntimeConfig {
+    qiankun?: XOR<Config, LifeCycles>
+}
+      `
+    });
+  });
   api.modifyDefaultConfig((memo) => {
     var _a, _b, _c;
     const initialSlaveOptions = __spreadValues(__spreadValues({

package/dist/qiankun.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// qiankun.ts
+// src/qiankun.ts
 var qiankun_exports = {};
 __export(qiankun_exports, {
   default: () => qiankun_default
@@ -28,12 +28,12 @@ module.exports = __toCommonJS(qiankun_exports);
 var qiankun_default = (api) => {
   api.describe({
     config: {
-      schema(joi) {
-        return joi.object().keys({
-          slave: joi.object(),
-          master: joi.object(),
-          externalQiankun: joi.boolean()
-        });
+      schema(Joi) {
+        return Joi.alternatives().try(Joi.object().keys({
+          slave: Joi.object(),
+          master: Joi.object(),
+          externalQiankun: Joi.boolean()
+        }), Joi.boolean().invalid(true));
       }
     }
   });

package/dist/request.js

@@ -19,22 +19,23 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// request.ts
+// src/request.ts
 var request_exports = {};
 __export(request_exports, {
   default: () => request_default
 });
 module.exports = __toCommonJS(request_exports);
 var import_path = require("path");
+var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var request_default = (api) => {
   api.describe({
     key: "request",
     config: {
-      schema: (joi) => {
-        return joi.object({
-          dataField: joi.string().pattern(/^[a-zA-Z]*$/).allow("")
-        });
+      schema: (Joi) => {
+        return Joi.alternatives().try(Joi.object({
+          dataField: Joi.string().pattern(/^[a-zA-Z]*$/).allow("")
+        }), Joi.boolean().invalid(true));
       }
     },
     enableBy: api.EnableBy.config
@@ -153,7 +154,7 @@ interface IErrorHandler {
 }
 type IRequestInterceptorAxios = (config: RequestOptions) => RequestOptions;
 type IRequestInterceptorUmiRequest = (url: string, config : RequestOptions) => { url: string, options: RequestOptions };
-type IRequestInterceptor = IRequestInterceptorAxios;
+type IRequestInterceptor = IRequestInterceptorAxios | IRequestInterceptorUmiRequest;
 type IErrorInterceptor = (error: Error) => Promise<Error>;
 type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosResponse<T> ;
 type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor
@@ -324,11 +325,11 @@ export type {
     api.writeTmpFile({
       path: "types.d.ts",
       content: `
-export type { 
-  RequestConfig,  
+export type {
+  RequestConfig,
   AxiosInstance,
   AxiosRequestConfig,
-  AxiosResponse, 
+  AxiosResponse,
   AxiosError,
   RequestError,
   ResponseInterceptor } from './request';
@@ -344,6 +345,15 @@ export {
 } from './request';
 `
     });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+import type { RequestConfig } from './types.d'
+export type IRuntimeConfig = {
+  request?: RequestConfig
+};
+      `
+    });
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/tailwindcss.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// tailwindcss.ts
+// src/tailwindcss.ts
 var tailwindcss_exports = {};
 __export(tailwindcss_exports, {
   default: () => tailwindcss_default
@@ -29,7 +29,7 @@ var tailwindcss_default = (api) => {
     key: "tailwindcss",
     config: {
       schema(Joi) {
-        return Joi.object();
+        return Joi.alternatives().try(Joi.object(), Joi.boolean().invalid(true));
       }
     },
     enableBy: api.EnableBy.config
@@ -40,15 +40,19 @@ var tailwindcss_default = (api) => {
     const inputPath = (0, import_path.join)(api.cwd, "tailwind.css");
     const generatedPath = (0, import_path.join)(api.paths.absTmpPath, outputPath);
     const binPath = (0, import_path.join)(api.cwd, "node_modules/.bin/tailwind");
+    const configPath = (0, import_path.join)(process.env.APP_ROOT || api.cwd, "tailwind.config.js");
     return new Promise((resolve) => {
       tailwind = (0, import_plugin_utils.crossSpawn)(`${binPath}`, [
+        "-c",
+        configPath,
         "-i",
         inputPath,
         "-o",
         generatedPath,
         api.env === "development" ? "--watch" : ""
       ], {
-        stdio: "inherit"
+        stdio: "inherit",
+        cwd: process.env.APP_ROOT || api.cwd
       });
       tailwind.on("error", (m) => {
         api.logger.error("tailwindcss service encounter an error: " + m);

package/dist/unocss.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unocss.ts
+// src/unocss.ts
 var unocss_exports = {};
 __export(unocss_exports, {
   default: () => unocss_default
@@ -31,9 +31,9 @@ var unocss_default = (api) => {
     key: "unocss",
     config: {
       schema(Joi) {
-        return Joi.object({
+        return Joi.alternatives().try(Joi.object({
           watch: Joi.array()
-        });
+        }), Joi.boolean().invalid(true));
       }
     },
     enableBy: api.EnableBy.config

package/dist/utils/astUtils.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// astUtils.ts
+// src/utils/astUtils.ts
 var astUtils_exports = {};
 __export(astUtils_exports, {
   getIdentifierDeclaration: () => getIdentifierDeclaration

package/dist/utils/localeUtils.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// localeUtils.ts
+// src/utils/localeUtils.ts
 var localeUtils_exports = {};
 __export(localeUtils_exports, {
   exactLocalePaths: () => exactLocalePaths,

package/dist/utils/modelUtils.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 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);
 
-// modelUtils.ts
+// src/utils/modelUtils.ts
 var modelUtils_exports = {};
 __export(modelUtils_exports, {
   Model: () => Model,

package/dist/utils/resolveProjectDep.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// resolveProjectDep.ts
+// src/utils/resolveProjectDep.ts
 var resolveProjectDep_exports = {};
 __export(resolveProjectDep_exports, {
   resolveProjectDep: () => resolveProjectDep

package/dist/utils/withTmpPath.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// withTmpPath.ts
+// src/utils/withTmpPath.ts
 var withTmpPath_exports = {};
 __export(withTmpPath_exports, {
   withTmpPath: () => withTmpPath

package/libs/locale/localeExports.tpl

@@ -3,7 +3,6 @@ import {
   IntlShape,
   MessageDescriptor,
 } from '{{{ reactIntlPkgPath }}}';
-import { ApplyPluginsType } from 'umi';
 import { getPluginManager } from '../core/plugin';
 import EventEmitter from '{{{EventEmitterPkg}}}';
 // @ts-ignore
@@ -153,7 +152,8 @@ export const setIntl = (locale: string) => {
 export const getLocale = () => {
   const runtimeLocale = getPluginManager().applyPlugins({
     key: 'locale',
-    type: ApplyPluginsType.modify,
+    // workaround: 不使用 ApplyPluginsType.modify 是为了避免循环依赖，与 fast-refresh 一起用时会有问题
+    type: 'modify',
     initialValue: {},
   });
   // runtime getLocale for user define
@@ -201,7 +201,8 @@ export const setLocale = (lang: string, realReload: boolean = true) => {
   //const { pluginManager } = useAppContext();
   //const runtimeLocale = pluginManagerapplyPlugins({
   //  key: 'locale',
-  //  type: ApplyPluginsType.modify,
+  //  workaround: 不使用 ApplyPluginsType.modify 是为了避免循环依赖，与 fast-refresh 一起用时会有问题
+  //  type: 'modify',
   //  initialValue: {},
   //});
 
@@ -261,6 +262,9 @@ http://j.mp/37Fkd5Q
     );
     firstWaring = false;
   }
+  if (!g_intl) {
+    setIntl(getLocale());
+  }
   return g_intl.formatMessage(descriptor, values);
 };
 

package/libs/qiankun/master/MicroApp.tsx

@@ -88,8 +88,14 @@ export const MicroApp = forwardRef(
       ...propsFromParams
     } = componentProps;
 
-    // 优先使用 alias 名匹配，fallback 到 name 匹配
-    const name = componentProps[appNameKeyAlias] || componentProps.name;
+    // ref: https://github.com/umijs/plugins/pull/866
+    // name 跟 appNameKeyAlias 这两个 key 同时存在时，优先使用 name，避免对存量应用造成 breaking change。
+    // 比如 appNameKeyAlias 配置是 id，但之前 id 正好作为普通的 props 使用过，如 <MicroApp name="app" id="123" />
+    // 正常场景会优先匹配 appNameKeyAlias 对应的字段，fallback 到 name，避免对已经使用 <MicroApp name="app" /> 的应用造成影响
+    const name =
+      componentProps.name && componentProps[appNameKeyAlias]
+        ? componentProps.name
+        : componentProps[appNameKeyAlias] || componentProps.name;
     const isCurrentApp = (app: any) =>
       app[appNameKeyAlias] === name || app.name === name;
 

package/libs/qiankun/master/types.ts

@@ -13,7 +13,7 @@ export type App = {
   // 取 entry 时是否需要开启跨域 credentials
   credentials?: boolean;
   props?: any;
-} & Pick<BaseIConfig, 'mountElementId'>;
+} & Partial<Pick<BaseIConfig, 'mountElementId'>>;
 
 export type MicroAppRoute = {
   path: string;

package/libs/qiankun/slave/lifecycles.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { getPluginManager } from '@@/core/plugin';
 import ReactDOM from 'react-dom';
-import { ApplyPluginsType } from 'umi';
+import { ApplyPluginsType, __getRoot } from 'umi';
 import { setModelState } from './qiankunModel';
 
 const noop = () => {};
@@ -149,12 +149,20 @@ export function genUpdate() {
 
 export function genUnmount(mountElementId: string) {
   return async (props: any) => {
-    const container = props?.container
-      ? props.container.querySelector(`#${mountElementId}`)
-      : document.getElementById(mountElementId);
-    if (container) {
-      ReactDOM.unmountComponentAtNode(container);
+    const root = __getRoot();
+
+    // support react 18 unmount
+    if (typeof root?.unmount === 'function') {
+      root.unmount();
+    } else {
+      const container = props?.container
+        ? props.container.querySelector(`#${mountElementId}`)
+        : document.getElementById(mountElementId);
+      if (container) {
+        ReactDOM.unmountComponentAtNode(container);
+      }
     }
+
     const slaveRuntime = await getSlaveRuntime();
     if (slaveRuntime.unmount) await slaveRuntime.unmount(props);
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.8",
+  "version": "4.0.11",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -16,16 +16,16 @@
     "libs"
   ],
   "scripts": {
-    "build": "pnpm father build",
+    "build": "umi-scripts father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm father dev",
+    "dev": "umi-scripts father dev",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^7.0.1-beta.20",
-    "@umijs/bundler-utils": "4.0.8",
+    "@ant-design/pro-layout": "^7.0.1-beta.28",
+    "@umijs/bundler-utils": "4.0.11",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.8"
+    "umi": "4.0.11"
   },
   "publishConfig": {
     "access": "public"