pnpm-plugin-alex-857 1.0.20 → 1.0.22

package/install-catalog.js

@@ -21,8 +21,12 @@ if (specifiers.length === 0) {
   process.exit(0);
 }
 
+const isWorkspaceRoot =
+  fs.existsSync(path.join(process.cwd(), "pnpm-workspace.yaml"));
+const addCmd = `pnpm add ${isWorkspaceRoot ? "-w " : ""}${specifiers.join(" ")}`;
+
 console.log("Adding from catalog:", specifiers.join(", "));
-execSync(`pnpm add ${specifiers.join(" ")}`, {
+execSync(addCmd, {
   stdio: "inherit",
   cwd: process.cwd(),
 });

package/install-workspace.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 const path = require("path");
 const fs = require("fs");
-const yaml = require("js-yaml");
 
 // Resolve pnpm-workspace.json: plugin dir first, then cwd
 const possiblePaths = [
@@ -22,17 +21,35 @@ if (!Array.isArray(packagesFromJson) || packagesFromJson.length === 0) {
 }
 
 const yamlPath = path.join(process.cwd(), "pnpm-workspace.yaml");
-let yamlContent = {};
-let exists = false;
+let existingPackages = [];
+let raw = "";
 
 if (fs.existsSync(yamlPath)) {
-  exists = true;
-  yamlContent = yaml.load(fs.readFileSync(yamlPath, "utf8")) || {};
+  raw = fs.readFileSync(yamlPath, "utf8");
+  const match = raw.match(/^packages\s*:\s*\n((?:\s+-\s+[^\n]+\n?)*)/m);
+  if (match) {
+    const items = match[1].matchAll(/^\s+-\s+['"]?([^'"]+)['"]?/gm);
+    for (const m of items) existingPackages.push(m[1]);
+  }
 }
 
-const existingPackages = Array.isArray(yamlContent.packages) ? yamlContent.packages : [];
 const mergedPackages = [...new Set([...existingPackages, ...packagesFromJson])];
-yamlContent.packages = mergedPackages;
+const packagesBlock = "packages:\n" + mergedPackages.map((p) => `  - '${p}'`).join("\n") + "\n";
 
-fs.writeFileSync(yamlPath, yaml.dump(yamlContent), "utf8");
-console.log(exists ? "Updated" : "Created", "pnpm-workspace.yaml with packages:", mergedPackages.join(", "));
+let output;
+if (raw) {
+  if (/^packages\s*:/m.test(raw)) {
+    output = raw.replace(/^packages\s*:\s*\n(?:\s+-\s+[^\n]+\n?)*/m, packagesBlock);
+  } else {
+    output = raw.trimEnd() + "\n\n" + packagesBlock;
+  }
+} else {
+  output = packagesBlock;
+}
+
+fs.writeFileSync(yamlPath, output, "utf8");
+console.log(
+  raw ? "Updated" : "Created",
+  "pnpm-workspace.yaml with packages:",
+  mergedPackages.join(", ")
+);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pnpm-plugin-alex-857",
-    "version": "1.0.20",
+    "version": "1.0.22",
     "description": "A plugin for pnpm to use alex as a linter",
     "bin": {
         "install-catalog": "./install-catalog.js",
@@ -14,9 +14,6 @@
         "install-workspace.js"
     ],
     "keywords": ["pnpm", "plugin"],
-    "dependencies": {
-        "js-yaml": "^4.1.0"
-    },
     "author": "aboungnaseng857",
     "license": "ISC",
     "scripts": {