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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.1.0-beta.45",
+  "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.45",
+    "@nocobase/cli": "2.1.0-beta.46",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.1.0-beta.45",
+    "@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.45",
+    "@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": "42587115fc34c3eb01ef2b2549f1c998e5708318"
+  "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/util.js

@@ -367,6 +367,38 @@ 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
@@ -622,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') {