@nocobase/app 2.2.0-alpha.1 → 2.2.0-alpha.2

package/dist/client/browser-checker.js

@@ -17,9 +17,31 @@ 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}`;
@@ -28,6 +50,42 @@ 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/dist/client/index.html

@@ -7,6 +7,8 @@
   <title>Loading...</title>
 <link rel="stylesheet" href="/global.css"><script>window['__webpack_public_path__'] = '';
 window['__nocobase_public_path__'] = '/';
+window['__nocobase_modern_client_prefix__'] = 'v';
+window['__nocobase_app_client_entry_mode__'] = 'legacy-default';
 window['__nocobase_api_base_url__'] = '/api/';
 window['__nocobase_api_client_storage_prefix__'] = 'NOCOBASE_';
 window['__nocobase_api_client_storage_type__'] = 'localStorage';
@@ -15,7 +17,7 @@ window['__nocobase_ws_url__'] = '';
 window['__nocobase_ws_path__'] = '/ws';
 window['__nocobase_app_dev__'] = false;
 window['__esm_cdn_base_url__'] = 'https://esm.sh';
-window['__esm_cdn_suffix__'] = '';</script><script src="/browser-checker.js?v=1"></script><script type="module" src="/assets/runtime-6964d231.js"></script><script type="module" src="/assets/vendor-core-a233b529.js"></script><script type="module" src="/assets/vendor-antd-ecosystem-b9174353.js"></script><script type="module" src="/assets/vendor-moment-8e0638ed.js"></script><script type="module" src="/assets/vendor-lodash-97b39f5f.js"></script><script type="module" src="/assets/vendor-ses-4e1acd6f.js"></script><script type="module" src="/assets/vendor-antd-icons-b345e75b.js"></script><script type="module" src="/assets/vendor-antd-a0dccf46.js"></script><script type="module" src="/assets/vendor-antv-b2b63ca6.js"></script><script type="module" src="/assets/vendor-markdown-6cd7c4ae.js"></script><script type="module" src="/assets/vendor-math-template-e14d2da2.js"></script><script type="module" src="/assets/vendor-editor-4a3d9571.js"></script><script type="module" src="/assets/vendor-mobile-ui-d13eb245.js"></script><script type="module" src="/assets/vendor-dayjs-b86f7bf1.js"></script><script type="module" src="/assets/vendor-diagram-686f3f07.js"></script><script type="module" src="/assets/vendor-misc-b5370062.js"></script><script type="module" src="/assets/index-055f2436.js"></script><link href="/assets/vendor-antd-debce1bd.css" rel="stylesheet"><link href="/assets/vendor-markdown-c8e9c5dd.css" rel="stylesheet"><link href="/assets/vendor-mobile-ui-4d3e1f9f.css" rel="stylesheet"><link href="/assets/9967-52c0cdfd.css" rel="stylesheet"><link href="/assets/index-560f1b6d.css" rel="stylesheet"></head>
+window['__esm_cdn_suffix__'] = '';</script><script src="/browser-checker.js?v=1"></script><script type="module" src="/assets/runtime-6964d231.js"></script><script type="module" src="/assets/vendor-core-a233b529.js"></script><script type="module" src="/assets/vendor-antd-ecosystem-b9174353.js"></script><script type="module" src="/assets/vendor-moment-8e0638ed.js"></script><script type="module" src="/assets/vendor-lodash-97b39f5f.js"></script><script type="module" src="/assets/vendor-ses-4e1acd6f.js"></script><script type="module" src="/assets/vendor-antd-icons-b345e75b.js"></script><script type="module" src="/assets/vendor-antd-a0dccf46.js"></script><script type="module" src="/assets/vendor-antv-b2b63ca6.js"></script><script type="module" src="/assets/vendor-markdown-6cd7c4ae.js"></script><script type="module" src="/assets/vendor-math-template-e14d2da2.js"></script><script type="module" src="/assets/vendor-editor-4a3d9571.js"></script><script type="module" src="/assets/vendor-mobile-ui-d13eb245.js"></script><script type="module" src="/assets/vendor-dayjs-b86f7bf1.js"></script><script type="module" src="/assets/vendor-diagram-686f3f07.js"></script><script type="module" src="/assets/vendor-misc-0f74f11a.js"></script><script type="module" src="/assets/index-269423c2.js"></script><link href="/assets/vendor-antd-debce1bd.css" rel="stylesheet"><link href="/assets/vendor-markdown-c8e9c5dd.css" rel="stylesheet"><link href="/assets/vendor-mobile-ui-4d3e1f9f.css" rel="stylesheet"><link href="/assets/9967-52c0cdfd.css" rel="stylesheet"><link href="/assets/index-560f1b6d.css" rel="stylesheet"></head>
 
 <body>
   <div id="root"></div>

package/dist/client/index.html.tpl

@@ -7,6 +7,8 @@
   <title>Loading...</title>
 <link rel="stylesheet" href="{{env.APP_PUBLIC_PATH}}global.css"><script>window['__webpack_public_path__'] = '{{env.CDN_BASE_URL}}';
 window['__nocobase_public_path__'] = '{{env.APP_PUBLIC_PATH}}';
+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}}';
@@ -15,7 +17,7 @@ window['__nocobase_ws_url__'] = '{{env.WS_URL}}';
 window['__nocobase_ws_path__'] = '{{env.WS_PATH}}';
 window['__nocobase_app_dev__'] = {{env.NOCOBASE_APP_DEV}};
 window['__esm_cdn_base_url__'] = '{{env.ESM_CDN_BASE_URL}}';
-window['__esm_cdn_suffix__'] = '{{env.ESM_CDN_SUFFIX}}';</script><script src="{{env.APP_PUBLIC_PATH}}browser-checker.js?v=1"></script><script type="module" src="assets/runtime-6964d231.js"></script><script type="module" src="assets/vendor-core-a233b529.js"></script><script type="module" src="assets/vendor-antd-ecosystem-b9174353.js"></script><script type="module" src="assets/vendor-moment-8e0638ed.js"></script><script type="module" src="assets/vendor-lodash-97b39f5f.js"></script><script type="module" src="assets/vendor-ses-4e1acd6f.js"></script><script type="module" src="assets/vendor-antd-icons-b345e75b.js"></script><script type="module" src="assets/vendor-antd-a0dccf46.js"></script><script type="module" src="assets/vendor-antv-b2b63ca6.js"></script><script type="module" src="assets/vendor-markdown-6cd7c4ae.js"></script><script type="module" src="assets/vendor-math-template-e14d2da2.js"></script><script type="module" src="assets/vendor-editor-4a3d9571.js"></script><script type="module" src="assets/vendor-mobile-ui-d13eb245.js"></script><script type="module" src="assets/vendor-dayjs-b86f7bf1.js"></script><script type="module" src="assets/vendor-diagram-686f3f07.js"></script><script type="module" src="assets/vendor-misc-b5370062.js"></script><script type="module" src="assets/index-055f2436.js"></script><link href="assets/vendor-antd-debce1bd.css" rel="stylesheet"><link href="assets/vendor-markdown-c8e9c5dd.css" rel="stylesheet"><link href="assets/vendor-mobile-ui-4d3e1f9f.css" rel="stylesheet"><link href="assets/9967-52c0cdfd.css" rel="stylesheet"><link href="assets/index-560f1b6d.css" rel="stylesheet"></head>
+window['__esm_cdn_suffix__'] = '{{env.ESM_CDN_SUFFIX}}';</script><script src="{{env.APP_PUBLIC_PATH}}browser-checker.js?v=1"></script><script type="module" src="assets/runtime-6964d231.js"></script><script type="module" src="assets/vendor-core-a233b529.js"></script><script type="module" src="assets/vendor-antd-ecosystem-b9174353.js"></script><script type="module" src="assets/vendor-moment-8e0638ed.js"></script><script type="module" src="assets/vendor-lodash-97b39f5f.js"></script><script type="module" src="assets/vendor-ses-4e1acd6f.js"></script><script type="module" src="assets/vendor-antd-icons-b345e75b.js"></script><script type="module" src="assets/vendor-antd-a0dccf46.js"></script><script type="module" src="assets/vendor-antv-b2b63ca6.js"></script><script type="module" src="assets/vendor-markdown-6cd7c4ae.js"></script><script type="module" src="assets/vendor-math-template-e14d2da2.js"></script><script type="module" src="assets/vendor-editor-4a3d9571.js"></script><script type="module" src="assets/vendor-mobile-ui-d13eb245.js"></script><script type="module" src="assets/vendor-dayjs-b86f7bf1.js"></script><script type="module" src="assets/vendor-diagram-686f3f07.js"></script><script type="module" src="assets/vendor-misc-0f74f11a.js"></script><script type="module" src="assets/index-269423c2.js"></script><link href="assets/vendor-antd-debce1bd.css" rel="stylesheet"><link href="assets/vendor-markdown-c8e9c5dd.css" rel="stylesheet"><link href="assets/vendor-mobile-ui-4d3e1f9f.css" rel="stylesheet"><link href="assets/9967-52c0cdfd.css" rel="stylesheet"><link href="assets/index-560f1b6d.css" rel="stylesheet"></head>
 
 <body>
   <div id="root"></div>