@nocobase/app 3.0.0-alpha.1 → 3.0.0-alpha.3

package/__tests__/browserChecker.test.ts

@@ -75,47 +75,31 @@ function runBrowserChecker(options: RunBrowserCheckerOptions) {
 }
 
 describe('v2 browser checker', () => {
-  it('redirects the modern client root to Settings only in modern-only mode', () => {
-    expect(
-      runBrowserChecker({
-        appClientEntryMode: 'modern-only',
-        pathname: '/v/',
-      }).replacements,
-    ).toEqual(['https://example.test/settings']);
-
-    expect(
-      runBrowserChecker({
-        appClientEntryMode: 'modern-default',
-        pathname: '/v/',
-      }).replacements,
-    ).toEqual([]);
-
-    expect(
-      runBrowserChecker({
-        pathname: '/v/',
-      }).replacements,
-    ).toEqual([]);
-  });
-
-  it('redirects scoped modern client roots to scoped Settings only in modern-only mode', () => {
-    expect(
-      runBrowserChecker({
-        appClientEntryMode: 'modern-only',
-        pathname: '/v/apps/demo',
-        search: '?from=admin',
-        hash: '#portal',
-      }).replacements,
-    ).toEqual(['https://example.test/settings/apps/demo?from=admin#portal']);
+  it.each([undefined, 'modern-default', 'modern-only'] as const)(
+    'redirects the modern client root to Settings for entry mode %s',
+    (appClientEntryMode) => {
+      expect(
+        runBrowserChecker({
+          appClientEntryMode,
+          pathname: '/v/',
+        }).replacements,
+      ).toEqual(['https://example.test/settings']);
+    },
+  );
 
-    expect(
-      runBrowserChecker({
-        appClientEntryMode: 'modern-default',
-        pathname: '/v/apps/demo',
-        search: '?from=admin',
-        hash: '#portal',
-      }).replacements,
-    ).toEqual([]);
-  });
+  it.each([undefined, 'modern-default', 'modern-only'] as const)(
+    'redirects scoped modern client roots to scoped Settings for entry mode %s',
+    (appClientEntryMode) => {
+      expect(
+        runBrowserChecker({
+          appClientEntryMode,
+          pathname: '/v/apps/demo',
+          search: '?from=admin',
+          hash: '#portal',
+        }).replacements,
+      ).toEqual(['https://example.test/settings/apps/demo?from=admin#portal']);
+    },
+  );
 
   it('keeps Settings scoped trailing slash normalization independent from entry mode', () => {
     expect(

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

@@ -81,11 +81,7 @@ function resolveScopedSettingsRootPath(publicPath, pathname) {
 const basename = normalizePublicPath(window['__nocobase_public_path__'] || '/');
 const currentPath = ensureLeadingSlash(String(window.location.pathname || '/').trim() || '/').replace(/\/{2,}/g, '/');
 const basenameWithoutTrailingSlash = basename === '/' ? '/' : basename.replace(/\/+$/, '');
-const appClientEntryMode = window['__nocobase_app_client_entry_mode__'];
-const settingsRootPath =
-  appClientEntryMode === 'modern-only'
-    ? resolveSettingsRootPath(basename, window['__nocobase_modern_client_prefix__'], currentPath)
-    : null;
+const settingsRootPath = resolveSettingsRootPath(basename, window['__nocobase_modern_client_prefix__'], currentPath);
 const scopedSettingsRootPath = isSettingsBrowserCheckerScript(document.currentScript)
   ? resolveScopedSettingsRootPath(basename, currentPath)
   : null;