@nocobase/cli 2.1.9 → 2.1.11-test.1

package/dist/lib/self-manager.js

@@ -108,19 +108,34 @@ function readCurrentVersion(packageRoot) {
     const pkg = JSON.parse(content);
     return String(pkg.version ?? '').trim();
 }
-function detectInstallMethod(packageRoot, globalPrefix) {
+function detectInstallMethod(packageRoot, options = {}) {
     if (fs.existsSync(path.join(packageRoot, 'src'))
         && fs.existsSync(path.join(packageRoot, 'tsconfig.json'))) {
         return 'source';
     }
-    if (globalPrefix && isSubPath(globalPrefix, packageRoot)) {
+    if (options.globalPrefix && isSubPath(options.globalPrefix, packageRoot)) {
         return 'npm-global';
     }
+    if (options.yarnGlobalDir && isSubPath(options.yarnGlobalDir, packageRoot)) {
+        return 'yarn-global';
+    }
+    if (isPnpmGlobalPath(packageRoot)) {
+        return 'pnpm-global';
+    }
     if (packageRoot.includes(`${path.sep}node_modules${path.sep}`)) {
         return 'package-local';
     }
     return 'unknown';
 }
+function isPnpmGlobalPath(packageRoot) {
+    const normalized = normalizePath(packageRoot);
+    const segments = normalized.split(path.sep).filter(Boolean);
+    const globalIndex = segments.findIndex((segment, index) => segment === 'global' && segments[index - 1] === 'pnpm');
+    if (globalIndex === -1) {
+        return false;
+    }
+    return segments.slice(globalIndex + 2).includes('node_modules');
+}
 function getInstallMethodCacheFile() {
     return path.join(resolveCliHomeDir('global'), INSTALL_METHOD_CACHE_FILE);
 }
@@ -163,6 +178,16 @@ async function readGlobalPrefix(commandOutputFn) {
         return undefined;
     }
 }
+async function readYarnGlobalDir(commandOutputFn) {
+    try {
+        return (await commandOutputFn('yarn', ['global', 'dir'], {
+            errorName: 'yarn global dir',
+        })).trim();
+    }
+    catch {
+        return undefined;
+    }
+}
 async function readDistTags(packageName, commandOutputFn) {
     const output = await commandOutputFn('npm', ['view', packageName, 'dist-tags', '--json'], {
         errorName: 'npm view',
@@ -174,21 +199,21 @@ function getUnsupportedSelfUpdateReason(installMethod) {
     if (installMethod === 'source') {
         return [
             'This CLI is running from source in a repository checkout.',
-            'Automatic self-update is only supported for standard global npm installs.',
+            'Automatic self-update is only supported for standard global npm, pnpm, or yarn installs.',
             'Upgrade this checkout through your repo workflow instead.',
         ].join(' ');
     }
     if (installMethod === 'package-local') {
         return [
             'This CLI is installed from a local project dependency tree.',
-            'Automatic self-update is only supported for standard global npm installs.',
+            'Automatic self-update is only supported for standard global npm, pnpm, or yarn installs.',
             'Upgrade the parent project dependency that provides this CLI instead.',
         ].join(' ');
     }
     if (installMethod === 'unknown') {
         return [
-            'This CLI install could not be recognized as a standard global npm install.',
-            'Automatic self-update is only supported for standard global npm installs.',
+            'This CLI install could not be recognized as a standard global npm, pnpm, or yarn install.',
+            'Automatic self-update is only supported for standard global npm, pnpm, or yarn installs.',
         ].join(' ');
     }
     return undefined;
@@ -220,11 +245,17 @@ export async function inspectSelfInstall(options = {}) {
     const commandOutputFn = options.commandOutputFn ?? commandOutput;
     const cachedInstallMethod = await readCachedInstallMethod(packageRoot);
     const globalPrefix = cachedInstallMethod?.globalPrefix ?? await readGlobalPrefix(commandOutputFn);
-    const installMethod = cachedInstallMethod?.installMethod ?? detectInstallMethod(packageRoot, globalPrefix);
+    const yarnGlobalDir = cachedInstallMethod?.yarnGlobalDir ?? await readYarnGlobalDir(commandOutputFn);
+    const installMethod = cachedInstallMethod?.installMethod
+        ?? detectInstallMethod(packageRoot, {
+            globalPrefix,
+            yarnGlobalDir,
+        });
     if (!cachedInstallMethod) {
         await writeCachedInstallMethod(packageRoot, {
             installMethod,
             globalPrefix,
+            yarnGlobalDir,
         });
     }
     return {
@@ -261,7 +292,7 @@ export async function inspectSelfStatus(options = {}) {
         latestVersion,
         updateAvailable,
         installMethod,
-        updatable: installMethod === 'npm-global',
+        updatable: installMethod === 'npm-global' || installMethod === 'pnpm-global' || installMethod === 'yarn-global',
         updateBlockedReason: getUnsupportedSelfUpdateReason(installMethod),
         globalPrefix,
         registryError,
@@ -270,9 +301,30 @@ export async function inspectSelfStatus(options = {}) {
 export function formatUnsupportedSelfUpdateMessage(status) {
     return status.updateBlockedReason
         ?? [
-            'Automatic self-update is only supported for standard global npm installs.',
+            'Automatic self-update is only supported for standard global npm, pnpm, or yarn installs.',
         ].join('\n');
 }
+function resolveSelfUpdateInstallCommand(installMethod, packageSpec) {
+    if (installMethod === 'pnpm-global') {
+        return {
+            command: 'pnpm',
+            args: ['add', '-g', packageSpec],
+            errorName: 'pnpm add',
+        };
+    }
+    if (installMethod === 'yarn-global') {
+        return {
+            command: 'yarn',
+            args: ['global', 'add', packageSpec],
+            errorName: 'yarn global add',
+        };
+    }
+    return {
+        command: 'npm',
+        args: ['install', '-g', packageSpec],
+        errorName: 'npm install',
+    };
+}
 export async function updateSelf(options = {}) {
     const status = await inspectSelfStatus(options);
     if (!status.updatable) {
@@ -291,9 +343,10 @@ export async function updateSelf(options = {}) {
         };
     }
     const packageSpec = getSelfUpdatePackageSpec(status);
-    await (options.runFn ?? run)('npm', ['install', '-g', packageSpec], {
+    const installCommand = resolveSelfUpdateInstallCommand(status.installMethod, packageSpec);
+    await (options.runFn ?? run)(installCommand.command, installCommand.args, {
         stdio: options.verbose ? 'inherit' : 'ignore',
-        errorName: 'npm install',
+        errorName: installCommand.errorName,
     });
     return {
         action: 'updated',

package/dist/lib/source-publish.js

@@ -232,7 +232,7 @@ export async function publishSourceSnapshot(params) {
             version,
             stdio,
         });
-        await run('yarn', ['lerna', 'publish', 'from-package', '--registry', npmRegistry, '--dist-tag', 'local', '--yes', '--no-verify-access', '--git-head', gitSha], {
+        await run('yarn', ['lerna', 'publish', 'from-package', '--registry', npmRegistry, '--dist-tag', 'local', '--yes', '--no-verify-access', '--no-git-reset', '--git-head', gitSha], {
             cwd: projectRoot,
             errorName: 'lerna publish',
             stdio,
@@ -319,7 +319,7 @@ export function buildSuggestedInitCommand(result) {
     const normalizedRegistry = result.npmRegistry || `http://${host}:${port || DEFAULT_SOURCE_REGISTRY_PORT}`;
     const suggestedEnv = ['snapshot', sanitizeEnvSegment(result.gitSha)].filter(Boolean).join('');
     return [
-        `nb init --ui --env ${suggestedEnv} --yes --source npm`,
+        `nb init --env ${suggestedEnv} --yes --source npm`,
         `--version ${result.version}`,
         `--npm-registry=${normalizedRegistry}`,
     ].join(' ');

package/dist/lib/startup-update.js

@@ -151,7 +151,7 @@ export async function shouldRunStartupUpdateCheck(argv, now = new Date()) {
     return readCurrentInstallLastCheckedDate(state) !== todayStamp(now);
 }
 export function shouldEnableStartupUpdateForInstallMethod(installMethod) {
-    return installMethod === 'npm-global';
+    return installMethod === 'npm-global' || installMethod === 'pnpm-global' || installMethod === 'yarn-global';
 }
 function hasPendingUpdates(selfStatus, skillsStatus) {
     return Boolean(selfStatus.updateAvailable || skillsStatus.updateAvailable === true);

package/package.json

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