@nocobase/cli-v1 2.1.0-beta.44 → 2.1.0-beta.46

package/nocobase.conf.tpl

@@ -58,6 +58,14 @@ server {
         }
     }
 
+    location ^~ {{distPath}} {
+        alias {{cwd}}/storage/dist-client/;
+        expires 365d;
+        add_header Cache-Control "public";
+        access_log off;
+        autoindex off;
+    }
+
     location {{publicPath}}static/plugins/ {
         alias {{cwd}}/node_modules/;
         expires 365d;
@@ -91,7 +99,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-beta.44",
+  "version": "2.1.0-beta.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-beta.44",
+    "@nocobase/cli": "2.1.0-beta.46",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.1.0-beta.44",
+    "@nocobase/utils": "2.1.0-beta.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-beta.44",
+    "@nocobase/devtools": "2.1.0-beta.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": "540d4897b1696cc24c0754521b0b766978b4933c"
+  "gitHead": "91fd3ab238a5ff58735bbfca04a8cb05d233b0af"
 }

package/src/__tests__/default-cdn-base-url.test.js

@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+
+/* eslint-env jest */
+
+const fs = require('fs-extra');
+const os = require('os');
+const path = require('path');
+const { resolveDefaultCdnBaseUrlFromActiveVersion } = require('../util');
+
+describe('cli-v1 default CDN_BASE_URL', () => {
+  const originalEnv = { ...process.env };
+
+  afterEach(() => {
+    process.env = { ...originalEnv };
+  });
+
+  test('prefers the extracted dist-client active version when available', async () => {
+    const storagePath = await fs.mkdtemp(path.join(os.tmpdir(), 'nocobase-dist-client-'));
+    const distClientRoot = path.join(storagePath, 'dist-client');
+    await fs.ensureDir(distClientRoot);
+    await fs.writeFile(path.join(distClientRoot, 'active-version'), '2.1.0-beta.45\n', 'utf8');
+    process.env.STORAGE_PATH = storagePath;
+
+    expect(resolveDefaultCdnBaseUrlFromActiveVersion('/console/')).toBe('/console/dist/2.1.0-beta.45/');
+    expect(resolveDefaultCdnBaseUrlFromActiveVersion('/')).toBe('/dist/2.1.0-beta.45/');
+
+    await fs.remove(storagePath);
+  });
+
+  test('returns undefined when the active version file is missing', async () => {
+    const storagePath = await fs.mkdtemp(path.join(os.tmpdir(), 'nocobase-dist-client-empty-'));
+    process.env.STORAGE_PATH = storagePath;
+
+    expect(resolveDefaultCdnBaseUrlFromActiveVersion('/console/')).toBeUndefined();
+
+    await fs.remove(storagePath);
+  });
+});

package/src/commands/client.js

@@ -8,9 +8,9 @@
  */
 
 const chalk = require('chalk');
-const { Command } = require('commander');
 const fs = require('fs-extra');
 const { resolve } = require('path');
+const { discoverPluginPackages } = require('@nocobase/utils/plugin-package');
 const { storagePathJoin } = require('../util');
 
 /**
@@ -20,39 +20,47 @@ const { storagePathJoin } = require('../util');
  */
 async function copyMainClient(source, target) {
   if (!(await fs.exists(source))) {
-    console.log(chalk.yellow(`Source directory does not exist: ${source}`));
-    return;
+    console.warn(chalk.yellow(`Source directory does not exist: ${source}`));
+    return false;
   }
   // 确保目标目录存在且为空
   await fs.ensureDir(target);
   await fs.emptyDir(target);
   await fs.copy(source, target, { recursive: true });
-  console.log(chalk.green(`Copied main client files from ${source} to ${target}`));
+  return true;
 }
 
 /**
  * 复制插件客户端文件
- * @param {string} pluginsBaseDir - 插件基础目录路径
- * @param {string} namespace - 命名空间（如 '@nocobase' 或 '@nocobase-example'）
+ * @param {Array<{ packageName: string, resolvedPath: string }>} plugins - 插件清单
  * @param {string} target - 目标目录
  */
