@nocobase/app 2.3.0-alpha.1 → 3.0.0-alpha.2

package/client-v2/rsbuild.config.ts

@@ -15,6 +15,7 @@ import { pluginNodePolyfill } from '@rsbuild/plugin-node-polyfill';
 import { pluginReact } from '@rsbuild/plugin-react';
 import { pluginSvgr } from '@rsbuild/plugin-svgr';
 import { generateV2Plugins, getRsbuildBrowserAlias } from '@nocobase/devtools/rsbuildConfig';
+import { createSettingsDevProxyOptions, isSettingsDevPath } from '../settingsDevProxy';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -33,7 +34,11 @@ function normalizeModernClientPrefix(value: string | undefined) {
   const segment = String(value || '')
     .trim()
     .replace(/^\/+|\/+$/g, '');
-  return segment || MODERN_CLIENT_DIST_DIR;
+  const normalized = segment || MODERN_CLIENT_DIST_DIR;
+  if (normalized === 'settings') {
+    throw new Error('APP_MODERN_CLIENT_PREFIX "settings" is reserved for the standalone Settings application.');
+  }
+  return normalized;
 }
 
 function ensurePublicPath(value: string) {
@@ -147,6 +152,7 @@ export default defineConfig(({ command }) => {
   const fileBasePath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/files/`);
   const localStorageBasePath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/storage/uploads/`);
   const staticBasePath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/static/`);
+  const portalBasePath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/x/`);
   const modernClientPrefix = normalizeModernClientPrefix(process.env.APP_MODERN_CLIENT_PREFIX);
   // Build bakes the FIXED dist-dir segment (`/v/`) as a sentinel that the
   // server rewrites to the runtime prefix per request. Dev serves under the
@@ -158,6 +164,7 @@ export default defineConfig(({ command }) => {
   const wsBasePath = ensurePublicPath(process.env.WS_PATH || '/ws/');
   const hmrPath = `${v2PublicPath.replace(/\/$/, '')}/__rspack_hmr`;
   const v2Port = toNumber(process.env.APP_V2_PORT, 13002);
+  const settingsPort = toNumber(process.env.APP_SETTINGS_PORT, toNumber(process.env.APP_PORT, 13001) + 3);
   const hmrClientHost = process.env.RSPACK_HMR_CLIENT_HOST;
   const hmrClientPort = toNumber(process.env.RSPACK_HMR_CLIENT_PORT || process.env.APP_PORT, v2Port);
   const proxyTargetUrl = process.env.PROXY_TARGET_URL || `http://127.0.0.1:${process.env.APP_PORT || 13001}`;
@@ -256,8 +263,10 @@ export default defineConfig(({ command }) => {
       publicDir: {
         name: path.resolve(__dirname, 'public'),
       },
-      proxy: {
-        [apiBasePath]: {
+      proxy: [
+        createSettingsDevProxyOptions(appPublicPath, settingsPort),
+        {
+          context: apiBasePath,
           target: proxyTargetUrl,
           changeOrigin: true,
           ws: true,
@@ -275,25 +284,36 @@ export default defineConfig(({ command }) => {
             }
           },
         },
-        [localStorageBasePath]: {
+        {
+          context: localStorageBasePath,
           target: proxyTargetUrl,
           changeOrigin: true,
         },
-        [fileBasePath]: {
+        {
+          context: fileBasePath,
           target: proxyTargetUrl,
           changeOrigin: true,
         },
-        [staticBasePath]: {
+        {
+          context: staticBasePath,
           target: proxyTargetUrl,
           changeOrigin: true,
         },
-        [wsBasePath]: {
+        {
+          context: portalBasePath,
           target: proxyTargetUrl,
           changeOrigin: true,
           ws: true,
           xfwd: true,
         },
-      },
+        {
+          context: wsBasePath,
+          target: proxyTargetUrl,
+          changeOrigin: true,
+          ws: true,
+          xfwd: true,
+        },
+      ],
       historyApiFallback: {
         disableDotRule: true,
         index: `${v2PublicPath}index.html`,
@@ -317,7 +337,9 @@ export default defineConfig(({ command }) => {
               pathname.startsWith(apiBasePath) ||
               pathname.startsWith(wsBasePath) ||
               pathname.startsWith(localStorageBasePath) ||
-              pathname.startsWith(staticBasePath)
+              pathname.startsWith(portalBasePath) ||
+              pathname.startsWith(staticBasePath) ||
+              isSettingsDevPath(pathname, appPublicPath)
             ) {
               next();
               return;