pob 35.1.0 → 35.2.1

package/lib/generators/core/pnpm/CorePnpmGenerator.js

@@ -0,0 +1,111 @@
+import sortObject from "@pob/sort-object";
+import yml from "js-yaml";
+import { lt } from "semver";
+import Generator from "yeoman-generator";
+import { writeAndFormat } from "../../../utils/writeAndFormat.js";
+
+const minimumReleaseAgeExcludePackages = [
+  "@pob/*",
+  "pob-dependencies",
+  "alouette",
+  "alouette-icons",
+  "nightingale",
+  "nightingale-logger",
+];
+
+export default class CorePnpmGenerator extends Generator {
+  constructor(args, opts) {
+    super(args, opts);
+
+    this.option("type", {
+      type: String,
+      required: false,
+      default: "lib",
+      description: "Project type (app or lib)",
+    });
+
+    this.option("enable", {
+      type: Boolean,
+      required: true,
+      description: "Enable pnpm",
+    });
+  }
+
+  async writing() {
+    const pkg = this.fs.readJSON(this.destinationPath("package.json"));
+
+    if (this.options.enable) {
+      if (
+        pkg.packageManager &&
+        (!pkg.packageManager.startsWith("pnpm@") ||
+          lt(pkg.packageManager.slice("pnpm@".length), "11.0.0"))
+      ) {
+        delete pkg.packageManager;
+      }
+
+      const configString = this.fs.read(
+        this.destinationPath("pnpm-workspace.yaml"),
+        { defaults: "" },
+      );
+      const config =
+        yml.load(configString, {
+          schema: yml.FAILSAFE_SCHEMA,
+        }) || {};
+
+      if (config.allowBuilds) {
+        config.allowBuilds = Object.fromEntries(
+          Object.entries(config.allowBuilds).map(([key, value]) => [
+            key,
+            value === "true" ? true : value,
+          ]),
+        );
+      }
+
+      if (pkg.workspaces) {
+        config.packages = pkg.workspaces;
+      } else {
+        delete config.packages;
+      }
+      config.savePrefix = this.options.type === "app" ? "" : "^";
+      config.minimumReleaseAge = 1440 * 3; // 3 days in minutes
+      config.minimumReleaseAgeExclude = minimumReleaseAgeExcludePackages;
+      config.dedupePeerDependents = true;
+
+      await writeAndFormat(
+        this.fs,
+        this.destinationPath("pnpm-workspace.yaml"),
+        yml.dump(sortObject(config), { lineWidth: 9999, noCompatMode: true }),
+      );
+    } else {
+      if (pkg.packageManager?.startsWith("pnpm@")) {
+        delete pkg.packageManager;
+      }
+      this.fs.delete("pnpm-lock.yaml");
+      this.fs.delete("pnpm-workspace.yaml");
+    }
+
+    this.fs.writeJSON(this.destinationPath("package.json"), pkg);
+  }
+
+  end() {
+    if (this.options.enable) {
+      this.spawnSync("pnpm", ["install"], {});
+      this.spawnSync("pnpm", ["dedupe"], {});
+
+      this.fs.delete("package-lock.json");
+      this.fs.delete("yarn.lock");
+
+      const pkg = this.fs.readJSON(this.destinationPath("package.json"));
+
+      if (pkg.scripts?.preversion) {
+        try {
+          this.spawnSync("pnpm", ["run", "preversion"]);
+        } catch {}
+      } else if (pkg.scripts?.build) {
+        try {
+          this.spawnSync("pnpm", ["run", "build"]);
+        } catch {}
+      }
+    }
+  }
+}

package/lib/generators/core/vscode/CoreVSCodeGenerator.js

