@nocobase/client-v2 2.2.0-beta.9 → 3.0.0-alpha.1

package/lib/locale/languageCodes.js

@@ -64,6 +64,7 @@ const languageCodes = {
   "ml-IN": { label: "\u0D2E\u0D32\u0D2F\u0D3E\u0D33\u0D02" },
   "mn-MN": { label: "\u041C\u043E\u043D\u0433\u043E\u043B \u0445\u044D\u043B" },
   "ms-MY": { label: "\u0628\u0647\u0627\u0633 \u0645\u0644\u0627\u064A\u0648" },
+  "my-MM": { label: "\u1019\u103C\u1014\u103A\u1019\u102C\u1018\u102C\u101E\u102C" },
   "nb-NO": { label: "Norsk bokm\xE5l" },
   "ne-NP": { label: "\u0928\u0947\u092A\u093E\u0932\u0940" },
   "nl-BE": { label: "Vlaams" },
@@ -83,7 +84,8 @@ const languageCodes = {
   "tk-TK": { label: "Turkmen" },
   "tr-TR": { label: "T\xFCrk\xE7e" },
   "uk-UA": { label: "\u0423\u043A\u0440\u0430\u0457\u043D\u0441\u044C\u043A\u0430" },
-  "ur-PK": { label: "O\u02BBzbekcha" },
+  "ur-PK": { label: "\u0627\u0631\u062F\u0648" },
+  "uz-UZ": { label: "O\u02BBzbekcha" },
   "vi-VN": { label: "Ti\u1EBFng Vi\u1EC7t" },
   "zh-CN": { label: "\u7B80\u4F53\u4E2D\u6587" },
   "zh-HK": { label: "\u7E41\u9AD4\u4E2D\u6587\uFF08\u9999\u6E2F\uFF09" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client-v2",
-  "version": "2.2.0-beta.9",
+  "version": "3.0.0-alpha.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -27,11 +27,11 @@
     "@formily/antd-v5": "1.2.3",
     "@formily/react": "^2.2.27",
     "@formily/shared": "^2.2.27",
-    "@nocobase/evaluators": "2.2.0-beta.9",
-    "@nocobase/flow-engine": "2.2.0-beta.9",
-    "@nocobase/sdk": "2.2.0-beta.9",
-    "@nocobase/shared": "2.2.0-beta.9",
-    "@nocobase/utils": "2.2.0-beta.9",
+    "@nocobase/evaluators": "3.0.0-alpha.1",
+    "@nocobase/flow-engine": "3.0.0-alpha.1",
+    "@nocobase/sdk": "3.0.0-alpha.1",
+    "@nocobase/shared": "3.0.0-alpha.1",
+    "@nocobase/utils": "3.0.0-alpha.1",
     "ahooks": "^3.7.2",
     "antd": "5.24.2",
     "antd-style": "3.7.1",
@@ -42,9 +42,11 @@
     "html5-qrcode": "^2.3.8",
     "i18next": "^22.4.9",
     "json5": "^2.2.3",
+    "jsqr": "^1.4.0",
     "lodash": "4.17.21",
+    "react-device-detect": "2.2.3",
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.30.1"
   },
-  "gitHead": "60e3d7abbaa0c7cead76f71a4f3d5eedb6b8acdb"
+  "gitHead": "22d8be8ece179cfa5c8a4ebb2c896c92bd418e03"
 }

package/src/APIClient.ts

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { APIClient as APIClientSDK, type APIClientOptions, hasHeaderValue } from '@nocobase/sdk';
+import { APIClient as APIClientSDK, hasHeaderValue } from '@nocobase/sdk';
 
 function offsetToTimeZone(offset: number) {
   const hours = Math.floor(Math.abs(offset));
@@ -23,15 +23,6 @@ function getCurrentTimezone() {
 }
 
 export class APIClient extends APIClientSDK {
-  appName?: string;
-
-  constructor(options?: APIClientOptions) {
-    super(options);
-    if (options && typeof options !== 'function') {
-      this.appName = options.appName;
-    }
-  }
-
   getHostname() {
     if (process.env.API_BASE_URL) {
       try {

package/src/Application.tsx

@@ -46,6 +46,10 @@ export class Application extends BaseApplication<
 
   protected createApiClient(options: ApplicationOptions) {
     return new APIClient({
+      // Cross-origin API deployments rely on cookies for auth (e.g. permanent file
+      // URLs); trust is enforced server-side via the CORS origin whitelist and the
+      // CSRF middleware, not by omitting credentials.
+      withCredentials: true,
       ...options.apiClient,
       appName: options.name || getSubAppName(options.publicPath),
     });

package/src/BaseApplication.tsx

@@ -35,6 +35,7 @@ import { SystemSettingsSource } from './flow/system-settings';
 import { LayoutManager } from './layout-manager/LayoutManager';
 import type { PluginClass, PluginManager, PluginType } from './PluginManager';
 import { RouteRepository } from './RouteRepository';
+import { stripModernClientPrefix } from './authRedirect';
 import type {
   ComponentTypeAndString,
   RenderableComponentType,
@@ -81,6 +82,10 @@ const trimTrailingSlashes = (value: string) => {
   return match ? value.slice(0, -match[0].length) : value;
 };
 
+const ensureTrailingSlash = (value: string) => {
+  return `${trimTrailingSlashes(value)}/`;
+};
+
 const isRenderableComponentType = (value: unknown): value is AnyComponent => isValidElementType(value);
 
 export type DevDynamicImport = (packageName: string) => Promise<{ default: PluginClass }>;
@@ -398,7 +403,7 @@ export abstract class BaseApplication<
       this.favicon = favicon || '';
     }
 
-    const iconHref = this.favicon || '/favicon/favicon.ico';
+    const iconHref = this.favicon || this.getCdnUrl() + 'favicon/favicon.ico';
 
     if (faviconLinkElement) {
       faviconLinkElement.href = iconHref;
@@ -433,12 +438,12 @@ export abstract class BaseApplication<
     return getSubAppName(this.getPublicPath()) || null;
   }
 
+  getCdnUrl() {
+    return ensureTrailingSlash(window['__webpack_public_path__'] || stripModernClientPrefix(this.getPublicPath()));
+  }
+
   getPublicPath() {
-    let publicPath = this.options.publicPath || '/';
-    if (!publicPath.endsWith('/')) {
-      publicPath += '/';
-    }
-    return publicPath;
+    return ensureTrailingSlash(this.options.publicPath || '/');
   }
 
   getApiUrl(pathname = '') {

package/src/__tests__/app.test.tsx

@@ -34,6 +34,8 @@ describe('app', () => {
     afterEach(() => {
       document.querySelectorAll('link[rel="shortcut icon"]').forEach((node) => node.remove());
       document.documentElement.removeAttribute('lang');
+      delete window['__webpack_public_path__'];
+      delete window['__nocobase_modern_client_prefix__'];
       vi.restoreAllMocks();
     });
 
@@ -50,6 +52,24 @@ describe('app', () => {
       expect(app.getHref('/test')).toBe('/test');
     });
 
+    it('should enable credentials for api clients by default', () => {
+      const sameOriginApp = new Application({
+        router,
+        apiClient: {
+          baseURL: '/api/',
+        },
+      });
+      const crossOriginApp = new Application({
+        router,
+        apiClient: {
+          baseURL: 'https://api.example.com/api/',
+        },
+      });
+
+      expect(sameOriginApp.apiClient.axios.defaults.withCredentials).toBe(true);
+      expect(crossOriginApp.apiClient.axios.defaults.withCredentials).toBe(true);
+    });
+
     it('should initialize shared jsonLogic operators', () => {
       const app = new Application({ router });
 
@@ -58,6 +78,59 @@ describe('app', () => {
       expect(app.jsonLogic.apply({ $testAlwaysTrue: [] })).toBe(true);
     });
 
+    it('should normalize publicPath and webpack public path with a single trailing slash', () => {
+      const app = new Application({
+        router,
+        publicPath: '/admin//',
+      });
+
+      expect(app.getPublicPath()).toBe('/admin/');
+
+      window['__webpack_public_path__'] = '/cdn/assets///';
+      expect(app.getCdnUrl()).toBe('/cdn/assets/');
+
+      delete window['__webpack_public_path__'];
+      expect(app.getCdnUrl()).toBe('/admin/');
+    });
+
+    it('should normalize webpack public path without a trailing slash', () => {
+      const app = new Application({
+        router,
+        publicPath: '/admin/',
+      });
+
+      window['__webpack_public_path__'] = '/cdn/assets';
+      expect(app.getCdnUrl()).toBe('/cdn/assets/');
+    });
+
+    it('should remove the modern client prefix from the CDN fallback path', () => {
+      const app = new Application({
+        router,
+        publicPath: '/v/',
+      });
+
+      expect(app.getCdnUrl()).toBe('/');
+    });
+
+    it('should preserve APP_PUBLIC_PATH when removing the modern client prefix', () => {
+      const app = new Application({
+        router,
+        publicPath: '/nocobase/v/',
+      });
+
+      expect(app.getCdnUrl()).toBe('/nocobase/');
+    });
+
+    it('should support a custom modern client prefix', () => {
+      window['__nocobase_modern_client_prefix__'] = 'modern';
+      const app = new Application({
+        router,
+        publicPath: '/nocobase/modern/',
+      });
+
+      expect(app.getCdnUrl()).toBe('/nocobase/');
+    });
+
     it('should apply the provided favicon immediately', () => {
       const app = new Application({ router });
 

package/src/__tests__/authRedirect.test.ts

@@ -17,12 +17,18 @@ import {
 
 describe('auth redirect helpers', () => {
   const originalLocation = globalThis.window.location;
+  const originalModernClientPrefix = window.__nocobase_modern_client_prefix__;
 
   afterEach(() => {
     Object.defineProperty(globalThis.window, 'location', {
       configurable: true,
       value: originalLocation,
     });
+    if (originalModernClientPrefix === undefined) {
+      delete window.__nocobase_modern_client_prefix__;
+    } else {
+      window.__nocobase_modern_client_prefix__ = originalModernClientPrefix;
+    }
     vi.restoreAllMocks();
   });
 
@@ -84,6 +90,107 @@ describe('auth redirect helpers', () => {
     expect(buildV2SigninHref(app, '/v2/admin/7vu4c2sdk6h')).toBe('/v2/signin?redirect=%2Fv2%2Fadmin%2F7vu4c2sdk6h');
   });
 
+  it('should keep validated standalone settings redirects outside the v2 basename', () => {
+    const app = {
+      getPublicPath: () => '/nocobase/v2/',
+      router: {
+        getBasename: () => '/nocobase/v2',
+      },
+    } as any;
+
+    expect(normalizeV2RedirectPath(app, '/nocobase/settings/workflow?tab=list#recent')).toBe(
+      '/nocobase/settings/workflow?tab=list#recent',
+    );
+  });
+
+  it('should build the standalone settings signin URL for a standalone settings app', () => {
+    const app = {
+      name: 'main',
+      getPublicPath: () => '/nocobase/',
+      router: {
+        getBasename: () => '/nocobase',
+      },
+      pluginSettingsManager: {
+        getRouteName: () => 'settings.',
+        getRoutePath: () => '/settings/',
+      },
+    } satisfies Parameters<typeof buildV2SigninHref>[0];
+    expect(buildV2SigninHref(app, '/nocobase/settings/workflow?tab=list#recent')).toBe(
+      '/nocobase/settings/signin?redirect=%2Fnocobase%2Fsettings%2Fworkflow%3Ftab%3Dlist%23recent',
+    );
+  });
+
+  it('should keep an apps segment inside the main public path out of the Settings application scope', () => {
+    const app = {
+      name: 'main',
+      getPublicPath: () => '/tenant/apps/root/',
+      router: {
+        getBasename: () => '/tenant/apps/root/',
+      },
+      pluginSettingsManager: {
+        getRouteName: () => 'settings.',
+        getRoutePath: () => '/settings/',
+      },
+    } satisfies Parameters<typeof buildV2SigninHref>[0];
+
+    expect(buildV2SigninHref(app, '/tenant/apps/root/settings/workflow')).toBe(
+      '/tenant/apps/root/settings/signin?redirect=%2Ftenant%2Fapps%2Froot%2Fsettings%2Fworkflow',
+    );
+  });
+
+  it.each([
+    ['/nocobase/settings/apps/test-app/', '/nocobase/settings/apps/test-app/signin'],
+    ['/nocobase/settings/_app/test-app/', '/nocobase/settings/_app/test-app/signin'],
+  ])('should keep the standalone settings signin in the current sub-app scope: %s', (basename, signinPath) => {
+    const app = {
+      name: 'test-app',
+      getPublicPath: () => '/nocobase/',
+      router: {
+        getBasename: () => basename,
+      },
+      pluginSettingsManager: {
+        getRouteName: () => 'settings.',
+        getRoutePath: () => '/',
+      },
+    } as any;
+
+    expect(buildV2SigninHref(app, `${basename}workflow`)).toBe(
+      `${signinPath}?redirect=${encodeURIComponent(`${basename}workflow`)}`,
+    );
+  });
+
+  it('should accept the current standalone settings signin URL only', () => {
+    Object.defineProperty(globalThis.window, 'location', {
+      configurable: true,
+      value: {
+        ...originalLocation,
+        origin: 'http://localhost:20000',
+      },
+    });
+    const app = {
+      name: 'test-app',
+      getPublicPath: () => '/nocobase/',
+      router: {
+        getBasename: () => '/nocobase/settings/apps/test-app/',
+      },
+      pluginSettingsManager: {
+        getRouteName: () => 'settings.',
+        getRoutePath: () => '/',
+      },
+    } as any;
+
+    expect(
+      resolveV2SigninRedirect(
+        '/nocobase/settings/apps/test-app/signin?redirect=%2Fnocobase%2Fsettings%2Fapps%2Ftest-app',
+        app,
+      ),
+    ).toBe(
+      'http://localhost:20000/nocobase/settings/apps/test-app/signin?redirect=%2Fnocobase%2Fsettings%2Fapps%2Ftest-app',
+    );
+    expect(resolveV2SigninRedirect('/nocobase/v/apps/test-app/signin', app)).toBeNull();
+    expect(resolveV2SigninRedirect('/nocobase/settings/apps/other-app/signin', app)).toBeNull();
+  });
+
   it('should redirect with window.location.replace by default', () => {
     const replace = vi.fn();
     Object.defineProperty(globalThis.window, 'location', {
@@ -134,6 +241,36 @@ describe('auth redirect helpers', () => {
   });
 
   describe('v2 sub-app context (router basename contains /apps/<id>/)', () => {
+    it('should keep only the current sub-app standalone settings redirect', () => {
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: {
+          getBasename: () => '/nocobase/v2/apps/test-app/',
+        },
+      } as any;
+
+      expect(normalizeV2RedirectPath(app, '/nocobase/settings/apps/test-app/workflow')).toBe(
+        '/nocobase/settings/apps/test-app/workflow',
+      );
+      expect(normalizeV2RedirectPath(app, '/nocobase/settings/apps/other-app/workflow')).toBe(
+        '/nocobase/v2/apps/test-app/admin/',
+      );
+    });
+
+    it.each([
+      '/nocobase/settings/apps/test-app/../../other-app/settings',
+      '/nocobase/settings/apps/test-app/%2e%2e/%2E%2e/other-app/settings',
+    ])('should reject a standalone settings redirect that resolves outside the current sub-app: %s', (target) => {
+      const app = {
+        getPublicPath: () => '/nocobase/v2/',
+        router: {
+          getBasename: () => '/nocobase/v2/apps/test-app/',
+        },
+      } as any;
+
+      expect(normalizeV2RedirectPath(app, target)).toBe('/nocobase/v2/apps/test-app/admin/');
+    });
+
     it('should normalize signin redirect fallback under the current sub-app basename', () => {
       const app = {
         getPublicPath: () => '/v/',

package/src/__tests__/browserChecker.test.ts

@@ -15,6 +15,11 @@ import { fileURLToPath } from 'node:url';
 type BrowserCheckerCase = {
   pathname: string;
   publicPath: string;
+  search?: string;
+  hash?: string;
+  modernClientPrefix?: string;
+  appClientEntryMode?: string;
+  scriptSrc?: string;
   expectedRedirect?: string;
 };
 
@@ -40,11 +45,13 @@ function executeBrowserChecker(scriptPath: string, input: BrowserCheckerCase) {
     showLog: false,
     window: {
       __nocobase_public_path__: input.publicPath,
+      __nocobase_modern_client_prefix__: input.modernClientPrefix,
+      __nocobase_app_client_entry_mode__: input.appClientEntryMode,
       location: {
         origin: 'http://c.local.nocobase.com',
         pathname: input.pathname,
-        search: '',
-        hash: '',
+        search: input.search || '',
+        hash: input.hash || '',
         replace,
       },
       console: consoleMock,
@@ -54,6 +61,13 @@ function executeBrowserChecker(scriptPath: string, input: BrowserCheckerCase) {
       onresize: undefined,
     },
     document: {
+      currentScript: {
+        src:
+          input.scriptSrc ||
+          (scriptPath.includes('/app/client-v2/public/')
+            ? 'http://assets.local.nocobase.com/v/browser-checker.js?v=1'
+            : 'http://assets.local.nocobase.com/browser-checker.js?v=1'),
+      },
       documentElement: {
         className: '',
         clientWidth: 1280,
@@ -76,11 +90,11 @@ function executeBrowserChecker(scriptPath: string, input: BrowserCheckerCase) {
 describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
   it('normalizes a relative public path before redirecting to the trailing-slash entry', () => {
     const replace = executeBrowserChecker(scriptPath, {
-      pathname: '/nocobase/v',
-      publicPath: 'nocobase/v/',
+      pathname: '/nocobase/console',
+      publicPath: 'nocobase/console/',
     });
 
-    expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/v/');
+    expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/console/');
   });
 
   it('prefixes outside paths with a root-relative basename instead of duplicating a relative segment', () => {
@@ -94,7 +108,7 @@ describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
 
   it('does not redirect when the current path is already under the normalized basename', () => {
     const replace = executeBrowserChecker(scriptPath, {
-      pathname: '/nocobase/v/',
+      pathname: '/nocobase/v/admin',
       publicPath: 'nocobase/v/',
     });
 
@@ -109,4 +123,169 @@ describe.each(browserCheckerCases)('$label', ({ scriptPath }) => {
 
     expect(replace).not.toHaveBeenCalled();
   });
+
+  if (scriptPath.includes('/app/client/public/')) {
+    it('redirects app root to modern entry for modern-default', () => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname: '/',
+        publicPath: '/',
+        modernClientPrefix: 'v',
+        appClientEntryMode: 'modern-default',
+      });
+
+      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/v/');
+    });
+
+    it('does not redirect legacy deep links for modern-default', () => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname: '/admin',
+        publicPath: '/',
+        modernClientPrefix: 'v',
+        appClientEntryMode: 'modern-default',
+      });
+
+      expect(replace).not.toHaveBeenCalled();
+    });
+
+    it('rewrites legacy document paths for modern-only', () => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname: '/admin/settings/workflow',
+        publicPath: '/',
+        modernClientPrefix: 'v',
+        appClientEntryMode: 'modern-only',
+      });
+
+      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/v/admin/settings/workflow');
+    });
+
+    it('redirects sub-path site root directly to final modern target', () => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname: '/nocobase/',
+        publicPath: '/nocobase/',
+        modernClientPrefix: 'v',
+        appClientEntryMode: 'modern-default',
+      });
+
+      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/v/');
+    });
+
+    it('rewrites sub-app legacy deep links for modern-only without collapsing the sub-app segment', () => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname: '/nocobase/apps/a_31itq60q4kg/admin/',
+        publicPath: '/nocobase/',
+        modernClientPrefix: 'v',
+        appClientEntryMode: 'modern-only',
+      });
+
+      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/nocobase/v/apps/a_31itq60q4kg/admin');
+    });
+  }
+
+  if (scriptPath.includes('/app/client-v2/public/')) {
+    it.each(['/v', '/v/'])('redirects the main modern root %s to Settings', (pathname) => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath: '/v/',
+        modernClientPrefix: 'v',
+      });
+
+      expect(replace).toHaveBeenCalledOnce();
+      expect(replace).toHaveBeenCalledWith('http://c.local.nocobase.com/settings');
+    });
+
+    it.each([
+      ['/v/apps/demo', '/settings/apps/demo'],
+      ['/v/apps/demo/', '/settings/apps/demo'],
+      ['/v/_app/demo', '/settings/_app/demo'],
+      ['/v/_app/demo/', '/settings/_app/demo'],
+    ])('redirects the scoped modern root %s to %s', (pathname, expectedPathname) => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath: '/v/',
+        modernClientPrefix: 'v',
+      });
+
+      expect(replace).toHaveBeenCalledOnce();
+      expect(replace).toHaveBeenCalledWith(`http://c.local.nocobase.com${expectedPathname}`);
+    });
+
+    it.each([
+      ['/settings/apps/demo', '/', '/settings/apps/demo/', 'v'],
+      ['/settings/_app/demo', '/', '/settings/_app/demo/', 'v'],
+      ['/nocobase/settings/apps/demo', '/nocobase/', '/nocobase/settings/apps/demo/', 'v'],
+      ['/nocobase/settings/_app/demo', '/nocobase/', '/nocobase/settings/_app/demo/', 'v'],
+      ['/tenant/apps/root/settings/apps/demo', '/tenant/apps/root/', '/tenant/apps/root/settings/apps/demo/', 'v'],
+      ['/tenant/_app/root/settings/_app/demo', '/tenant/_app/root/', '/tenant/_app/root/settings/_app/demo/', 'v'],
+      ['/tenant/v/settings/apps/demo', '/tenant/v/', '/tenant/v/settings/apps/demo/', 'v'],
+      ['/tenant/modern/settings/_app/demo', '/tenant/modern/', '/tenant/modern/settings/_app/demo/', 'modern'],
+    ])('normalizes the scoped Settings root %s to %s', (pathname, publicPath, expectedPathname, modernClientPrefix) => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath,
+        modernClientPrefix,
+        scriptSrc: 'https://cdn.example.com/ui/settings/browser-checker.js?v=1',
+        search: '?tab=overview',
+        hash: '#panel',
+      });
+
+      expect(replace).toHaveBeenCalledOnce();
+      expect(replace).toHaveBeenCalledWith(`http://c.local.nocobase.com${expectedPathname}?tab=overview#panel`);
+    });
+
+    it.each([
+      ['/tenant/apps/root/modern/apps/demo/', '/tenant/apps/root/modern/', '/tenant/apps/root/settings/apps/demo'],
+      ['/tenant/_app/root/modern/_app/demo/', '/tenant/_app/root/modern/', '/tenant/_app/root/settings/_app/demo'],
+    ])(
+      'preserves public path, query, and hash for %s without treating public-path segments as app scope',
+      (pathname, publicPath, expectedPathname) => {
+        const replace = executeBrowserChecker(scriptPath, {
+          pathname,
+          publicPath,
+          modernClientPrefix: 'modern',
+          search: '?tab=overview',
+          hash: '#panel',
+        });
+
+        expect(replace).toHaveBeenCalledOnce();
+        expect(replace).toHaveBeenCalledWith(`http://c.local.nocobase.com${expectedPathname}?tab=overview#panel`);
+      },
+    );
+
+    it.each([
+      ['/v/admin', '/v/'],
+      ['/v/apps/demo/admin', '/v/'],
+      ['/v/_app/demo/admin', '/v/'],
+      ['/v/_apps/demo', '/v/'],
+      ['/v/settings/apps/demo', '/v/'],
+      ['/nocobase/modern/settings/_app/demo', '/nocobase/modern/', 'modern'],
+    ])('does not redirect a non-root modern path %s to Settings', (pathname, publicPath, modernClientPrefix = 'v') => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath,
+        modernClientPrefix,
+      });
+
+      expect(replace).not.toHaveBeenCalled();
+    });
+
+    it.each([
+      ['/settings', '/'],
+      ['/settings/', '/'],
+      ['/settings/apps/demo/', '/'],
+      ['/settings/_app/demo/', '/'],
+      ['/settings/apps/demo/multi-portal', '/'],
+      ['/settings/_app/demo/multi-portal', '/'],
+      ['/settings/_apps/demo', '/'],
+      ['/nocobase/settings/apps/demo/multi-portal', '/nocobase/'],
+    ])('does not redirect a non-target Settings path %s', (pathname, publicPath) => {
+      const replace = executeBrowserChecker(scriptPath, {
+        pathname,
+        publicPath,
+        modernClientPrefix: 'v',
+        scriptSrc: 'https://cdn.example.com/ui/settings/browser-checker.js?v=1',
+      });
+
+      expect(replace).not.toHaveBeenCalled();
+    });
+  }
 });