@umijs/plugins 4.0.8 → 4.0.9

package/dist/access.js

@@ -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

@@ -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

@@ -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

@@ -38,10 +38,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

package/dist/initial-state.js

@@ -27,9 +27,9 @@ 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

package/dist/layout.js

@@ -34,8 +34,8 @@ 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
     },
@@ -256,8 +256,8 @@ const { formatMessage } = useIntl();
       initData: InitDataType,
     ) => ProLayoutProps & {
       childrenRender?: (dom: JSX.Element, props: ProLayoutProps) => React.ReactNode,
-      unAccessible?: JSX.Element,
-      noFound?: JSX.Element,
+      noAccessible?: JSX.Element,
+      notFound?: JSX.Element,
     };
     `
     });

package/dist/locale.js

@@ -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

package/dist/model.js

@@ -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

@@ -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.js

@@ -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

@@ -31,10 +31,10 @@ 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
@@ -324,11 +324,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';

package/dist/tailwindcss.js

@@ -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

package/dist/unocss.js

@@ -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/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: {},
   //});
 

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/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.9",
   "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.9",
     "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.9"
   },
   "publishConfig": {
     "access": "public"