@nocobase/app 2.4.0-alpha.10 → 2.4.0-alpha.12

package/client/rsbuild.config.ts

@@ -67,7 +67,7 @@ function createRuntimeHeadScript(appPublicPath: string, isBuild: boolean) {
       `window['__nocobase_public_path__'] = ${JSON.stringify(appPublicPath)};`,
       `window['__nocobase_modern_client_prefix__'] = ${JSON.stringify(modernClientPrefix)};`,
       `window['__nocobase_app_client_entry_mode__'] = ${JSON.stringify(appClientEntryMode)};`,
-      `window['__nocobase_dev_public_path__'] = "/";`,
+      `window['__nocobase_dev_public_path__'] = ${JSON.stringify(appPublicPath)};`,
       `window['__nocobase_app_dev__'] = ${JSON.stringify(process.env.NOCOBASE_APP_DEV === 'true')};`,
       `window['__esm_cdn_base_url__'] = ${JSON.stringify(process.env.ESM_CDN_BASE_URL || '')};`,
       `window['__esm_cdn_suffix__'] = ${JSON.stringify(process.env.ESM_CDN_SUFFIX || '')};`,
@@ -113,7 +113,6 @@ export default defineConfig(({ command }) => {
   const isDev = !isBuild;
   const resolvedAppPublicPath = ensurePublicPath(process.env.APP_PUBLIC_PATH, '/');
   const appPublicPath = isBuild ? APP_PUBLIC_PATH_TEMPLATE : resolvedAppPublicPath;
-  const htmlPublicPath = isDev ? '/' : appPublicPath;
   const apiBasePath = ensurePublicPath(process.env.API_BASE_PATH, '/api/');
   const fileBasePath = ensurePublicPath(`${resolvedAppPublicPath}files/`, '/files/');
   const localStorageBasePath = ensurePublicPath(`${resolvedAppPublicPath}storage/uploads/`, '/storage/uploads/');
@@ -157,7 +156,7 @@ export default defineConfig(({ command }) => {
           tag: 'link',
           attrs: {
             rel: 'stylesheet',
-            href: `${htmlPublicPath}global.css`,
+            href: `${appPublicPath}global.css`,
           },
           publicPath: false,
           head: true,
@@ -172,7 +171,7 @@ export default defineConfig(({ command }) => {
         {
           tag: 'script',
           attrs: {
-            src: `${htmlPublicPath}browser-checker.js?v=1`,
+            src: `${appPublicPath}browser-checker.js?v=1`,
           },
           publicPath: false,
           head: true,

package/client-v2/rsbuild.config.ts

@@ -335,8 +335,13 @@ export default defineConfig(({ command }) => {
             }
             const [rawPathname = '/', query = ''] = String(req.url || '/').split('?');
             const pathname = normalizePathname(rawPathname);
+            // Strip APP_PUBLIC_PATH first so `/nocobase/admin` maps to `/nocobase/v/admin` instead of
+            // `/nocobase/v/nocobase/admin`, and `/nocobase/index.html` is still treated as a document entry.
+            const relativePath = isWithinBasePath(pathname, appPublicPath)
+              ? normalizePathname(pathname.slice(normalizePathname(appPublicPath).length))
+              : pathname;
             if (
-              !isClientDocumentEntryPath(pathname) ||
+              !isClientDocumentEntryPath(relativePath) ||
               pathname.startsWith('/.well-known/') ||
               pathname.startsWith(apiBasePath) ||
               pathname.startsWith(wsBasePath) ||
@@ -349,7 +354,7 @@ export default defineConfig(({ command }) => {
               return;
             }
             if (!isWithinBasePath(pathname, v2PublicPath)) {
-              const target = pathname === '/' ? v2PublicPath : `${v2PublicPath.replace(/\/$/, '')}${pathname}`;
+              const target = relativePath === '/' ? v2PublicPath : `${v2PublicPath.replace(/\/$/, '')}${relativePath}`;
               res.statusCode = 302;
               res.setHeader('Location', `${target}${query ? `?${query}` : ''}`);
               res.end();