@@ -87,6 +87,7 @@ export default class CoreVSCodeGenerator extends Generator {
           pnp: this.options.yarnNodeLinker === "pnp",
           npm: this.options.packageManager === "npm",
           bun: this.options.packageManager === "bun",
+          pnpm: this.options.packageManager === "pnpm",
           typescript: this.options.typescript,
           testing: this.options.testing,
           testRunner: this.options.testRunner,

package/lib/generators/core/vscode/templates/settings.json.ejs

@@ -27,6 +27,9 @@
 <% } else if (bun) { -%>
   // set bun as package manager to run scripts and tasks
   "npm.packageManager": "bun",
+<% } else if (pnpm) { -%>
+  // set pnpm as package manager to run scripts and tasks
+  "npm.packageManager": "pnpm",
 <% } -%>
 
   // save config

package/lib/generators/core/yarn/CoreYarnGenerator.js

@@ -91,7 +91,10 @@ export default class CoreYarnGenerator extends Generator {
         ["plugin", "runtime", "--json"],
         { stdio: "pipe" },
       );
-      const installedPlugins = stdout.split("\n").map(JSON.parse);
+      const installedPlugins = stdout
+        .split("\n")
+        .filter(Boolean)
+        .map(JSON.parse);
 
       const isPluginInstalled = (name) =>
         installedPlugins.some((plugin) => plugin.name === name);
@@ -156,6 +159,9 @@ export default class CoreYarnGenerator extends Generator {
           schema: yml.FAILSAFE_SCHEMA,
           json: true,
         }) || {};
