pnpm-plugin-alex-857 1.0.28 → 1.0.29

package/install-catalog.js

@@ -21,8 +21,22 @@ if (specifiers.length === 0) {
   process.exit(0);
 }
 
-const isWorkspaceRoot =
-  fs.existsSync(path.join(process.cwd(), "pnpm-workspace.yaml"));
+// In a workspace, catalog: is resolved by the plugin (configDependencies). If the workspace
+// was just created or config was wiped, skip so postinstall does not fail.
+const workspaceYamlPath = path.join(process.cwd(), "pnpm-workspace.yaml");
+if (fs.existsSync(workspaceYamlPath)) {
+  const yaml = fs.readFileSync(workspaceYamlPath, "utf8");
+  const hasCatalog =
+    /\ncatalog\s*:/m.test(yaml) || /\nconfigDependencies\s*:/m.test(yaml);
+  if (!hasCatalog) {
+    console.warn(
+      "install-catalog: No catalog or configDependencies in pnpm-workspace.yaml; run 'pnpm add --config pnpm-plugin-alex-857@latest' first, then pnpm install."
+    );
+    process.exit(0);
+  }
+}
+
+const isWorkspaceRoot = fs.existsSync(workspaceYamlPath);
 const addCmd = `pnpm add ${isWorkspaceRoot ? "-w " : ""}${specifiers.join(" ")}`;
 
 console.log("Adding from catalog:", specifiers.join(", "));

package/install-workspace.js

@@ -67,13 +67,17 @@ const packagesBlock =
 
 let output;
 if (raw && /^packages\s*:/m.test(raw)) {
-  // Replace only the packages section: from "packages:" to next top-level key (catalog/configDependencies) or end of file.
-  // Do not use $ with /m (it matches end of line) or we stop at a blank line and leave duplicates.
+  // Replace only the packages list: "packages:\n" + list lines. Never replace to end of file
+  // so we never wipe catalog / configDependencies (which would break install-catalog).
   const nextKeyRegex = /^packages\s*:\s*\n[\s\S]*?(?=\n(?:catalog|configDependencies)\s*:)/m;
   output = raw.replace(nextKeyRegex, () => packagesBlock);
   if (output === raw) {
-    // No catalog/configDependencies after packages; replace to end of string
-    output = raw.replace(/^packages\s*:\s*\n[\s\S]*/m, packagesBlock);
+    // No catalog/configDependencies after packages: replace only the list lines (  - '...')
+    // so any trailing content (catalog, configDependencies, blank lines) is preserved.
+    output = raw.replace(
+      /^(packages\s*:\s*\n)((?:\s+-\s+['"][^'"]+['"]\s*\n)*)/m,
+      () => packagesBlock
+    );
   }
 } else if (raw) {
   output = raw.trimEnd() + "\n\n" + packagesBlock;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pnpm-plugin-alex-857",
-    "version": "1.0.28",
+    "version": "1.0.29",
     "description": "A plugin for pnpm to use alex as a linter",
     "bin": {
         "install-catalog": "./install-catalog.js",