@meistrari/mise-en-place 2.4.7 → 2.4.9

package/dist/cli/cli.mjs

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 import { argv } from 'node:process';
-import { existsSync, writeFileSync, readFileSync, globSync } from 'node:fs';
+import { existsSync, writeFileSync, globSync, readFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { dirname } from 'node:path';
+import { parse } from 'yaml';
 
 function readPackageJson(path) {
   return JSON.parse(readFileSync(path, "utf-8"));
@@ -80,6 +81,30 @@ function detectPackageManager() {
   }
   return null;
 }
+function readPnpmWorkspaces() {
+  const workspaceFile = "pnpm-workspace.yaml";
+  if (!existsSync(workspaceFile)) {
+    return [];
+  }
+  try {
+    const content = readFileSync(workspaceFile, "utf-8");
+    const parsed = parse(content);
+    return parsed.packages || [];
+  } catch (error) {
+    console.warn(`Failed to parse ${workspaceFile}:`, error);
+    return [];
+  }
+}
+function getWorkspaces(packageManager) {
+  if (packageManager === "pnpm") {
+    return readPnpmWorkspaces();
+  }
+  if (!existsSync("package.json")) {
+    return [];
+  }
+  const rootPackageJson = readPackageJson("package.json");
+  return rootPackageJson.workspaces || [];
+}
 function updateLibraries(packageManager, libs, cwd) {
   const libsStr = libs.join(" ");
   const options = {
@@ -107,7 +132,7 @@ function handleMakefileInitialSetup() {
     return;
   }
   console.log("No Makefile found. Generating one that includes mise-en-place Makefile.");
-  writeFileSync("Makefile", "include ./node_modules/@meistrari/mise-en-place/Makefile\n");
+  writeFileSync("Makefile", "-include ./node_modules/@meistrari/mise-en-place/Makefile\n");
   execSync("make mise-en-place", { stdio: "inherit" });
 }
 function updateMeistrariLibraries(packageManagerOverride) {
@@ -115,8 +140,22 @@ function updateMeistrariLibraries(packageManagerOverride) {
     console.log("No package.json found. Skipping @meistrari/* updates.");
     return;
   }
-  const rootPackageJson = readPackageJson("package.json");
-  const workspaces = rootPackageJson.workspaces || [];
+  const selectPackageManager = () => {
+    if (packageManagerOverride) {
+      console.log(`Using overridden package manager: ${packageManagerOverride}`);
+      return packageManagerOverride;
+    }
+    const detectedPackageManager = detectPackageManager();
+    if (!detectedPackageManager) {
+      console.log("No recognized lock file found (pnpm-lock.yaml, yarn.lock, package-lock.json)");
+      process.exit(1);
+    }
+    const { packageManager: packageManager2, file } = detectedPackageManager;
+    console.log(`Detected ${packageManager2} due to the presence of the file '${file}'. Updating @meistrari/* libraries...`);
+    return packageManager2;
+  };
+  const packageManager = selectPackageManager();
+  const workspaces = getWorkspaces(packageManager);
   const packageJsonPaths = ["./package.json"];
   if (workspaces.length > 0) {
     const workspacePackageJsons = findWorkspacePackageJsons(workspaces);
@@ -153,21 +192,6 @@ function updateMeistrariLibraries(packageManagerOverride) {
   const libsList = Array.from(allMeistrariLibs).sort();
   console.log(`Found ${libsList.length} @meistrari/* libraries to update:`);
   console.log(libsList.join("\n"));
-  const selectPackageManager = () => {
-    if (packageManagerOverride) {
-      console.log(`Using overridden package manager: ${packageManagerOverride}`);
-      return packageManagerOverride;
-    }
-    const detectedPackageManager = detectPackageManager();
-    if (!detectedPackageManager) {
-      console.log("No recognized lock file found (pnpm-lock.yaml, yarn.lock, package-lock.json)");
-      process.exit(1);
-    }
-    const { packageManager: packageManager2, file } = detectedPackageManager;
-    console.log(`Detected ${packageManager2} due to the presence of the file '${file}'. Updating @meistrari/* libraries...`);
-    return packageManager2;
-  };
-  const packageManager = selectPackageManager();
   if (packageManager === "bun") {
     for (const pkgJsonPath of packageJsonPaths) {
       if (!existsSync(pkgJsonPath))

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meistrari/mise-en-place",
-    "version": "2.4.7",
+    "version": "2.4.9",
     "description": "",
     "repository": {
         "type": "git",
@@ -37,7 +37,8 @@
         "@antfu/eslint-config": "6.2.0",
         "eslint": "9.39.1",
         "eslint-plugin-diff": "2.0.3",
-        "eslint-plugin-drizzle": "0.2.3"
+        "eslint-plugin-drizzle": "0.2.3",
+        "yaml": "^2.7.0"
     },
     "devDependencies": {
         "@types/node": "24.10.1",