befly-vite 1.0.1 → 1.0.3

package/index.js

@@ -15,49 +15,56 @@ import { createInspectPlugin } from './plugins/inspect.js';
  * 默认分包策略
  */
 function defaultManualChunks(id) {
-    // Vue 核心框架
-    if (id.includes('node_modules/vue/') || id.includes('node_modules/@vue/')) {
-        return 'framework-vue';
+    // Vue 生态系统 - 使用更严格的匹配确保独立打包
+    // 注意：必须在 befly-addon 之前判断，因为 addon 会引用这些库
+
+    // vue-router（优先级最高）
+    if (id.match(/node_modules[\/\\]vue-router[\/\\]/)) {
+        return 'vue-router';
     }
-    if (id.includes('node_modules/vue-router/')) {
-        return 'framework-vue-router';
+
+    // pinia
+    if (id.match(/node_modules[\/\\]pinia[\/\\]/)) {
+        return 'pinia';
     }
-    if (id.includes('node_modules/pinia/')) {
-        return 'framework-pinia';
+
+    // vue 核心和运行时（@vue/* 包）
+    if (id.match(/node_modules[\/\\](vue[\/\\]|@vue[\/\\])/)) {
+        return 'vue';
     }
 
     // TDesign Vue Next
-    if (id.includes('node_modules/tdesign-vue-next/') || id.includes('node_modules/.bun/tdesign-vue-next')) {
+    if (id.includes('tdesign-vue-next')) {
         return 'tdesign';
     }
 
     // 工具库
-    if (id.includes('node_modules/axios/')) {
-        return 'lib-axios';
+    if (id.match(/node_modules[\/\\]axios[\/\\]/)) {
+        return 'axios';
     }
-    if (id.includes('node_modules/lodash-es/') || id.includes('node_modules/.bun/lodash-es')) {
-        return 'lib-lodash';
+    if (id.match(/node_modules[\/\\]lodash-es[\/\\]/)) {
+        return 'lodash';
     }
 
     // echarts
-    if (id.includes('node_modules/echarts/') || id.includes('node_modules/.bun/echarts')) {
-        return 'lib-echarts';
+    if (id.match(/node_modules[\/\\]echarts[\/\\]/)) {
+        return 'echarts';
     }
-    if (id.includes('node_modules/zrender/') || id.includes('node_modules/.bun/zrender')) {
-        return 'lib-zrender';
+    if (id.match(/node_modules[\/\\]zrender[\/\\]/)) {
+        return 'zrender';
     }
 
     // 图标
-    if (id.includes('node_modules/@iconify/') || id.includes('~icons/')) {
+    if (id.includes('/@iconify/') || id.includes('~icons/')) {
         return 'icons';
     }
 
     // Vue Macros
-    if (id.includes('node_modules/@vue-macros/') || id.includes('node_modules/vue-macros/')) {
+    if (id.match(/node_modules[\/\\](@vue-macros|vue-macros)[\/\\]/)) {
         return 'vue-macros';
     }
 
-    // befly-addon
+    // befly-addon（必须在 Vue 判断之后）
     if (id.includes('@befly-addon/') || id.includes('packages/addonAdmin/') || id.includes('packages\\addonAdmin\\')) {
         return 'befly-addon';
     }
@@ -119,21 +126,36 @@ export function createBeflyViteConfig(options = {}) {
             sourcemap: false,
             minify: 'esbuild',
             chunkSizeWarningLimit: 1000,
+            commonjsOptions: {
+                include: [/node_modules/],
+                transformMixedEsModules: true
+            },
             rollupOptions: {
                 output: {
                     chunkFileNames: 'assets/js/[name]-[hash].js',
                     entryFileNames: 'assets/js/[name]-[hash].js',
                     assetFileNames: 'assets/[ext]/[name]-[hash].[ext]',
-                    manualChunks: manualChunks || defaultManualChunks
-                }
-            }
-        },
-
-        css: {
-            preprocessorOptions: {
-                scss: {
-                    api: 'modern-compiler',
-                    additionalData: `@use "@/styles/variables.scss" as *;`
+                    manualChunks(id) {
+                        // 最高优先级：框架库必须单独打包
+                        if (id.includes('node_modules')) {
+                            // vue-router
+                            if (id.includes('/vue-router/')) return 'vue-router';
+                            // pinia
+                            if (id.includes('/pinia/')) return 'pinia';
+                            // vue 核心（包括 @vue/*）
+                            if (id.includes('/vue/') || id.includes('/@vue/')) return 'vue';
+                            // tdesign
+                            if (id.includes('/tdesign-vue-next/')) return 'tdesign';
+                            // axios
+                            if (id.includes('/axios/')) return 'axios';
+                            // 其他第三方库
+                            return 'vendor';
+                        }
+                        // befly-addon（workspace 包）
+                        if (id.includes('@befly-addon/') || id.includes('/addonAdmin/')) {
+                            return 'befly-addon';
+                        }
+                    }
                 }
             }
         },
@@ -150,7 +172,7 @@ export function createBeflyViteConfig(options = {}) {
 export { createUnoConfig } from './configs/uno.config.js';
 
 // 导出工具函数
-export { scanBeflyAddonViews } from './utils/scanBeflyAddonViews.js';
+export { scanBeflyViews } from './utils/scanBeflyViews.js';
 
 // 导出所有插件创建函数（供高级用户自定义）
 export { createVuePlugins } from './plugins/vue.js';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly-vite",
-    "version": "1.0.1",
+    "version": "1.0.3",
     "description": "Befly Vite 配置预设和插件集合",
     "type": "module",
     "private": false,
@@ -37,6 +37,7 @@
         "@unocss/preset-uno": "^66.5.6",
         "@vitejs/plugin-vue": "^6.0.1",
         "@vue-macros/reactivity-transform": "^3.1.1",
+        "sass": "^1.94.0",
         "unocss": "^66.5.6",
         "unplugin-auto-import": "^20.2.0",
         "unplugin-icons": "^22.5.0",
@@ -54,5 +55,5 @@
     "engines": {
         "bun": ">=1.3.0"
     },
-    "gitHead": "01a5bd6c9cb6c1c6f5f20f1c3136533d8da4024d"
+    "gitHead": "afb329b2cce2ab5f5821d8515ae7dba4622a4f1f"
 }

package/plugins/icons.js

@@ -8,6 +8,6 @@ export function createIconsPlugin() {
         compiler: 'vue3',
         autoInstall: false,
         defaultClass: 'icon-befly',
-        defaultStyle: 'margin-right: 8px; vertical-align: middle;'
+        defaultStyle: 'vertical-align: middle;'
     });
 }

package/plugins/router.js

@@ -1,13 +1,14 @@
 import VueRouter from 'unplugin-vue-router/vite';
+import { scanBeflyViews } from '../utils/scanBeflyViews.js';
 
 /**
  * 创建路由插件配置
  */
 export function createRouterPlugin(options = {}) {
-    const { scanViews } = options;
+    const { scanViews = scanBeflyViews } = options;
 
     return VueRouter({
-        routesFolder: scanViews ? scanViews() : 'src/views',
+        routesFolder: scanViews(),
         dts: './src/types/typed-router.d.ts',
         extensions: ['.vue'],
         importMode: 'async',

package/utils/{scanBeflyAddonViews.js → scanBeflyViews.js}

@@ -2,17 +2,28 @@ import { readdirSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
 
 /**
- * 扫描所有 @befly-addon 包的 views 目录
+ * 扫描项目和所有 @befly-addon 包的 views 目录
  * 用于 unplugin-vue-router 的 routesFolder 配置
- * 注意：此函数只能在 vite.config.js 中使用（Node.js 环境），不能在浏览器中使用
+ * 注意:此函数只能在 vite.config.js 中使用(Node.js 环境),不能在浏览器中使用
  * @returns 路由文件夹配置数组
  */
-export function scanBeflyAddonViews() {
+export function scanBeflyViews() {
     // 使用绝对路径：基于项目根目录（process.cwd()）
     const projectRoot = process.cwd();
     const addonBasePath = join(projectRoot, 'node_modules', '@befly-addon');
     const routesFolders = [];
 
+    // 1. 先添加项目自己的 views 目录
+    const projectViewsPath = join(projectRoot, 'src', 'views');
+    if (existsSync(projectViewsPath)) {
+        routesFolders.push({
+            src: projectViewsPath,
+            path: '',
+            exclude: ['**/components/**']
+        });
+    }
+
+    // 2. 扫描 @befly-addon 包的 views 目录
     if (!existsSync(addonBasePath)) {
         return routesFolders;
     }
@@ -31,7 +42,8 @@ export function scanBeflyAddonViews() {
             if (existsSync(viewsPath)) {
                 routesFolders.push({
                     src: viewsPath,
-                    path: `addon/${addonName}/`
+                    path: `addon/${addonName}/`,
+                    exclude: ['**/components/**']
                 });
             }
         }