@lark-apaas/fullstack-rspack-preset 1.0.13-alpha.proxy.1 → 1.0.13-alpha.proxy.4

package/lib/preset.js

@@ -295,7 +295,7 @@ function createRecommendRspackConfig(options) {
             },
             setupMiddlewares: (middlewares, devServer) => {
                 if (devServer.app) {
-                    (0, dev_server_snapdom_proxy_1.registerSnapDomProxyMiddleware)(devServer.app);
+                    (0, dev_server_snapdom_proxy_1.registerSnapDomProxyMiddleware)(devServer.app, { baseUrl: clientBasePath });
                     (0, devtool_kits_1.registerMiddlewares)(devServer.app, [
                         (0, devtool_kits_1.createDevLogsMiddleware)({ logDir: process.env.LOG_DIR || './logs' }),
                         (0, devtool_kits_1.createOpenapiMiddleware)({

package/lib/utils/dev-server-snapdom-proxy.d.ts

@@ -1,5 +1,6 @@
 interface SnapDomMiddlewareOptions {
     proxyUrl?: string;
+    baseUrl?: string;
 }
 export declare function registerSnapDomProxyMiddleware(serverApp: any, options?: SnapDomMiddlewareOptions): void;
 export {};

package/lib/utils/dev-server-snapdom-proxy.js

@@ -1,12 +1,18 @@
 "use strict";
 /* eslint-disable @typescript-eslint/no-explicit-any */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerSnapDomProxyMiddleware = registerSnapDomProxyMiddleware;
+const path_1 = __importDefault(require("path"));
 function registerSnapDomProxyMiddleware(serverApp, options = {}) {
-    const { proxyUrl = '/snapdom-proxy' } = options;
+    // `/dev`前缀保证请求不会被拦截
+    const { proxyUrl = '/dev/snapdom-proxy', baseUrl = '/' } = options;
+    const targetUrl = path_1.default.join(baseUrl, proxyUrl);
     // req: import('express').Request
     // res: import('express').Response
-    serverApp.get(proxyUrl, async (req, res) => {
+    serverApp.get(targetUrl, async (req, res) => {
         try {
             let targetUrl = req.query.url;
             if (!targetUrl) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-rspack-preset",
-  "version": "1.0.13-alpha.proxy.1",
+  "version": "1.0.13-alpha.proxy.4",
   "files": [
     "lib",
     "patches",