-async function copyPluginClients(pluginsBaseDir, namespace, target) {
-  const pluginsDir = resolve(process.cwd(), pluginsBaseDir, namespace);
-  if (await fs.exists(pluginsDir)) {
-    const pluginNames = await fs.readdir(pluginsDir);
-    for (const pluginName of pluginNames) {
-      const pluginPath = resolve(pluginsDir, pluginName);
-      for (const lane of ['client', 'client-v2']) {
-        const pluginDistClient = resolve(pluginPath, `dist/${lane}`);
-        if (await fs.exists(pluginDistClient)) {
-          const pluginTarget = resolve(target, 'static/plugins', namespace, pluginName, 'dist', lane);
-          await fs.mkdir(resolve(pluginTarget, '..'), { recursive: true });
-          await fs.copy(pluginDistClient, pluginTarget, { recursive: true });
-          console.log(chalk.green(`Copied ${namespace}/${pluginName} ${lane} files`));
-        }
+async function copyPluginClients(plugins, target) {
+  let copiedCount = 0;
+  for (const plugin of plugins) {
+    for (const lane of ['client', 'client-v2']) {
+      const pluginDistClient = resolve(plugin.resolvedPath, `dist/${lane}`);
+      if (await fs.exists(pluginDistClient)) {
+        const pluginTarget = resolve(target, 'static/plugins', plugin.packageName, 'dist', lane);
+        await fs.mkdir(resolve(pluginTarget, '..'), { recursive: true });
+        await fs.copy(pluginDistClient, pluginTarget, { recursive: true });
+        copiedCount++;
       }
     }
   }
+  return copiedCount;
+}
+
+async function writeActiveVersion(version) {
+  const distClientRoot = storagePathJoin('dist-client');
+  const activeVersionFile = resolve(distClientRoot, 'active-version');
+  const tempFile = resolve(distClientRoot, `.active-version.${process.pid}.${Date.now()}.tmp`);
+
+  await fs.ensureDir(distClientRoot);
+  await fs.writeFile(tempFile, `${version}\n`, 'utf8');
+  await fs.move(tempFile, activeVersionFile, { overwrite: true });
+
+  return activeVersionFile;
 }
 
 /**
@@ -108,15 +116,38 @@ async function uploadDirectoryToOSS(client, localDir, ossPrefix = '') {
 module.exports = (cli) => {
   cli
     .command('client:extract')
+    .option('--json', 'Output machine-readable JSON')
     .allowUnknownOption()
-    .action(async () => {
+    .action(async function () {
+      const json = this.opts().json === true;
       const version = require('../../package.json').version;
       const target = storagePathJoin('dist-client', version);
       const mainClientSource = resolve(process.cwd(), 'node_modules/@nocobase/app/dist/client');
-      await copyMainClient(mainClientSource, target);
-      await copyPluginClients('packages/plugins', '@nocobase', target);
-      await copyPluginClients('packages/plugins', '@nocobase-example', target);
-      await copyPluginClients('packages/pro-plugins', '@nocobase', target);
+      const plugins = await discoverPluginPackages({
+        nodeModulesPath: resolve(process.cwd(), 'node_modules'),
+      });
+      const copiedMainClient = await copyMainClient(mainClientSource, target);
+      const copiedPluginBundles = await copyPluginClients(plugins, target);
+      const activeVersionFile = await writeActiveVersion(version);
+
+      if (json) {
+        process.stdout.write(
+          JSON.stringify({
+            version,
+            target,
+            activeVersionFile,
+          }),
+        );
+        return;
+      }
+
+      console.log(
+        chalk.green(
+          `Extracted client assets ${version} to ${target} (main client: ${
+            copiedMainClient ? 'yes' : 'no'
+          }, plugin bundles: ${copiedPluginBundles}).`,
+        ),
+      );
     });
 
   cli

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

@@ -8,8 +8,7 @@
  */
 
 const { resolve, posix } = require('path');
-const { storagePathJoin, resolvePublicPath, resolveV2PublicPath } = require('../util');
-const { Command } = require('commander');
+const { storagePathJoin, resolvePublicPath, resolveV2PublicPath, normalizeModernClientPrefix } = require('../util');
 const { readFileSync, writeFileSync } = require('fs');
 
 /**
@@ -20,18 +19,22 @@ module.exports = (cli) => {
   cli.command('create-nginx-conf').action(async (name, options) => {
     const rawAppPublicPath = process.env.APP_PUBLIC_PATH || '/';
     const appPublicPath = resolvePublicPath(rawAppPublicPath);
+    const distPath = `${appPublicPath.replace(/\/$/, '')}/dist/`;
     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;
     }
 
@@ -43,6 +46,7 @@ module.exports = (cli) => {
     const replaced = data
       .replace(/\{\{cwd\}\}/g, posix.resolve(process.cwd()))
       .replace(/\{\{publicPath\}\}/g, appPublicPath)
+      .replace(/\{\{distPath\}\}/g, distPath)
       .replace(/\{\{v2PublicPath\}\}/g, v2PublicPath)
       .replace(/\{\{v2PublicPathNoTrailingSlash\}\}/g, v2PublicPathWithoutTrailingSlash)
       .replace(/\{\{apiPort\}\}/g, process.env.APP_PORT)

package/src/util.js

@@ -367,9 +367,64 @@ function resolvePublicPath(appPublicPath = '/') {
 
 exports.resolvePublicPath = resolvePublicPath;
 
+function resolveDistPublicPath(appPublicPath = '/') {
+  const publicPath = resolvePublicPath(appPublicPath).replace(/\/+$/, '');
+  return `${publicPath}/dist/`;
+}
+
+function buildDefaultCdnBaseUrl(appPublicPath, version) {
+  const normalizedVersion = String(version || '')
+    .trim()
+    .replace(/^\/+|\/+$/g, '');
+  if (!normalizedVersion) {
+    return undefined;
+  }
+  return `${resolveDistPublicPath(appPublicPath)}${normalizedVersion}/`;
+}
+
+exports.buildDefaultCdnBaseUrl = buildDefaultCdnBaseUrl;
+
+function resolveDefaultCdnBaseUrlFromActiveVersion(appPublicPath = '/') {
+  try {
+    const activeVersionFile = storagePathJoin('dist-client', 'active-version');
+    if (!fs.existsSync(activeVersionFile)) {
+      return undefined;
+    }
+    const activeVersion = String(fs.readFileSync(activeVersionFile, 'utf8') || '').trim();
+    return buildDefaultCdnBaseUrl(appPublicPath, activeVersion);
+  } catch (_error) {
+    return undefined;
+  }
+}
+
+exports.resolveDefaultCdnBaseUrlFromActiveVersion = resolveDefaultCdnBaseUrlFromActiveVersion;
+
+// 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 +588,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: '',
   };
@@ -598,8 +654,10 @@ exports.initEnv = function initEnv() {
     process.env.__env_modified__ = true;
   }
 
-  if (!process.env.CDN_BASE_URL && process.env.APP_PUBLIC_PATH !== '/') {
-    process.env.CDN_BASE_URL = process.env.APP_PUBLIC_PATH;
+  if (!process.env.CDN_BASE_URL) {
+    process.env.CDN_BASE_URL =
+      resolveDefaultCdnBaseUrlFromActiveVersion(process.env.APP_PUBLIC_PATH) ||
+      (process.env.APP_PUBLIC_PATH !== '/' ? process.env.APP_PUBLIC_PATH : '');
   }
 
   if (process.env.CDN_BASE_URL.includes('http') && process.env.CDN_VERSION === 'auto') {