@nocobase/server 2.1.0-alpha.45 → 2.1.0-alpha.46

package/lib/gateway/index.js

@@ -287,6 +287,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   getV2RuntimeConfig() {
     return {
       __nocobase_public_path__: this.getV2PublicPath(),
+      __nocobase_modern_client_prefix__: (0, import_utils3.normalizeModernClientPrefix)(import_node_process.default.env.APP_MODERN_CLIENT_PREFIX),
       __webpack_public_path__: import_node_process.default.env.CDN_BASE_URL ? `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/` : "",
       __nocobase_api_base_url__: import_node_process.default.env.API_BASE_URL || import_node_process.default.env.API_BASE_PATH,
       __nocobase_api_client_storage_prefix__: import_node_process.default.env.API_CLIENT_STORAGE_PREFIX,
@@ -306,12 +307,12 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   }
   getV2AssetPublicPath() {
     if (import_node_process.default.env.CDN_BASE_URL) {
-      return `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/v2/`;
+      return `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/${import_utils3.MODERN_CLIENT_DIST_DIR}/`;
     }
     return this.getV2PublicPath();
   }
   getV2IndexTemplate() {
-    const file = `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client/v2/index.html`;
+    const file = `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client/${import_utils3.MODERN_CLIENT_DIST_DIR}/index.html`;
     if (!import_fs.default.existsSync(file)) {
       return null;
     }
@@ -409,6 +410,10 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
           }
         }
         req.url = req.url.substring(APP_PUBLIC_PATH.length - 1);
+        const modernPrefix = (0, import_utils3.normalizeModernClientPrefix)(import_node_process.default.env.APP_MODERN_CLIENT_PREFIX);
+        if (modernPrefix !== import_utils3.MODERN_CLIENT_DIST_DIR && req.url.startsWith(`/${modernPrefix}/`)) {
+          req.url = `/${import_utils3.MODERN_CLIENT_DIST_DIR}/${req.url.slice(modernPrefix.length + 2)}`;
+        }
         await compress(req, res);
         return (0, import_serve_handler.default)(req, res, {
           public: `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client`

package/lib/gateway/utils.d.ts

@@ -9,7 +9,9 @@
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
 import { IncomingRequest } from '.';
+export declare const MODERN_CLIENT_DIST_DIR = "v";
 export declare function resolvePublicPath(appPublicPath?: string): string;
+export declare function normalizeModernClientPrefix(value?: string): string;
 export declare function resolveV2PublicPath(appPublicPath?: string): string;
 export declare function rewriteV2AssetPublicPath(html: string, assetPublicPath: string): string;
 export declare function injectRuntimeScript(html: string, runtimeScript: string): string;

package/lib/gateway/utils.js

@@ -27,23 +27,32 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  MODERN_CLIENT_DIST_DIR: () => MODERN_CLIENT_DIST_DIR,
   getHost: () => getHost,
   getHostname: () => getHostname,
   injectRuntimeScript: () => injectRuntimeScript,
+  normalizeModernClientPrefix: () => normalizeModernClientPrefix,
   resolvePublicPath: () => resolvePublicPath,
   resolveV2PublicPath: () => resolveV2PublicPath,
   rewriteV2AssetPublicPath: () => rewriteV2AssetPublicPath
 });
 module.exports = __toCommonJS(utils_exports);
+const MODERN_CLIENT_DIST_DIR = "v";
 function resolvePublicPath(appPublicPath = "/") {
   const normalized = String(appPublicPath || "/").trim() || "/";
   const withLeadingSlash = normalized.startsWith("/") ? normalized : `/${normalized}`;
   return withLeadingSlash.endsWith("/") ? withLeadingSlash : `${withLeadingSlash}/`;
 }
 __name(resolvePublicPath, "resolvePublicPath");
