@nocobase/app 2.2.0-alpha.7 → 2.2.0-beta.10

package/client/public/browser-checker.js

@@ -17,31 +17,9 @@ function normalizePublicPath(value) {
   return ensureTrailingSlash(normalized);
 }
 
-function trimTrailingSlash(value) {
-  return value === '/' ? value : value.replace(/\/+$/g, '');
-}
-
-function normalizePathname(value) {
-  const normalized = ensureLeadingSlash(String(value || '/').trim() || '/').replace(/\/{2,}/g, '/');
-  if (normalized !== '/' && normalized.endsWith('/')) {
-    return normalized.replace(/\/+$/g, '');
-  }
-  return normalized;
-}
-
-function isClientDocumentEntryPath(pathname) {
-  const normalized = normalizePathname(pathname);
-  return normalized === '/' || normalized === '/index.html' || !/\.[^/]+$/.test(normalized);
-}
-
 const basename = normalizePublicPath(window['__nocobase_public_path__'] || '/');
 const currentPath = ensureLeadingSlash(String(window.location.pathname || '/').trim() || '/').replace(/\/{2,}/g, '/');
 const basenameWithoutTrailingSlash = basename === '/' ? '/' : basename.replace(/\/+$/, '');
-const modernClientPrefix =
-  String(window['__nocobase_modern_client_prefix__'] || 'v')
-    .trim()
-    .replace(/^\/+|\/+$/g, '') || 'v';
-const appClientEntryMode = window['__nocobase_app_client_entry_mode__'];
 
 if (basename !== '/' && currentPath === basenameWithoutTrailingSlash) {
   const newUrl = `${window.location.origin}${basename}${window.location.search}${window.location.hash}`;
@@ -50,42 +28,6 @@ if (basename !== '/' && currentPath === basenameWithoutTrailingSlash) {
   const newPath = currentPath === '/' ? basename : `${basenameWithoutTrailingSlash}${currentPath}`;
   let newUrl = window.location.origin + newPath + window.location.search + window.location.hash;
   window.location.replace(newUrl);
-} else {
-  // This client-side redirect is still needed because legacy `index.html` is
-  // not always served through the node gateway. In nginx/static delivery paths
-  // the browser may already be running the legacy shell by the time entry-mode
-  // logic is evaluated, so the last hop into the modern entry has to be
-  // recoverable in the browser as well.
-  const normalizedPath = normalizePathname(currentPath);
-  const relativePath =
-    basename === '/'
-      ? normalizedPath
-      : normalizedPath === basenameWithoutTrailingSlash
-      ? '/'
-      : normalizedPath.startsWith(basename)
-      ? normalizePathname(normalizedPath.slice(basename.length - 1))
-      : null;
-  const modernBase = `${trimTrailingSlash(basename)}/${modernClientPrefix}/`.replace(/\/{2,}/g, '/');
-  const isModernDefault = appClientEntryMode === 'modern-default';
-  const isModernOnly = appClientEntryMode === 'modern-only';
-  if (
-    relativePath &&
-    isClientDocumentEntryPath(relativePath) &&
-    (isModernDefault || isModernOnly) &&
-    !normalizedPath.startsWith(modernBase)
-  ) {
-    const targetPath = isModernDefault
-      ? relativePath === '/' || relativePath === '/index.html'
-        ? relativePath === '/index.html'
-          ? `${modernBase}index.html`
-          : modernBase
-        : null
-      : `${trimTrailingSlash(modernBase)}${relativePath}`;
-    if (targetPath && targetPath !== currentPath) {
-      const newUrl = window.location.origin + targetPath + window.location.search + window.location.hash;
-      window.location.replace(newUrl);
-    }
-  }
 }
 let showLog = true;
 function log(m) {

package/client/rsbuild.config.ts

@@ -47,16 +47,9 @@ function toDefineLiteral(value: string | undefined) {
 }
 
 function createRuntimeHeadScript(appPublicPath: string, isBuild: boolean) {
-  const modernClientPrefix =
-    String(process.env.APP_MODERN_CLIENT_PREFIX || 'v')
-      .trim()
-      .replace(/^\/+|\/+$/g, '') || 'v';
-  const appClientEntryMode = process.env.APP_CLIENT_ENTRY_MODE;
   if (!isBuild) {
     return [
       `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_app_dev__'] = ${JSON.stringify(process.env.NOCOBASE_APP_DEV === 'true')};`,
       `window['__esm_cdn_base_url__'] = ${JSON.stringify(process.env.ESM_CDN_BASE_URL || '')};`,
@@ -67,8 +60,6 @@ function createRuntimeHeadScript(appPublicPath: string, isBuild: boolean) {
   return [
     `window['__webpack_public_path__'] = '{{env.CDN_BASE_URL}}';`,
     `window['__nocobase_public_path__'] = '${appPublicPath}';`,
-    `window['__nocobase_modern_client_prefix__'] = '{{env.APP_MODERN_CLIENT_PREFIX}}';`,
-    `window['__nocobase_app_client_entry_mode__'] = '{{env.APP_CLIENT_ENTRY_MODE}}';`,
     `window['__nocobase_api_base_url__'] = '{{env.API_BASE_URL}}';`,
     `window['__nocobase_api_client_storage_prefix__'] = '{{env.API_CLIENT_STORAGE_PREFIX}}';`,
     `window['__nocobase_api_client_storage_type__'] = '{{env.API_CLIENT_STORAGE_TYPE}}';`,

package/client-v2/rsbuild.config.ts

@@ -52,27 +52,6 @@ function toNumber(value: string | undefined, fallback: number) {
   return Number.isFinite(parsed) ? parsed : fallback;
 }
 
-function normalizePathname(value: string | undefined) {
-  let normalized = value || '/';
-  if (!normalized.startsWith('/')) {
-    normalized = `/${normalized}`;
-  }
-  normalized = normalized.replace(/\/{2,}/g, '/');
-  if (normalized !== '/' && normalized.endsWith('/')) {
-    return normalized.replace(/\/+$/g, '');
-  }
-  return normalized || '/';
-}
-
-function isClientDocumentEntryPath(pathname: string) {
-  return pathname === '/' || pathname === '/index.html' || !/\.[^/]+$/.test(pathname);
-}
-
-function isWithinBasePath(pathname: string, basePath: string) {
-  const normalizedBasePath = normalizePathname(basePath);
-  return pathname === normalizedBasePath || pathname.startsWith(`${normalizedBasePath}/`);
-}
-
 function createRuntimeHeadScript(v2PublicPath: string, isBuild: boolean, modernClientPrefix: string) {
   if (!isBuild) {
     return [
@@ -153,7 +132,6 @@ export default defineConfig(({ command }) => {
   const modernClientDistPath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/${MODERN_CLIENT_DIST_DIR}/`);
   const modernClientPublicPath = ensurePublicPath(`${appPublicPath.replace(/\/$/, '')}/${modernClientPrefix}/`);
   const v2PublicPath = isBuild ? modernClientDistPath : modernClientPublicPath;
-  const appClientEntryMode = process.env.APP_CLIENT_ENTRY_MODE;
   const wsBasePath = ensurePublicPath(process.env.WS_PATH || '/ws/');
   const hmrPath = `${v2PublicPath.replace(/\/$/, '')}/__rspack_hmr`;
   const v2Port = toNumber(process.env.APP_V2_PORT, 13002);
@@ -297,37 +275,6 @@ export default defineConfig(({ command }) => {
     dev: {
       assetPrefix: v2PublicPath,
       lazyCompilation: false,
-      setupMiddlewares: [
-        (middlewares) => {
-          if (appClientEntryMode !== 'modern-only') {
-            return;
-          }
-
-          middlewares.unshift((req, res, next) => {
-            const [rawPathname = '/', query = ''] = String(req.url || '/').split('?');
-            const pathname = normalizePathname(rawPathname);
-            if (
-              !isClientDocumentEntryPath(pathname) ||
-              pathname.startsWith('/.well-known/') ||
-              pathname.startsWith(apiBasePath) ||
-              pathname.startsWith(wsBasePath) ||
-              pathname.startsWith(localStorageBasePath) ||
-              pathname.startsWith(staticBasePath)
-            ) {
-              next();
-              return;
-            }
-            if (!isWithinBasePath(pathname, v2PublicPath)) {
-              const target = pathname === '/' ? v2PublicPath : `${v2PublicPath.replace(/\/$/, '')}${pathname}`;
-              res.statusCode = 302;
-              res.setHeader('Location', `${target}${query ? `?${query}` : ''}`);
-              res.end();
-              return;
-            }
-            next();
-          });
-        },
-      ],
       client: {
         overlay: false,
         protocol: 'ws',