+      if (config.enableScripts === "true") {
+        config.enableScripts = true;
+      }
       const previousConfig = { ...config };
       if (this.options.disableYarnGitCache) {
         // leave default compressionLevel instead of this next line
@@ -165,7 +171,7 @@ export default class CoreYarnGenerator extends Generator {
         delete config.supportedArchitectures;
       } else {
         config.compressionLevel = 0; // optimized for github config
-        config.enableGlobalCache = "false";
+        config.enableGlobalCache = false;
         // https://yarnpkg.dev/releases/3-1/
         // make sure all supported architectures are in yarn cache
         config.supportedArchitectures = {

package/lib/generators/lib/PobLibGenerator.js

@@ -23,7 +23,7 @@ export default class PobLibGenerator extends Generator {
 
     this.option("packageManager", {
       type: String,
-      default: "yarn",
+      required: true,
       description: "yarn, bun or npm",
     });
 
@@ -252,12 +252,14 @@ export default class PobLibGenerator extends Generator {
       fromPob: this.options.fromPob,
       onlyLatestLTS: this.onlyLatestLTS,
     });
+
     this.composeWith("pob:common:transpiler", {
       updateOnly: this.options.updateOnly,
       testing: !!this.pobjson.testing,
       documentation: !!this.pobjson.documentation,
       fromPob: this.options.fromPob,
       onlyLatestLTS: this.onlyLatestLTS,
+      packageManager: this.options.packageManager,
     });
   }
 
@@ -270,14 +272,14 @@ export default class PobLibGenerator extends Generator {
         pkg.pob.envs) ||
       [];
 
-    const packageManager =
-      inMonorepo && !inMonorepo.root
-        ? inMonorepo.rootPackageManager
-        : this.options.packageManager;
+    const packageManager = this.options.packageManager;
 
     const withBabel = babelEnvs.length > 0;
     const withTypescript =
-      withBabel || pkg.pob.typescript === true || pkg.pob.bundler === "tsc";
+      withBabel ||
+      pkg.pob.typescript === true ||
+      pkg.pob.bundler === "tsc" ||
+      pkg.pob.bundler === "rollup-esbuild";
     const jsx = (withBabel || withTypescript) && pkg.pob.jsx === true;
     const browser = pkg.pob.envs?.some((env) => env.target === "browser");
 

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -3,6 +3,8 @@ import fs from "node:fs";
 import { platform } from "node:process";
 import Generator from "yeoman-generator";
 import * as packageUtils from "../../utils/package.js";
+import { packageManagerRun } from "../../utils/packageManagerUtils.js";
+import { workspacesRun } from "../../utils/packageManagerWorkspacesUtils.js";
 import {
   buildDependenciesMaps,
   buildTopologicalOrderBatches,
@@ -87,7 +89,7 @@ export default class PobMonorepoGenerator extends Generator {
     this.option("packageManager", {
       type: String,
       default: "yarn",
-      description: "yarn, bun or npm",
+      description: "yarn, npm, bun, or pnpm",
     });
 
     this.option("yarnNodeLinker", {
@@ -397,9 +399,12 @@ export default class PobMonorepoGenerator extends Generator {
         this.fs.delete("rollup.config.mjs");
       }
       packageUtils.addOrRemoveScripts(pkg, rollupConfigs.length > 0, {
-        "clean:build": "yarn workspaces foreach --parallel -A run clean:build",
-        build: "yarn clean:build && rollup --config rollup.config.mjs",
-        watch: "yarn clean:build && rollup --config rollup.config.mjs --watch",
+        "clean:build": workspacesRun(
+          this.options.packageManager,
+          "clean:build",
+        ),
+        build: `${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs`,
+        watch: `${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs --watch`,
       });
       packageUtils.addOrRemoveDevDependencies(
         pkg,

package/lib/generators/monorepo/lerna/MonorepoLernaGenerator.js

@@ -16,7 +16,7 @@ export default class MonorepoLernaGenerator extends Generator {
     this.option("packageManager", {
       type: String,
       default: "yarn",
-      description: "yarn or npm",
+      description: "yarn, npm, bun, or pnpm",
     });
 
     this.option("disableYarnGitCache", {

package/lib/generators/monorepo/workspaces/MonorepoWorkspacesGenerator.js

@@ -2,6 +2,10 @@ import { spawnSync } from "node:child_process";
 import { existsSync, readdirSync } from "node:fs";
 import Generator from "yeoman-generator";
 import * as packageUtils from "../../../utils/package.js";
+import {
+  workspacesRunExcluding,
+  workspacesRunTopological,
+} from "../../../utils/packageManagerWorkspacesUtils.js";
 import { copyAndFormatTpl } from "../../../utils/writeAndFormat.js";
 
 export default class MonorepoWorkspacesGenerator extends Generator {
@@ -17,7 +21,7 @@ export default class MonorepoWorkspacesGenerator extends Generator {
     this.option("packageManager", {
       type: String,
       default: "yarn",
-      description: "yarn or npm",
+      description: "yarn, npm, bun, or pnpm",
     });
 
     this.option("disableYarnGitCache", {
@@ -77,6 +81,10 @@ export default class MonorepoWorkspacesGenerator extends Generator {
       if (!pkg.engines) pkg.engines = {};
       pkg.engines.yarn = "< 0.0.0";
       pkg.engines.npm = ">= 6.4.0";
+    } else if (this.options.packageManager === "pnpm") {
+      if (!pkg.engines) pkg.engines = {};
+      pkg.engines.pnpm = ">= 11.0.0";
+      delete pkg.engines.yarn;
     } else if (pkg.engines) {
       delete pkg.engines.yarn;
     }
@@ -91,18 +99,11 @@ export default class MonorepoWorkspacesGenerator extends Generator {
       "lint:eslint":
         monorepoConfig &&
         monorepoConfig.eslint &&
-        this.packagesConfig.length < 50
-          ? `${
-              this.packagesConfig.length > 15
-                ? "NODE_OPTIONS=--max_old_space_size=4096 "
-                : ""
-            }eslint --quiet .`
-          : // eslint-disable-next-line unicorn/no-nested-ternary
-            this.options.packageManager === "yarn"
-            ? `NODE_OPTIONS=--max_old_space_size=4096 eslint --report-unused-disable-directives --resolve-plugins-relative-to . --quiet . --ignore-pattern ${pkg.workspaces.join(
-                ",",
-              )} && yarn workspaces foreach --parallel -Av run lint:eslint`
-            : "npm run lint:eslint --workspaces",
+        `${
+          this.packagesConfig.length > 15
+            ? "NODE_OPTIONS=--max_old_space_size=4096 "
+            : ""
+        }eslint --quiet .`,
     });
 
     if (
@@ -114,10 +115,8 @@ export default class MonorepoWorkspacesGenerator extends Generator {
 
     if (this.options.isAppProject) {
       packageUtils.addOrRemoveScripts(pkg, withBundler, {
-        build:
-          "yarn workspaces foreach --parallel --topological-dev -Av run build",
-        watch:
-          'yarn workspaces foreach --parallel --jobs unlimited --interlaced --exclude "*-example" -Av run watch',
+        build: workspacesRunTopological(packageManager, "build"),
+        watch: workspacesRunExcluding(packageManager, "watch", "*-example"),
       });
     }
 
@@ -209,6 +208,9 @@ export default class MonorepoWorkspacesGenerator extends Generator {
         this.spawnCommandSync("npm", ["install"]);
         this.spawnCommandSync("npm", ["run", "preversion"]);
         break;
+      case "pnpm":
+        // see CorePnpmGenerator
+        break;
       case "yarn":
         // see CoreYarnGenerator
         break;

package/lib/generators/pob/PobBaseGenerator.js

@@ -107,7 +107,7 @@ export default class PobBaseGenerator extends Generator {
         name: "packageManager",
         message: "Witch package manager do you want to use ?",
         type: "list",
-        choices: ["yarn", "npm", "bun"],
+        choices: ["yarn", "npm", "bun", "pnpm"],
         default: config.packageManager || "yarn",
       },
       {
@@ -137,18 +137,34 @@ export default class PobBaseGenerator extends Generator {
     ]);
 
     this.projectConfig = { ...config, ...responses };
+    if (this.projectConfig.packageManager !== "yarn") {
+      delete this.projectConfig.yarnNodeLinker;
+    }
     this.config.set("project", this.projectConfig);
   }
 
+  getPackageManager() {
+    return inMonorepo && !inMonorepo.root
+      ? inMonorepo.rootPackageManager
+      : (this.projectConfig?.packageManager ?? "yarn");
+  }
+
   default() {
+    const packageManager = this.getPackageManager();
+
     this.composeWith("pob:core:bun", {
       type: this.projectConfig.type,
-      enable: this.isRoot && this.projectConfig.packageManager === "bun",
+      enable: this.isRoot && packageManager === "bun",
+    });
+
+    this.composeWith("pob:core:pnpm", {
+      type: this.projectConfig.type,
+      enable: this.isRoot && packageManager === "pnpm",
     });
 
     this.composeWith("pob:core:yarn", {
       type: this.projectConfig.type,
-      enable: this.isRoot && this.projectConfig.packageManager === "yarn",
+      enable: this.isRoot && packageManager === "yarn",
       yarnNodeLinker: this.projectConfig.yarnNodeLinker,
       disableYarnGitCache: this.projectConfig.disableYarnGitCache !== false,
     });
@@ -160,20 +176,20 @@ export default class PobBaseGenerator extends Generator {
       inMonorepo: !!inMonorepo,
       isRoot: this.isRoot,
       packageType: this.projectConfig.type === "app" ? "module" : undefined,
-      packageManager: this.projectConfig.packageManager,
+      packageManager,
     });
 
     if (this.isMonorepo) {
       this.composeWith("pob:monorepo:workspaces", {
         force: this.options.force,
         isAppProject: this.projectConfig.type === "app",
-        packageManager: this.projectConfig.packageManager,
+        packageManager,
         disableYarnGitCache: this.projectConfig.disableYarnGitCache !== false,
       });
       this.composeWith("pob:monorepo:lerna", {
         force: this.options.force,
         isAppProject: this.projectConfig.type === "app",
-        packageManager: this.projectConfig.packageManager,
+        packageManager,
         disableYarnGitCache: this.projectConfig.disableYarnGitCache !== false,
       });
     }
@@ -236,7 +252,7 @@ export default class PobBaseGenerator extends Generator {
           updateOnly: this.options.updateOnly,
           disableYarnGitCache: this.projectConfig.disableYarnGitCache !== false,
           isAppProject: this.projectConfig.type === "app",
-          packageManager: this.projectConfig.packageManager,
+          packageManager,
           yarnNodeLinker: this.projectConfig.yarnNodeLinker,
           onlyLatestLTS,
         },
@@ -251,7 +267,7 @@ export default class PobBaseGenerator extends Generator {
               this.projectConfig.disableYarnGitCache !== false,
             updateOnly: this.options.updateOnly,
             fromPob: this.options.fromPob,
-            packageManager: this.projectConfig.packageManager,
+            packageManager,
             yarnNodeLinker: this.projectConfig.yarnNodeLinker,
             ci: this.projectConfig.ci,
           });
@@ -264,7 +280,7 @@ export default class PobBaseGenerator extends Generator {
               this.projectConfig.disableYarnGitCache !== false,
             updateOnly: this.options.updateOnly,
             fromPob: this.options.fromPob,
-            packageManager: this.projectConfig.packageManager,
+            packageManager,
             yarnNodeLinker: this.projectConfig.yarnNodeLinker,
             ci: this.projectConfig.ci,
           });
@@ -278,13 +294,14 @@ export default class PobBaseGenerator extends Generator {
   install() {
     if (this.options.fromPob) return;
 
-    switch (this.projectConfig.packageManager) {
+    switch (this.getPackageManager()) {
       case "npm":
         this.spawnCommandSync("npm", ["install"]);
         break;
+      case "pnpm":
       case "yarn":
       default:
-        // see CoreYarnGenerator
+        // see CorePnpmGenerator / CoreYarnGenerator
         break;
     }
   }

package/lib/pob.js

@@ -31,6 +31,7 @@ import CoreGitGithubGenerator from "./generators/core/git/generators/github/Core
 import CoreGitignoreGenerator from "./generators/core/gitignore/CoreGitignoreGenerator.js";
 import CoreNpmGenerator from "./generators/core/npm/CoreNpmGenerator.js";
 import CorePackageGenerator from "./generators/core/package/CorePackageGenerator.js";
+import CorePnpmGenerator from "./generators/core/pnpm/CorePnpmGenerator.js";
 import CoreRenovateGenerator from "./generators/core/renovate/CoreRenovateGenerator.js";
 import CoreSortPackageGenerator from "./generators/core/sort-package/CoreSortPackageGenerator.js";
 import CoreVSCodeGenerator from "./generators/core/vscode/CoreVSCodeGenerator.js";
@@ -205,6 +206,11 @@ env.registerStub(
   "pob:core:bun",
   `${__dirname}/generators/core/bun/CoreBunGenerator.js`,
 );
+env.registerStub(
+  CorePnpmGenerator,
+  "pob:core:pnpm",
+  `${__dirname}/generators/core/pnpm/CorePnpmGenerator.js`,
+);
 env.registerStub(
   PobLibGenerator,
   "pob:lib",
@@ -299,6 +305,7 @@ if (action === "migrate-to-monorepo") {
         ".yarnrc.yml",
         "eslint.config.js",
         "bun.lock",
+        "pnpm-lock.yaml",
         ".prettierignore",
         "renovate.json",
         "packages",

package/lib/utils/package.js

@@ -1,3 +1,5 @@
+import fs from "node:fs";
+import { fileURLToPath } from "node:url";
 import sortObject from "@pob/sort-object";
 import sortPkg from "@pob/sort-pkg";
 import parseAuthor from "parse-author";
@@ -108,12 +110,23 @@ const getVersionFromDependencyName = (dependency) => {
     return pobEslintConfig.dependencies[dependency];
   }
 
+  let value = pobDependencies[dependency];
   // prevents cycle that lerna doesnt like
   if (dependency === "@pob/root") {
-    return pobPkg.devDependencies[dependency];
+    value = pobPkg.devDependencies[dependency];
   }
 
-  return pobDependencies[dependency];
+  if (value === "workspace:*") {
+    const pkgJson = JSON.parse(
+      fs.readFileSync(
+        fileURLToPath(
+          import.meta.resolve(`${dependency}/package.json`, import.meta.url),
+        ),
+      ),
+    );
+    return pkgJson.version;
+  }
+  return value;
 };
 
 const internalAddDependencies = (pkg, type, dependencies, cleaned, prefix) => {

package/lib/utils/packageManagerUtils.js

@@ -9,6 +9,24 @@ export const packageManagerRun = (packageManager, script) => {
       return `npm run ${script}`;
     case "bun":
       return `bun run ${script}`;
+    case "pnpm":
+      return `pnpm run ${script}`;
+    default:
+      throw new Error(`Unsupported package manager: ${packageManager}`);
+  }
+};
+
+export const packageManagerExec = (packageManager, command) => {
+  switch (packageManager) {
+    case undefined:
+    case "yarn":
+      return `yarn ${command}`;
+    case "npm":
+      return `npx ${command}`;
+    case "bun":
+      return `bun run ${command}`;
+    case "pnpm":
+      return `pnpm exec ${command}`;
     default:
       throw new Error(`Unsupported package manager: ${packageManager}`);
   }
@@ -23,6 +41,8 @@ export const packageManagerRunWithCwd = (packageManager, cwd, script) => {
       return `npm --prefix ${quoteArg(cwd)} run ${script}`;
     case "bun":
       return `bun run --cwd ${quoteArg(cwd)} ${script}`;
+    case "pnpm":
+      return `pnpm run --dir ${quoteArg(cwd)} ${script}`;
     default:
       throw new Error(`Unsupported package manager: ${packageManager}`);
   }

package/lib/utils/packageManagerWorkspacesUtils.js

@@ -0,0 +1,75 @@
+/**
+ * Run a script in all workspaces in parallel.
+ * Use for independent operations like lint, test, clean.
+ */
+export const workspacesRun = (packageManager, script) => {
+  switch (packageManager) {
+    case undefined:
+    case "yarn":
+      return `yarn workspaces foreach --parallel -Av run ${script}`;
+    case "pnpm":
+      return `pnpm -r --parallel run ${script}`;
+    case "npm":
+      return `npm run ${script} --workspaces`;
+    case "bun":
+      return `bun --filter '*' run ${script}`;
+    default:
+      throw new Error(`Unsupported package manager: ${packageManager}`);
+  }
+};
+
+/**
+ * Run a script in all workspaces in topological dependency order.
+ * Use for build where packages may depend on each other.
+ */
+export const workspacesRunTopological = (packageManager, script) => {
+  switch (packageManager) {
+    case undefined:
+    case "yarn":
+      return `yarn workspaces foreach --parallel --topological-dev -Av run ${script}`;
+    case "pnpm":
+      return `pnpm -r run ${script}`; // pnpm respects topological order by default (without --parallel)
+    case "npm":
+      return `npm run ${script} --workspaces`;
+    case "bun":
+      return `bun --filter '*' run ${script}`;
+    default:
+      throw new Error(`Unsupported package manager: ${packageManager}`);
+  }
+};
+
+/**
+ * Run a script in all workspaces in parallel, excluding packages matching the given patterns.
+ * Use for watch commands where example/demo packages should be skipped.
+ */
+export const workspacesRunExcluding = (
+  packageManager,
+  script,
+  ...excludePatterns
+) => {
+  switch (packageManager) {
+    case undefined:
+    case "yarn": {
+      const excludeArgs = excludePatterns
+        .map((p) => `--exclude "${p}"`)
+        .join(" ");
+      return `yarn workspaces foreach --parallel --jobs unlimited --interlaced ${excludeArgs} -Av run ${script}`;
+    }
+    case "pnpm": {
+      const filterArgs = excludePatterns
+        .map((p) => `--filter "!${p}"`)
+        .join(" ");
+      return `pnpm -r --parallel ${filterArgs} run ${script}`;
+    }
+    case "npm":
+      return `npm run ${script} --workspaces`;
+    case "bun": {
+      const filterArgs = excludePatterns
+        .map((p) => `--filter '!${p}'`)
+        .join(" ");
+      return `bun ${filterArgs} run ${script}`;
+    }
+    default:
+      throw new Error(`Unsupported package manager: ${packageManager}`);
+  }
+};