befly-vite 1.5.17 → 1.5.19

package/index.browser.js

@@ -7,6 +7,36 @@
  * @property {Record<string, any>=} meta
  */
 
+function normalizeRouteSegment(segment) {
+    if (segment.startsWith(":")) {
+        return segment;
+    }
+
+    return segment
+        .replace(/_/g, "-")
+        .replace(/([a-z0-9])([A-Z])/g, "$1-$2")
+        .toLowerCase();
+}
+
+function resolveRoutePath(path, parentPath = "") {
+    const rawPath = String(path || "");
+    const match = rawPath.match(/_(\d+)$/);
+    const cleanPath = match ? rawPath.slice(0, match.index) : rawPath;
+    const routePath =
+        cleanPath === "index"
+            ? ""
+            : cleanPath
+                  .split("/")
+                  .filter(Boolean)
+                  .map((segment) => normalizeRouteSegment(segment))
+                  .join("/");
+
+    return {
+        layoutName: match ? match[1] : "",
+        path: `/${[parentPath, routePath].filter(Boolean).join("/")}`.replace(/\/+/g, "/")
+    };
+}
+
 /**
  * 内部实现：根据文件名后缀 _数字 判断使用哪个布局，并直接输出最终路由。
  *
@@ -14,66 +44,22 @@
  *
  * @param {RouteConfig[]} routes
  * @param {(layoutName: string) => any} resolveLayoutComponent
+ * @param {import('vue-router').RouteRecordRaw[]} result
  * @param {string=} parentPath
  * @param {string=} inheritLayout
- * @returns {import('vue-router').RouteRecordRaw[]}
  */
