@nocobase/cli-v1 2.1.0-alpha.45 → 2.1.0-alpha.46

package/nocobase.conf.tpl

@@ -30,6 +30,9 @@ server {
     client_max_body_size 0;
     access_log /var/log/nginx/nocobase.log apm;
 
+    include /etc/nginx/mime.types;
+    types { application/javascript mjs; }
+
     gzip on;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
@@ -88,7 +91,7 @@ server {
     }
 
     location {{v2PublicPath}}assets/ {
-        alias {{cwd}}/node_modules/@nocobase/app/dist/client/v2/assets/;
+        alias {{cwd}}/node_modules/@nocobase/app/dist/client/v/assets/;
         expires 365d;
         add_header Cache-Control "public";
         access_log off;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.1.0-alpha.45",
+  "version": "2.1.0-alpha.46",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,9 +8,9 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "2.1.0-alpha.45",
+    "@nocobase/cli": "2.1.0-alpha.46",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.1.0-alpha.45",
+    "@nocobase/utils": "2.1.0-alpha.46",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "deepmerge": "^4.3.1",
@@ -25,7 +25,7 @@
     "tree-kill": "^1.2.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.1.0-alpha.45",
+    "@nocobase/devtools": "2.1.0-alpha.46",
     "@types/fs-extra": "^11.0.1"
   },
   "repository": {
@@ -33,5 +33,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "e9e24987e12d0ad10a5db8815b1e1b7b447f1938"
+  "gitHead": "42b269944cdd1908d7a848c0af4936fe94c03bb7"
 }

package/src/commands/create-nginx-conf.js

@@ -8,7 +8,7 @@
  */
 
 const { resolve, posix } = require('path');
-const { storagePathJoin, resolvePublicPath, resolveV2PublicPath } = require('../util');
+const { storagePathJoin, resolvePublicPath, resolveV2PublicPath, normalizeModernClientPrefix } = require('../util');
 const { Command } = require('commander');
 const { readFileSync, writeFileSync } = require('fs');
 
@@ -21,17 +21,20 @@ module.exports = (cli) => {
     const rawAppPublicPath = process.env.APP_PUBLIC_PATH || '/';
     const appPublicPath = resolvePublicPath(rawAppPublicPath);
     const v2PublicPath = resolveV2PublicPath(rawAppPublicPath);
+    const modernClientPrefix = normalizeModernClientPrefix(process.env.APP_MODERN_CLIENT_PREFIX);
     const appPublicPathWithoutTrailingSlash = appPublicPath.replace(/\/$/, '');
     const v2PublicPathWithoutTrailingSlash = v2PublicPath.replace(/\/$/, '');
     const file = resolve(__dirname, '../../nocobase.conf.tpl');
     const data = readFileSync(file, 'utf-8');
     let otherLocation = '';
     if (appPublicPath !== '/') {
-      otherLocation = `location = /v2 {
+      // When the app is mounted under a sub-path, redirect the root-level
+      // `/<prefix>` and `/<prefix>/` to the real (sub-path-prefixed) location.
+      otherLocation = `location = /${modernClientPrefix} {
         return 302 ${v2PublicPath}$is_args$args;
     }
 
-    location /v2/ {
+    location /${modernClientPrefix}/ {
         return 302 ${appPublicPathWithoutTrailingSlash}$uri$is_args$args;
     }
 

package/src/util.js

@@ -367,9 +367,32 @@ function resolvePublicPath(appPublicPath = '/') {
 
 exports.resolvePublicPath = resolvePublicPath;
 
+// Default URL segment under which the modern (v2) client is served.
+// Kept local here so the CLI bootstrap (bin/index.js -> initEnv) stays lightweight
+// and does not have to require heavier packages. A second copy of the fixed
+// build-output directory name lives in:
+//   - packages/core/app/client-v2/rsbuild.config.ts (output.distPath)
+//   - packages/core/server/src/gateway/index.ts (MODERN_CLIENT_DIST_DIR)
+// Keep them in sync. See docs/adr/0001-modern-client-prefix.md.
+const DEFAULT_MODERN_CLIENT_PREFIX = 'v';
+
+exports.DEFAULT_MODERN_CLIENT_PREFIX = DEFAULT_MODERN_CLIENT_PREFIX;
+
+// Normalize APP_MODERN_CLIENT_PREFIX (accepts `v`, `/v`, `/v/`)
+// down to a bare segment like `v`.
+function normalizeModernClientPrefix(value) {
+  const segment = String(value || '')
+    .trim()
+    .replace(/^\/+|\/+$/g, '');
+  return segment || DEFAULT_MODERN_CLIENT_PREFIX;
+}
+
+exports.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}/`;
 }
 
 exports.resolveV2PublicPath = resolveV2PublicPath;
@@ -533,6 +556,7 @@ exports.initEnv = function initEnv() {
     APP_BASE_URL: '',
     CDN_BASE_URL: '',
     APP_PUBLIC_PATH: '/',
+    APP_MODERN_CLIENT_PREFIX: DEFAULT_MODERN_CLIENT_PREFIX,
     ESM_CDN_BASE_URL: 'https://esm.sh',
     ESM_CDN_SUFFIX: '',
   };