@nocobase/app 2.3.0-alpha.1 → 3.0.0-alpha.2

package/dist/client/v/assets/index-41529ca7.js.LICENSE.txt

@@ -0,0 +1 @@
+/* istanbul ignore file -- @preserve */

package/dist/client/v/browser-checker.js

@@ -17,11 +17,86 @@ 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');
+}
+
+function resolveScopedSettingsRootPath(publicPath, pathname) {
+  const normalizedPublicPath = normalizePublicPath(publicPath);
+  const rootPrefix = normalizedPublicPath === '/' ? '' : normalizedPublicPath.replace(/\/+$/g, '');
+  const settingsRootPath = `${rootPrefix}/settings`;
+  if (!pathname.startsWith(`${settingsRootPath}/`)) {
+    return null;
+  }
+
+  const relativePath = pathname.slice(settingsRootPath.length + 1);
+  if (!/^(apps|_app)\/[^/]+$/.test(relativePath)) {
+    return null;
+  }
+
+  return `${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 (basename !== '/' && currentPath === basenameWithoutTrailingSlash) {
+if (settingsRootPath) {
+  const newUrl = `${window.location.origin}${settingsRootPath}${window.location.search}${window.location.hash}`;
+  window.location.replace(newUrl);
+} else if (scopedSettingsRootPath) {
+  const newUrl = `${window.location.origin}${scopedSettingsRootPath}${window.location.search}${window.location.hash}`;
+  window.location.replace(newUrl);
+} else if (basename !== '/' && currentPath === basenameWithoutTrailingSlash) {
   const newUrl = `${window.location.origin}${basename}${window.location.search}${window.location.hash}`;
   window.location.replace(newUrl);
 } else if (basename !== '/' && !currentPath.startsWith(basename)) {

package/dist/client/v/index.html

@@ -14,7 +14,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="/v/browser-checker.js?v=1"></script><script type="module" src="/v/assets/runtime-72080663.js"></script><script type="module" src="/v/assets/vendor-antd-ecosystem-de737eca.js"></script><script type="module" src="/v/assets/vendor-moment-84b317dc.js"></script><script type="module" src="/v/assets/vendor-lodash-905dd3b8.js"></script><script type="module" src="/v/assets/vendor-ses-b7bccbcd.js"></script><script type="module" src="/v/assets/vendor-antd-icons-97ed2369.js"></script><script type="module" src="/v/assets/vendor-antd-155a4c9b.js"></script><script type="module" src="/v/assets/8384-1634db4d.js"></script><script type="module" src="/v/assets/index-2f7426fe.js"></script><link href="/v/assets/vendor-antd-debce1bd.css" rel="stylesheet"><link href="/v/assets/8384-336ef7b3.css" rel="stylesheet"></head>
+window['__esm_cdn_suffix__'] = window['__esm_cdn_suffix__'] || "";</script><script src="/v/browser-checker.js?v=1"></script><script type="module" src="/v/assets/runtime-72080663.js"></script><script type="module" src="/v/assets/vendor-antd-ecosystem-de737eca.js"></script><script type="module" src="/v/assets/vendor-moment-84b317dc.js"></script><script type="module" src="/v/assets/vendor-lodash-905dd3b8.js"></script><script type="module" src="/v/assets/vendor-ses-b7bccbcd.js"></script><script type="module" src="/v/assets/vendor-antd-icons-97ed2369.js"></script><script type="module" src="/v/assets/vendor-antd-155a4c9b.js"></script><script type="module" src="/v/assets/8384-1634db4d.js"></script><script type="module" src="/v/assets/index-41529ca7.js"></script><link href="/v/assets/vendor-antd-debce1bd.css" rel="stylesheet"><link href="/v/assets/8384-336ef7b3.css" rel="stylesheet"></head>
   <body>
     <div id="root"></div>
   </body>

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@nocobase/app",
-  "version": "2.3.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/cli-v1": "2.3.0-alpha.1",
-    "@nocobase/database": "2.3.0-alpha.1",
-    "@nocobase/preset-nocobase": "2.3.0-alpha.1",
-    "@nocobase/server": "2.3.0-alpha.1"
+    "@nocobase/cli-v1": "3.0.0-alpha.2",
+    "@nocobase/database": "3.0.0-alpha.2",
+    "@nocobase/preset-nocobase": "3.0.0-alpha.2",
+    "@nocobase/server": "3.0.0-alpha.2"
   },
   "devDependencies": {
-    "@nocobase/client": "2.3.0-alpha.1"
+    "@nocobase/client": "3.0.0-alpha.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/app"
   },
-  "gitHead": "2377df8ceb12549149017f7f14a61207bf6e49a2"
+  "gitHead": "a3faea21082b30989301de04591ee1b91fd4e6a5"
 }

package/settingsDevProxy.ts

@@ -0,0 +1,52 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+function normalizePublicPath(value: string) {
+  let normalized = value || '/';
+  if (!normalized.startsWith('/')) {
+    normalized = `/${normalized}`;
+  }
+  if (!normalized.endsWith('/')) {
+    normalized = `${normalized}/`;
+  }
+  return normalized.replace(/\/{2,}/g, '/');
+}
+
+function escapeRegExp(value: string) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function createSettingsPathPattern(appPublicPath: string) {
+  const publicPath = normalizePublicPath(appPublicPath);
+  return new RegExp(`^${escapeRegExp(publicPath)}settings(?:/|$)`);
+}
+
+export function isSettingsDevPath(url: string, appPublicPath: string) {
+  const [pathname] = String(url || '/').split(/[?#]/, 1);
+  return createSettingsPathPattern(appPublicPath).test(pathname);
+}
+
+export function rewriteSettingsDevProxyPath(url: string, appPublicPath: string) {
+  const publicPath = normalizePublicPath(appPublicPath);
+  const settingsRoot = `${publicPath}settings`;
+  const settingsRootWithoutTrailingSlash = new RegExp(`^${escapeRegExp(settingsRoot)}(?=[?#]|$)`);
+
+  return url.replace(settingsRootWithoutTrailingSlash, `${settingsRoot}/`);
+}
+
+export function createSettingsDevProxyOptions(appPublicPath: string, settingsPort: number) {
+  return {
+    context: (pathname: string) => isSettingsDevPath(pathname, appPublicPath),
+    target: `http://127.0.0.1:${settingsPort}`,
+    changeOrigin: true,
+    ws: true,
+    xfwd: true,
+    pathRewrite: (pathname: string) => rewriteSettingsDevProxyPath(pathname, appPublicPath),
+  };
+}