pob 35.1.0 → 35.2.0

package/lib/generators/app/PobAppGenerator.js

@@ -37,7 +37,7 @@ export default class PobAppGenerator extends Generator {
 
     this.option("packageManager", {
       type: String,
-      default: "yarn",
+      required: true,
       description: "yarn or npm",
     });
 
@@ -151,10 +151,6 @@ export default class PobAppGenerator extends Generator {
     }
     const srcDirectory =
       srcDirectoriesFromAppType[this.appConfig.type] || "src";
-    const packageManager =
-      inMonorepo && !inMonorepo.root
-        ? inMonorepo.pobMonorepoConfig.packageManager
-        : this.options.packageManager;
 
     if (this.appConfig.type === "pobpack") {
       throw new Error("pobpack is no longer supported.");
@@ -192,6 +188,7 @@ export default class PobAppGenerator extends Generator {
         fromPob: this.options.fromPob,
         srcDirectory,
         buildDirectory,
+        packageManager: this.options.packageManager,
       });
     }
 
@@ -282,7 +279,7 @@ export default class PobAppGenerator extends Generator {
       documentation: false,
       codecov: this.appConfig.codecov,
       ci: this.options.ci,
-      packageManager,
+      packageManager: this.options.packageManager,
       isApp: true,
       splitCIJobs: false,
       onlyLatestLTS: true,
@@ -306,7 +303,7 @@ export default class PobAppGenerator extends Generator {
       browser,
       // nextjs now supports src rootAsSrc: this.appConfig.type === 'next.js',
       enableSrcResolver: true,
-      packageManager,
+      packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
       rootIgnorePaths: ignorePaths.join("\n"),
       srcDirectory,
@@ -324,13 +321,13 @@ export default class PobAppGenerator extends Generator {
       ci: this.options.ci,
       disableYarnGitCache: this.options.disableYarnGitCache,
       updateOnly: this.options.updateOnly,
-      packageManager,
+      packageManager: this.options.packageManager,
     });
 
     this.composeWith("pob:core:vscode", {
       root: !inMonorepo,
       monorepo: false,
-      packageManager,
+      packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
       typescript,
       testing: this.appConfig.testing,

package/lib/generators/common/format-lint/templates/oxfmtrc.jsonc.ejs

@@ -29,6 +29,6 @@
     "<%= ignorePattern %>",
 <% } -%>
 <% } -%>
-    "CHANGELOG.md"
-  ]
+    "CHANGELOG.md",
+  ],
 }

package/lib/generators/common/release/CommonReleaseGenerator.js

@@ -1,6 +1,10 @@
 import Generator from "yeoman-generator";
 // import { latestLTS } from "../../../utils/nodeVersions.js";
 import * as packageUtils from "../../../utils/package.js";
