befly-vite 1.4.13 → 1.4.15

package/README.md

@@ -26,6 +26,8 @@ import { createBeflyViteConfig } from "befly-vite";
 export default createBeflyViteConfig();
 ```
 
+> 提示：befly-admin-ui 的 `views` 路由会自动排除 `**/components/**`。
+
 ### 自定义配置
 
 ```javascript
@@ -35,9 +37,6 @@ import { fileURLToPath } from "node:url";
 export default createBeflyViteConfig({
     root: fileURLToPath(new URL(".", import.meta.url)),
 
-    // 说明：项目 views 固定扫描 "src/views"；如需扫描 addon 内的视图目录，可配置 addonView（单级目录名）
-    // addonView: "adminViews",
-
     // 自定义配置
     viteConfig: {
         server: {

package/index.js

@@ -1,105 +1,140 @@
-import { existsSync, readdirSync, realpathSync } from "node:fs";
+import { existsSync, realpathSync } from "node:fs";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 
+import vue from "@vitejs/plugin-vue";
+import AutoImport from "unplugin-auto-import/vite";
+import { TDesignResolver } from "unplugin-vue-components/resolvers";
+import Components from "unplugin-vue-components/vite";
 import { defineConfig, mergeConfig } from "vite";
-
-import { createAnalyzerPlugin } from "./plugins/analyzer.js";
-import { createAutoImportPlugin } from "./plugins/auto-import.js";
-import { createComponentsPlugin } from "./plugins/components.js";
-import { createDevToolsPlugin } from "./plugins/devtools.js";
-import { createIconsPlugin } from "./plugins/icons.js";
-import { createRouterPlugin } from "./plugins/router.js";
-import { createVuePlugin } from "./plugins/vue.js";
+import { analyzer } from "vite-bundle-analyzer";
+import VueDevTools from "vite-plugin-vue-devtools";
+import { VueRouterAutoImports } from "vue-router/unplugin";
+import VueRouter from "vue-router/vite";
 
 /**
- * 默认分包策略
+ * 创建路由插件配置
  */
