@nocobase/app 2.1.0-beta.44 → 2.1.0-beta.45

package/dist/client/browser-checker.js

@@ -1,14 +1,35 @@
-const basename = window['__nocobase_public_path__'] || '/';
-let currentPath = window.location.pathname;
-if (currentPath === basename.slice(0, -1)) {
+function ensureLeadingSlash(value) {
+  if (!value) {
+    return '/';
+  }
+  return value.startsWith('/') ? value : `/${value}`;
+}
+
+function ensureTrailingSlash(value) {
+  if (!value) {
+    return '/';
+  }
+  return value.endsWith('/') ? value : `${value}/`;
+}
+
+function normalizePublicPath(value) {
+  const normalized = ensureLeadingSlash(String(value || '/').trim() || '/').replace(/\/{2,}/g, '/');
+  return ensureTrailingSlash(normalized);
+}
+
+const basename = normalizePublicPath(window['__nocobase_public_path__'] || '/');
+const currentPath = ensureLeadingSlash(String(window.location.pathname || '/').trim() || '/').replace(/\/{2,}/g, '/');
+const basenameWithoutTrailingSlash = basename === '/' ? '/' : basename.replace(/\/+$/, '');
+
+if (currentPath === basenameWithoutTrailingSlash) {
   const newUrl = `${window.location.origin}${basename}${window.location.search}${window.location.hash}`;
   window.location.replace(newUrl);
-} else if (!currentPath.startsWith(basename)) {
-  let newPath = basename + (currentPath.startsWith('/') ? currentPath.slice(1) : currentPath);
+} else if (basename !== '/' && !currentPath.startsWith(basename)) {
+  const newPath = currentPath === '/' ? basename : `${basenameWithoutTrailingSlash}${currentPath}`;
   let newUrl = window.location.origin + newPath + window.location.search + window.location.hash;
   window.location.replace(newUrl);
 }
-showLog = true;
+let showLog = true;
 function log(m) {
   if (window.console && showLog) {
     console.log(m);
@@ -46,7 +67,7 @@ function css_browser_selector(u) {
     dv = 'device_',
     html = document.documentElement,
     b = [
-      (!/opera|webtv/i.test(ua) && /msie\s(\d+)/.test(ua)) || /trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.test(ua)
+      (!/opera|webtv/i.test(ua) && /msie\s(\d+)/.test(ua)) || /trident\/.*rv:([0-9]{1,}[.0-9]{0,})/.test(ua)
         ? 'ie ie' + (/trident\/4\.0/.test(ua) ? '8' : RegExp.$1 == '11.0' ? '11' : RegExp.$1)
         : is('firefox/')
         ? g +
@@ -70,7 +91,7 @@ function css_browser_selector(u) {
         ? bb +
           (/Version\/(\d+)(\.(\d+)+)/i.test(ua)
             ? ' ' + bb + RegExp.$1 + ' ' + bb + RegExp.$1 + RegExp.$2.replace('.', '_')
-            : /Blackberry ?(([0-9]+)([a-z]?))[\/|;]/gi.test(ua)
+            : /Blackberry ?(([0-9]+)([a-z]?))[/|;]/gi.test(ua)
             ? ' ' + bb + RegExp.$2 + (RegExp.$3 ? ' ' + bb + RegExp.$2 + RegExp.$3 : '')
             : '')
         : is('android')
@@ -112,7 +133,7 @@ function css_browser_selector(u) {
       is('j2me')
         ? 'j2me'
         : is('ipad|ipod|iphone')
-        ? (/CPU( iPhone)? OS (\d+[_|\.]\d+([_|\.]\d+)*)/i.test(ua) ? 'ios' + version('ios', RegExp.$2) : '') +
+        ? (/CPU( iPhone)? OS (\d+[_.]\d+([_.]\d+)*)/i.test(ua) ? 'ios' + version('ios', RegExp.$2) : '') +
           ' ' +
           (/(ip(ad|od|hone))/gi.test(ua) ? RegExp.$1 : '')
         : is('playbook')
@@ -144,7 +165,7 @@ function css_browser_selector(u) {
         : is('x11|linux')
         ? 'linux'
         : '',
-      /[; |\[](([a-z]{2})(\-[a-z]{2})?)[)|;|\]]/i.test(ua)
+      /(?:[; |]|\[)(([a-z]{2})(-[a-z]{2})?)(?:\)|;|\||])/i.test(ua)
         ? (lang + RegExp.$2).replace('-', '_') + (RegExp.$3 != '' ? (' ' + lang + RegExp.$1).replace('-', '_') : '')
         : '',
       is('ipad|iphone|ipod') && !is('safari') ? 'ipad_app' : '',
@@ -161,7 +182,7 @@ function css_browser_selector(u) {
         break;
       }
     }
-    widthClasses = '';
+    let widthClasses = '';
     for (var info in uaInfo) {
       widthClasses += ' ' + info + '_' + uaInfo[info];
     }

package/dist/client/index.html

@@ -15,7 +15,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-bc0ac0e3.js"></script><script type="module" src="/assets/vendor-misc-0f74f11a.js"></script><script type="module" src="/assets/index-2bb32c00.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-bc0ac0e3.js"></script><script type="module" src="/assets/vendor-misc-b5370062.js"></script><script type="module" src="/assets/index-83f69b39.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

@@ -15,7 +15,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-bc0ac0e3.js"></script><script type="module" src="assets/vendor-misc-0f74f11a.js"></script><script type="module" src="assets/index-2bb32c00.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-bc0ac0e3.js"></script><script type="module" src="assets/vendor-misc-b5370062.js"></script><script type="module" src="assets/index-83f69b39.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>