@nocobase/app 3.0.0-alpha.2 → 3.0.0-alpha.4

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)(
+    'lets the modern client handle its root for entry mode %s',
+    (appClientEntryMode) => {
+      expect(
+        runBrowserChecker({
+          appClientEntryMode,
+          pathname: '/v/',
+        }).replacements,
+      ).toEqual([]);
+    },
+  );
 
-    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)(
+    'lets scoped modern clients handle their roots for entry mode %s',
+    (appClientEntryMode) => {
+      expect(
+        runBrowserChecker({
+          appClientEntryMode,
+          pathname: '/v/apps/demo',
+          search: '?from=admin',
+          hash: '#portal',
+        }).replacements,
+      ).toEqual([]);
+    },
+  );
 
   it('keeps Settings scoped trailing slash normalization independent from entry mode', () => {
     expect(

package/__tests__/clientDevProxy.test.ts

@@ -0,0 +1,34 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { describe, expect, it } from 'vitest';
+import { isClientDevProxyPath, rewriteClientDevProxyRootPath } from '../clientDevProxy';
+
+describe('client dev proxy', () => {
+  it.each([
+    ['/x', '/x/', true],
+    ['/x/', '/x/', true],
+    ['/x/test2/assets/index.js', '/x/', true],
+    ['/x-other', '/x/', false],
+    ['/console/v?from=portal', '/console/v/', true],
+    ['/v', '/console/v/', false],
+  ])('matches complete client base paths: %s', (url, basePath, expected) => {
+    expect(isClientDevProxyPath(url, basePath)).toBe(expected);
+  });
+
+  it.each([
+    ['/v', '/v/', '/v/'],
+    ['/v?from=portal', '/v/', '/v/?from=portal'],
+    ['/console/v#section', '/console/v/', '/console/v/#section'],
+    ['/v/admin', '/v/', '/v/admin'],
+    ['/v/', '/v/', '/v/'],
+  ])('normalizes only a slashless client root: %s', (url, basePath, expected) => {
+    expect(rewriteClientDevProxyRootPath(url, basePath)).toBe(expected);
+  });
+});

package/client/rsbuild.config.ts

@@ -16,6 +16,7 @@ import { pluginNodePolyfill } from '@rsbuild/plugin-node-polyfill';
 import { pluginReact } from '@rsbuild/plugin-react';
 import { pluginSvgr } from '@rsbuild/plugin-svgr';
 import { generatePlugins, getRsbuildBrowserAlias } from '@nocobase/devtools/rsbuildConfig';
+import { isClientDevProxyPath, rewriteClientDevProxyRootPath } from '../clientDevProxy';
 import { createSettingsDevProxyOptions } from '../settingsDevProxy';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -259,17 +260,15 @@ export default defineConfig(({ command }) => {
           xfwd: true,
         },
         {
-          context: v2BasePath,
+          context: (pathname) => isClientDevProxyPath(pathname, v2BasePath),
           target: `http://127.0.0.1:${v2Port}`,
           changeOrigin: true,
           ws: true,
-          pathRewrite: {
-            [`^${v2BasePath}`]: v2BasePath,
-          },
+          pathRewrite: (pathname) => rewriteClientDevProxyRootPath(pathname, v2BasePath),
           xfwd: true,
         },
         {
-          context: portalBasePath,
+          context: (pathname) => isClientDevProxyPath(pathname, portalBasePath),
           target: proxyTargetUrl,
           changeOrigin: true,
           ws: true,

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

@@ -17,46 +17,6 @@ function normalizePublicPath(value) {
   return ensureTrailingSlash(normalized);
 }
 
-function normalizePathname(value) {
-  const normalized = ensureLeadingSlash(String(value || '/').trim() || '/').replace(/\/{2,}/g, '/');
-  return normalized === '/' ? normalized : normalized.replace(/\/+$/g, '');
-}
-
-function resolveSettingsRootPath(publicPath, modernPrefix, pathname) {
-  const normalizedPublicPath = normalizePublicPath(publicPath);
-  const normalizedModernPrefix =
-    String(modernPrefix || 'v')
-      .trim()
-      .replace(/^\/+|\/+$/g, '') || 'v';
-  const modernPublicPathSuffix = `/${normalizedModernPrefix}/`;
-  if (!normalizedPublicPath.endsWith(modernPublicPathSuffix)) {
-    return null;
-  }
-
-  const modernRootPath = normalizePathname(normalizedPublicPath);
-  const normalizedPathname = normalizePathname(pathname);
-  let relativePath = '';
-  if (normalizedPathname !== modernRootPath) {
-    if (!normalizedPathname.startsWith(`${modernRootPath}/`)) {
-      return null;
-    }
-    relativePath = normalizedPathname.slice(modernRootPath.length + 1);
-  }
-
-  let appScope = '';
-  if (relativePath) {
-    const match = /^(apps|_app)\/([^/]+)$/.exec(relativePath);
-    if (!match) {
-      return null;
-    }
-    appScope = `/${match[1]}/${match[2]}`;
-  }
-
-  const rootPublicPath = normalizedPublicPath.slice(0, -(normalizedModernPrefix.length + 1));
-  const rootPrefix = rootPublicPath === '/' ? '' : rootPublicPath.replace(/\/+$/g, '');
-  return `${rootPrefix}/settings${appScope}`;
-}
-
 function isSettingsBrowserCheckerScript(script) {
   const source = String((script && script.src) || '').split(/[?#]/)[0];
   return source.endsWith('/settings/browser-checker.js');
@@ -81,19 +41,11 @@ 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 scopedSettingsRootPath = isSettingsBrowserCheckerScript(document.currentScript)
   ? resolveScopedSettingsRootPath(basename, currentPath)
   : null;
 
-if (settingsRootPath) {
-  const newUrl = `${window.location.origin}${settingsRootPath}${window.location.search}${window.location.hash}`;
-  window.location.replace(newUrl);
-} else if (scopedSettingsRootPath) {
+if (scopedSettingsRootPath) {
   const newUrl = `${window.location.origin}${scopedSettingsRootPath}${window.location.search}${window.location.hash}`;
   window.location.replace(newUrl);
 } else if (basename !== '/' && currentPath === basenameWithoutTrailingSlash) {

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 { isClientDevProxyPath, rewriteClientDevProxyRootPath } from '../clientDevProxy';
 import { createSettingsDevProxyOptions, isSettingsDevPath } from '../settingsDevProxy';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -300,7 +301,7 @@ export default defineConfig(({ command }) => {
           changeOrigin: true,
         },
         {
-          context: portalBasePath,
+          context: (pathname) => isClientDevProxyPath(pathname, portalBasePath),
           target: proxyTargetUrl,
           changeOrigin: true,
           ws: true,
@@ -324,11 +325,12 @@ export default defineConfig(({ command }) => {
       lazyCompilation: false,
       setupMiddlewares: [
         (middlewares) => {
-          if (appClientEntryMode !== 'modern-only') {
-            return;
-          }
-
           middlewares.unshift((req, res, next) => {
+            req.url = rewriteClientDevProxyRootPath(String(req.url || '/'), v2PublicPath);
+            if (appClientEntryMode !== 'modern-only') {
+              next();
+              return;
+            }
             const [rawPathname = '/', query = ''] = String(req.url || '/').split('?');
             const pathname = normalizePathname(rawPathname);
             if (
@@ -337,7 +339,7 @@ export default defineConfig(({ command }) => {
               pathname.startsWith(apiBasePath) ||
               pathname.startsWith(wsBasePath) ||
               pathname.startsWith(localStorageBasePath) ||
-              pathname.startsWith(portalBasePath) ||
+              isClientDevProxyPath(pathname, portalBasePath) ||
               pathname.startsWith(staticBasePath) ||
               isSettingsDevPath(pathname, appPublicPath)
             ) {

package/clientDevProxy.ts

@@ -0,0 +1,32 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+function normalizeBasePath(value: string) {
+  let normalized = value || '/';
+  if (!normalized.startsWith('/')) {
+    normalized = `/${normalized}`;
+  }
+  normalized = normalized.replace(/\/{2,}/g, '/');
+  return normalized === '/' ? normalized : normalized.replace(/\/+$/g, '');
+}
+
+export function isClientDevProxyPath(url: string, basePath: string) {
+  const [pathname] = String(url || '/').split(/[?#]/, 1);
+  const normalizedBasePath = normalizeBasePath(basePath);
+  return pathname === normalizedBasePath || pathname.startsWith(`${normalizedBasePath}/`);
+}
+
+export function rewriteClientDevProxyRootPath(url: string, basePath: string) {
+  const normalizedBasePath = normalizeBasePath(basePath);
+  const [pathname] = String(url || '/').split(/[?#]/, 1);
+  if (pathname !== normalizedBasePath || normalizedBasePath === '/') {
+    return url;
+  }
+  return `${normalizedBasePath}/${url.slice(pathname.length)}`;
+}