+import {
+  packageManagerExec,
+  packageManagerRun,
+} from "../../../utils/packageManagerUtils.js";
 
 export default class CommonReleaseGenerator extends Generator {
   constructor(args, opts) {
@@ -83,6 +87,7 @@ export default class CommonReleaseGenerator extends Generator {
             this.options.isMonorepo &&
             (!pkg.version || pkg.version === "0.0.0"),
           nodeLatestMajorVersion: 24, // TODO use latestLTS, when latest is updated to 24
+          packageManagerExec,
         },
       );
     } else {
@@ -103,9 +108,10 @@ export default class CommonReleaseGenerator extends Generator {
     if (this.options.enable && !this.options.ci) {
       packageUtils.addScripts(pkg, {
         preversion: [
-          "yarn run lint",
+          packageManagerRun(this.options.packageManager, "lint"),
           this.options.withBabel ||
-            (this.options.withTypescript && "yarn run build"),
+            (this.options.withTypescript &&
+              packageManagerRun(this.options.packageManager, "build")),
           "repository-check-dirty",
         ]
           .filter(Boolean)

package/lib/generators/common/release/templates/workflow-release.yml.ejs

@@ -47,6 +47,12 @@ jobs:
         uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
+<% } else if (packageManager === 'pnpm') { -%>
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v6
+        with:
+          version: 11
 <% } -%>
 
       - uses: actions/setup-node@v6
@@ -73,11 +79,14 @@ jobs:
 <% } else if (packageManager === 'bun') { -%>
       - name: Install Dependencies
         run: bun install --frozen-lockfile
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
 <% } -%>
 
       - name: New version (dry run)
         if: github.ref == 'refs/heads/main' && inputs.dry-run
-        run: <%= packageManager %> run pob-version --dry-run<% if (isMonorepo && isMonorepoIndependent) { %> --bump-dependents-highest-as=${{ inputs.bump-dependents-highest-as }}<% } %>
+        run: <%= packageManagerExec(packageManager, 'pob-version') %> --dry-run<% if (isMonorepo && isMonorepoIndependent) { %> --bump-dependents-highest-as=${{ inputs.bump-dependents-highest-as }}<% } %>
 
       - name: Configure Git user
         if: github.ref == 'refs/heads/main' && !inputs.dry-run
@@ -88,19 +97,27 @@ jobs:
       - name: New version
         if: github.ref == 'refs/heads/main' && !inputs.dry-run
         run: |
-          <%= packageManager %> run pob-version <% if (enablePublish && packageManager === "bun") { %>--publish <% } %>--create-release=github <% if (isMonorepo && isMonorepoIndependent) { %> --bump-dependents-highest-as=${{ inputs.bump-dependents-highest-as }}<% } %> -m 'chore: release <%- isMonorepoIndependent ? '' : '%v ' %>[skip ci]<%- isMonorepoIndependent ? '\\n\\n%t' : '' %>'
+          <%= packageManagerExec(packageManager, 'pob-version') %> <% if (enablePublish && packageManager === "bun") { %>--publish <% } %>--create-release=github <% if (isMonorepo && isMonorepoIndependent) { %> --bump-dependents-highest-as=${{ inputs.bump-dependents-highest-as }}<% } %> -m 'chore: release <%- isMonorepoIndependent ? '' : '%v ' %>[skip ci]<%- isMonorepoIndependent ? '\\n\\n%t' : '' %>'
         env:
           POB_GIT_HOOKS: 0
           YARN_ENABLE_IMMUTABLE_INSTALLS: false
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-<% if (enablePublish && packageManager === "yarn") { -%>
+<% if (enablePublish && (packageManager === "yarn" || packageManager === "pnpm")) { -%>
 
       - name: Publish to npm
         if: github.ref == 'refs/heads/main' && !inputs.dry-run
         run: |
+<% if (packageManager === 'yarn') { -%>
 <% if (isMonorepo) { -%>
           yarn workspaces foreach --all --parallel --no-private npm publish --tolerate-republish
 <% } else { -%>
           yarn npm publish
 <% } -%>
+<% } else if (packageManager === 'pnpm') { -%>
+<% if (isMonorepo) { -%>
+          pnpm -r publish --no-git-checks
+<% } else { -%>
+          pnpm publish --no-git-checks
+<% } -%>
+<% } -%>
 <% } -%>

package/lib/generators/common/testing/CommonTestingGenerator.js

@@ -5,6 +5,7 @@ import { quoteArg } from "../../../utils/execUtils.js";
 import inMonorepo from "../../../utils/inMonorepo.js";
 import * as packageUtils from "../../../utils/package.js";
 import { packageManagerRunWithCwd } from "../../../utils/packageManagerUtils.js";
+import { workspacesRun } from "../../../utils/packageManagerWorkspacesUtils.js";
 import {
   copyAndFormatTpl,
   writeAndFormatJson,
@@ -65,7 +66,7 @@ export default class CommonTestingGenerator extends Generator {
     this.option("packageManager", {
       type: String,
       default: "yarn",
-      description: "yarn, bun or npm",
+      description: "yarn, npm, bun, or pnpm",
     });
 
     this.option("isApp", {
@@ -313,7 +314,7 @@ export default class CommonTestingGenerator extends Generator {
       "@vitest/coverage-v8",
     ]);
     if (isVitestUsed) {
-      packageUtils.addDependencies(pkg, ["vite"]);
+      packageUtils.addDevDependencies(pkg, ["vite"]);
     }
 
     if (!this.options.enable) {
@@ -355,7 +356,7 @@ export default class CommonTestingGenerator extends Generator {
 
       if (this.options.monorepo && !globalTesting) {
         packageUtils.addScripts(pkg, {
-          test: "yarn workspaces foreach --parallel -Av run test",
+          test: workspacesRun(this.options.packageManager, "test"),
         });
       } else {
         if (this.testRunner === "vitest") {

package/lib/generators/common/transpiler/CommonTranspilerGenerator.js

@@ -3,6 +3,7 @@ import semver from "semver";
 import Generator from "yeoman-generator";
 import { latestLTS, maintenanceLTS } from "../../../utils/nodeVersions.js";
 import * as packageUtils from "../../../utils/package.js";
+import { packageManagerRun } from "../../../utils/packageManagerUtils.js";
 import { copyAndFormatTpl } from "../../../utils/writeAndFormat.js";
 
 export default class CommonTranspilerGenerator extends Generator {
@@ -65,6 +66,12 @@ export default class CommonTranspilerGenerator extends Generator {
       default: false,
       description: "only latest lts",
     });
+
+    this.option("packageManager", {
+      type: String,
+      required: true,
+      description: "Package manager",
+    });
   }
 
   async prompting() {
@@ -165,13 +172,13 @@ export default class CommonTranspilerGenerator extends Generator {
       packageUtils.removeScripts(["watch"]);
       packageUtils.addOrRemoveScripts(pkg, bundler && bundler !== "tsc", {
         "clean:build": `${cleanCommand} ${this.options.buildDirectory}`,
-        clean: "yarn clean:build",
+        clean: packageManagerRun(this.options.packageManager, "clean:build"),
       });
 
       packageUtils.addOrRemoveScripts(pkg, bundler, {
         start: (() => {
           if (bundler && bundler.startsWith("rollup")) {
-            return "yarn clean:build && rollup --config rollup.config.mjs --watch";
+            return `${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs --watch`;
           }
           if (bundler === "tsc") return "tsc --watch";
           if (bundler === "esbuild") return "pob-esbuild-watch";
@@ -187,7 +194,7 @@ export default class CommonTranspilerGenerator extends Generator {
     packageUtils.addOrRemoveScripts(pkg, bundler, {
       build: (() => {
         if (bundler && bundler.startsWith("rollup")) {
-          return "yarn clean:build && rollup --config rollup.config.mjs";
+          return `${packageManagerRun(this.options.packageManager, "clean:build")} && rollup --config rollup.config.mjs`;
         }
         if (bundler === "tsc") return "tsc";
         if (bundler === "esbuild") return "pob-esbuild-build";
@@ -203,9 +210,9 @@ export default class CommonTranspilerGenerator extends Generator {
 
     if (shouldBuildDefinitions) {
       if (pkg.scripts.build) {
-        pkg.scripts.build += " && yarn run build:definitions";
+        pkg.scripts.build += ` && ${packageManagerRun(this.options.packageManager, "build:definitions")}`;
       } else {
-        pkg.scripts.build = "yarn run build:definitions";
+        pkg.scripts.build = `${packageManagerRun(this.options.packageManager, "build:definitions")}`;
       }
     } else if (!this.options.isApp && !bundler && !withTypescript) {
       // check definitions, but also force lerna to execute build:definitions in right order
@@ -214,7 +221,10 @@ export default class CommonTranspilerGenerator extends Generator {
         packageUtils.addScripts(pkg, {
           "build:definitions":
             "tsc --lib esnext --noEmit --skipLibCheck ./lib/index.d.ts",
-          build: "yarn run build:definitions",
+          build: packageManagerRun(
+            this.options.packageManager,
+            "build:definitions",
+          ),
         });
       }
 
@@ -222,7 +232,10 @@ export default class CommonTranspilerGenerator extends Generator {
         packageUtils.addScripts(pkg, {
           "build:definitions":
             "tsc --lib esnext --noEmit --skipLibCheck ./lib/index.ts",
-          build: "yarn run build:definitions",
+          build: packageManagerRun(
+            this.options.packageManager,
+            "build:definitions",
+          ),
         });
       }
     }
@@ -786,7 +799,9 @@ export default class CommonTranspilerGenerator extends Generator {
 
   end() {
     if (this.bundler) {
-      this.spawnSync("yarn", ["run", "build"]);
+      this.spawnCommandSync(
+        packageManagerRun(this.options.packageManager, "build"),
+      );
     }
   }
 }

package/lib/generators/common/typescript/CommonTypescriptGenerator.js

@@ -208,6 +208,8 @@ export default class CommonTypescriptGenerator extends Generator {
       delete pkg.scripts.flow;
     }
 
+    console.log({ enableTypescript: this.options.enable });
+
     packageUtils.addOrRemoveDevDependencies(
       pkg,
       this.options.enable ||
@@ -236,12 +238,6 @@ export default class CommonTypescriptGenerator extends Generator {
           yoConfig.pob.monorepo.typescript;
 
         if (monorepoComposite) {
-          packageUtils.addOrRemoveDevDependencies(
-            pkg,
-            inMonorepo.rootPackageManager === "yarn",
-            ["typescript"],
-          );
-
           const packageLocations = new Map(
             yoConfig.pob.monorepo.packageNames
               .filter(

package/lib/generators/common/typescript/templates/tsconfig.json.ejs

@@ -36,6 +36,7 @@
     "tsBuildInfoFile": "node_modules/.cache/tsc/tsbuildinfo",
 <% } else { -%>
     "noEmit": true,
+    "tsBuildInfoFile": "node_modules/.cache/tsc/tsbuildinfo",
 <% } -%>
 <% if ((composite && cacheEnabled) || emitDefinitions) { -%>
     "noEmitOnError": true,

package/lib/generators/core/ci/CoreCIGenerator.js

@@ -2,6 +2,10 @@ import fs from "node:fs";
 import Generator from "yeoman-generator";
 import inMonorepo from "../../../utils/inMonorepo.js";
 import { latestLTS, maintenanceLTS } from "../../../utils/nodeVersions.js";
+import {
+  packageManagerExec,
+  packageManagerRun,
+} from "../../../utils/packageManagerUtils.js";
 import { copyAndFormatTpl } from "../../../utils/writeAndFormat.js";
 
 export const ciContexts = [];
@@ -140,6 +144,8 @@ export default class CoreCIGenerator extends Generator {
             inMonorepo.pobConfig?.project?.type === "lib",
           nodeLatestMajorVersion: latestLTS,
           nodeMaintenanceMajorVersion: maintenanceLTS,
+          packageManagerRun,
+          packageManagerExec,
         },
       );
 

package/lib/generators/core/ci/templates/github-action-documentation-workflow.yml.ejs

@@ -20,6 +20,12 @@ jobs:
         with:
           bun-version: latest
 
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install pnpm
+        uses: pnpm/action-setup@v6
+        with:
+          version: 11
+
 <% } -%>
       - uses: actions/setup-node@v6
         with:
@@ -35,6 +41,9 @@ jobs:
 <% } else if (packageManager === 'bun') { -%>
       - name: Install Dependencies
         run: bun install --frozen-lockfile
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
 <% } -%>
 
 <% if (typedoc) { -%>

package/lib/generators/core/ci/templates/github-action-push-workflow-split.yml.ejs

@@ -11,9 +11,23 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+<% if (packageManager === 'yarn') { -%>
       - name: Enable Corepack
         run: corepack enable
 
+<% } else if (packageManager === 'bun') { -%>
+      - name: Install bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install pnpm
+        uses: pnpm/action-setup@v6
+        with:
+          version: 11
+
+<% } -%>
       - uses: actions/setup-node@v6
         with:
           node-version: <%= nodeLatestMajorVersion %>
@@ -27,6 +41,8 @@ jobs:
 <% } -%>
 <% } else if (packageManager === 'bun') { -%>
         run: bun install --frozen-lockfile
+<% } else if (packageManager === 'pnpm') { -%>
+        run: pnpm install --frozen-lockfile
 <% } -%>
 
       - name: Checks
@@ -40,9 +56,23 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+<% if (packageManager === 'yarn') { -%>
       - name: Enable Corepack
         run: corepack enable
 
+<% } else if (packageManager === 'bun') { -%>
+      - name: Install bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install pnpm
+        uses: pnpm/action-setup@v6
+        with:
+          version: 11
+
+<% } -%>
       - uses: actions/setup-node@v6
         with:
           node-version: <%= nodeLatestMajorVersion %>
@@ -56,13 +86,15 @@ jobs:
 <% } -%>
 <% } else if (packageManager === 'bun') { -%>
         run: bun install --frozen-lockfile
+<% } else if (packageManager === 'pnpm') { -%>
+        run: pnpm install --frozen-lockfile
 <% } -%>
 
       - name: Build
         run: <%= packageManager %> run build
 
       - name: Check nothing was forgotten before commit
-        run: <%= packageManager %> run repository-check-dirty
+        run: <%= packageManagerExec(packageManager, 'repository-check-dirty') %>
 
 <% } -%>
   lint:
@@ -71,19 +103,41 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+<% if (packageManager === 'yarn') { -%>
       - name: Enable Corepack
         run: corepack enable
 
+<% } else if (packageManager === 'bun') { -%>
+      - name: Install bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install pnpm
+        uses: pnpm/action-setup@v6
+        with:
+          version: 11
+
+<% } -%>
       - uses: actions/setup-node@v6
         with:
           node-version: <%= nodeLatestMajorVersion %>
 
       - name: Install Dependencies
+<% if (packageManager === 'yarn') { -%>
 <% if (disableYarnGitCache) { -%>
         run: yarn install --immutable
 <% } else { -%>
         run: yarn install --immutable --immutable-cache
 <% } -%>
+<% } else if (packageManager === 'bun') { -%>
+        run: bun install --frozen-lockfile
+<% } else if (packageManager === 'pnpm') { -%>
+        run: pnpm install --frozen-lockfile
+<% } else { -%>
+        run: npm ci
+<% } -%>
 
       - name: Format
         run: <%= packageManager %> run format:check
@@ -117,6 +171,12 @@ jobs:
         with:
           bun-version: latest
 
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install pnpm
+        uses: pnpm/action-setup@v6
+        with:
+          version: 11
+
 <% } -%>
       - uses: actions/setup-node@v6
         with:
@@ -132,6 +192,9 @@ jobs:
 <% } else if (packageManager === 'bun') { -%>
       - name: Install Dependencies
         run: bun install --frozen-lockfile
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
 <% } -%>
 
 <% if (codecov) { -%>
@@ -169,19 +232,41 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+<% if (packageManager === 'yarn') { -%>
       - name: Enable Corepack
         run: corepack enable
 
+<% } else if (packageManager === 'bun') { -%>
+      - name: Install bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install pnpm
+        uses: pnpm/action-setup@v6
+        with:
+          version: 11
+
+<% } -%>
       - uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
 
       - name: Install Dependencies
+<% if (packageManager === 'yarn') { -%>
 <% if (disableYarnGitCache) { -%>
         run: yarn install --immutable
 <% } else { -%>
         run: yarn install --immutable --immutable-cache
 <% } -%>
+<% } else if (packageManager === 'bun') { -%>
+        run: bun install --frozen-lockfile
+<% } else if (packageManager === 'pnpm') { -%>
+        run: pnpm install --frozen-lockfile
+<% } else { -%>
+        run: npm ci
+<% } -%>
 
       - name: E2E testing
         run: <%= packageManager %> <%= e2eTesting === '.' || e2eTesting === true ? '.' : `./${e2eTesting}` %> run test:e2e

package/lib/generators/core/ci/templates/github-action-push-workflow.yml.ejs

@@ -24,6 +24,12 @@ jobs:
         with:
           bun-version: latest
 
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install pnpm
+        uses: pnpm/action-setup@v6
+        with:
+          version: 11
+
 <% } -%>
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v6
@@ -44,6 +50,9 @@ jobs:
 <% } else if (packageManager === 'bun') { -%>
       - name: Install Dependencies
         run: bun install --frozen-lockfile
+<% } else if (packageManager === 'pnpm') { -%>
+      - name: Install Dependencies
+        run: pnpm install --frozen-lockfile
 <% } -%>
 
 <% if (checks) { -%>
@@ -75,7 +84,7 @@ jobs:
 
       - name: Check nothing was forgotten before commit
         if: startsWith(matrix.node-version, '<%= nodeLatestMajorVersion %>.')
-        run: <%= packageManager === 'npm' ? 'npx' : packageManager + ' run' %> repository-check-dirty
+        run: <%= packageManagerExec(packageManager, 'repository-check-dirty') %>
 <% } -%>
 <% if (codecov) { -%>
 

package/lib/generators/core/git/CoreGitGenerator.js

@@ -143,13 +143,13 @@ export default class CoreGitGenerator extends Generator {
     const cwd = this.destinationPath();
 
     this.initGitRepository =
-      this.spawnCommandSync("git", ["status"], {
+      this.spawnCommandSync("git status", {
         cwd,
         stdio: "ignore",
         reject: false,
       }).status === 128;
     if (this.initGitRepository) {
-      this.spawnCommandSync("git", ["init"], { cwd });
+      this.spawnCommandSync("git init", { cwd });
 
       if (!this.originUrl) {
         let repoSSH = pkg.repository;
@@ -170,7 +170,7 @@ export default class CoreGitGenerator extends Generator {
           repoSSH = pkg.repository;
         }
 
-        this.spawnCommandSync("git", ["remote", "add", "origin", repoSSH], {
+        this.spawnCommandSync(`git remote add origin ${repoSSH}`, {
           cwd,
         });
       }

package/lib/generators/core/package/CorePackageGenerator.js

@@ -210,6 +210,9 @@ export default class CorePackageGenerator extends Generator {
       if (this.fs.exists(this.destinationPath("yarn.lock"))) {
         fs.unlinkSync(this.destinationPath("yarn.lock"));
       }
+      if (this.fs.exists(this.destinationPath("pnpm-lock.yaml"))) {
+        fs.unlinkSync(this.destinationPath("pnpm-lock.yaml"));
+      }
     }
     if (this.fs.exists(this.destinationPath("yarn-error.log"))) {
       fs.unlinkSync(this.destinationPath("yarn-error.log"));