@umijs/preset-umi 4.0.65 → 4.0.67

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/esbuildPlugins/esbuildExternalPlugin.js

@@ -41,6 +41,11 @@ function esbuildExternalPlugin(opts) {
     name: "esbuildExternalPlugin",
     setup(build) {
       build.onResolve({ filter: /.*/ }, (args) => {
+        if (args.path.includes("_UMI_PREPARE_EXTERNAL_")) {
+          return {
+            external: true
+          };
+        }
         if (!isSource(args.path)) {
           return {
             external: true

package/dist/features/tmpFiles/tmpFiles.js

@@ -102,10 +102,7 @@ var tmpFiles_default = (api) => {
             ...api.appData.framework === "vue" ? {
               // TODO Actually, it should be vite mode, but here it is written as vue only
               // Required in Vite https://vitejs.dev/guide/features.html#typescript
-              isolatedModules: true,
-              // For `<script setup>`
-              // See <https://devblogs.microsoft.com/typescript/announcing-typescript-4-5-beta/#preserve-value-imports>
-              preserveValueImports: true
+              isolatedModules: true
             } : {},
             paths: {
               "@/*": [`${srcPrefix}*`],
@@ -123,8 +120,9 @@ var tmpFiles_default = (api) => {
             `${baseUrl}.umirc.ts`,
             `${baseUrl}**/*.d.ts`,
             `${baseUrl}**/*.ts`,
-            `${baseUrl}**/*.tsx`
-          ]
+            `${baseUrl}**/*.tsx`,
+            api.appData.framework === "vue" && `${baseUrl}**/*.vue`
+          ].filter(Boolean)
         },
         null,
         2

package/dist/features/ui/ui.js

@@ -113,6 +113,16 @@ var ui_default = (api) => {
       `
     ];
   });
+  api.modifyAppData(async (memo) => {
+    const uiModules = await api.applyPlugins({
+      key: "addUIModules",
+      initialValue: []
+    }) ?? [];
+    memo.ui = {
+      modules: uiModules
+    };
+    return memo;
+  });
   api.onGenerateFiles(({ isFirstTime }) => {
     if (!isFirstTime)
       return;

package/dist/registerMethods.js

@@ -75,6 +75,7 @@ var registerMethods_default = (api) => {
     "addHTMLScripts",
     "addTmpGenerateWatcherPaths",
     "addOnDemandDeps",
+    "addUIModules",
     "chainWebpack",
     "modifyEntry",
     "modifyHTMLFavicon",

package/dist/types.d.ts

@@ -67,6 +67,17 @@ export interface IOnGenerateFiles {
     files?: IFileInfo | null;
     isFirstTime?: boolean;
 }
+export interface IUIMenu {
+    path: string;
+    url: string;
+    icon: string;
+    name: string;
+}
+export interface IUIModule {
+    name: string;
+    menus?: IUIMenu[];
+    [key: string]: any;
+}
 export declare type GenerateFilesFn = (opts: IOnGenerateFiles) => Promise<void>;
 export declare type OnConfigChangeFn = (opts: {
     generate: GenerateFilesFn;
@@ -101,6 +112,7 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
     addRuntimePlugin: IAdd<null, string>;
     addRuntimePluginKey: IAdd<null, string>;
     addTmpGenerateWatcherPaths: IAdd<null, string>;
+    addUIModules: IAdd<null, IUIModule[]>;
     chainWebpack: {
         (fn: {
             (memo: WebpackChain, args: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.65",
+  "version": "4.0.67",
   "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.65",
-    "@umijs/babel-preset-umi": "4.0.65",
-    "@umijs/bundler-vite": "4.0.65",
-    "@umijs/core": "4.0.65",
+    "@umijs/ast": "4.0.67",
+    "@umijs/babel-preset-umi": "4.0.67",
+    "@umijs/bundler-utils": "4.0.67",
+    "@umijs/bundler-webpack": "4.0.67",
+    "@umijs/bundler-vite": "4.0.67",
+    "@umijs/core": "4.0.67",
+    "@umijs/mfsu": "4.0.67",
+    "@umijs/renderer-react": "4.0.67",
+    "@umijs/plugin-run": "4.0.67",
+    "@umijs/server": "4.0.67",
+    "@umijs/utils": "4.0.67",
+    "@umijs/zod2ts": "4.0.67",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/mfsu": "4.0.65",
-    "@umijs/renderer-react": "4.0.65",
-    "@umijs/bundler-utils": "4.0.65",
-    "@umijs/bundler-webpack": "4.0.65",
-    "@umijs/ui": "3.0.0-alpha.0",
-    "@umijs/utils": "4.0.65",
-    "@umijs/zod2ts": "4.0.65",
-    "@umijs/plugin-run": "4.0.65",
-    "@umijs/server": "4.0.65"
+    "@umijs/ui": "3.0.0-alpha.0"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",
@@ -64,7 +64,7 @@
     "multer": "1.4.4",
     "os-locale": "^6.0.2",
     "sirv": "2.0.2",
-    "vite": "4.2.0"
+    "vite": "4.3.1"
   },
   "publishConfig": {
     "access": "public"