@nocobase/app 3.0.0-alpha.6 → 3.0.0-alpha.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/__tests__/browserChecker.test.ts +2 -2
- package/client/public/browser-checker.js +11 -4
- package/dist/client/assets/{index-63950411.js → index-4c372088.js} +351 -341
- package/dist/client/browser-checker.js +11 -4
- package/dist/client/index.html +1 -1
- package/dist/client/index.html.tpl +1 -1
- package/dist/client/settings/assets/{index-4c8c6c43.js → index-e4664b54.js} +112 -102
- package/dist/client/settings/index.html +1 -1
- package/dist/client/v/assets/{index-97731b94.js → index-7e6cd4d6.js} +144 -134
- package/dist/client/v/index.html +1 -1
- package/package.json +7 -7
- /package/dist/client/assets/{index-63950411.js.LICENSE.txt → index-4c372088.js.LICENSE.txt} +0 -0
- /package/dist/client/settings/assets/{index-4c8c6c43.js.LICENSE.txt → index-e4664b54.js.LICENSE.txt} +0 -0
- /package/dist/client/v/assets/{index-97731b94.js.LICENSE.txt → index-7e6cd4d6.js.LICENSE.txt} +0 -0
|
@@ -54,7 +54,7 @@ if (basename !== '/' && currentPath === basenameWithoutTrailingSlash) {
|
|
|
54
54
|
// This client-side redirect is still needed because legacy `index.html` is
|
|
55
55
|
// not always served through the node gateway. In nginx/static delivery paths
|
|
56
56
|
// the browser may already be running the legacy shell by the time entry-mode
|
|
57
|
-
// logic is evaluated, so the last hop into the
|
|
57
|
+
// logic is evaluated, so the last hop into the configured default entry has to be
|
|
58
58
|
// recoverable in the browser as well.
|
|
59
59
|
const normalizedPath = normalizePathname(currentPath);
|
|
60
60
|
const relativePath =
|
|
@@ -66,15 +66,22 @@ if (basename !== '/' && currentPath === basenameWithoutTrailingSlash) {
|
|
|
66
66
|
? normalizePathname(normalizedPath.slice(basename.length - 1))
|
|
67
67
|
: null;
|
|
68
68
|
const modernBase = `${trimTrailingSlash(basename)}/${modernClientPrefix}/`.replace(/\/{2,}/g, '/');
|
|
69
|
+
const settingsBase = `${basename}settings/`;
|
|
69
70
|
const isModernDefault = appClientEntryMode === 'modern-default';
|
|
70
71
|
const isModernOnly = appClientEntryMode === 'modern-only';
|
|
72
|
+
const isSettingsDefault = appClientEntryMode === 'settings-default';
|
|
73
|
+
const targetBase = isSettingsDefault ? settingsBase : modernBase;
|
|
71
74
|
if (
|
|
72
75
|
relativePath &&
|
|
73
76
|
isClientDocumentEntryPath(relativePath) &&
|
|
74
|
-
(isModernDefault || isModernOnly) &&
|
|
75
|
-
!normalizedPath.startsWith(
|
|
77
|
+
(isModernDefault || isModernOnly || isSettingsDefault) &&
|
|
78
|
+
!normalizedPath.startsWith(targetBase)
|
|
76
79
|
) {
|
|
77
|
-
const targetPath =
|
|
80
|
+
const targetPath = isSettingsDefault
|
|
81
|
+
? relativePath === '/' || relativePath === '/index.html'
|
|
82
|
+
? settingsBase
|
|
83
|
+
: null
|
|
84
|
+
: isModernDefault
|
|
78
85
|
? relativePath === '/' || relativePath === '/index.html'
|
|
79
86
|
? relativePath === '/index.html'
|
|
80
87
|
? `${modernBase}index.html`
|
package/dist/client/index.html
CHANGED
|
@@ -17,7 +17,7 @@ window['__nocobase_ws_url__'] = '';
|
|
|
17
17
|
window['__nocobase_ws_path__'] = '/ws';
|
|
18
18
|
window['__nocobase_app_dev__'] = false;
|
|
19
19
|
window['__esm_cdn_base_url__'] = 'https://esm.sh';
|
|
20
|
-
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-c512d103.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-f421fb70.js"></script><script type="module" src="/assets/vendor-antv-b2b63ca6.js"></script><script type="module" src="/assets/vendor-markdown-543b0a6e.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-c90b5083.js"></script><script type="module" src="/assets/vendor-misc-47bbd442.js"></script><script type="module" src="/assets/index-
|
|
20
|
+
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-c512d103.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-f421fb70.js"></script><script type="module" src="/assets/vendor-antv-b2b63ca6.js"></script><script type="module" src="/assets/vendor-markdown-543b0a6e.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-c90b5083.js"></script><script type="module" src="/assets/vendor-misc-47bbd442.js"></script><script type="module" src="/assets/index-4c372088.js"></script><link href="/assets/vendor-antd-debce1bd.css" rel="stylesheet"><link href="/assets/vendor-markdown-1f674ec1.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>
|
|
21
21
|
|
|
22
22
|
<body>
|
|
23
23
|
<div id="root"></div>
|
|
@@ -17,7 +17,7 @@ window['__nocobase_ws_url__'] = '{{env.WS_URL}}';
|
|
|
17
17
|
window['__nocobase_ws_path__'] = '{{env.WS_PATH}}';
|
|
18
18
|
window['__nocobase_app_dev__'] = {{env.NOCOBASE_APP_DEV}};
|
|
19
19
|
window['__esm_cdn_base_url__'] = '{{env.ESM_CDN_BASE_URL}}';
|
|
20
|
-
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-c512d103.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-f421fb70.js"></script><script type="module" src="assets/vendor-antv-b2b63ca6.js"></script><script type="module" src="assets/vendor-markdown-543b0a6e.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-c90b5083.js"></script><script type="module" src="assets/vendor-misc-47bbd442.js"></script><script type="module" src="assets/index-
|
|
20
|
+
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-c512d103.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-f421fb70.js"></script><script type="module" src="assets/vendor-antv-b2b63ca6.js"></script><script type="module" src="assets/vendor-markdown-543b0a6e.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-c90b5083.js"></script><script type="module" src="assets/vendor-misc-47bbd442.js"></script><script type="module" src="assets/index-4c372088.js"></script><link href="assets/vendor-antd-debce1bd.css" rel="stylesheet"><link href="assets/vendor-markdown-1f674ec1.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>
|
|
21
21
|
|
|
22
22
|
<body>
|
|
23
23
|
<div id="root"></div>
|