@umijs/preset-umi 4.0.64 → 4.0.66

package/dist/commands/generators/component.js

@@ -84,21 +84,12 @@ var ComponentGenerator = class {
       capitalizeName
     );
     const { _, eject: _eject, fallback, ...restArgs } = args;
-    const indexFile = (0, import_path.join)(base, "index.ts");
-    const compFile = (0, import_path.join)(base, `${capitalizeName}.tsx`);
     await (0, import_utils2.processGenerateFiles)({
       filesMap: [
         {
-          from: (0, import_path.join)(appRoot, USER_TEMPLATE_COMP_DIR, "index"),
-          fromFallback: INDEX_TPL,
-          to: indexFile,
-          exts: [".ts.tpl", ".ts", "tsx.tpl", "tsx"]
-        },
-        {
-          from: (0, import_path.join)(appRoot, USER_TEMPLATE_COMP_DIR, "component"),
-          fromFallback: COMP_TPL,
-          to: compFile,
-          exts: [".tsx.tpl", ".tsx"]
+          from: (0, import_path.join)(appRoot, USER_TEMPLATE_COMP_DIR),
+          fromFallback: COMP_TEMPLATE_DIR,
+          to: base
         }
       ],
       baseDir: appRoot,
@@ -112,8 +103,7 @@ var ComponentGenerator = class {
     });
   }
 };
-var INDEX_TPL = (0, import_path.join)(import_constants.TEMPLATES_DIR, "generate/component/index.ts.tpl");
-var COMP_TPL = (0, import_path.join)(import_constants.TEMPLATES_DIR, "generate/component/component.tsx.tpl");
+var COMP_TEMPLATE_DIR = (0, import_path.join)(import_constants.TEMPLATES_DIR, "generate/component");
 var USER_TEMPLATE_COMP_DIR = "templates/component";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/commands/verify-commit.js

@@ -39,11 +39,11 @@ var verify_commit_default = (api) => {
   api.describe({
     key: "verifyCommit",
     config: {
-      schema(Joi) {
-        return Joi.object({
-          scope: Joi.array().items(Joi.string()),
-          allowEmoji: Joi.boolean()
-        });
+      schema({ zod }) {
+        return zod.object({
+          scope: zod.array(zod.string()),
+          allowEmoji: zod.boolean()
+        }).deepPartial();
       }
     }
   });

package/dist/features/icons/icons.js

@@ -145,7 +145,7 @@ var icons_default = (api) => {
     const localIcons = [];
     if (import_fs.default.existsSync(localIconDir)) {
       localIcons.push(
-        ...import_fs.default.readdirSync(localIconDir).filter((file) => file.endsWith(".svg")).map((file) => file.replace(/\.svg$/, ""))
+        ...readIconsFromDir(localIconDir).filter((file) => file.endsWith(".svg")).map((file) => file.replace(/\.svg$/, ""))
       );
     }
     api.writeTmpFile({
@@ -385,7 +385,7 @@ function normalizeRotate(rotate: number | string) {
 }
 
 function camelCase(str: string) {
-  return str.replace(/-([a-z]|[1-9])/g, (g) => g[1].toUpperCase());
+  return str.replace(/\\//g, '-').replace(/-([a-zA-Z]|[1-9])/g, (g) => g[1].toUpperCase());
 }
 
 function normalizeIconName(name: string) {
@@ -433,5 +433,22 @@ function normalizeIconName(name: string) {
     return import_path.default.join(api.paths.absSrcPath, "icons");
   }
 };
+function readIconsFromDir(dir) {
+  const icons = [];
+  const prefix = (0, import_utils.winPath)(import_path.default.join(dir, "./"));
+  const collect = (p) => {
+    if (import_fs.default.statSync(p).isDirectory()) {
+      const files = import_fs.default.readdirSync(p);
+      files.forEach((name) => {
+        collect(import_path.default.join(p, name));
+      });
+    } else {
+      const prunePath = (0, import_utils.winPath)(p).replace(prefix, "");
+      icons.push(prunePath);
+    }
+  };
+  collect(dir);
+  return icons;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/icons/svgr.js

@@ -38,7 +38,7 @@ var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_loadIcon = require("./loadIcon");
 function camelCase(str) {
-  return str.replace(/-([a-z]|[0-9])/g, (g) => g[1].toUpperCase());
+  return str.replace(/\//g, "-").replace(/-([a-zA-Z]|[0-9])/g, (g) => g[1].toUpperCase());
 }
 function generateIconName(opts) {
   return camelCase(`${opts.collect}-${opts.icon}`);

package/dist/features/prepare/prepare.js

@@ -79,13 +79,15 @@ var prepare_default = (api) => {
   api.register({
     key: "onGenerateFiles",
     async fn({ isFirstTime }) {
+      var _a, _b;
       if (api.appData.framework === "vue") {
         return;
       }
       if (!isFirstTime)
         return;
       import_utils.logger.info("Preparing...");
-      const entryFile = import_path.default.join(api.paths.absTmpPath, "umi.ts");
+      const umiEntry = import_path.default.join(api.paths.absTmpPath, "umi.ts");
+      const entryPoints = [umiEntry];
       const { build } = await import("./build.js");
       const watch = api.name === "dev";
       const plugins = await api.applyPlugins({
@@ -95,8 +97,13 @@ var prepare_default = (api) => {
       const unwrappedAlias = import_utils.aliasUtils.parseCircleAlias({
         alias: api.config.alias
       });
+      if (api.userConfig.mpa) {
+        (_b = (_a = api.appData.mpa) == null ? void 0 : _a.entry) == null ? void 0 : _b.forEach(({ tmpFilePath }) => {
+          entryPoints.push(import_path.default.join(api.paths.absTmpPath, tmpFilePath));
+        });
+      }
       const buildResult = await build({
-        entryPoints: [entryFile],
+        entryPoints,
         watch: watch && {
           async onRebuildSuccess({ result }) {
             const fileImports2 = await parseProjectImportSpecifiers(result);
@@ -119,8 +126,8 @@ var prepare_default = (api) => {
       });
       if (watch) {
         (0, import_watch.addUnWatch)(() => {
-          var _a;
-          (_a = buildResult.stop) == null ? void 0 : _a.call(buildResult);
+          var _a2;
+          (_a2 = buildResult.stop) == null ? void 0 : _a2.call(buildResult);
         });
       }
       const fileImports = await parseProjectImportSpecifiers(buildResult);

package/package.json

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