@lark-apaas/fullstack-rspack-preset 1.0.32-alpha.22 → 1.0.32-alpha.24

package/lib/preset.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -43,7 +10,7 @@ const core_1 = __importDefault(require("@rspack/core"));
 const devtool_kits_1 = require("@lark-apaas/devtool-kits");
 const plugin_react_refresh_1 = __importDefault(require("@rspack/plugin-react-refresh"));
 const dev_server_listener_1 = require("./utils/dev-server-listener");
-const route_parser_plugin_1 = __importStar(require("./rspack-plugins/route-parser-plugin"));
+const route_parser_plugin_1 = __importDefault(require("./rspack-plugins/route-parser-plugin"));
 const slardar_performance_monitor_plugin_1 = __importDefault(require("./rspack-plugins/slardar-performance-monitor-plugin"));
 const view_context_injection_plugin_1 = __importDefault(require("./rspack-plugins/view-context-injection-plugin"));
 const og_meta_injection_plugin_1 = __importDefault(require("./rspack-plugins/og-meta-injection-plugin"));
@@ -89,11 +56,25 @@ function createRecommendRspackConfig(options) {
     const staticAssetsPlugin = new static_assets_plugin_1.default({ clientBasePath, rootDir });
     // 优先从环境变量获取 RELEASE_ID，否则使用时间戳作为兜底
     const releaseId = process.env.RELEASE_ID || new Date().toISOString();
-    // 解析路由定义，供 DefinePlugin 注入到 bundle
-    let routeDefinitions = [];
+    // 读取构建前生成的路由定义 JSON，供 DefinePlugin 注入到 bundle
+    // build.sh 在 client 构建之前已将 page-routes.json / api-routes.json 写入 dist/
+    let pageRouteDefinitions = [];
+    let apiRouteDefinitions = [];
     if (needRoutes) {
-        const routeBasePath = isDev ? '' : (0, route_parser_plugin_1.normalizeBasePath)(clientBasePath || '');
-        routeDefinitions = (0, route_parser_plugin_1.parseRoutesFromFile)('./client/src/app.tsx', routeBasePath);
+        try {
+            const pageRoutesPath = path_1.default.resolve(rootDir, 'dist/page-routes.json');
+            if (fs_1.default.existsSync(pageRoutesPath)) {
+                pageRouteDefinitions = JSON.parse(fs_1.default.readFileSync(pageRoutesPath, 'utf-8'));
+            }
+        }
+        catch { /* ignore */ }
+        try {
+            const apiRoutesPath = path_1.default.resolve(rootDir, 'dist/api-routes.json');
+            if (fs_1.default.existsSync(apiRoutesPath)) {
+                apiRouteDefinitions = JSON.parse(fs_1.default.readFileSync(apiRoutesPath, 'utf-8'));
+            }
+        }
+        catch { /* ignore */ }
     }
     return {
         mode: isDev ? 'development' : 'production',
@@ -245,6 +226,9 @@ function createRecommendRspackConfig(options) {
                 'process.env.BUILD_TOOL': JSON.stringify('rspack'),
                 // 模板 flags 配置
                 'process.env.APP_FLAGS': JSON.stringify(appFlags),
+                // 路由定义，供客户端匹配 referer_path 和 api
+                'process.env.__PAGE_ROUTE_DEFINITIONS__': JSON.stringify(JSON.stringify(pageRouteDefinitions)),
+                'process.env.__API_ROUTE_DEFINITIONS__': JSON.stringify(JSON.stringify(apiRouteDefinitions)),
                 // 解决 window 未定义问题
                 'typeof window': JSON.stringify('object'),
                 window: 'globalThis',

package/lib/rspack-plugins/route-parser-plugin.d.ts

@@ -7,8 +7,6 @@ declare class RouteParserPlugin {
     private options;
     private lastAppPathHash;
     private cachedRoutes;
-    /** 不带 basePath 前缀的路由（供日志服务消费） */
-    private cachedPageRoutes;
     constructor(options?: RouteParserPluginOptions);
     private normalizeBasePath;
     private log;

package/lib/rspack-plugins/route-parser-plugin.js

@@ -48,8 +48,6 @@ class RouteParserPlugin {
     constructor(options = {}) {
         this.lastAppPathHash = null;
         this.cachedRoutes = null;
-        /** 不带 basePath 前缀的路由（供日志服务消费） */
-        this.cachedPageRoutes = null;
         // 从环境变量读取 basePath，并规范化（确保以 / 开头，不以 / 结尾）
         const envBasePath = process.env.CLIENT_BASE_PATH || '';
         const normalizedBasePath = this.normalizeBasePath(options.basePath ?? envBasePath);
@@ -104,12 +102,6 @@ class RouteParserPlugin {
                     source: () => routesJson,
                     size: () => routesJson.length
                 };
-                // 不带 basePath 前缀的路由，供日志服务消费
-                const pageRoutesJson = JSON.stringify(this.cachedPageRoutes, null, 2);
-                compilation.assets['page-routes.json'] = {
-                    source: () => pageRoutesJson,
-                    size: () => pageRoutesJson.length
-                };
                 callback();
             }
             catch (error) {
@@ -118,16 +110,10 @@ class RouteParserPlugin {
                 const defaultPath = basePath ? `${basePath}/` : '/';
                 const defaultRoutes = [{ path: defaultPath }];
                 const routesJson = JSON.stringify(defaultRoutes, null, 2);
-                const defaultPageRoutes = [{ path: '/' }];
-                const pageRoutesJson = JSON.stringify(defaultPageRoutes, null, 2);
                 compilation.assets['routes.json'] = {
                     source: () => routesJson,
                     size: () => routesJson.length
                 };
-                compilation.assets['page-routes.json'] = {
-                    source: () => pageRoutesJson,
-                    size: () => pageRoutesJson.length
-                };
                 callback();
             }
         });
@@ -214,11 +200,6 @@ class RouteParserPlugin {
                 }
             });
             const { basePath } = this.options;
-            // 不带前缀的纯页面路由（供日志服务消费）
-            const pageRoutes = Array.from(routeSet).map(routePath => ({
-                path: routePath,
-            }));
-            this.cachedPageRoutes = pageRoutes.length > 0 ? pageRoutes : [{ path: '/' }];
             const routes = Array.from(routeSet).map(routePath => ({
                 path: basePath ? `${basePath}${routePath}` : routePath,
             }));
@@ -230,7 +211,6 @@ class RouteParserPlugin {
             this.log('warn', '⚠️ 路由解析失败，使用默认路由:', error.message);
             const { basePath } = this.options;
             const defaultPath = basePath ? `${basePath}/` : '/';
-            this.cachedPageRoutes = [{ path: '/' }];
             return [{ path: defaultPath }];
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-rspack-preset",
-  "version": "1.0.32-alpha.22",
+  "version": "1.0.32-alpha.24",
   "files": [
     "lib",
     "patches",
@@ -31,7 +31,7 @@
     "@babel/parser": "^7.28.0",
     "@babel/traverse": "^7.28.0",
     "@babel/types": "^7.28.2",
-    "@lark-apaas/devtool-kits": "1.2.17-alpha.35",
+    "@lark-apaas/devtool-kits": "1.2.17-alpha.37",
     "@lark-apaas/miaoda-inspector-babel-plugin": "^1.0.2",
     "@lark-apaas/styled-jsx": "^1.0.1",
     "@rspack/plugin-react-refresh": "^1.5.1",