pob 37.0.0 → 38.1.0

package/lib/generators/app/PobAppGenerator.js

@@ -288,7 +288,6 @@ export default class PobAppGenerator extends Generator {
       documentation: false,
       codecov: this.appConfig.codecov,
       ci: this.options.ci,
-      ciPushWorkflow: this.options.ci,
       packageManager: this.options.packageManager,
       isApp: true,
       splitCIJobs: false,

package/lib/generators/common/babel/CommonBabelGenerator.js

@@ -332,13 +332,13 @@ export default class CommonBabelGenerator extends Generator {
     }
     const isLibraryRollupPlugin = pkg.name.includes("rollup-plugin");
 
-    packageUtils.addOrRemoveDevDependencies(
-      pkg,
-      (useBabel && pkg.pob.jsx) ||
-        (pkg.devDependencies?.["@babel/preset-react"] &&
-          (isLibraryRollupPlugin || pkg.name === "alouette-icons")),
-      ["@babel/preset-react"],
-    );
+    // packageUtils.addOrRemoveDevDependencies(
+    //   pkg,
+    //   (useBabel && pkg.pob.jsx) ||
+    //     (pkg.devDependencies?.["@babel/preset-react"] &&
+    //       (isLibraryRollupPlugin || pkg.name === "alouette-icons")),
+    //   ["@babel/preset-react"],
+    // );
 
     packageUtils.removeDevDependencies(pkg, [
       "babel-preset-env", // now @babel/preset-env

package/lib/generators/common/format-lint/CommonLintGenerator.js

@@ -316,7 +316,12 @@ export default class CommonFormatLintGenerator extends Generator {
         !pkg.name.startsWith("@pob/eslint-config") &&
         pkg.name !== "@pob/use-eslint-plugin"
       ) {
-        packageUtils.addDevDependencies(pkg, ["@pob/eslint-config"]);
+        // @pob/eslint-config is provided through @pob/root (which re-exports it
+        // via "@pob/root/eslint-config"), so projects only need @pob/root.
+        if (pkg.name !== "@pob/root") {
+          packageUtils.addDevDependencies(pkg, ["@pob/root"]);
+        }
+        packageUtils.removeDevDependencies(pkg, ["@pob/eslint-config"]);
         packageUtils.addOrRemoveDevDependencies(
           pkg,
           shouldHavePluginsDependencies,
@@ -373,7 +378,7 @@ export default class CommonFormatLintGenerator extends Generator {
 
       return {
         imports: [
-          'import pobConfig from "@pob/eslint-config"',
+          'import pobConfig from "@pob/root/eslint-config"',
           useTypescript &&
             hasReact &&
             'import pobTypescriptConfigReact from "@pob/eslint-config-typescript-react"',
@@ -385,25 +390,23 @@ export default class CommonFormatLintGenerator extends Generator {
           if (!useTypescript) {
             return [
               useNode
-                ? `...pobConfig(import.meta.url).configs.node${pkg.type === "commonjs" ? "Commonjs" : "Module"}`
-                : `...pobConfig(import.meta.url).configs.base${pkg.type === "commonjs" ? "Commonjs" : "Module"}`,
+                ? `...pobConfig.configs.node${pkg.type === "commonjs" ? "Commonjs" : "Module"}`
+                : `...pobConfig.configs.base${pkg.type === "commonjs" ? "Commonjs" : "Module"}`,
             ];
           }
           if (!hasReact) {
             return [
               useNode
-                ? "...pobConfig(import.meta.url).configs.node"
-                : "...pobConfig(import.meta.url).configs.base",
+                ? "...pobConfig.configs.node"
+                : "...pobConfig.configs.base",
             ];
           }
 
           return [
-            useNode
-              ? "...pobConfig(import.meta.url).configs.node"
-              : "...pobConfig(import.meta.url).configs.base",
-            this.options.isApp && "...pobConfig(import.meta.url).configs.app",
+            useNode ? "...pobConfig.configs.node" : "...pobConfig.configs.base",
+            this.options.isApp && "...pobConfig.configs.app",
             pkg.dependencies?.["react-native-web"] &&
-              '...pobTypescriptConfigReact(import.meta.url).configs["react-native-web"]',
+              '...pobTypescriptConfigReact.configs["react-native-web"]',
           ];
         })().filter(Boolean),
       };
@@ -412,7 +415,7 @@ export default class CommonFormatLintGenerator extends Generator {
     const isMonorepoRoot =
       this.options.monorepo || Boolean(inMonorepo && inMonorepo.root);
     if (isMonorepoRoot && useTypescript) {
-      flatCascade.push("...pobConfig(import.meta.url).configs.monorepo");
+      flatCascade.push("...pobConfig.configs.monorepo");
     }
 
     const eslintrcBadPath = this.destinationPath(".eslintrc");

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

@@ -39,10 +39,10 @@ export default class CommonTestingGenerator extends Generator {
       description: "ci",
     });
 
-    this.option("ciPushWorkflow", {
+    this.option("disablePushWorkflow", {
       type: Boolean,
       required: true,
-      description: "push workflow enabled",
+      description: "disable push workflow",
     });
 
     this.option("typescript", {
@@ -130,7 +130,7 @@ export default class CommonTestingGenerator extends Generator {
         testing: this.options.enable,
         testRunner: this.options.runner,
         e2eTesting: this.options.e2eTesting,
-        push: this.options.pushWorkflow,
+        disablePushWorkflow: this.options.disablePushWorkflow,
         build: this.options.build,
         typescript: this.options.typescript,
         documentation: this.options.documentation,

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

@@ -20,10 +20,10 @@ export default class CoreCIGenerator extends Generator {
       description: "enable ci",
     });
 
-    this.option("push", {
+    this.option("disablePushWorkflow", {
       type: Boolean,
       default: true,
-      description: "enable push workflow",
+      description: "disable push workflow",
     });
 
     this.option("build", {
@@ -119,7 +119,7 @@ export default class CoreCIGenerator extends Generator {
         this.options.testing && !!pkg.scripts && !!pkg.scripts.test;
       const build = this.options.build;
 
-      if (this.options.push) {
+      if (!this.options.disablePushWorkflow) {
         await copyAndFormatTpl(
           this.fs,
           this.templatePath(
@@ -151,8 +151,20 @@ export default class CoreCIGenerator extends Generator {
               inMonorepo.pobConfig?.project?.type === "lib",
             nodeLatestMajorVersion: latestLTS,
             nodeMaintenanceMajorVersion: maintenanceLTS,
-            packageManagerRun,
-            packageManagerExec,
+            packageManagerRun: (script, packagePath) => {
+              return packageManagerRun(
+                this.options.packageManager,
+                script,
+                packagePath,
+              );
+            },
+            packageManagerExec: (command, packagePath) => {
+              return packageManagerExec(
+                this.options.packageManager,
+                command,
+                packagePath,
+              );
+            },
           },
         );
         ciContexts.push(
@@ -188,6 +200,13 @@ export default class CoreCIGenerator extends Generator {
         this.destinationPath(".github/workflows/gh-pages.yml"),
         {
           packageManager: this.options.packageManager,
+          packageManagerRun: (script, packagePath) => {
+            return packageManagerRun(
+              this.options.packageManager,
+              "docs:build",
+              packagePath,
+            );
+          },
           disableYarnGitCache: this.options.disableYarnGitCache,
           testing: this.options.testing,
           testRunner: this.options.testRunner,

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

@@ -58,11 +58,11 @@ jobs:
 <% if (testRunner === 'node') { -%>
 
       - name: Generate Coverage
-        run: NODE_V8_COVERAGE=./docs/coverage <%= packageManager %> run test:coverage:generate
+        run: NODE_V8_COVERAGE=./docs/coverage <%= packageManagerRun("test:coverage:generate") %>
 <% } else {-%>
 
       - name: Generate Coverage
-        run: <%= packageManager %> run test:coverage:generate
+        run: <%= packageManagerRun("test:coverage:generate") %>
 <% } -%>
 <% } -%>
 

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

@@ -46,7 +46,7 @@ jobs:
 <% } -%>
 
       - name: Checks
-        run: <%= packageManager %> run checks
+        run: <%= packageManagerRun("checks") %>
 
 <% } -%>
 <% if (build) { -%>
@@ -91,10 +91,10 @@ jobs:
 <% } -%>
 
       - name: Build
-        run: <%= packageManager %> run build
+        run: <%= packageManagerRun("build") %>
 
       - name: Check nothing was forgotten before commit
-        run: <%= packageManagerExec(packageManager, 'repository-check-dirty') %>
+        run: <%= packageManagerExec('repository-check-dirty') %>
 
 <% } -%>
   lint:
@@ -140,15 +140,15 @@ jobs:
 <% } -%>
 
       - name: Format
-        run: <%= packageManager %> run format:check
+        run: <%= packageManagerRun("format:check") %>
 <% if (typescript) { -%>
 
       - name: Typescript
-        run: <%= packageManager %> run tsc
+        run: <%= packageManagerRun("tsc") %>
 <% } -%>
 
       - name: Eslint
-        run: <%= packageManager %> run lint:eslint
+        run: <%= packageManagerRun("lint:eslint") %>
 <% if (testing) { -%>
 
   test:
@@ -199,11 +199,11 @@ jobs:
 
 <% if (codecov) { -%>
       - name: Test
-        run: <%= packageManager %> run test
+        run: <%= packageManagerRun("test") %>
         if: matrix.node-version != <%= nodeLatestMajorVersion %>
 
       - name: Generate Test Coverage
-        run: <%= packageManager %> run test:coverage:generate
+        run: <%= packageManagerRun("test:coverage:generate") %>
         if: matrix.node-version == <%= nodeLatestMajorVersion %>
         env:
           CI: true
@@ -217,7 +217,7 @@ jobs:
 <% } else { -%>
 
       - name: Test
-        run: <%= packageManager %> run test
+        run: <%= packageManagerRun("test") %>
 <% } -%>
 <% } -%>
 <% if (e2eTesting) { -%>
@@ -269,7 +269,7 @@ jobs:
 <% } -%>
 
       - name: E2E testing
-        run: <%= packageManager %> <%= e2eTesting === '.' || e2eTesting === true ? '.' : `./${e2eTesting}` %> run test:e2e
+        run: <%= packageManagerRun("test:e2e", e2eTesting) %>
 <% } -%>
 <% if (isReleasePleaseEnabled) { -%>
   release:

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

@@ -84,12 +84,12 @@ jobs:
 
       - name: Check nothing was forgotten before commit
         if: startsWith(matrix.node-version, '<%= nodeLatestMajorVersion %>.')
-        run: <%= packageManagerExec(packageManager, 'repository-check-dirty') %>
+        run: <%= packageManagerExec('repository-check-dirty') %>
 <% } -%>
 <% if (codecov) { -%>
 
       - name: Generate Test Coverage
-        run: <%= packageManager %> run test:coverage:generate
+        run: <%= packageManagerRun("test:coverage:generate) %>
         if: startsWith(matrix.node-version, '<%= nodeLatestMajorVersion %>.')
         env:
           CI: true
@@ -112,7 +112,7 @@ jobs:
 <% if (e2eTesting) { -%>
 
       - name: E2E testing
-        run: <%= packageManager %> <%= e2eTesting %> run test:e2e
+        run: <%= packageManagerRun("test:e2e", e2eTesting) %>
 <% } -%>
 <% if (isReleasePleaseEnabled) { -%>
 

package/lib/generators/lib/PobLibGenerator.js

@@ -321,7 +321,6 @@ export default class PobLibGenerator extends Generator {
       documentation: !!this.pobjson.documentation,
       codecov: this.pobjson.testing && this.pobjson.testing.codecov,
       ci: this.options.ci,
-      ciPushWorkflow: this.options.ci,
       packageManager,
       isApp: false,
       splitCIJobs: false,

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -151,13 +151,19 @@ export default class PobMonorepoGenerator extends Generator {
     const config = this.config.get("monorepo");
 
     if (this.options.updateOnly && config) {
-      this.pobLernaConfig = config;
-      this.pobLernaConfig.packageNames = this.packageNames;
-      this.config.set("monorepo", this.pobLernaConfig);
+      this.pobMonorepoConfig = config;
+      this.pobMonorepoConfig.packageNames = this.packageNames;
+      this.config.set("monorepo", this.pobMonorepoConfig);
       return;
     }
 
-    this.pobLernaConfig = await this.prompt([
+    if (this.pobMonorepoConfig.ciPushWorkflow) {
+      throw new Error(
+        "ciPushWorkflow is deprecated, use disablePushWorkflow instead",
+      );
+    }
+
+    this.pobMonorepoConfig = await this.prompt([
       {
         type: "confirm",
         name: "ci",
@@ -169,10 +175,10 @@ export default class PobMonorepoGenerator extends Generator {
       },
       {
         type: "confirm",
-        name: "ciPushWorkflow",
-        message: "Would you like ci push workflow ?",
+        name: "disablePushWorkflow",
+        message: "Would you like to DISABLE push workflow ?",
         when: (answers) => answers.ci,
-        default: config.ciPushWorkflow == null ? true : config.ciPushWorkflow,
+        default: config.disablePushWorkflow,
       },
       {
         type: "confirm",
@@ -223,8 +229,8 @@ export default class PobMonorepoGenerator extends Generator {
         default: config ? config.eslint : true,
       },
     ]);
-    this.pobLernaConfig.packageNames = this.packageNames;
-    this.config.set("monorepo", this.pobLernaConfig);
+    this.pobMonorepoConfig.packageNames = this.packageNames;
+    this.config.set("monorepo", this.pobMonorepoConfig);
     this.config.delete("pob-config");
   }
 
@@ -233,7 +239,7 @@ export default class PobMonorepoGenerator extends Generator {
 
     const packageNames = this.packageNames;
     const packagePaths = this.packageLocations.filter(
-      this.pobLernaConfig.typescript
+      this.pobMonorepoConfig.typescript
         ? (packagePath) => fs.existsSync(`${packagePath}/tsconfig.json`)
         : Boolean,
     );
@@ -249,17 +255,17 @@ export default class PobMonorepoGenerator extends Generator {
 
     this.composeWith("pob:common:testing", {
       monorepo: true,
-      enable: this.pobLernaConfig.testing,
-      runner: this.pobLernaConfig.testRunner,
+      enable: this.pobMonorepoConfig.testing,
+      runner: this.pobMonorepoConfig.testRunner,
       disableYarnGitCache: this.options.disableYarnGitCache,
-      testing: this.pobLernaConfig.testing,
-      e2eTesting: this.pobLernaConfig.e2eTesting,
-      build: this.pobLernaConfig.typescript === true,
-      typescript: this.pobLernaConfig.typescript,
-      documentation: !!this.pobLernaConfig.documentation,
-      codecov: this.pobLernaConfig.testing && this.pobLernaConfig.codecov,
-      ci: this.pobLernaConfig.ci,
-      ciPushWorkflow: this.pobLernaConfig.ciPushWorkflow,
+      testing: this.pobMonorepoConfig.testing,
+      e2eTesting: this.pobMonorepoConfig.e2eTesting,
+      build: this.pobMonorepoConfig.typescript === true,
+      typescript: this.pobMonorepoConfig.typescript,
+      documentation: !!this.pobMonorepoConfig.documentation,
+      codecov: this.pobMonorepoConfig.testing && this.pobMonorepoConfig.codecov,
+      ci: this.pobMonorepoConfig.ci,
+      disablePushWorkflow: this.pobMonorepoConfig.disablePushWorkflow,
       packageManager: this.options.packageManager,
       isApp: this.options.isAppProject,
       onlyLatestLTS: this.options.onlyLatestLTS,
@@ -267,10 +273,10 @@ export default class PobMonorepoGenerator extends Generator {
     });
 
     const rootIgnorePaths = [
-      this.pobLernaConfig.e2eTesting &&
-        `${this.pobLernaConfig.e2eTesting === "." || this.pobLernaConfig.e2eTesting === true ? "" : `/${this.pobLernaConfig.e2eTesting}`}/playwright-report/`,
-      this.pobLernaConfig.e2eTesting &&
-        `${this.pobLernaConfig.e2eTesting === "." || this.pobLernaConfig.e2eTesting === true ? "" : `/${this.pobLernaConfig.e2eTesting}`}/test-results/`,
+      this.pobMonorepoConfig.e2eTesting &&
+        `${this.pobMonorepoConfig.e2eTesting === "." || this.pobMonorepoConfig.e2eTesting === true ? "" : `/${this.pobMonorepoConfig.e2eTesting}`}/playwright-report/`,
+      this.pobMonorepoConfig.e2eTesting &&
+        `${this.pobMonorepoConfig.e2eTesting === "." || this.pobMonorepoConfig.e2eTesting === true ? "" : `/${this.pobMonorepoConfig.e2eTesting}`}/test-results/`,
     ].filter(Boolean);
 
     if (hasTamagui(this.packages, this.packageConfigs)) {
@@ -283,12 +289,12 @@ export default class PobMonorepoGenerator extends Generator {
 
     this.composeWith("pob:common:format-lint", {
       monorepo: true,
-      documentation: this.pobLernaConfig.documentation,
+      documentation: this.pobMonorepoConfig.documentation,
       storybook: pkg?.devDependencies?.storybook,
-      typescript: this.pobLernaConfig.typescript,
-      build: this.pobLernaConfig.typescript === true,
-      testing: this.pobLernaConfig.testing,
-      testRunner: this.pobLernaConfig.testRunner,
+      typescript: this.pobMonorepoConfig.typescript,
+      build: this.pobMonorepoConfig.typescript === true,
+      testing: this.pobMonorepoConfig.testing,
+      testRunner: this.pobMonorepoConfig.testRunner,
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
       appTypes: JSON.stringify(getAppTypes(this.packageConfigs)),
@@ -304,8 +310,8 @@ export default class PobMonorepoGenerator extends Generator {
     });
 
     this.composeWith("pob:lib:doc", {
-      enabled: this.pobLernaConfig.documentation,
-      testing: this.pobLernaConfig.testing,
+      enabled: this.pobMonorepoConfig.documentation,
+      testing: this.pobMonorepoConfig.testing,
       packageNames: JSON.stringify(packageNames),
       packagePaths: JSON.stringify(packagePaths),
       packageManager: this.options.packageManager,
@@ -316,9 +322,9 @@ export default class PobMonorepoGenerator extends Generator {
       monorepo: true,
       packageManager: this.options.packageManager,
       yarnNodeLinker: this.options.yarnNodeLinker,
-      typescript: this.pobLernaConfig.typescript,
-      testing: this.pobLernaConfig.testing,
-      testRunner: this.pobLernaConfig.testRunner,
+      typescript: this.pobMonorepoConfig.typescript,
+      testing: this.pobMonorepoConfig.testing,
+      testRunner: this.pobMonorepoConfig.testRunner,
       packageNames: JSON.stringify(packageNames),
       packageLocations: JSON.stringify(this.packageLocations),
     });
@@ -326,9 +332,9 @@ export default class PobMonorepoGenerator extends Generator {
     // Always add a gitignore, because npm publish uses it.
     this.composeWith("pob:core:gitignore", {
       root: true,
-      typescript: this.pobLernaConfig.typescript,
-      documentation: this.pobLernaConfig.documentation,
-      testing: this.pobLernaConfig.testing,
+      typescript: this.pobMonorepoConfig.typescript,
+      documentation: this.pobMonorepoConfig.documentation,
+      testing: this.pobMonorepoConfig.testing,
       // TODO add workspaces paths like we do in format-lint
       paths: [
         // TODO remove gitignorePaths
@@ -336,7 +342,7 @@ export default class PobMonorepoGenerator extends Generator {
         ...rootIgnorePaths,
       ].join("\n"),
       // todo: fix this using workspaces
-      // buildDirectory: this.pobLernaConfig.typescript ? `/*/build` : "",
+      // buildDirectory: this.pobMonorepoConfig.typescript ? `/*/build` : "",
     });
 
     this.composeWith("pob:common:remove-old-dependencies");
@@ -345,20 +351,20 @@ export default class PobMonorepoGenerator extends Generator {
       enable: true,
       packageManager: this.options.packageManager,
       enablePublish: !this.options.isAppProject,
-      withBabel: this.pobLernaConfig.typescript,
+      withBabel: this.pobMonorepoConfig.typescript,
       isMonorepo: true,
-      ci: this.pobLernaConfig.ci,
+      ci: this.pobMonorepoConfig.ci,
       disableYarnGitCache: this.options.disableYarnGitCache,
       updateOnly: this.options.updateOnly,
     });
 
     this.composeWith("pob:monorepo:typescript", {
-      enable: this.pobLernaConfig.typescript,
-      checkOnly: this.pobLernaConfig.typescript === "check-only",
+      enable: this.pobMonorepoConfig.typescript,
+      checkOnly: this.pobMonorepoConfig.typescript === "check-only",
       isAppProject: this.options.isAppProject,
       packageNames: JSON.stringify(packageNames),
       packagePaths: JSON.stringify(packagePaths),
-      testRunner: this.pobLernaConfig.testRunner,
+      testRunner: this.pobMonorepoConfig.testRunner,
       onlyLatestLTS: this.options.onlyLatestLTS,
       packageManager: this.options.packageManager,
     });

package/lib/utils/packageManagerUtils.js

@@ -1,16 +1,18 @@
 import { quoteArg } from "./execUtils.js";
 
-export const packageManagerRun = (packageManager, script) => {
+export const packageManagerRun = (packageManager, script, packagePath) => {
+  const packagePathArg =
+    packagePath === "." || packagePath === true ? "" : packagePath;
   switch (packageManager) {
     case undefined:
     case "yarn":
-      return `yarn run ${script}`;
+      return `yarn${packagePathArg ? ` ${packagePathArg}` : ""} run ${script}`;
     case "npm":
-      return `npm run ${script}`;
+      return `npm run${packagePathArg ? ` --prefix ${packagePathArg}` : ""} ${script}`;
     case "bun":
-      return `bun run ${script}`;
+      return `bun run${packagePathArg ? ` --cwd ${packagePathArg}` : ""} ${script}`;
     case "pnpm":
-      return `pnpm run ${script}`;
+      return `pnpm${packagePathArg ? ` --dir ${packagePathArg}` : ""} run ${script}`;
     default:
       throw new Error(`Unsupported package manager: ${packageManager}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "37.0.0",
+  "version": "38.1.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/vitest",
   "keywords": [
     "skeleton"
@@ -30,7 +30,7 @@
   "dependencies": {
     "@types/inquirer": "9.0.10",
     "@yeoman/adapter": "4.0.2",
-    "eslint": "10.7.0",
+    "eslint": "10.8.0",
     "findup-sync": "^5.0.0",
     "git-remote-url": "^1.0.1",
     "github-username": "^9.0.0",
@@ -48,17 +48,17 @@
     "validate-npm-package-name": "^8.0.0",
     "yeoman-environment": "6.1.0",
     "yeoman-generator": "8.2.2",
-    "@pob/eslint-config": "66.0.0",
-    "@pob/eslint-config-typescript-react": "66.0.0",
-    "@pob/sort-pkg": "13.1.2",
+    "@pob/eslint-config": "67.1.0",
+    "@pob/eslint-config-typescript-react": "67.1.0",
     "@pob/sort-object": "11.1.1",
-    "pob-dependencies": "26.0.0"
+    "pob-dependencies": "27.1.0",
+    "@pob/sort-pkg": "13.1.2"
   },
   "devDependencies": {
     "@types/node": "24.13.3",
     "@typescript/native": "npm:typescript@7.0.2",
     "@yeoman/types": "1.11.1",
-    "@pob/root": "26.0.0"
+    "@pob/root": "27.1.0"
   },
   "engines": {
     "node": ">=22.18.0"