@umijs/preset-umi 4.0.58 → 4.0.60

package/dist/features/apiRoute/apiRoute.js

@@ -58,10 +58,10 @@ var apiRoute_default = (api) => {
   api.describe({
     key: "apiRoute",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          platform: Joi.string()
-        });
+      schema({ zod }) {
+        return zod.object({
+          platform: zod.string()
+        }).deepPartial();
       }
     },
     enableBy: () => {

package/dist/features/classPropertiesLoose/classPropertiesLoose.js

@@ -26,8 +26,10 @@ var classPropertiesLoose_default = (api) => {
   api.describe({
     key: "classPropertiesLoose",
     config: {
-      schema(joi) {
-        return joi.object();
+      schema({ zod }) {
+        return zod.union([zod.boolean(), zod.object({})]).describe(
+          "设置 babel class-properties 启用 loose \n @doc https://umijs.org/docs/api/config#classpropertiesloose"
+        );
       }
     },
     enableBy: api.EnableBy.config

package/dist/features/clickToComponent/clickToComponent.js

@@ -38,9 +38,11 @@ var clickToComponent_default = (api) => {
   api.describe({
     key: "clickToComponent",
     config: {
-      schema(joi) {
-        return joi.object({
-          editor: joi.string()
+      schema({ zod }) {
+        return zod.object({
+          editor: zod.string().describe(
+            "默认情况下，点击将默认编辑器为vscode, 你可以设置编辑器 vscode 或者 vscode-insiders"
+          ).optional()
         });
       }
     },

package/dist/features/clientLoader/clientLoader.js

@@ -26,8 +26,8 @@ var import_routeExportExtractor = require("../../utils/routeExportExtractor");
 var clientLoader_default = (api) => {
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.object({});
+      schema({ zod }) {
+        return zod.object({});
       }
     },
     enableBy: api.EnableBy.config

package/dist/features/codeSplitting/codeSplitting.js

@@ -37,16 +37,12 @@ var codeSplitting_default = (api) => {
   api.describe({
     key: "codeSplitting",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          jsStrategy: Joi.string().allow(
-            "bigVendors",
-            "depPerChunk",
-            "granularChunks"
-          ),
-          jsStrategyOptions: Joi.object(),
-          cssStrategy: Joi.string().allow("mergeAll"),
-          cssStrategyOptions: Joi.object()
+      schema({ zod }) {
+        return zod.object({
+          jsStrategy: zod.enum(["bigVendors", "depPerChunk", "granularChunks"]),
+          jsStrategyOptions: zod.object({}).optional(),
+          cssStrategy: zod.enum(["mergeAll"]).optional(),
+          cssStrategyOptions: zod.object({}).optional()
         });
       }
     },

package/dist/features/configPlugins/schema.d.ts

@@ -1,2 +1,4 @@
-import type { Root } from '@umijs/utils/compiled/@hapi/joi';
-export declare function getSchemas(): Record<string, (Joi: Root) => any>;
+import { z } from '@umijs/utils/compiled/zod';
+export declare function getSchemas(): Record<string, ({}: {
+    zod: typeof z;
+}) => any>;

package/dist/features/configPlugins/schema.js

@@ -24,37 +24,90 @@ __export(schema_exports, {
 module.exports = __toCommonJS(schema_exports);
 var import_utils = require("@umijs/utils");
 function getSchemas() {
+  const scriptsSchema = ({ zod }) => zod.array(
+    zod.union([
+      zod.string(),
+      zod.object({
+        src: zod.string().optional()
+      }),
+      zod.object({
+        content: zod.string().optional()
+      }),
+      zod.record(zod.string(), zod.any())
+    ])
+  );
   return {
-    analyze: (Joi) => Joi.object(),
-    base: (Joi) => Joi.string(),
-    conventionRoutes: (Joi) => Joi.object({
-      base: Joi.string(),
-      exclude: Joi.array().items(Joi.any())
+    analyze: ({ zod }) => zod.object({}),
+    base: ({ zod }) => zod.string(),
+    conventionRoutes: ({ zod }) => zod.object({
+      base: zod.string().optional(),
+      exclude: zod.array(zod.any()).optional()
     }),
-    esbuildMinifyIIFE: (Joi) => Joi.boolean(),
-    headScripts: (Joi) => Joi.array(),
-    history: (Joi) => Joi.object({
-      type: Joi.string().valid("browser", "hash", "memory")
+    esbuildMinifyIIFE: ({ zod }) => zod.boolean(),
+    headScripts: scriptsSchema,
+    history: ({ zod }) => zod.object({
+      type: zod.enum(["browser", "hash", "memory"])
     }),
-    historyWithQuery: (Joi) => Joi.object(),
-    links: (Joi) => Joi.array(),
-    metas: (Joi) => Joi.array(),
-    mountElementId: (Joi) => Joi.string(),
-    npmClient: (Joi) => Joi.string().valid(
+    historyWithQuery: ({ zod }) => zod.object({}),
+    links: ({ zod }) => zod.array(
+      zod.union([
+        zod.object({
+          crossorigin: zod.string(),
+          href: zod.string(),
+          hreflang: zod.string(),
+          media: zod.string(),
+          referrerpolicy: zod.string(),
+          rel: zod.string(),
+          sizes: zod.any(),
+          title: zod.any(),
+          type: zod.any()
+        }).deepPartial(),
+        zod.record(zod.string(), zod.any())
+      ])
+    ),
+    metas: ({ zod }) => zod.array(
+      zod.union([
+        zod.object({
+          charset: zod.string(),
+          content: zod.string(),
+          "http-equiv": zod.string(),
+          name: zod.string()
+        }).deepPartial(),
+        zod.record(zod.string(), zod.any())
+      ])
+    ),
+    mountElementId: ({ zod }) => zod.string(),
+    npmClient: ({ zod }) => zod.enum([
       import_utils.NpmClientEnum.pnpm,
       import_utils.NpmClientEnum.tnpm,
       import_utils.NpmClientEnum.cnpm,
       import_utils.NpmClientEnum.yarn,
       import_utils.NpmClientEnum.npm
-    ),
-    plugins: (Joi) => Joi.array().items(Joi.string()),
-    presets: (Joi) => Joi.array().items(Joi.string()),
-    publicPath: (Joi) => Joi.string().regex(/(\/|^auto)$/).error(new Error('publicPath must be "auto" or end with /')),
-    reactRouter5Compat: (Joi) => Joi.object(),
-    routes: (Joi) => Joi.array().items(Joi.object()),
-    scripts: (Joi) => Joi.array(),
-    styles: (Joi) => Joi.array(),
-    title: (Joi) => Joi.string()
+    ]),
+    plugins: ({ zod }) => zod.array(zod.string()),
+    presets: ({ zod }) => zod.array(zod.string()),
+    publicPath: ({ zod }) => zod.string().regex(/(\/|^auto)$/, {
+      message: 'publicPath must be "auto" or end with /'
+    }),
+    reactRouter5Compat: ({ zod }) => zod.union([zod.boolean(), zod.object({})]),
+    routes: ({ zod }) => {
+      const routeSchema = zod.union([
+        zod.object({
+          component: zod.string(),
+          layout: zod.literal(false),
+          path: zod.string(),
+          redirect: zod.string(),
+          // lazy schema need replace type when `zod2ts`
+          routes: zod.lazy(() => routeSchema.array()),
+          wrappers: zod.array(zod.string())
+        }).deepPartial(),
+        zod.record(zod.string(), zod.any())
+      ]);
+      return routeSchema.array();
+    },
+    scripts: scriptsSchema,
+    styles: scriptsSchema,
+    title: ({ zod }) => zod.string()
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/features/crossorigin/crossorigin.js

@@ -26,13 +26,13 @@ var crossorigin_default = (api) => {
   api.describe({
     key: "crossorigin",
     config: {
-      schema(Joi) {
-        return Joi.alternatives(
-          Joi.boolean(),
-          Joi.object({
-            includes: Joi.array().items(Joi.object().instance(RegExp))
+      schema({ zod }) {
+        return zod.union([
+          zod.boolean(),
+          zod.object({
+            includes: zod.array(zod.instanceof(RegExp)).optional()
           })
-        );
+        ]);
       }
     },
     enableBy: api.EnableBy.config

package/dist/features/esmi/esmi.js

@@ -165,10 +165,10 @@ var esmi_default = (api) => {
   api.describe({
     key: "esmi",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          cdnOrigin: Joi.string(),
-          shimUrl: Joi.string()
+      schema({ zod }) {
+        return zod.object({
+          cdnOrigin: zod.string(),
+          shimUrl: zod.string().optional()
         });
       }
     },

package/dist/features/exportStatic/exportStatic.js

@@ -101,12 +101,12 @@ var exportStatic_default = (api) => {
   }
   api.describe({
     config: {
-      schema: (Joi) => Joi.object({
-        extraRoutePaths: Joi.alternatives(
-          Joi.function(),
-          Joi.array().items(Joi.string())
-        )
-      })
+      schema: ({ zod }) => zod.object({
+        extraRoutePaths: zod.union([
+          zod.function(),
+          zod.array(zod.string())
+        ])
+      }).deepPartial()
     },
     enableBy: api.EnableBy.config
   });

package/dist/features/favicons/favicons.js

@@ -40,7 +40,7 @@ function getFaviconFiles(p) {
 var favicons_default = (api) => {
   api.describe({
     config: {
-      schema: (Joi) => Joi.array().items(Joi.string())
+      schema: ({ zod }) => zod.array(zod.string())
     }
   });
   api.modifyAppData(async (memo) => {

package/dist/features/helmet/helmet.js

@@ -37,7 +37,7 @@ var import_path = require("path");
 var helmet_default = (api) => {
   api.describe({
     config: {
-      schema: (Joi) => Joi.boolean()
+      schema: ({ zod }) => zod.boolean()
     }
   });
   api.onGenerateFiles(() => {

package/dist/features/icons/icons.js

@@ -43,15 +43,15 @@ var icons_default = (api) => {
   const svgr = (0, import_utils.importLazy)(require.resolve("./svgr"));
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.object({
+      schema({ zod }) {
+        return zod.object({
           // don't support tnpm
-          autoInstall: Joi.object(),
-          defaultComponentConfig: Joi.object(),
+          autoInstall: zod.object({}),
+          defaultComponentConfig: zod.object({}),
           // e.g. alias: { home: 'fa:home' }
-          alias: Joi.object(),
-          include: Joi.array().items(Joi.string())
-        });
+          alias: zod.object({}),
+          include: zod.array(zod.string())
+        }).deepPartial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/features/legacy/legacy.js

@@ -39,12 +39,12 @@ var legacy_default = (api) => {
   api.describe({
     key: "legacy",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          buildOnly: Joi.boolean(),
-          nodeModulesTransform: Joi.boolean(),
-          checkOutput: Joi.boolean()
-        });
+      schema({ zod }) {
+        return zod.object({
+          buildOnly: zod.boolean(),
+          nodeModulesTransform: zod.boolean(),
+          checkOutput: zod.boolean()
+        }).deepPartial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/features/lowImport/lowImport.js

@@ -80,11 +80,11 @@ var lowImport_default = (api) => {
   api.describe({
     key: "lowImport",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          libs: Joi.array(),
-          css: Joi.string()
-        });
+      schema({ zod }) {
+        return zod.object({
+          libs: zod.array(zod.any()),
+          css: zod.string()
+        }).deepPartial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/features/mock/mock.js

@@ -41,11 +41,11 @@ function mock_default(api) {
   api.describe({
     key: "mock",
     config: {
-      schema(Joi) {
-        return Joi.object().keys({
-          exclude: Joi.array().items(Joi.string()).description("exclude files not parse mock"),
-          include: Joi.array().items(Joi.string())
-        });
+      schema({ zod }) {
+        return zod.object({
+          exclude: zod.array(zod.string()).describe("exclude files not parse mock"),
+          include: zod.array(zod.string())
+        }).deepPartial();
       }
     },
     enableBy() {

package/dist/features/monorepo/redirect.js

@@ -42,15 +42,15 @@ var redirect_default = (api) => {
   api.describe({
     key: "monorepoRedirect",
     config: {
-      schema(Joi) {
-        return Joi.alternatives(
-          Joi.boolean(),
-          Joi.object({
-            srcDir: Joi.array().items(Joi.string()),
-            exclude: Joi.array().items(Joi.object().instance(RegExp)),
-            peerDeps: Joi.boolean()
-          })
-        );
+      schema({ zod }) {
+        return zod.union([
+          zod.boolean(),
+          zod.object({
+            srcDir: zod.array(zod.string()),
+            exclude: zod.array(zod.instanceof(RegExp)),
+            peerDeps: zod.boolean()
+          }).deepPartial()
+        ]);
       }
     },
     enableBy: api.EnableBy.config

package/dist/features/mpa/mpa.js

@@ -40,13 +40,13 @@ var mpa_default = (api) => {
   api.describe({
     key: "mpa",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          template: Joi.string(),
-          layout: Joi.string(),
-          getConfigFromEntryFile: Joi.boolean(),
-          entry: Joi.object()
-        });
+      schema({ zod }) {
+        return zod.object({
+          template: zod.string(),
+          layout: zod.string(),
+          getConfigFromEntryFile: zod.boolean(),
+          entry: zod.object({})
+        }).deepPartial();
       }
     },
     enableBy: api.EnableBy.config

package/dist/features/phantomDependency/phantomDependency.js

@@ -38,9 +38,9 @@ var phantomDependency_default = (api) => {
   api.describe({
     key: "phantomDependency",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          exclude: Joi.array().items(Joi.string())
+      schema({ zod }) {
+        return zod.object({
+          exclude: zod.array(zod.string()).optional()
         });
       }
     },

package/dist/features/polyfill/polyfill.js

@@ -40,9 +40,9 @@ var polyfill_default = (api) => {
   api.describe({
     key: "polyfill",
     config: {
-      schema(Joi) {
-        return Joi.object().keys({
-          imports: Joi.array().items(Joi.string()).required().unique()
+      schema({ zod }) {
+        return zod.object({
+          imports: zod.array(zod.string()).optional()
         });
       }
     },

package/dist/features/routePrefetch/routePrefetch.js

@@ -27,8 +27,8 @@ var import_path = require("path");
 var routePrefetch_default = (api) => {
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.object({});
+      schema({ zod }) {
+        return zod.object({});
       }
     },
     enableBy: api.EnableBy.config

package/dist/features/routeProps/routeProps.js

@@ -26,8 +26,8 @@ var import_routeExportExtractor = require("../../utils/routeExportExtractor");
 var routeProps_default = (api) => {
   api.describe({
     config: {
-      schema(Joi) {
-        return Joi.object({});
+      schema({ zod }) {
+        return zod.object({});
       }
     },
     enableBy: () => {

package/dist/features/ssr/ssr.js

@@ -48,12 +48,12 @@ var ssr_default = (api) => {
   api.describe({
     key: "ssr",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          serverBuildPath: Joi.string(),
-          platform: Joi.string(),
-          builder: Joi.string().allow("esbuild", "webpack")
-        });
+      schema({ zod }) {
+        return zod.object({
+          serverBuildPath: zod.string(),
+          platform: zod.string(),
+          builder: zod.enum(["esbuild", "webpack"])
+        }).deepPartial();
       }
     },
     enableBy: import_types.EnableBy.config

package/dist/features/terminal/terminal.js

@@ -27,8 +27,8 @@ var terminal_default = (api) => {
   api.describe({
     key: "terminal",
     config: {
-      schema(Joi) {
-        return Joi.object();
+      schema({ zod }) {
+        return zod.object({});
       }
     }
   });

package/dist/features/test/test.js

@@ -41,8 +41,8 @@ var test_default = (api) => {
   api.describe({
     key: "test",
     config: {
-      schema(Joi) {
-        return Joi.object();
+      schema({ zod }) {
+        return zod.object({});
       }
     },
     enableBy() {

package/dist/features/tmpFiles/configTypes.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(configTypes_exports);
 var import_utils = require("@umijs/utils");
 var import_joi = __toESM(require("@umijs/utils/compiled/@hapi/joi"));
 var import_zod = require("@umijs/utils/compiled/zod");
-var import_path = require("path");
+var import_zod2ts = require("@umijs/zod2ts");
 var FILTER_KEYS = ["chainWebpack"];
 var configTypes_default = (api) => {
   api.onGenerateFiles(async () => {
@@ -72,17 +72,27 @@ var configTypes_default = (api) => {
       path: `core/pluginConfigJoi.d.ts`,
       content
     });
+    const typeName = `IConfigTypes`;
+    const typeString = (0, import_zod2ts.zodToTs)({
+      zod: import_zod.z.object(zodProperties),
+      identifier: typeName
+    }).replace(
+      // replace to support routes circular reference type
+      `routes?: (any | undefined)`,
+      `routes?: ${typeName}['routes']`
+    );
     const typeContent = `
-import { zod as z } from "${(0, import_utils.winPath)(
-      (0, import_path.dirname)(require.resolve("@umijs/utils/package.json"))
-    )}";
-import { IConfigFromPluginsJoi } from "./pluginConfigJoi.d";
+import { ${interfaceName} } from "./pluginConfigJoi.d";
 
-const IConfig = ${(0, import_utils.zod2string)(import_zod.z.object(zodProperties))};
+interface ${typeName} ${typeString};
 
-type IConfigTypes = z.infer<typeof IConfig>;
+type PrettifyWithCloseable<T> = {
+  [K in keyof T]: T[K] | false;
+} & {};
 
-export type IConfigFromPlugins = IConfigFromPluginsJoi & Partial<IConfigTypes>;
+export type IConfigFromPlugins = PrettifyWithCloseable<
+  ${interfaceName} & Partial<${typeName}>
+>;
     `;
     api.writeTmpFile({
       noPluginDir: true,

package/dist/features/tmpFiles/tmpFiles.js

@@ -47,8 +47,8 @@ var tmpFiles_default = (api) => {
   api.describe({
     key: "tmpFiles",
     config: {
-      schema(Joi) {
-        return Joi.boolean();
+      schema({ zod }) {
+        return zod.boolean();
       }
     }
   });

package/dist/features/vite/vite.js

@@ -26,8 +26,8 @@ var vite_default = (api) => {
   api.describe({
     key: "vite",
     config: {
-      schema(Joi) {
-        return Joi.object();
+      schema({ zod }) {
+        return zod.object({});
       }
     },
     enableBy: api.EnableBy.config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.58",
+  "version": "4.0.60",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -36,18 +36,19 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.0.58",
-    "@umijs/babel-preset-umi": "4.0.58",
-    "@umijs/bundler-vite": "4.0.58",
-    "@umijs/bundler-webpack": "4.0.58",
-    "@umijs/core": "4.0.58",
-    "@umijs/renderer-react": "4.0.58",
-    "@umijs/server": "4.0.58",
-    "@umijs/utils": "4.0.58",
-    "@umijs/plugin-run": "4.0.58",
-    "@umijs/bundler-utils": "4.0.58",
-    "@umijs/mfsu": "4.0.58",
-    "@umijs/did-you-know": "1.0.3"
+    "@umijs/ast": "4.0.60",
+    "@umijs/babel-preset-umi": "4.0.60",
+    "@umijs/bundler-utils": "4.0.60",
+    "@umijs/bundler-webpack": "4.0.60",
+    "@umijs/bundler-vite": "4.0.60",
+    "@umijs/core": "4.0.60",
+    "@umijs/mfsu": "4.0.60",
+    "@umijs/plugin-run": "4.0.60",
+    "@umijs/did-you-know": "1.0.3",
+    "@umijs/renderer-react": "4.0.60",
+    "@umijs/server": "4.0.60",
+    "@umijs/utils": "4.0.60",
+    "@umijs/zod2ts": "4.0.60"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",