@soybeanjs/cli 1.8.0 → 1.8.2

package/dist/index.d.ts

@@ -67,7 +67,7 @@ interface CliOption {
    */
   cleanupDirs: string[];
   /**
-   * Npm-check-updates command args
+   * npm-check-updates command args
    *
    * If not set, soybean-cli will resolve workspace package.json files automatically and fall back to package.json in single-package repos.
    */

package/dist/index.js

@@ -4,18 +4,16 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import process$1 from "node:process";
 import { loadConfig } from "c12";
 import { bgRed, green, red, yellow } from "kolorist";
-import path, { join, posix } from "node:path";
+import path, { join } from "node:path";
 import enquirer from "enquirer";
 import { rimraf } from "rimraf";
-import { readFile } from "node:fs/promises";
-import { glob } from "tinyglobby";
 import { existsSync as existsSync$1 } from "fs";
 import { join as join$1 } from "path";
 import { generateChangelog, generateTotalChangelog } from "@soybeanjs/changelog";
 import { versionBump } from "bumpp";
 import { consola } from "consola";
 //#region package.json
-var version = "1.8.0";
+var version = "1.8.2";
 //#endregion
 //#region src/locales/index.ts
 const locales = {
@@ -255,68 +253,31 @@ async function cleanup(paths) {
 }
 //#endregion
 //#region src/command/ncu.ts
-async function ncu(args = []) {
-	await execCommand("pnpm", ["npm-check-updates", ...args.length ? args : await resolveDefaultNcuArgs()], { stdio: "inherit" });
+async function ncu(args) {
+	await execCommand("pnpm", ["npm-check-updates", ...args && args.length > 0 ? args : hasWorkspaces() ? ["-u", "-w"] : ["-u"]], { stdio: "inherit" });
 }
-function parsePnpmWorkspacePackages(content) {
-	const lines = content.split(/\r?\n/u);
-	const packages = [];
-	let inPackages = false;
-	for (const line of lines) {
-		const trimmedLine = line.trim();
-		if (!inPackages) {
-			if (trimmedLine === "packages:") inPackages = true;
-			continue;
-		}
-		if (!trimmedLine || trimmedLine.startsWith("#")) continue;
-		if (/^\S/u.test(line)) break;
-		const match = line.match(/^\s*-\s*['"]?(.+?)['"]?\s*$/u);
-		if (match?.[1]) packages.push(match[1]);
-	}
-	return packages;
-}
-function resolveWorkspacePatterns(packageJson, pnpmWorkspaceContent) {
-	const workspaces = Array.isArray(packageJson?.workspaces) ? packageJson.workspaces : packageJson?.workspaces?.packages ?? [];
-	const pnpmWorkspacePackages = pnpmWorkspaceContent ? parsePnpmWorkspacePackages(pnpmWorkspaceContent) : [];
-	return [.../* @__PURE__ */ new Set([...workspaces, ...pnpmWorkspacePackages])];
-}
-function toPackageFilePattern(pattern) {
-	const normalizedPattern = pattern.trim();
-	if (!normalizedPattern) return "";
-	const isNegated = normalizedPattern.startsWith("!");
-	const cleanPattern = (isNegated ? normalizedPattern.slice(1) : normalizedPattern).replace(/\/$/u, "");
-	const packageFilePattern = cleanPattern.endsWith("package.json") ? cleanPattern : posix.join(cleanPattern, "package.json");
-	return isNegated ? `!${packageFilePattern}` : packageFilePattern;
-}
-async function resolveDefaultNcuArgs(cwd = process$1.cwd()) {
-	const [packageJsonContent, pnpmWorkspaceContent] = await Promise.all([readFile(join(cwd, "package.json"), "utf8").catch(() => null), readFile(join(cwd, "pnpm-workspace.yaml"), "utf8").catch(() => null)]);
-	const workspacePatterns = resolveWorkspacePatterns(packageJsonContent ? JSON.parse(packageJsonContent) : null, pnpmWorkspaceContent).map(toPackageFilePattern).filter(Boolean);
-	if (!workspacePatterns.length) return [
-		"-u",
-		"--packageFile",
-		"package.json"
-	];
-	const packageFiles = await glob(["package.json", ...workspacePatterns], {
-		cwd,
-		followSymbolicLinks: false,
-		onlyFiles: true
-	});
-	const uniquePackageFiles = [...new Set(packageFiles)].sort((left, right) => {
-		if (left === "package.json") return -1;
-		if (right === "package.json") return 1;
-		return left.localeCompare(right);
-	});
-	if (!uniquePackageFiles.length) return [
-		"-u",
-		"--packageFile",
-		"package.json"
-	];
-	if (uniquePackageFiles.length === 1) return [
-		"-u",
-		"--packageFile",
-		uniquePackageFiles[0]
-	];
-	return ["-u", ...uniquePackageFiles.flatMap((file) => ["--packageFile", file])];
+/**
+* Detect whether the current project is a workspace/monorepo.
+*
+* npm-check-updates' `-w` flag recognizes workspaces from either:
+*   1. the `workspaces` field in package.json (npm/yarn format), or
+*   2. the `packages` field in pnpm-workspace.yaml (pnpm format, used as
+*      fallback when `workspaces` is absent from package.json).
+*
+* Applying `-w` to a non-workspace project causes ncu to fail with:
+* "workspaces property missing from package.json".
+*/
+function hasWorkspaces(cwd = process$1.cwd()) {
+	const pkgPath = join(cwd, "package.json");
+	if (existsSync(pkgPath)) try {
+		if (JSON.parse(readFileSync(pkgPath, "utf8")).workspaces) return true;
+	} catch {}
+	const wsPath = join(cwd, "pnpm-workspace.yaml");
+	if (existsSync(wsPath)) try {
+		const content = readFileSync(wsPath, "utf8");
+		if (/^packages\s*:/m.test(content)) return true;
+	} catch {}
+	return false;
 }
 //#endregion
 //#region src/command/changelog.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soybeanjs/cli",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "SoybeanJS's command line tools",
   "homepage": "https://github.com/soybeanjs/cli",
   "bugs": {
@@ -38,34 +38,30 @@
   },
   "dependencies": {
     "@soybeanjs/changelog": "^0.5.2",
-    "bumpp": "^12.0.0",
+    "bumpp": "^12.1.1",
     "c12": "^3.3.4",
     "cac": "^7.0.0",
     "consola": "^3.4.2",
     "enquirer": "^2.4.1",
-    "execa": "^10.0.0",
+    "execa": "^10.0.1",
     "kolorist": "^1.8.0",
-    "npm-check-updates": "^22.2.9",
+    "npm-check-updates": "^23.0.1",
     "rimraf": "^6.1.3",
     "tinyglobby": "^0.2.17"
   },
   "devDependencies": {
     "@soybeanjs/cli": "link:",
     "@soybeanjs/oxc-config": "^0.2.3",
-    "@types/node": "^26.1.1",
-    "oxfmt": "^0.60.0",
-    "oxlint": "^1.75.0",
-    "tsdown": "^0.22.14",
-    "tsx": "^4.23.1",
+    "@types/node": "^26.1.2",
+    "tsx": "^4.23.5",
     "typescript": "^7.0.2",
-    "vite-plus": "0.2.6"
+    "vite-plus": "0.2.7"
   },
   "scripts": {
     "build": "vp pack",
     "commit": "soy git-commit",
-    "commit:zh": "soy git-commit -l=zh-cn",
     "fmt": "vp fmt",
-    "lint": "vp lint",
+    "lint": "vp lint --fix",
     "publish-pkg": "pnpm -r publish --access public",
     "release": "soy release",
     "typecheck": "tsc --noEmit --skipLibCheck",