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

package/dist/client/settings/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/dist/client/settings/index.html

@@ -15,7 +15,7 @@ window['__nocobase_ws_url__'] = window['__nocobase_ws_url__'] ?? "";
 window['__nocobase_ws_path__'] = window['__nocobase_ws_path__'] ?? "/ws";
 window['__nocobase_app_dev__'] = window['__nocobase_app_dev__'] ?? false;
 window['__esm_cdn_base_url__'] = window['__esm_cdn_base_url__'] ?? "https://esm.sh";
-window['__esm_cdn_suffix__'] = window['__esm_cdn_suffix__'] ?? "";</script><script src="/settings/browser-checker.js?v=1"></script><script type="module" src="/settings/assets/runtime-6b2f3ebe.js"></script><script type="module" src="/settings/assets/7245-1058e96e.js"></script><script type="module" src="/settings/assets/index-3da8ef5b.js"></script><link href="/settings/assets/7245-db3cd5c2.css" rel="stylesheet"></head>
+window['__esm_cdn_suffix__'] = window['__esm_cdn_suffix__'] ?? "";</script><script src="/settings/browser-checker.js?v=1"></script><script type="module" src="/settings/assets/runtime-6b2f3ebe.js"></script><script type="module" src="/settings/assets/7245-1058e96e.js"></script><script type="module" src="/settings/assets/index-e8b81081.js"></script><link href="/settings/assets/7245-db3cd5c2.css" rel="stylesheet"></head>
   <body>
     <div id="root"></div>
   </body>