@nocobase/cli 2.1.11-test.9 → 2.1.12

package/dist/lib/auth-store.js

@@ -99,6 +99,17 @@ function normalizeAuthConfig(config) {
         ? settings.log.retentionDays
         : undefined;
     const logEnabled = typeof settings.log?.enabled === 'boolean' ? settings.log.enabled : undefined;
+    const hasBinSettings = settings.bin?.docker ||
+        settings.bin?.caddy ||
+        settings.bin?.git ||
+        settings.bin?.nginx ||
+        settings.bin?.pnpm ||
+        settings.bin?.yarn;
+    const hasProxySettings = settings.proxy?.nbCliRoot ||
+        settings.proxy?.caddyDriver ||
+        settings.proxy?.nginxDriver ||
+        settings.proxy?.upstreamHost ||
+        settings.proxy?.host;
     return {
         name: config.name || config.dockerResourcePrefix,
         settings: {
@@ -123,12 +134,7 @@ function normalizeAuthConfig(config) {
                     },
                 }
                 : {}),
-            ...(settings.bin?.docker ||
-                settings.bin?.caddy ||
-                settings.bin?.git ||
-                settings.bin?.nginx ||
-                settings.bin?.pnpm ||
-                settings.bin?.yarn
+            ...(hasBinSettings
                 ? {
                     bin: {
                         ...(settings.bin?.docker ? { docker: normalizeOptionalString(settings.bin.docker) } : {}),
@@ -140,11 +146,7 @@ function normalizeAuthConfig(config) {
                     },
                 }
                 : {}),
-            ...(settings.proxy?.nbCliRoot ||
-                settings.proxy?.caddyDriver ||
-                settings.proxy?.nginxDriver ||
-                settings.proxy?.upstreamHost ||
-                settings.proxy?.host
+            ...(hasProxySettings
                 ? {
                     proxy: {
                         ...(settings.proxy?.nbCliRoot ? { nbCliRoot: normalizeOptionalString(settings.proxy.nbCliRoot) } : {}),

package/dist/lib/prompt-validators.js

@@ -10,7 +10,7 @@ import { spawn } from 'node:child_process';
 import net from 'node:net';
 import { translateCli } from "./cli-locale.js";
 const API_BASE_URL_EXAMPLE = 'http://localhost:13000/api';
-const ENV_KEY_PATTERN = /^[A-Za-z0-9]+$/;
+const ENV_KEY_PATTERN = /^[A-Za-z0-9_-]+$/;
 const APP_PUBLIC_PATH_PATTERN = /^\/(?:[A-Za-z0-9_-]+(?:\/[A-Za-z0-9_-]+)*)?\/?$/;
 const TCP_PORT_EXAMPLE = '13000';
 const API_BASE_URL_REQUEST_TIMEOUT_MS = 5_000;

package/dist/lib/self-manager.js

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { commandOutput, run } from './run-npm.js';
@@ -124,6 +125,7 @@ function detectInstallMethod(packageRoot, options = {}) {
     })) {
         return 'pnpm-global';
     }
+    // Best-effort fallback for environments where pnpm probes are unavailable.
     if (isPnpmGlobalPath(packageRoot)) {
         return 'pnpm-global';
     }
@@ -141,6 +143,39 @@ function isPnpmGlobalPath(packageRoot) {
     }
     return segments.slice(globalIndex + 2).includes('node_modules');
 }
+function normalizePnpmGlobalNodeModulesRoot(pnpmGlobalRoot) {
+    const normalizedGlobalRoot = normalizePath(pnpmGlobalRoot);
+    return path.basename(normalizedGlobalRoot) === 'node_modules'
+        ? normalizedGlobalRoot
+        : path.join(normalizedGlobalRoot, 'node_modules');
+}
+function readSiblingPnpmGlobalNodeModulesRoots(pnpmGlobalRoot) {
+    const globalNodeModulesDir = normalizePnpmGlobalNodeModulesRoot(pnpmGlobalRoot);
+    const globalProjectDir = path.dirname(globalNodeModulesDir);
+    let entries;
+    try {
+        entries = fs.readdirSync(globalProjectDir);
+    }
+    catch {
+        return [];
+    }
+    return entries
+        .filter((entry) => {
+        if (entry === path.basename(globalNodeModulesDir)) {
+            return false;
+        }
+        try {
+            return fs.statSync(path.join(globalProjectDir, entry)).isDirectory();
+        }
+        catch {
+            return false;
+        }
+    })
+        .map((entry) => path.join(globalProjectDir, entry, 'node_modules'));
+}
+function readPnpmGlobalNodeModulesRoots(pnpmGlobalRoot) {
+    return [normalizePnpmGlobalNodeModulesRoot(pnpmGlobalRoot), ...readSiblingPnpmGlobalNodeModulesRoots(pnpmGlobalRoot)];
+}
 function packageNameToPath(packageName) {
     return packageName.split('/').filter(Boolean);
 }
@@ -156,10 +191,7 @@ function isPnpmGlobalRootPath(pnpmGlobalRoot, packageRoot) {
     if (isSubPath(pnpmGlobalRoot, packageRoot)) {
         return true;
     }
-    const normalizedGlobalRoot = normalizePath(pnpmGlobalRoot);
-    const globalNodeModulesDir = path.basename(normalizedGlobalRoot) === 'node_modules'
-        ? normalizedGlobalRoot
-        : path.join(normalizedGlobalRoot, 'node_modules');
+    const globalNodeModulesDir = normalizePnpmGlobalNodeModulesRoot(pnpmGlobalRoot);
     const globalProjectDir = path.dirname(globalNodeModulesDir);
     if (!isSubPath(globalProjectDir, packageRoot)) {
         return false;
@@ -172,7 +204,7 @@ function isPnpmGlobalRootPath(pnpmGlobalRoot, packageRoot) {
     return segments.slice(pnpmStoreIndex + 1).includes('node_modules');
 }
 function isPnpmGlobalPackagePath(pnpmGlobalRoot, packageRoot, packageName) {
-    return isSameRealPath(path.join(pnpmGlobalRoot, ...packageNameToPath(packageName)), packageRoot);
+    return readPnpmGlobalNodeModulesRoots(pnpmGlobalRoot).some((pnpmGlobalNodeModulesRoot) => isSameRealPath(path.join(pnpmGlobalNodeModulesRoot, ...packageNameToPath(packageName)), packageRoot));
 }
 function isPnpmGlobalBinProjectPath(pnpmGlobalBin, packageRoot, packageName) {
     const pnpmHome = path.dirname(normalizePath(pnpmGlobalBin));
@@ -188,9 +220,9 @@ function isPnpmGlobalBinProjectPath(pnpmGlobalBin, packageRoot, packageName) {
         return false;
     }
     return entries.some((entry) => {
-        const pnpmGlobalRoot = path.join(globalDir, entry, 'node_modules');
-        return isPnpmGlobalRootPath(pnpmGlobalRoot, packageRoot)
-            || isPnpmGlobalPackagePath(pnpmGlobalRoot, packageRoot, packageName);
+        const pnpmGlobalRoot = path.join(globalDir, entry);
+        return (isPnpmGlobalRootPath(pnpmGlobalRoot, packageRoot)
+            || isPnpmGlobalPackagePath(pnpmGlobalRoot, packageRoot, packageName));
     });
 }
 function isPnpmGlobalInstallPath(options) {
@@ -217,9 +249,27 @@ function cleanCommandPath(value) {
     const trimmed = value.trim();
     return trimmed ? trimmed : undefined;
 }
+function resolvePackageManagerProbeCwd() {
+    const candidates = [os.homedir(), os.tmpdir(), path.parse(process.cwd()).root];
+    for (const candidate of candidates) {
+        if (!candidate) {
+            continue;
+        }
+        try {
+            if (fs.statSync(candidate).isDirectory()) {
+                return candidate;
+            }
+        }
+        catch {
+            // Ignore invalid probe cwd candidates and continue to the next one.
+        }
+    }
+    return undefined;
+}
 async function readGlobalPrefix(commandOutputFn) {
     try {
         return cleanCommandPath(await commandOutputFn('npm', ['prefix', '-g'], {
+            cwd: resolvePackageManagerProbeCwd(),
             errorName: 'npm prefix',
         }));
     }
@@ -230,6 +280,7 @@ async function readGlobalPrefix(commandOutputFn) {
 async function readPnpmGlobalBin(commandOutputFn) {
     try {
         return cleanCommandPath(await commandOutputFn('pnpm', ['bin', '-g'], {
+            cwd: resolvePackageManagerProbeCwd(),
             errorName: 'pnpm bin',
         }));
     }
@@ -240,6 +291,7 @@ async function readPnpmGlobalBin(commandOutputFn) {
 async function readPnpmGlobalRoot(commandOutputFn) {
     try {
         return cleanCommandPath(await commandOutputFn('pnpm', ['root', '-g'], {
+            cwd: resolvePackageManagerProbeCwd(),
             errorName: 'pnpm root',
         }));
     }
@@ -250,6 +302,7 @@ async function readPnpmGlobalRoot(commandOutputFn) {
 async function readYarnGlobalDir(commandOutputFn) {
     try {
         return cleanCommandPath(await commandOutputFn('yarn', ['global', 'dir'], {
+            cwd: resolvePackageManagerProbeCwd(),
             errorName: 'yarn global dir',
         }));
     }
@@ -260,6 +313,7 @@ async function readYarnGlobalDir(commandOutputFn) {
 async function readYarnGlobalBin(commandOutputFn) {
     try {
         return cleanCommandPath(await commandOutputFn('yarn', ['global', 'bin'], {
+            cwd: resolvePackageManagerProbeCwd(),
             errorName: 'yarn global bin',
         }));
     }
@@ -367,6 +421,7 @@ export async function inspectSelfStatus(options = {}) {
     const channel = options.channel && options.channel !== 'auto' ? options.channel : detectChannel(currentVersion);
     const commandOutputFn = options.commandOutputFn ?? commandOutput;
     const { installMethod, globalPrefix } = await inspectSelfInstall({
+        currentBinPath: options.currentBinPath,
         packageName,
         packageRoot,
         commandOutputFn,

package/dist/locale/en-US.json

@@ -68,7 +68,7 @@
       "unreachable": "Unable to connect to the API base URL. Check the address and make sure the server is reachable. Details: {{details}}"
     },
     "envKey": {
-      "invalid": "Use letters and numbers only."
+      "invalid": "Use letters, numbers, hyphens, and underscores only."
     },
     "appPublicPath": {
       "invalid": "Use / or a slash-separated path like /nocobase/ or /foo-bar/baz_2/. Each path segment may contain letters, numbers, hyphens, and underscores only."

package/dist/locale/zh-CN.json

@@ -68,7 +68,7 @@
       "unreachable": "无法连接到该 API 地址，请检查地址是否正确，并确认服务可访问。详情：{{details}}"
     },
     "envKey": {
-      "invalid": "仅支持字母和数字。"
+      "invalid": "仅支持字母、数字、中划线和下划线。"
     },
     "appPublicPath": {
       "invalid": "请输入 /，或类似 /nocobase/、/foo-bar/baz_2/ 这样的路径。每个路径段仅支持字母、数字、中划线和下划线。"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.11-test.9",
+  "version": "2.1.12",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -142,5 +142,6 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
-  }
+  },
+  "gitHead": "3a69ed089fbb5a3e8700c0134f83d654f0190d25"
 }