befly-vite 1.9.0 → 1.10.0

package/index.js

@@ -10,39 +10,15 @@ import bundleAnalyzer from "vite-bundle-analyzer";
 import VueDevTools from "vite-plugin-vue-devtools";
 import VueRouter from "vue-router/vite";
 
-/**
- * 创建路由插件配置
- */
-function createRouterPlugin(options = {}) {
-    const { routesFolders } = options;
-
-    return VueRouter({
-        routesFolder: routesFolders,
-        dts: false,
-        extensions: [".vue"],
-        importMode: "async",
-        exclude: ["**/components/**"]
-    });
-}
-
-/**
- * 创建 Vue 插件配置
- */
-function createVuePlugin() {
-    return vue({
-        script: {
-            defineModel: true,
-            propsDestructure: true
-        }
-    });
-}
-
-function createTDesignResolver() {
-    return TDesignResolver({
-        library: "vue-next",
-        importStyle: "css"
-    });
-}
+const COMPONENTS_EXCLUDE = [/[\\/]node_modules[\\/](?!(?:.*[\\/])?befly-admin-ui[\\/])/];
+const DEFAULT_CSS_TARGET = ["chrome107", "edge107", "firefox104", "safari16"];
+const DEFAULT_LIGHTNINGCSS_TARGETS = {
+    chrome: 107 << 16,
+    edge: 107 << 16,
+    firefox: 104 << 16,
+    ios_saf: 16 << 16,
+    safari: 16 << 16
+};
 
 function normalizeResolvers(resolvers) {
     if (resolvers === null || resolvers === undefined) {
@@ -65,10 +41,6 @@ function resolveTDesignIcon(componentName) {
     }
 }
 
-function createComponentsInclude() {
-    return [/[\\/]src[\\/].*\.vue$/, /[\\/]node_modules[\\/]befly-admin-ui[\\/].*\.vue$/, /[\\/]packages[\\/]adminUI[\\/].*\.vue$/];
-}
-
 /**
  * 创建组件自动注册插件配置
  */
@@ -76,44 +48,15 @@ function createComponentsPlugin(options = {}) {
     const { resolvers } = options;
 
     return Components({
-        // 给 admin 自身源码、node_modules 中的 befly-admin-ui，以及 monorepo 源码 packages/adminUI 做组件自动注册
-        include: createComponentsInclude(),
-        resolvers: [createTDesignResolver(), resolveTDesignIcon, ...normalizeResolvers(resolvers)],
+        // 恢复插件默认 include，保留 node_modules 排除，但放行 befly-admin-ui 内置视图
+        exclude: COMPONENTS_EXCLUDE,
+        resolvers: [TDesignResolver({ library: "vue-next", importStyle: "css" }), resolveTDesignIcon, ...normalizeResolvers(resolvers)],
         dirs: ["src/components"],
         deep: true,
         dts: false
     });
 }
 
-function createAnalyzerPlugin(appRoot) {
-    return bundleAnalyzer({
-        analyzerMode: "static",
-        openAnalyzer: false,
-        fileName: function () {
-            return join(appRoot, "temp", "analyzer");
-        },
-        reportTitle: "打包分析"
-    });
-}
-
-function createCssCompatConfig(viteConfig) {
-    const defaultCssTarget = ["chrome107", "edge107", "firefox104", "safari16"];
-    const defaultLightningCssTargets = {
-        chrome: 107 << 16,
-        edge: 107 << 16,
-        firefox: 104 << 16,
-        ios_saf: 16 << 16,
-        safari: 16 << 16
-    };
-
-    return {
-        cssTarget: viteConfig.build && Object.hasOwn(viteConfig.build, "cssTarget") ? viteConfig.build.cssTarget : defaultCssTarget,
-        lightningcss: {
-            targets: viteConfig.css && viteConfig.css.lightningcss && Object.hasOwn(viteConfig.css.lightningcss, "targets") ? viteConfig.css.lightningcss.targets : defaultLightningCssTargets
-        }
-    };
-}
-
 /**
  * 创建 Befly Vite 配置
  * @param {Object} options - 配置选项
@@ -138,23 +81,46 @@ export function createBeflyViteConfig(options = {}) {
 
     // 计算根目录（如果未提供）
     const appRoot = root || process.cwd();
-
     const routesFolders = scanViews(appRoot);
+    const cssTarget = viteConfig.build && Object.hasOwn(viteConfig.build, "cssTarget") ? viteConfig.build.cssTarget : DEFAULT_CSS_TARGET;
+    const lightningcssTargets = viteConfig.css && viteConfig.css.lightningcss && Object.hasOwn(viteConfig.css.lightningcss, "targets") ? viteConfig.css.lightningcss.targets : DEFAULT_LIGHTNINGCSS_TARGETS;
 
     /** @type {import('vite').Plugin[]} */
     const plugins = [];
-    plugins.push(createRouterPlugin({ routesFolders: routesFolders }));
-    plugins.push(createVuePlugin());
+    plugins.push(
+        VueRouter({
+            routesFolder: routesFolders,
+            dts: false,
+            extensions: [".vue"],
+            importMode: "async",
+            exclude: ["**/components/**"]
+        })
+    );
+    plugins.push(
+        vue({
+            script: {
+                defineModel: true,
+                propsDestructure: true
+            }
+        })
+    );
     if (devtool) {
         plugins.push(VueDevTools());
     }
     plugins.push(createComponentsPlugin({ resolvers: resolvers }));
     if (analyzer) {
-        plugins.push(createAnalyzerPlugin(appRoot));
+        plugins.push(
+            bundleAnalyzer({
+                analyzerMode: "static",
+                openAnalyzer: false,
+                fileName: function () {
+                    return join(appRoot, "temp", "analyzer");
+                },
+                reportTitle: "打包分析"
+            })
+        );
     }
 
-    const cssCompatConfig = createCssCompatConfig(viteConfig);
-
     const baseConfig = defineConfig({
         base: "./",
 
@@ -174,7 +140,7 @@ export function createBeflyViteConfig(options = {}) {
         build: {
             outDir: "dist",
             assetsDir: "assets",
-            cssTarget: cssCompatConfig.cssTarget,
+            cssTarget: cssTarget,
             rolldownOptions:
                 manualChunks === undefined
                     ? undefined
@@ -188,7 +154,9 @@ export function createBeflyViteConfig(options = {}) {
 
         css: {
             transformer: "lightningcss",
-            lightningcss: cssCompatConfig.lightningcss
+            lightningcss: {
+                targets: lightningcssTargets
+            }
         },
 
         optimizeDeps: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly-vite",
-    "version": "1.9.0",
+    "version": "1.10.0",
     "gitHead": "282f7accca9c8d55956a5490c0365cce4a1ad90d",
     "private": false,
     "description": "Befly Vite 配置预设和插件集合",