+function normalizeModernClientPrefix(value) {
+  const segment = String(value || "").trim().replace(/^\/+|\/+$/g, "");
+  return segment || MODERN_CLIENT_DIST_DIR;
+}
+__name(normalizeModernClientPrefix, "normalizeModernClientPrefix");
 function resolveV2PublicPath(appPublicPath = "/") {
   const publicPath = resolvePublicPath(appPublicPath);
-  return `${publicPath.replace(/\/$/, "")}/v2/`;
+  const prefix = normalizeModernClientPrefix(process.env.APP_MODERN_CLIENT_PREFIX);
+  return `${publicPath.replace(/\/$/, "")}/${prefix}/`;
 }
 __name(resolveV2PublicPath, "resolveV2PublicPath");
 function ensureTrailingSlash(value) {
@@ -52,10 +61,12 @@ function ensureTrailingSlash(value) {
 __name(ensureTrailingSlash, "ensureTrailingSlash");
 function rewriteV2AssetPublicPath(html, assetPublicPath) {
   const normalizedAssetPublicPath = ensureTrailingSlash(assetPublicPath);
-  if (normalizedAssetPublicPath === "/v2/") {
+  const sentinel = `/${MODERN_CLIENT_DIST_DIR}/`;
+  if (normalizedAssetPublicPath === sentinel) {
     return html;
   }
-  return html.replace(/((?:src|href)=["'])\/v2\//g, `$1${normalizedAssetPublicPath}`);
+  const sentinelPattern = new RegExp(`((?:src|href)=["'])${sentinel.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "g");
+  return html.replace(sentinelPattern, `$1${normalizedAssetPublicPath}`);
 }
 __name(rewriteV2AssetPublicPath, "rewriteV2AssetPublicPath");
 function injectRuntimeScript(html, runtimeScript) {
@@ -106,9 +117,11 @@ function getHostname(req) {
 __name(getHostname, "getHostname");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  MODERN_CLIENT_DIST_DIR,
   getHost,
   getHostname,
   injectRuntimeScript,
+  normalizeModernClientPrefix,
   resolvePublicPath,
   resolveV2PublicPath,
   rewriteV2AssetPublicPath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-alpha.45",
+  "version": "2.1.0-alpha.46",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.1.0-alpha.45",
-    "@nocobase/actions": "2.1.0-alpha.45",
-    "@nocobase/ai": "2.1.0-alpha.45",
-    "@nocobase/auth": "2.1.0-alpha.45",
-    "@nocobase/cache": "2.1.0-alpha.45",
-    "@nocobase/data-source-manager": "2.1.0-alpha.45",
-    "@nocobase/database": "2.1.0-alpha.45",
-    "@nocobase/evaluators": "2.1.0-alpha.45",
-    "@nocobase/lock-manager": "2.1.0-alpha.45",
-    "@nocobase/logger": "2.1.0-alpha.45",
-    "@nocobase/resourcer": "2.1.0-alpha.45",
-    "@nocobase/sdk": "2.1.0-alpha.45",
-    "@nocobase/snowflake-id": "2.1.0-alpha.45",
-    "@nocobase/telemetry": "2.1.0-alpha.45",
-    "@nocobase/utils": "2.1.0-alpha.45",
+    "@nocobase/acl": "2.1.0-alpha.46",
+    "@nocobase/actions": "2.1.0-alpha.46",
+    "@nocobase/ai": "2.1.0-alpha.46",
+    "@nocobase/auth": "2.1.0-alpha.46",
+    "@nocobase/cache": "2.1.0-alpha.46",
+    "@nocobase/data-source-manager": "2.1.0-alpha.46",
+    "@nocobase/database": "2.1.0-alpha.46",
+    "@nocobase/evaluators": "2.1.0-alpha.46",
+    "@nocobase/lock-manager": "2.1.0-alpha.46",
+    "@nocobase/logger": "2.1.0-alpha.46",
+    "@nocobase/resourcer": "2.1.0-alpha.46",
+    "@nocobase/sdk": "2.1.0-alpha.46",
+    "@nocobase/snowflake-id": "2.1.0-alpha.46",
+    "@nocobase/telemetry": "2.1.0-alpha.46",
+    "@nocobase/utils": "2.1.0-alpha.46",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "e9e24987e12d0ad10a5db8815b1e1b7b447f1938"
+  "gitHead": "42b269944cdd1908d7a848c0af4936fe94c03bb7"
 }