@nocobase/app 2.1.0-beta.44 → 2.1.0-beta.46

package/client/public/browser-checker.js

@@ -1,14 +1,35 @@
-const basename = window['__nocobase_public_path__'] || '/';
-let currentPath = window.location.pathname;
-if (currentPath === basename.slice(0, -1)) {
+function ensureLeadingSlash(value) {
+  if (!value) {
+    return '/';
+  }
+  return value.startsWith('/') ? value : `/${value}`;
+}
+
+function ensureTrailingSlash(value) {
+  if (!value) {
+    return '/';
+  }
+  return value.endsWith('/') ? value : `${value}/`;
+}
+
+function normalizePublicPath(value) {
+  const normalized = ensureLeadingSlash(String(value || '/').trim() || '/').replace(/\/{2,}/g, '/');
+  return ensureTrailingSlash(normalized);
+}
+
+const basename = normalizePublicPath(window['__nocobase_public_path__'] || '/');
+const currentPath = ensureLeadingSlash(String(window.location.pathname || '/').trim() || '/').replace(/\/{2,}/g, '/');
+const basenameWithoutTrailingSlash = basename === '/' ? '/' : basename.replace(/\/+$/, '');
+
+if (basename !== '/' && currentPath === basenameWithoutTrailingSlash) {
   const newUrl = `${window.location.origin}${basename}${window.location.search}${window.location.hash}`;
   window.location.replace(newUrl);
-} else if (!currentPath.startsWith(basename)) {
-  let newPath = basename + (currentPath.startsWith('/') ? currentPath.slice(1) : currentPath);
+} else if (basename !== '/' && !currentPath.startsWith(basename)) {
+  const newPath = currentPath === '/' ? basename : `${basenameWithoutTrailingSlash}${currentPath}`;
   let newUrl = window.location.origin + newPath + window.location.search + window.location.hash;
   window.location.replace(newUrl);
 }
-showLog = true;
+let showLog = true;
 function log(m) {
   if (window.console && showLog) {
     console.log(m);
@@ -46,7 +67,7 @@ function css_browser_selector(u) {
     dv = 'device_',
     html = document.documentElement,
     b = [
-      (!/opera|webtv/i.test(ua) && /msie\s(\d+)/.test(ua)) || /trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.test(ua)
+      (!/opera|webtv/i.test(ua) && /msie\s(\d+)/.test(ua)) || /trident\/.*rv:([0-9]{1,}[.0-9]{0,})/.test(ua)
         ? 'ie ie' + (/trident\/4\.0/.test(ua) ? '8' : RegExp.$1 == '11.0' ? '11' : RegExp.$1)
         : is('firefox/')
         ? g +
@@ -70,7 +91,7 @@ function css_browser_selector(u) {
         ? bb +
           (/Version\/(\d+)(\.(\d+)+)/i.test(ua)
             ? ' ' + bb + RegExp.$1 + ' ' + bb + RegExp.$1 + RegExp.$2.replace('.', '_')
-            : /Blackberry ?(([0-9]+)([a-z]?))[\/|;]/gi.test(ua)
+            : /Blackberry ?(([0-9]+)([a-z]?))[/|;]/gi.test(ua)
             ? ' ' + bb + RegExp.$2 + (RegExp.$3 ? ' ' + bb + RegExp.$2 + RegExp.$3 : '')
             : '')
         : is('android')
@@ -112,7 +133,7 @@ function css_browser_selector(u) {
       is('j2me')
         ? 'j2me'
         : is('ipad|ipod|iphone')
-        ? (/CPU( iPhone)? OS (\d+[_|\.]\d+([_|\.]\d+)*)/i.test(ua) ? 'ios' + version('ios', RegExp.$2) : '') +
+        ? (/CPU( iPhone)? OS (\d+[_.]\d+([_.]\d+)*)/i.test(ua) ? 'ios' + version('ios', RegExp.$2) : '') +
           ' ' +
           (/(ip(ad|od|hone))/gi.test(ua) ? RegExp.$1 : '')
         : is('playbook')
@@ -144,7 +165,7 @@ function css_browser_selector(u) {
         : is('x11|linux')
         ? 'linux'
         : '',
-      /[; |\[](([a-z]{2})(\-[a-z]{2})?)[)|;|\]]/i.test(ua)
+      /(?:[; |]|\[)(([a-z]{2})(-[a-z]{2})?)(?:\)|;|\||])/i.test(ua)
         ? (lang + RegExp.$2).replace('-', '_') + (RegExp.$3 != '' ? (' ' + lang + RegExp.$1).replace('-', '_') : '')
         : '',
       is('ipad|iphone|ipod') && !is('safari') ? 'ipad_app' : '',
@@ -161,7 +182,7 @@ function css_browser_selector(u) {
         break;
       }
     }
-    widthClasses = '';
+    let widthClasses = '';
     for (var info in uaInfo) {
       widthClasses += ' ' + info + '_' + uaInfo[info];
     }

package/client/rsbuild.config.ts

@@ -99,7 +99,14 @@ export default defineConfig(({ command }) => {
   const localStorageBasePath = ensurePublicPath(`${resolvedAppPublicPath}storage/uploads/`, '/storage/uploads/');
   const staticBasePath = ensurePublicPath(`${resolvedAppPublicPath}static/`, '/static/');
   const wsBasePath = ensurePublicPath(process.env.WS_PATH, '/ws/');
-  const v2BasePath = ensurePublicPath(`${resolvedAppPublicPath.replace(/\/$/, '')}/v2/`, '/v2/');
+  const modernClientPrefix =
+    String(process.env.APP_MODERN_CLIENT_PREFIX || 'v')
+      .trim()
+      .replace(/^\/+|\/+$/g, '') || 'v';
+  const v2BasePath = ensurePublicPath(
+    `${resolvedAppPublicPath.replace(/\/$/, '')}/${modernClientPrefix}/`,
+    `/${modernClientPrefix}/`,
+  );
   const clientPort = toNumber(process.env.APP_PORT, 13001);
   const v2Port = toNumber(process.env.APP_V2_PORT, clientPort + 2);
   const hmrPath = `${resolvedAppPublicPath.replace(/\/$/, '')}/__rspack_hmr`;

package/client-v2/public/browser-checker.js

@@ -1,14 +1,35 @@
-const basename = window['__nocobase_public_path__'] || '/';
-let currentPath = window.location.pathname;
-if (currentPath === basename.slice(0, -1)) {
+function ensureLeadingSlash(value) {
+  if (!value) {
+    return '/';
+  }
+  return value.startsWith('/') ? value : `/${value}`;
+}
+
+function ensureTrailingSlash(value) {
+  if (!value) {
+    return '/';
+  }
+  return value.endsWith('/') ? value : `${value}/`;
+}
+
+function normalizePublicPath(value) {
+  const normalized = ensureLeadingSlash(String(value || '/').trim() || '/').replace(/\/{2,}/g, '/');
+  return ensureTrailingSlash(normalized);
+}
+
+const basename = normalizePublicPath(window['__nocobase_public_path__'] || '/');
+const currentPath = ensureLeadingSlash(String(window.location.pathname || '/').trim() || '/').replace(/\/{2,}/g, '/');
+const basenameWithoutTrailingSlash = basename === '/' ? '/' : basename.replace(/\/+$/, '');
+
+if (basename !== '/' && currentPath === basenameWithoutTrailingSlash) {
   const newUrl = `${window.location.origin}${basename}${window.location.search}${window.location.hash}`;
   window.location.replace(newUrl);
-} else if (!currentPath.startsWith(basename)) {
-  let newPath = basename + (currentPath.startsWith('/') ? currentPath.slice(1) : currentPath);
+} else if (basename !== '/' && !currentPath.startsWith(basename)) {
+  const newPath = currentPath === '/' ? basename : `${basenameWithoutTrailingSlash}${currentPath}`;
   let newUrl = window.location.origin + newPath + window.location.search + window.location.hash;
   window.location.replace(newUrl);
 }
-showLog = true;
+let showLog = true;
 function log(m) {
   if (window.console && showLog) {
     console.log(m);
@@ -46,7 +67,7 @@ function css_browser_selector(u) {
     dv = 'device_',
     html = document.documentElement,
     b = [
-      (!/opera|webtv/i.test(ua) && /msie\s(\d+)/.test(ua)) || /trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.test(ua)
+      (!/opera|webtv/i.test(ua) && /msie\s(\d+)/.test(ua)) || /trident\/.*rv:([0-9]{1,}[.0-9]{0,})/.test(ua)
         ? 'ie ie' + (/trident\/4\.0/.test(ua) ? '8' : RegExp.$1 == '11.0' ? '11' : RegExp.$1)
         : is('firefox/')
         ? g +
@@ -70,7 +91,7 @@ function css_browser_selector(u) {
         ? bb +
           (/Version\/(\d+)(\.(\d+)+)/i.test(ua)
             ? ' ' + bb + RegExp.$1 + ' ' + bb + RegExp.$1 + RegExp.$2.replace('.', '_')
-            : /Blackberry ?(([0-9]+)([a-z]?))[\/|;]/gi.test(ua)
+            : /Blackberry ?(([0-9]+)([a-z]?))[/|;]/gi.test(ua)
             ? ' ' + bb + RegExp.$2 + (RegExp.$3 ? ' ' + bb + RegExp.$2 + RegExp.$3 : '')
             : '')
         : is('android')
@@ -112,7 +133,7 @@ function css_browser_selector(u) {
       is('j2me')
         ? 'j2me'
         : is('ipad|ipod|iphone')
-        ? (/CPU( iPhone)? OS (\d+[_|\.]\d+([_|\.]\d+)*)/i.test(ua) ? 'ios' + version('ios', RegExp.$2) : '') +
+        ? (/CPU( iPhone)? OS (\d+[_.]\d+([_.]\d+)*)/i.test(ua) ? 'ios' + version('ios', RegExp.$2) : '') +
           ' ' +
           (/(ip(ad|od|hone))/gi.test(ua) ? RegExp.$1 : '')
         : is('playbook')
@@ -144,7 +165,7 @@ function css_browser_selector(u) {
         : is('x11|linux')
         ? 'linux'
         : '',
-      /[; |\[](([a-z]{2})(\-[a-z]{2})?)[)|;|\]]/i.test(ua)
+      /(?:[; |]|\[)(([a-z]{2})(-[a-z]{2})?)(?:\)|;|\||])/i.test(ua)
         ? (lang + RegExp.$2).replace('-', '_') + (RegExp.$3 != '' ? (' ' + lang + RegExp.$1).replace('-', '_') : '')
         : '',
       is('ipad|iphone|ipod') && !is('safari') ? 'ipad_app' : '',
@@ -161,7 +182,7 @@ function css_browser_selector(u) {
         break;
       }
     }
-    widthClasses = '';
+    let widthClasses = '';
     for (var info in uaInfo) {
       widthClasses += ' ' + info + '_' + uaInfo[info];
     }

package/client-v2/rsbuild.config.ts

@@ -21,8 +21,23 @@ const __dirname = path.dirname(__filename);
 
 generateV2Plugins();
 
+// Fixed on-disk build-output directory name for the modern (v2) client. A
+// sibling copy of this default lives in packages/core/cli-v1/src/util.js
+// (DEFAULT_MODERN_CLIENT_PREFIX) and packages/core/server/src/gateway (utils.ts
+// MODERN_CLIENT_DIST_DIR). Keep them in sync. See docs/adr/0001-modern-client-prefix.md.
+const MODERN_CLIENT_DIST_DIR = 'v';
+
+// Normalize APP_MODERN_CLIENT_PREFIX (accepts `v`, `/v`, `/v/`)
+// to a bare segment, falling back to the fixed dist dir name.
+function normalizeModernClientPrefix(value: string | undefined) {
+  const segment = String(value || '')
+    .trim()
+    .replace(/^\/+|\/+$/g, '');
+  return segment || MODERN_CLIENT_DIST_DIR;
+}
+
 function ensurePublicPath(value: string) {
-  let normalized = value || '/v2/';
+  let normalized = value || `/${MODERN_CLIENT_DIST_DIR}/`;
   if (!normalized.startsWith('/')) {
     normalized = `/${normalized}`;
   }
@@ -37,10 +52,13 @@ function toNumber(value: string | undefined, fallback: number) {
   return Number.isFinite(parsed) ? parsed : fallback;
 }
 
-function createRuntimeHeadScript(v2PublicPath: string, isBuild: boolean) {
+function createRuntimeHeadScript(v2PublicPath: string, isBuild: boolean, modernClientPrefix: string) {
   if (!isBuild) {
     return [
       `window['__nocobase_public_path__'] = window['__nocobase_public_path__'] || ${JSON.stringify(v2PublicPath)};`,
+      `window['__nocobase_modern_client_prefix__'] = window['__nocobase_modern_client_prefix__'] || ${JSON.stringify(
+        modernClientPrefix,
+      )};`,
       `window['__nocobase_app_dev__'] = window['__nocobase_app_dev__'] || ${JSON.stringify(
         process.env.NOCOBASE_APP_DEV === 'true',
       )};`,
@@ -55,6 +73,9 @@ function createRuntimeHeadScript(v2PublicPath: string, isBuild: boolean) {
 
   return [
     `window['__nocobase_public_path__'] = window['__nocobase_public_path__'] || ${JSON.stringify(v2PublicPath)};`,
+    `window['__nocobase_modern_client_prefix__'] = window['__nocobase_modern_client_prefix__'] || ${JSON.stringify(
+      modernClientPrefix,
+    )};`,
     `window['__nocobase_api_base_url__'] = window['__nocobase_api_base_url__'] || ${JSON.stringify(
       process.env.API_BASE_URL || process.env.API_BASE_PATH || '',
     )};`,
@@ -104,7 +125,13 @@ export default defineConfig(({ command }) => {
   const apiBasePath = ensurePublicPath(process.env.API_BASE_PATH || '/api/');
   const localStorageBasePath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/storage/uploads/`);
   const staticBasePath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/static/`);
-  const v2PublicPath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/v2/`);
+  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
+  // actual runtime prefix so URLs line up with the v1 dev proxy.
+  const modernClientDistPath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/${MODERN_CLIENT_DIST_DIR}/`);
+  const modernClientPublicPath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/${modernClientPrefix}/`);
+  const v2PublicPath = isBuild ? modernClientDistPath : modernClientPublicPath;
   const wsBasePath = ensurePublicPath(process.env.WS_PATH || '/ws/');
   const hmrPath = `${v2PublicPath.replace(/\/$/, '')}/__rspack_hmr`;
   const v2Port = toNumber(process.env.APP_V2_PORT, 13002);
@@ -151,7 +178,11 @@ export default defineConfig(({ command }) => {
         },
         {
           tag: 'script',
-          children: createRuntimeHeadScript(v2PublicPath, isBuild),
+          children: createRuntimeHeadScript(
+            v2PublicPath,
+            isBuild,
+            isBuild ? MODERN_CLIENT_DIST_DIR : modernClientPrefix,
+          ),
           head: true,
           append: false,
         },
@@ -169,7 +200,7 @@ export default defineConfig(({ command }) => {
     output: {
       target: 'web',
       distPath: {
-        root: path.resolve(__dirname, '../dist/client/v2'),
+        root: path.resolve(__dirname, `../dist/client/${MODERN_CLIENT_DIST_DIR}`),
         js: 'assets',
         jsAsync: 'assets',
         css: 'assets',

package/client-v2/src/main.tsx

@@ -7,13 +7,15 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Application } from '@nocobase/client-v2';
+import { Application, getModernClientPrefix } from '@nocobase/client-v2';
 import devDynamicImport from './.plugins';
 import { NocoBaseClientPresetPluginV2 } from '@nocobase/preset-nocobase/client-v2';
 
 declare global {
   interface Window {
     __nocobase_public_path__?: string;
+    __nocobase_modern_client_prefix__?: string;
+    __webpack_public_path__?: string;
     __nocobase_api_base_url__?: string;
     __nocobase_api_client_storage_prefix__?: string;
     __nocobase_api_client_storage_type__?: string;
@@ -38,8 +40,20 @@ function ensureSlash(pathname: string, fallback: string) {
   return normalized;
 }
 
+function getModernPrefixSuffix() {
+  return `/${getModernClientPrefix()}/`;
+}
+
+function stripPrefixSuffix(value: string) {
+  const suffix = getModernPrefixSuffix();
+  if (value.endsWith(suffix)) {
+    return ensureSlash(value.slice(0, value.length - suffix.length), '/');
+  }
+  return ensureSlash(value, '/');
+}
+
 function inferRootPublicPathFromLocation() {
-  const marker = '/v2/';
+  const marker = getModernPrefixSuffix();
   const pathname = window.location.pathname;
   const index = pathname.indexOf(marker);
   if (index >= 0) {
@@ -51,17 +65,18 @@ function inferRootPublicPathFromLocation() {
 function getRootPublicPath() {
   const fromWindow = window.__nocobase_public_path__;
   if (fromWindow) {
-    return ensureSlash(fromWindow.replace(/\/v2\/$/, '/'), '/');
+    return stripPrefixSuffix(ensureSlash(fromWindow, '/'));
   }
   const fromBase = import.meta.env.BASE_URL;
   if (fromBase) {
-    return ensureSlash(fromBase.replace(/\/v2\/$/, '/'), '/');
+    return stripPrefixSuffix(ensureSlash(fromBase, '/'));
   }
   return inferRootPublicPathFromLocation();
 }
 
 function getV2PublicPath() {
-  return ensureSlash(`${getRootPublicPath().replace(/\/$/, '')}/v2/`, '/v2/');
+  const suffix = getModernPrefixSuffix();
+  return ensureSlash(`${getRootPublicPath().replace(/\/$/, '')}${suffix}`, suffix);
 }
 
 function parseShareToken(value: boolean | string | undefined) {
@@ -83,6 +98,25 @@ function parseStorageType(value: string | undefined): ClientStorageType {
 const rootPublicPath = getRootPublicPath();
 const v2PublicPath = getV2PublicPath();
 
+// The fixed build-output directory segment baked into asset paths at build time
+// (e.g. `v`), derived from the baked BASE_URL. Distinct from the runtime
+// modern-client prefix, which may be overridden per-deployment.
+function getBuildAssetDir() {
+  const base = (import.meta.env.BASE_URL || '/v/').replace(/\/+$/, '');
+  return base.split('/').pop() || 'v';
+}
+
+// Point dynamically-imported chunks of the main bundle at the runtime modern
+// client asset path, so a runtime prefix override / sub-path deployment / CDN
+// works without rebuilding (mirrors AutoInjectPublicPathPlugin used for plugins).
+// `__webpack_public_path__` is a webpack magic global that must be assigned.
+declare let __webpack_public_path__: string;
+const cdnBase = window.__webpack_public_path__;
+// eslint-disable-next-line prefer-const
+__webpack_public_path__ = cdnBase
+  ? ensureSlash(`${cdnBase.replace(/\/$/, '')}/${getBuildAssetDir()}/`, '/')
+  : v2PublicPath;
+
 const app = new Application({
   publicPath: v2PublicPath,
   apiClient: {