-function defaultManualChunks(id) {
-    // Vue 生态系统 - 使用更严格的匹配确保独立打包
-    // 注意：必须在 befly-addon 之前判断，因为 addon 会引用这些库
-
-    // vue-router（优先级最高）
-    if (id.match(/node_modules[/\\]vue-router[/\\]/)) {
-        return "vue-router";
-    }
+function createRouterPlugin(options = {}) {
+    const { routesFolders } = options;
+
+    return VueRouter({
+        routesFolder: routesFolders,
+        dts: false,
+        extensions: [".vue"],
+        importMode: "async",
+        exclude: ["**/components/**"]
+    });
+}
 
-    // pinia
-    if (id.match(/node_modules[/\\]pinia[/\\]/)) {
-        return "pinia";
-    }
+/**
+ * 创建 Vue 插件配置
+ */
+function createVuePlugin() {
+    return vue({
+        script: {
+            defineModel: true,
+            propsDestructure: true
+        }
+    });
+}
 
-    // vue 核心和运行时（@vue/* 包）
-    if (id.match(/node_modules[/\\](vue[/\\]|@vue[/\\])/)) {
-        return "vue";
-    }
+/**
+ * 创建自动导入插件配置
+ */
+function createAutoImportPlugin() {
+    return AutoImport({
+        // 只给 admin 自身源码做自动导入；addon 视图强制手动导入
+        include: [/[\\/]src[\\/].*\.(vue|js)$/],
+        exclude: [/[\\/]packages[\\/].*[\\/]views[\\/]/, /[\\/]node_modules[\\/]befly-admin-ui[\\/]views[\\/]/],
+        imports: ["vue", "pinia", VueRouterAutoImports],
+        resolvers: [
+            TDesignResolver({
+                library: "vue-next"
+            })
+        ],
+        dts: false,
+        dirs: ["src/utils", "src/plugins", "src/config"],
+        vueTemplate: true
+    });
+}
 
-    // TDesign Vue Next
-    if (id.includes("tdesign-vue-next")) {
-        return "tdesign";
+function resolveTDesignIcon(componentName) {
+    if (componentName === "Icon" || componentName === "IconFont" || componentName.endsWith("Icon")) {
+        return {
+            name: componentName,
+            from: "tdesign-icons-vue-next"
+        };
     }
+}
 
-    // 工具库
-    if (id.match(/node_modules[/\\]axios[/\\]/)) {
-        return "axios";
-    }
-    if (id.match(/node_modules[/\\]lodash-es[/\\]/)) {
-        return "lodash";
-    }
+/**
+ * 创建组件自动导入插件配置
+ */
+function createComponentsPlugin() {
+    return Components({
+        // 只给 admin 自身源码做组件自动注册；addon 视图强制手动导入
+        include: [/[\\/]src[\\/].*\.vue$/],
+        exclude: [/[\\/]packages[\\/].*[\\/]views[\\/]/, /[\\/]node_modules[\\/]befly-admin-ui[\\/]views[\\/]/],
+        resolvers: [
+            TDesignResolver({
+                library: "vue-next"
+            }),
+            resolveTDesignIcon
+        ],
+        dirs: ["src/components"],
+        deep: true,
+        dts: false
+    });
+}
 
-    // echarts
-    if (id.match(/node_modules[/\\]echarts[/\\]/)) {
-        return "echarts";
-    }
-    if (id.match(/node_modules[/\\]zrender[/\\]/)) {
-        return "zrender";
-    }
+/**
+ * 创建打包分析插件配置
+ */
+function createAnalyzerPlugin(options = {}) {
+    const { analyzerMode = "static", fileName = "bundle-report", reportTitle = "打包分析", openAnalyzer = false } = options;
+
+    return analyzer({
+        analyzerMode: analyzerMode,
+        fileName: fileName,
+        reportTitle: reportTitle,
+        defaultSizes: "gzip",
+        gzipOptions: {},
+        brotliOptions: {},
+        openAnalyzer: openAnalyzer,
+        summary: true
+    });
+}
 
-    // 图标
-    if (id.includes("/@iconify/") || id.includes("~icons/")) {
-        return "icons";
+/**
+ * 创建 Vue DevTools 插件配置（仅开发环境）
+ */
+function createDevToolsPlugin() {
+    // 该插件内部会引入 inspector 能力；如果在非开发环境启用，容易引入不必要的解析开销/兼容性风险。
+    // Vite 的 plugins 数组允许包含 null/false，会被自动忽略。
+    if (process.env.NODE_ENV === "production") {
+        return null;
     }
 
-    // 注意：不要把所有 addon 或 node_modules 强制合并到单个 chunk。
-    // - addon 路由（importMode: async）应按页面懒加载自然拆分。
-    // - node_modules 让 Rollup 按共享与动态导入边界自动拆分即可。
-    // 如需进一步细分，可通过 createBeflyViteConfig({ manualChunks }) 注入自定义策略。
+    return VueDevTools();
 }
 
 /**
  * 创建 Befly Vite 配置
  * @param {Object} options - 配置选项
  * @param {string} options.root - 项目根目录（可选）
- * @param {string} options.addonView - addon 内要扫描的视图目录名（可选，默认 "adminViews"）
  * @param {Object} options.resolvers - 自定义 resolvers（可选）
  * @param {Function} options.manualChunks - 自定义分包配置（可选）
  * @param {Object} options.viteConfig - 用户自定义配置（可选）
  * @returns {Object} Vite 配置对象
  */
 export function createBeflyViteConfig(options = {}) {
-    const { root, addonView = "adminViews", resolvers = {}, manualChunks, viteConfig = {} } = options;
+    const { root, resolvers = {}, manualChunks, viteConfig = {} } = options;
 
     // 计算根目录（如果未提供）
     const appRoot = root || process.cwd();
 
-    if (typeof addonView !== "string") {
-        throw new Error('createBeflyViteConfig({ addonView }) 中 addonView 必须是字符串目录名。\n例如：addonView: "adminViews"');
-    }
-
-    if (addonView.trim() !== addonView) {
-        throw new Error('createBeflyViteConfig({ addonView }) 中 addonView 不能包含首尾空格。\n例如：addonView: "adminViews"');
-    }
-
-    if (!addonView) {
-        throw new Error('createBeflyViteConfig({ addonView }) 中 addonView 不能为空。\n例如：addonView: "adminViews"');
-    }
-
-    // 只能是单级目录名：禁止多级路径与路径穿越
-    if (addonView === "." || addonView === ".." || addonView.includes("/") || addonView.includes("\\") || addonView.includes("..") || addonView.includes("\0")) {
-        throw new Error('createBeflyViteConfig({ addonView }) 中 addonView 必须是单级目录名（不能是多级路径）。\n例如：addonView: "adminViews"');
-    }
-
-    const routesFolders = scanViewsInternal(appRoot, addonView);
+    const routesFolders = scanViews(appRoot);
 
     const enableAnalyzer = process.env["ANALYZE"] === "1";
 
@@ -107,13 +142,12 @@ export function createBeflyViteConfig(options = {}) {
     const plugins = [];
     plugins.push(createRouterPlugin({ routesFolders: routesFolders }));
     plugins.push(createVuePlugin());
-    plugins.push(createDevToolsPlugin());
+    // plugins.push(createDevToolsPlugin());
     plugins.push(createAutoImportPlugin({ resolvers: resolvers }));
     plugins.push(createComponentsPlugin({ resolvers: resolvers }));
-    plugins.push(createIconsPlugin());
-    if (enableAnalyzer) {
-        plugins.push(createAnalyzerPlugin());
-    }
+    // if (enableAnalyzer) {
+    //     plugins.push(createAnalyzerPlugin());
+    // }
 
     const baseConfig = defineConfig({
         base: "./",
@@ -132,35 +166,12 @@ export function createBeflyViteConfig(options = {}) {
         },
 
         build: {
-            target: "es2020",
             outDir: "dist",
-            assetsDir: "assets",
-            sourcemap: false,
-            reportCompressedSize: false,
-            chunkSizeWarningLimit: 1000,
-            commonjsOptions: {
-                include: [/node_modules/],
-                transformMixedEsModules: true
-            },
-            rolldownOptions: {
-                output: {
-                    chunkFileNames: "assets/js/[name]-[hash].js",
-                    entryFileNames: "assets/js/[name]-[hash].js",
-                    assetFileNames: "assets/[ext]/[name]-[hash].[ext]",
-                    codeSplitting: true,
-                    manualChunks(id) {
-                        if (typeof manualChunks === "function") {
-                            const chunkName = manualChunks(id);
-                            if (chunkName) return chunkName;
-                        }
-                        return defaultManualChunks(id);
-                    }
-                }
-            }
+            assetsDir: "assets"
         },
 
         optimizeDeps: {
-            include: ["vue", "vue-router", "pinia", "axios", "tdesign-vue-next"]
+            include: ["vue", "vue-router", "pinia", "axios", "tdesign-vue-next", "tdesign-icons-vue-next"]
         }
     });
 
@@ -168,13 +179,12 @@ export function createBeflyViteConfig(options = {}) {
 }
 
 /**
- * 内部实现：扫描项目和所有 @befly-addon 包的视图目录
+ * 扫描项目和 befly-admin-ui 的视图目录
  * @param {string} appRoot
- * @param {string} addonView
  * @returns {Array<{ src: string, path: string, exclude: string[] }>}
  */
-function scanViewsInternal(appRoot, addonView = "adminViews") {
-    const addonBasePath = join(appRoot, "node_modules", "@befly-addon");
+export function scanViews(appRoot = process.cwd()) {
+    const adminUiPath = join(appRoot, "node_modules", "befly-admin-ui");
 
     /** @type {Array<{ src: string, path: string, exclude: string[] }>} */
     const routesFolders = [];
@@ -189,31 +199,16 @@ function scanViewsInternal(appRoot, addonView = "adminViews") {
         });
     }
 
-    // 2. 扫描 @befly-addon/*/<addonView>（仅此目录允许生成 addon 路由）
-    if (!existsSync(addonBasePath)) {
-        return routesFolders;
-    }
-
-    try {
-        const addonDirs = readdirSync(addonBasePath);
-
-        for (const addonName of addonDirs) {
-            const addonPath = join(addonBasePath, addonName);
-            if (!existsSync(addonPath)) {
-                continue;
-            }
-
-            const addonViewPath = join(addonPath, addonView);
-            if (existsSync(addonViewPath)) {
-                routesFolders.push({
-                    src: realpathSync(addonViewPath),
-                    path: `addon/${addonName}/`,
-                    exclude: ["**/components/**"]
-                });
-            }
+    // 2. 扫描 befly-admin-ui/views（框架内置视图）
+    if (existsSync(adminUiPath)) {
+        const adminUiViewsPath = join(adminUiPath, "views");
+        if (existsSync(adminUiViewsPath)) {
+            routesFolders.push({
+                src: realpathSync(adminUiViewsPath),
+                path: "core/",
+                exclude: ["**/components/**"]
+            });
         }
-    } catch {
-        // 扫描失败保持静默，避免影响 Vite 启动
     }
 
     return routesFolders;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-vite",
-    "version": "1.4.13",
-    "gitHead": "079343731ad8b8138f1b9c378d2bb52b3516c40f",
+    "version": "1.4.15",
+    "gitHead": "3f389979b8d565fe0476e0859df5a2c94627137c",
     "private": false,
     "description": "Befly Vite 配置预设和插件集合",
     "keywords": [
@@ -18,8 +18,7 @@
         "index.browser.js",
         "index.js",
         "package.json",
-        "README.md",
-        "plugins/"
+        "README.md"
     ],
     "type": "module",
     "exports": {
@@ -37,14 +36,13 @@
         "@vitejs/plugin-vue": "^6.0.4",
         "sass": "^1.97.3",
         "unplugin-auto-import": "^21.0.0",
-        "unplugin-icons": "^23.0.1",
         "unplugin-vue-components": "^31.0.0",
         "vite-bundle-analyzer": "^1.3.6",
         "vite-plugin-vue-devtools": "^8.0.6"
     },
     "peerDependencies": {
-        "vite": "^8.0.0-beta.12",
-        "vue": "^3.5.27",
+        "vite": "^8.0.0-beta.15",
+        "vue": "^3.5.28",
         "vue-router": "^5.0.2"
     },
     "engines": {

package/plugins/analyzer.js

@@ -1,19 +0,0 @@
-import { analyzer } from "vite-bundle-analyzer";
-
-/**
- * 创建打包分析插件配置
- */
-export function createAnalyzerPlugin(options = {}) {
-    const { analyzerMode = "static", fileName = "bundle-report", reportTitle = "打包分析", openAnalyzer = false } = options;
-
-    return analyzer({
-        analyzerMode: analyzerMode,
-        fileName: fileName,
-        reportTitle: reportTitle,
-        defaultSizes: "gzip",
-        gzipOptions: {},
-        brotliOptions: {},
-        openAnalyzer: openAnalyzer,
-        summary: true
-    });
-}

package/plugins/auto-import.js

@@ -1,26 +0,0 @@
-import AutoImport from "unplugin-auto-import/vite";
-import { TDesignResolver } from "unplugin-vue-components/resolvers";
-import { VueRouterAutoImports } from "vue-router/unplugin";
-
-/**
- * 创建自动导入插件配置
- */
-export function createAutoImportPlugin(options = {}) {
-    const { resolvers = {} } = options;
-
-    return AutoImport({
-        // 只给 admin 自身源码做自动导入；addon 视图强制手动导入
-        include: [/[\\/]src[\\/].*\.(vue|ts|tsx)$/],
-        exclude: [/[\\/]packages[\\/].*[\\/](adminViews|appViews)[\\/]/, /[\\/]node_modules[\\/]@befly-addon[\\/].*[\\/](adminViews|appViews)[\\/]/],
-        imports: ["vue", "pinia", VueRouterAutoImports],
-        resolvers: [
-            TDesignResolver({
-                library: "vue-next"
-            }),
-            ...(resolvers.auto || [])
-        ],
-        dts: "src/types/auto-imports.d.ts",
-        dirs: ["src/utils", "src/plugins", "src/config"],
-        vueTemplate: true
-    });
-}

package/plugins/components.js

@@ -1,26 +0,0 @@
-import IconsResolver from "unplugin-icons/resolver";
-import { TDesignResolver } from "unplugin-vue-components/resolvers";
-import Components from "unplugin-vue-components/vite";
-
-/**
- * 创建组件自动导入插件配置
- */
-export function createComponentsPlugin(options = {}) {
-    const { resolvers = {} } = options;
-
-    return Components({
-        // 只给 admin 自身源码做组件自动注册；addon 视图强制手动导入
-        include: [/[\\/]src[\\/].*\.vue$/],
-        exclude: [/[\\/]packages[\\/].*[\\/](adminViews|appViews)[\\/]/, /[\\/]node_modules[\\/]@befly-addon[\\/].*[\\/](adminViews|appViews)[\\/]/],
-        resolvers: [
-            TDesignResolver({
-                library: "vue-next"
-            }),
-            IconsResolver({}),
-            ...(resolvers.components || [])
-        ],
-        dirs: ["src/components"],
-        deep: true,
-        dts: "src/types/components.d.ts"
-    });
-}

package/plugins/devtools.js

@@ -1,14 +0,0 @@
-import VueDevTools from "vite-plugin-vue-devtools";
-
-/**
- * 创建 Vue DevTools 插件配置（仅开发环境）
- */
-export function createDevToolsPlugin() {
-    // 该插件内部会引入 inspector 能力；如果在非开发环境启用，容易引入不必要的解析开销/兼容性风险。
-    // Vite 的 plugins 数组允许包含 null/false，会被自动忽略。
-    if (process.env.NODE_ENV === "production") {
-        return null;
-    }
-
-    return VueDevTools();
-}

package/plugins/icons.js

@@ -1,13 +0,0 @@
-import Icons from "unplugin-icons/vite";
-
-/**
- * 创建图标插件配置
- */
-export function createIconsPlugin() {
-    return Icons({
-        compiler: "vue3",
-        autoInstall: false,
-        defaultClass: "icon-befly",
-        defaultStyle: "vertical-align: middle;"
-    });
-}

package/plugins/reactivity-transform.js

@@ -1,14 +0,0 @@
-/**
- * ⚠️ 说明
- *
- * 本仓库已不再依赖 @vue-macros/reactivity-transform。
- *
- * 这个文件保留为“空实现”，避免旧项目/旧代码在仍引用 createReactivityTransformPlugin 时直接崩溃。
- * 新项目请使用 Vue 原生 ref/reactive/computed 等 API，不要使用 $ref/$computed/$shallowRef 宏。
- */
-
-export function createReactivityTransformPlugin() {
-    return {
-        name: "befly-no-reactivity-transform"
-    };
-}

package/plugins/router.js

@@ -1,16 +0,0 @@
-import VueRouter from "vue-router/vite";
-
-/**
- * 创建路由插件配置
- */
-export function createRouterPlugin(options = {}) {
-    const { routesFolders } = options;
-
-    return VueRouter({
-        routesFolder: routesFolders,
-        dts: "./src/types/typed-router.d.ts",
-        extensions: [".vue"],
-        importMode: "async",
-        exclude: ["**/components/**"]
-    });
-}

package/plugins/vue.js

@@ -1,13 +0,0 @@
-import vue from "@vitejs/plugin-vue";
-
-/**
- * 创建 Vue 插件配置
- */
-export function createVuePlugin() {
-    return vue({
-        script: {
-            defineModel: true,
-            propsDestructure: true
-        }
-    });
-}