-function parseRoutePath(path) {
-    const rawPath = String(path || "");
-    const match = rawPath.match(/_(\d+)$/);
-
-    return {
-        layoutName: match ? match[1] : "",
-        path: match ? rawPath.slice(0, match.index) : rawPath
-    };
-}
-
-function normalizeRoutePath(path) {
-    return String(path || "")
-        .split("/")
-        .filter(Boolean)
-        .map((segment) => {
-            if (segment.startsWith(":")) {
-                return segment;
-            }
-
-            return segment
-                .replace(/_/g, "-")
-                .replace(/([a-z0-9])([A-Z])/g, "$1-$2")
-                .toLowerCase();
-        })
-        .join("/");
-}
-
-function joinRoutePath(parentPath, childPath) {
-    if (!parentPath) {
-        return childPath;
-    }
-
-    if (!childPath) {
-        return parentPath;
-    }
-
-    return `${parentPath}/${childPath}`;
-}
-
-function buildLayoutRoutes(routes, resolveLayoutComponent, parentPath = "", inheritLayout = "") {
-    /** @type {import('vue-router').RouteRecordRaw[]} */
-    const result = [];
-
+function appendLayoutRoutes(routes, resolveLayoutComponent, result, parentPath = "", inheritLayout = "") {
     for (const route of routes) {
-        const { layoutName, path } = parseRoutePath(route.path);
+        const { layoutName, path } = resolveRoutePath(route.path, parentPath);
         const currentLayout = layoutName || inheritLayout;
-        const currentPath = path === "index" ? "" : normalizeRoutePath(path);
-        const fullPath = joinRoutePath(parentPath, currentPath);
 
         if (route.children && route.children.length > 0) {
-            result.push(...buildLayoutRoutes(route.children, resolveLayoutComponent, fullPath, currentLayout));
+            appendLayoutRoutes(route.children, resolveLayoutComponent, result, path, currentLayout);
             continue;
         }
 
         result.push({
-            path: fullPath,
+            path: path,
             component: resolveLayoutComponent(currentLayout || "default"),
             meta: route.meta,
             children: [
@@ -84,8 +70,6 @@ function buildLayoutRoutes(routes, resolveLayoutComponent, parentPath = "", inhe
             ]
         });
     }
-
-    return result;
 }
 
 /**
@@ -110,8 +94,8 @@ export function Layouts(routes, rootRedirectPath, resolveLayoutComponent) {
     }
 
     const trimmedRootRedirectPath = typeof rootRedirectPath === "string" ? rootRedirectPath.trim() : "";
-
-    const layoutRoutes = buildLayoutRoutes(routes, resolveLayoutComponent);
+    const layoutRoutes = [];
+    appendLayoutRoutes(routes, resolveLayoutComponent, layoutRoutes);
 
     if (trimmedRootRedirectPath && trimmedRootRedirectPath !== "/") {
         return [

package/index.js

@@ -7,7 +7,6 @@ import AutoImport from "unplugin-auto-import/vite";
 import { TDesignResolver } from "unplugin-vue-components/resolvers";
 import Components from "unplugin-vue-components/vite";
 import bundleAnalyzer from "vite-bundle-analyzer";
-import VueDevTools from "vite-plugin-vue-devtools";
 import { defineConfig, mergeConfig } from "vite";
 import { VueRouterAutoImports } from "vue-router/unplugin";
 import VueRouter from "vue-router/vite";
@@ -88,10 +87,6 @@ function createComponentsPlugin() {
     });
 }
 
-function createDevToolsPlugin() {
-    return VueDevTools();
-}
-
 function createAnalyzerPlugin(appRoot) {
     return bundleAnalyzer({
         analyzerMode: "static",
@@ -107,7 +102,7 @@ function createAnalyzerPlugin(appRoot) {
  * 创建 Befly Vite 配置
  * @param {Object} options - 配置选项
  * @param {string} options.root - 项目根目录（可选）
- * @param {boolean} options.devtool - 是否启用 vite-plugin-vue-devtools（可选，默认 false）
+ * @param {boolean} options.devtool - 是否启用 Vite 8 内置 devtools（可选，默认 false）
  * @param {boolean} options.analyzer - 是否启用 vite-bundle-analyzer（可选，默认 false）
  * @param {Object} options.resolvers - 自定义 resolvers（可选）
  * @param {Function} options.manualChunks - 自定义分包配置（可选）
@@ -133,9 +128,6 @@ export function createBeflyViteConfig(options = {}) {
     const plugins = [];
     plugins.push(createRouterPlugin({ routesFolders: routesFolders }));
     plugins.push(createVuePlugin());
-    if (devtool) {
-        plugins.push(createDevToolsPlugin());
-    }
     plugins.push(createAutoImportPlugin({ resolvers: resolvers }));
     plugins.push(createComponentsPlugin({ resolvers: resolvers }));
     if (analyzer) {
@@ -145,6 +137,8 @@ export function createBeflyViteConfig(options = {}) {
     const baseConfig = defineConfig({
         base: "./",
 
+        devtools: devtool,
+
         plugins: plugins,
 
         resolve: {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "befly-vite",
-    "version": "1.5.17",
-    "gitHead": "7e5f2dee776d284ec29cec8aaf9ebc0acf24385d",
+    "version": "1.5.19",
+    "gitHead": "9f262d5515b1990c215e39285dedce3016d29d5c",
     "private": false,
     "description": "Befly Vite 配置预设和插件集合",
     "keywords": [
@@ -33,12 +33,12 @@
         "registry": "https://registry.npmjs.org"
     },
     "dependencies": {
+        "@vitejs/devtools": "^0.1.2",
         "@vitejs/plugin-vue": "^6.0.5",
         "sass": "^1.98.0",
         "unplugin-auto-import": "^21.0.0",
         "unplugin-vue-components": "^31.0.0",
-        "vite-bundle-analyzer": "^1.3.6",
-        "vite-plugin-vue-devtools": "^8.1.0"
+        "vite-bundle-analyzer": "^1.3.6"
     },
     "engines": {
         "bun": ">=1.3.0"