@umijs/plugins 4.0.62 → 4.0.64

package/dist/access.js

@@ -38,11 +38,8 @@ var import_withTmpPath = require("./utils/withTmpPath");
 var access_default = (api) => {
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object(),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.record(zod.any());
       }
     },
     enableBy: api.EnableBy.config

package/dist/analytics.js

@@ -31,15 +31,12 @@ var analytics_default = (api) => {
   api.describe({
     key: "analytics",
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object({
-            baidu: Joi.string(),
-            ga: Joi.string(),
-            ga_v2: Joi.string()
-          }),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.object({
+          baidu: zod.string(),
+          ga: zod.string(),
+          ga_v2: zod.string()
+        }).partial();
       },
       onChange: api.ConfigChangeType.reload
     },

package/dist/antd.js

@@ -54,23 +54,20 @@ var antd_default = (api) => {
   const appConfigAvailable = import_plugin_utils.semver.gte(antdVersion, "5.3.0");
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object({
-            configProvider: Joi.object(),
-            // themes
-            dark: Joi.boolean(),
-            compact: Joi.boolean(),
-            // babel-plugin-import
-            import: Joi.boolean(),
-            // less or css, default less
-            style: Joi.string().allow("less", "css"),
-            theme: Joi.object(),
-            // Only antd@5.1.0 is supported
-            appConfig: Joi.object()
-          }),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.object({
+          configProvider: zod.record(zod.any()),
+          // themes
+          dark: zod.boolean(),
+          compact: zod.boolean(),
+          // babel-plugin-import
+          import: zod.boolean(),
+          // less or css, default less
+          style: zod.enum(["less", "css"]).describe("less or css, default less"),
+          theme: zod.record(zod.any()),
+          // Only antd@5.1.0 is supported
+          appConfig: zod.record(zod.any()).describe("Only antd@5.1.0 is supported")
+        }).deepPartial();
       }
     },
     enableBy({ userConfig }) {

package/dist/confetti.js

@@ -45,8 +45,8 @@ var confetti_default = (api) => {
   api.describe({
     key: "confetti",
     config: {
-      schema(joi) {
-        return joi.object();
+      schema({ zod }) {
+        return zod.object({});
       }
     },
     enableBy: api.EnableBy.config

package/dist/dva.js

@@ -45,15 +45,12 @@ var dva_default = (api) => {
   const pkgPath = (0, import_path.join)(__dirname, "../libs/dva.ts");
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object({
-            extraModels: Joi.array().items(Joi.string()),
-            immer: Joi.object(),
-            skipModelValidate: Joi.boolean()
-          }),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.object({
+          extraModels: zod.array(zod.string()),
+          immer: zod.record(zod.any()),
+          skipModelValidate: zod.boolean()
+        }).deepPartial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/initial-state.js

@@ -27,13 +27,10 @@ var import_withTmpPath = require("./utils/withTmpPath");
 var initial_state_default = (api) => {
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object({
-            loading: Joi.string()
-          }),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.object({
+          loading: zod.string()
+        }).partial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/layout.js

@@ -66,11 +66,8 @@ var layout_default = (api) => {
   api.describe({
     key: "layout",
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object(),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.record(zod.any());
       },
       onChange: api.ConfigChangeType.regenerateTmpFiles
     },

package/dist/locale.js

@@ -35,6 +35,7 @@ __export(locale_exports, {
 module.exports = __toCommonJS(locale_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_localeUtils = require("./utils/localeUtils");
 var import_withTmpPath = require("./utils/withTmpPath");
@@ -55,18 +56,15 @@ var locale_default = (api) => {
   api.describe({
     key: "locale",
     config: {
-      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)
-        );
+      schema({ zod }) {
+        return zod.object({
+          default: zod.string(),
+          useLocalStorage: zod.boolean(),
+          baseNavigator: zod.boolean(),
+          title: zod.boolean(),
+          antd: zod.boolean(),
+          baseSeparator: zod.string()
+        }).partial();
       }
     },
     enableBy: api.EnableBy.config
@@ -228,6 +226,21 @@ export { addLocale, setLocale, getLocale, getIntl, useIntl, injectIntl, formatMe
 export { SelectLang } from './SelectLang';
 `
     });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+import {
+  IntlCache,
+  createIntl,
+} from '${reactIntlPkgPath}';
+type OptionalIntlConfig = Omit<Parameters<typeof createIntl>[0], 'locale' | 'defaultLocale'>;
+export interface IRuntimeConfig {
+    locale?: {
+      getLocale?: () => string;
+      cache?: IntlCache;
+    } & OptionalIntlConfig;
+};`
+    });
   });
   api.addRuntimePlugin(() => [(0, import_withTmpPath.withTmpPath)({ api, path: "runtime.tsx" })]);
   api.addRuntimePluginKey(() => ["locale"]);

package/dist/mf.js

@@ -33,21 +33,22 @@ 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()
+      schema({ zod }) {
+        return zod.object({
+          name: zod.string(),
+          remotes: zod.array(
+            zod.object({
+              aliasName: zod.string().optional(),
+              //  string 上没有 required
+              name: zod.string(),
+              entry: zod.string().optional(),
+              entries: zod.object({}).optional(),
+              keyResolver: zod.string().optional()
             })
           ),
-          shared: Joi.object(),
-          library: Joi.object()
-        });
+          shared: zod.record(zod.any()),
+          library: zod.record(zod.any())
+        }).partial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/model.js

@@ -41,13 +41,10 @@ var import_withTmpPath = require("./utils/withTmpPath");
 var model_default = (api) => {
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object({
-            extraModels: Joi.array().items(Joi.string())
-          }),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.object({
+          extraModels: zod.array(zod.string())
+        }).partial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/moment2dayjs.js

@@ -38,15 +38,12 @@ var moment2dayjs_default = (api) => {
   api.describe({
     key: "moment2dayjs",
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object({
-            preset: Joi.string(),
-            // 'antd' | 'antdv3 | 'none'
-            plugins: Joi.array()
-          }),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.object({
+          preset: zod.enum(["antd", "antdv3", "none"]),
+          // 'antd' | 'antdv3 | 'none'
+          plugins: zod.array(zod.string())
+        }).partial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/qiankun.js

@@ -35,15 +35,12 @@ module.exports = __toCommonJS(qiankun_exports);
 var qiankun_default = (api) => {
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object().keys({
-            slave: Joi.object(),
-            master: Joi.object(),
-            externalQiankun: Joi.boolean()
-          }),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.object({
+          slave: zod.record(zod.any()),
+          master: zod.record(zod.any()),
+          externalQiankun: zod.boolean()
+        }).deepPartial();
       }
     }
   });

package/dist/react-query.js

@@ -40,11 +40,11 @@ var react_query_default = (api) => {
   api.describe({
     key: "reactQuery",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          devtool: Joi.alternatives(Joi.object(), Joi.boolean()),
-          queryClient: Joi.alternatives(Joi.object(), Joi.boolean())
-        });
+      schema({ zod }) {
+        return zod.object({
+          devtool: zod.union([zod.record(zod.any()), zod.boolean()]),
+          queryClient: zod.union([zod.record(zod.any()), zod.boolean()])
+        }).deepPartial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/request.js

@@ -39,16 +39,11 @@ var request_default = (api) => {
   api.describe({
     key: "request",
     config: {
-      schema: (Joi) => {
-        return Joi.alternatives().try(
-          Joi.object({
-            dataField: Joi.alternatives().try(
-              Joi.string().allow(""),
-              Joi.string()
-            )
-          }),
-          Joi.boolean().invalid(true)
-        );
+      schema: ({ zod }) => {
+        return zod.object({
+          // TODO: '' | string 没有找到对应的写法
+          dataField: zod.string()
+        }).partial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/styled-components.js

@@ -39,9 +39,9 @@ var styled_components_default = (api) => {
   api.describe({
     key: "styledComponents",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          babelPlugin: Joi.object()
+      schema({ zod }) {
+        return zod.object({
+          babelPlugin: zod.record(zod.any()).optional()
         });
       }
     },

package/dist/tailwindcss.js

@@ -28,11 +28,8 @@ var tailwindcss_default = (api) => {
   api.describe({
     key: "tailwindcss",
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object(),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.record(zod.any());
       }
     },
     enableBy: api.EnableBy.config

package/dist/unocss.js

@@ -22,7 +22,7 @@ __export(unocss_exports, {
   default: () => unocss_default
 });
 module.exports = __toCommonJS(unocss_exports);
-var import_child_process = require("child_process");
+var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_plugin_utils = require("umi/plugin-utils");
@@ -30,19 +30,16 @@ var unocss_default = (api) => {
   api.describe({
     key: "unocss",
     config: {
-      schema(Joi) {
-        return Joi.alternatives().try(
-          Joi.object({
-            watch: Joi.array()
-          }),
-          Joi.boolean().invalid(true)
-        );
+      schema({ zod }) {
+        return zod.object({
+          watch: zod.array(zod.any())
+        });
       }
     },
     enableBy: api.EnableBy.config
   });
   const outputPath = "uno.css";
-  api.onBeforeCompiler(() => {
+  api.onBeforeCompiler(async () => {
     if (process.env.IS_UMI_BUILD_WORKER)
       return;
     if (!(0, import_fs.existsSync)((0, import_path.join)(api.paths.cwd, "unocss.config.ts")))
@@ -51,14 +48,21 @@ var unocss_default = (api) => {
       );
     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 }
-    );
-    unocss.on("error", (m) => {
-      api.logger.error("unocss service encounter an error: " + m);
+    const watchDirs = api.config.unocss.watch || [];
+    const isDev = api.env === "development";
+    const args = [
+      ...watchDirs,
+      "--out-file",
+      generatedPath,
+      isDev ? "--watch" : ""
+    ].filter(Boolean);
+    const execaRes = import_utils.execa.execa(binPath, args, {
+      cwd: api.cwd,
+      stdio: isDev ? "pipe" : "inherit"
     });
+    if (!isDev) {
+      await execaRes;
+    }
   });
   api.addEntryImports(() => {
     const generatedPath = (0, import_plugin_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, outputPath));

package/dist/valtio.js

@@ -38,8 +38,8 @@ var valtio_default = (api) => {
   api.describe({
     key: "valtio",
     config: {
-      schema(joi) {
-        return joi.object();
+      schema({ zod }) {
+        return zod.object({});
       }
     },
     enableBy: api.EnableBy.config

package/libs/locale/localeExports.tpl

@@ -105,6 +105,20 @@ export const addLocale = (
   }
 };
 
+const applyRuntimeLocalePlugin = (initialValue: any) => {
+  return getPluginManager().applyPlugins({
+    key: 'locale',
+    type: 'modify',
+    initialValue
+  });
+}
+
+const _createIntl = (locale: string) => {
+    const runtimeLocale = applyRuntimeLocalePlugin(localeInfo[locale]);
+    const { cache, ...config } = runtimeLocale;
+    return createIntl(config, cache);
+}
+
 /**
  * 获取当前的 intl 对象，可以在 node 中使用
  * @param locale 需要切换的语言类型
@@ -120,7 +134,7 @@ export const getIntl = (locale?: string, changeIntl?: boolean) => {
   if (!locale) locale = getLocale();
   // 如果存在于 localeInfo 中
   if (locale&&localeInfo[locale]) {
-    return createIntl(localeInfo[locale]);
+    return _createIntl(locale);
   }
   {{#ExistLocaleDir}}
   // 不存在需要一个报错提醒
@@ -130,12 +144,14 @@ export const getIntl = (locale?: string, changeIntl?: boolean) => {
   );
   {{/ExistLocaleDir}}
   // 使用 zh-CN
-  if (localeInfo[{{{ DefaultLocale }}}]) return createIntl(localeInfo[{{{ DefaultLocale }}}]);
+  if (localeInfo[{{{ DefaultLocale }}}]) {
+    return _createIntl({{{ DefaultLocale }}});
+  }
 
   // 如果还没有，返回一个空的
   return createIntl({
     locale: {{{ DefaultLocale }}},
-    messages: {},
+    messages: {}
   });
 };
 
@@ -152,12 +168,7 @@ export const setIntl = (locale: string) => {
  * @returns string
  */
 export const getLocale = () => {
-  const runtimeLocale = getPluginManager().applyPlugins({
-    key: 'locale',
-    // workaround: 不使用 ApplyPluginsType.modify 是为了避免循环依赖，与 fast-refresh 一起用时会有问题
-    type: 'modify',
-    initialValue: {},
-  });
+  const runtimeLocale = applyRuntimeLocalePlugin({});
   // runtime getLocale for user define
   if (typeof runtimeLocale?.getLocale === 'function') {
    return runtimeLocale.getLocale();

package/libs/qiankun/master/MicroApp.tsx

@@ -58,9 +58,21 @@ export type Props = {
   className?: string;
 } & Record<string, any>;
 
-function unmountMicroApp(microApp?: MicroAppType) {
+function unmountMicroApp(microApp?: MicroAppType, updatingPromise?: Promise<void>) {
   if (microApp) {
-    microApp.mountPromise.then(() => microApp.unmount());
+    microApp.mountPromise.then(() => {
+      switch (microApp.getStatus()) {
+        case "MOUNTED":
+          microApp.unmount();
+          break;
+        case "UPDATING":
+          // UPDATING 阶段 updatingPromise 一定存在
+          updatingPromise!.then(() => microApp.unmount());
+          break;
+        default:
+          break;
+      }
+    });
   }
 }
 
@@ -213,7 +225,7 @@ export const MicroApp = forwardRef(
         },
       );
 
-      return () => unmountMicroApp(microAppRef.current);
+      return () => unmountMicroApp(microAppRef.current, updatingPromise.current);
     }, [name]);
 
     useEffect(() => {

package/package.json

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