pob 22.1.1 → 22.3.0

package/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [22.3.0](https://github.com/christophehurpeau/pob/compare/pob@22.2.0...pob@22.3.0) (2024-07-30)
+
+### Features
+
+* **deps:** update @pob/eslint-config to v56.1.0 ([#2149](https://github.com/christophehurpeau/pob/issues/2149)) ([061b9d7](https://github.com/christophehurpeau/pob/commit/061b9d7d43bc1826e1d7fdbebd0c812f37d2c91b))
+* **pob:** move more stuff from commonbabel to commontranspiler ([fad5d29](https://github.com/christophehurpeau/pob/commit/fad5d2902ea91370af3a4218b0624c34e691bad3))
+
+### Bug Fixes
+
+* **pob:** fix template ([035eff7](https://github.com/christophehurpeau/pob/commit/035eff78368cca1e3c60be4ddf44b16eae8b28c2))
+
+Version bump for dependency: yarn-workspace-utils
+Version bump for dependency: @pob/root
+
+
+## [22.2.0](https://github.com/christophehurpeau/pob/compare/pob@22.1.1...pob@22.2.0) (2024-07-27)
+
+### Features
+
+* **deps:** update dependency yeoman-generator to v7.3.0 ([#2098](https://github.com/christophehurpeau/pob/issues/2098)) ([5e2295b](https://github.com/christophehurpeau/pob/commit/5e2295b2e983752f7eaf42c22d30cced22c5fce6))
+* **deps:** update yarn monorepo ([#2087](https://github.com/christophehurpeau/pob/issues/2087)) ([fa9d77b](https://github.com/christophehurpeau/pob/commit/fa9d77bf2cfe11d736d288362ad5df9255533e65))
+
+### Bug Fixes
+
+* **deps:** update dependency prettier to v3.3.2 ([#2089](https://github.com/christophehurpeau/pob/issues/2089)) ([cc20ddd](https://github.com/christophehurpeau/pob/commit/cc20ddd10f743f57b0f13e3630b2945cdb1104a9))
+* **deps:** update dependency prettier to v3.3.3 ([#2140](https://github.com/christophehurpeau/pob/issues/2140)) ([c44959e](https://github.com/christophehurpeau/pob/commit/c44959ed852e087419bf5b61f9460e6a3e02b789))
+* **deps:** update dependency semver to v7.6.3 ([#2141](https://github.com/christophehurpeau/pob/issues/2141)) ([047d95c](https://github.com/christophehurpeau/pob/commit/047d95c38ce1e5b267be78579400620b99c7de64))
+* **deps:** update dependency yeoman-generator to v7.3.1 ([#2099](https://github.com/christophehurpeau/pob/issues/2099)) ([a632c39](https://github.com/christophehurpeau/pob/commit/a632c39899b44a4222e9e48fe1f5c1b038b60824))
+* **deps:** update dependency yeoman-generator to v7.3.2 ([#2118](https://github.com/christophehurpeau/pob/issues/2118)) ([f385316](https://github.com/christophehurpeau/pob/commit/f3853160b128a36843e14ef63a3d8d58d53dd08a))
+* **deps:** update yarn monorepo ([#2111](https://github.com/christophehurpeau/pob/issues/2111)) ([7abc59d](https://github.com/christophehurpeau/pob/commit/7abc59d18cf9f3ea2ca9b763be4d4c9477253bcb))
+
+Version bump for dependency: @pob/sort-pkg
+Version bump for dependency: yarn-workspace-utils
+Version bump for dependency: @pob/root
+
+
 ## [22.1.1](https://github.com/christophehurpeau/pob/compare/pob@22.1.0...pob@22.1.1) (2024-06-08)
 
 Version bump for dependency: @pob/root

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

@@ -1,4 +1,3 @@
-import semver from "semver";
 import Generator from "yeoman-generator";
 import * as packageUtils from "../../../utils/package.js";
 import { copyAndFormatTpl } from "../../../utils/writeAndFormat.js";
@@ -220,18 +219,6 @@ export default class CommonBabelGenerator extends Generator {
       babelConfig.browserVersions = ["supported"];
     }
 
-    if (hasInitialPkgPob && pkg.main && !pkg.exports) {
-      const result = await this.prompt({
-        type: "confirm",
-        name: "setupExports",
-        message: 'Setup package.json "exports" field based on "main" ?',
-      });
-
-      if (result.setupExports) {
-        pkg.exports = pkg.main;
-      }
-    }
-
     const newBabelEnvs = [
       ...(babelConfig.nodeVersions || []).map((version) => ({
         target: "node",
@@ -260,7 +247,6 @@ export default class CommonBabelGenerator extends Generator {
       })),
     ];
 
-    delete pkg.pob.withReact;
     if (newBabelEnvs.length === 0) {
       if (!pkg.pob.bundler || pkg.pob.bundler === "rollup-babel") {
         delete pkg.pob.envs;
@@ -319,10 +305,6 @@ export default class CommonBabelGenerator extends Generator {
   default() {
     const pkg = this.fs.readJSON(this.destinationPath("package.json"));
     const useBabel = this.babelEnvs && this.babelEnvs.length > 0;
-    const useTypescript = useBabel || pkg.pob?.typescript;
-    const hasTargetNode = useBabel
-      ? this.babelEnvs.find((env) => env.target === "node")
-      : useTypescript; // todo pkg.pob.typescriptTargets
     const hasTargetBrowser = this.babelEnvs.find(
       (env) => env.target === "browser",
     );
@@ -370,57 +352,6 @@ export default class CommonBabelGenerator extends Generator {
       ["@babel/preset-env"],
     );
 
-    /* engines */
-
-    if (hasTargetNode) {
-      if (!pkg.engines) pkg.engines = {};
-      const minNodeVersion = useBabel
-        ? Math.min(
-            ...this.babelEnvs
-              .filter((env) => env.target === "node")
-              .map((env) => env.version),
-          )
-        : // eslint-disable-next-line unicorn/no-unreadable-iife
-          (() => (this.options.onlyLatestLTS ? "20" : "18"))();
-      switch (String(minNodeVersion)) {
-        case "10":
-        case "12":
-        case "14":
-        case "16":
-        case "18":
-          pkg.engines.node = ">=18.12.0";
-          break;
-        case "20":
-          pkg.engines.node = ">=20.9.0";
-          break;
-        default:
-          throw new Error(`Invalid min node version: ${minNodeVersion}`);
-      }
-
-      if (pkg.dependencies && pkg.dependencies["@types/node"]) {
-        pkg.dependencies["@types/node"] = `>=${minNodeVersion}.0.0`;
-      }
-      if (
-        pkg.devDependencies &&
-        pkg.devDependencies["@types/node"] &&
-        !semver.satisfies(
-          pkg.devDependencies["@types/node"],
-          `>=${minNodeVersion}.0.0`,
-        )
-      ) {
-        pkg.devDependencies["@types/node"] = `>=${minNodeVersion}.0.0`;
-      }
-    } else {
-      packageUtils.removeDependencies(pkg, ["@types/node"]);
-      packageUtils.removeDevDependencies(pkg, ["@types/node"]);
-      // Supports oldest current or active LTS version of node
-      if (this.options.onlyLatestLTS) {
-        pkg.engines.node = ">=20.9.0";
-      } else {
-        pkg.engines.node = ">=18.12.0";
-      }
-    }
-
     /* browserslist */
 
     if (hasTargetBrowser) {

package/lib/generators/common/husky/templates/lint-staged.config.cjs.txt

@@ -1,5 +1,5 @@
-'use strict';
+"use strict";
 
-const createLintStagedConfig = require('@pob/root/createLintStagedConfig.cjs');
+const createLintStagedConfig = require("@pob/root/createLintStagedConfig.cjs");
 
 module.exports = createLintStagedConfig();

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

@@ -178,7 +178,7 @@ export default class CommonTestingGenerator extends Generator {
     let hasReact =
       withTypescript &&
       (this.options.monorepo
-        ? yoConfigPobMonorepo.react ?? packageUtils.hasReact(pkg)
+        ? (yoConfigPobMonorepo.react ?? packageUtils.hasReact(pkg))
         : packageUtils.hasReact(pkg));
     const testRunner = globalTesting
       ? inMonorepo.pobConfig.monorepo.testRunner || "jest"

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

@@ -136,8 +136,8 @@ export default class CommonTranspilerGenerator extends Generator {
       withTypescript &&
       (pkg.pob.rollup === false
         ? "tsc"
-        : pkg.pob.bundler ??
-          (pkg.pob.typescript ? "rollup-typescript" : "rollup-babel"));
+        : (pkg.pob.bundler ??
+          (pkg.pob.typescript ? "rollup-typescript" : "rollup-babel")));
     this.bundler = bundler;
 
     const cleanCommand = (() => {
@@ -302,13 +302,6 @@ export default class CommonTranspilerGenerator extends Generator {
           pkg.types = "./lib/index.d.ts";
         }
       }
-      if (!pkg.engines) pkg.engines = {};
-      if (
-        !pkg.engines.node ||
-        semver.lt(semver.minVersion(pkg.engines.node), "18.0.0")
-      ) {
-        pkg.engines.node = ">=18.0.0";
-      }
     }
 
     delete pkg["browser-dev"];
@@ -518,6 +511,64 @@ export default class CommonTranspilerGenerator extends Generator {
     const pkg = this.fs.readJSON(this.destinationPath("package.json"));
     const entries = pkg.pob.entries || ["index"];
     const envs = pkg.pob.envs || pkg.pob.babelEnvs;
+    delete pkg.pob.withReact;
+
+    const hasTargetNode = envs && envs.some((env) => env.target === "node");
+
+    if (!pkg.engines) pkg.engines = {};
+
+    if (hasTargetNode || !envs) {
+      const minNodeVersion = envs
+        ? Math.min(
+            ...envs
+              .filter((env) => env.target === "node")
+              .map((env) => env.version),
+          )
+        : // eslint-disable-next-line unicorn/no-unreadable-iife
+          (() => (this.options.onlyLatestLTS ? "20" : "18"))();
+
+      switch (String(minNodeVersion)) {
+        case "10":
+        case "12":
+        case "14":
+        case "16":
+        case "18":
+          pkg.engines.node = ">=18.12.0";
+          break;
+        case "20":
+          pkg.engines.node = ">=20.9.0";
+          break;
+        default:
+          throw new Error(`Invalid min node version: ${minNodeVersion}`);
+      }
+
+      if (pkg.dependencies && pkg.dependencies["@types/node"]) {
+        pkg.dependencies["@types/node"] = `>=${minNodeVersion}.0.0`;
+      }
+      if (
+        pkg.devDependencies &&
+        pkg.devDependencies["@types/node"] &&
+        !semver.satisfies(
+          pkg.devDependencies["@types/node"],
+          `>=${minNodeVersion}.0.0`,
+        )
+      ) {
+        pkg.devDependencies["@types/node"] = `>=${minNodeVersion}.0.0`;
+      }
+    } else {
+      packageUtils.removeDependencies(pkg, ["@types/node"]);
+      packageUtils.removeDevDependencies(pkg, ["@types/node"]);
+
+      // Supports oldest current or active LTS version of node
+      const minVersion = this.options.onlyLatestLTS ? "20.9.0" : "18.12.0";
+
+      if (
+        !pkg.engines.node ||
+        semver.lt(semver.minVersion(pkg.engines.node), minVersion)
+      ) {
+        pkg.engines.node = `>=${minVersion}`;
+      }
+    }
 
     this.fs.delete("rollup.config.js");
     if (

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

@@ -66,6 +66,18 @@ export default class CorePackageGenerator extends Generator {
       delete pkg.packageManager;
     }
 
+    if (pkg.pob && pkg.main && !pkg.exports) {
+      const result = await this.prompt({
+        type: "confirm",
+        name: "setupExports",
+        message: 'Setup package.json "exports" field based on "main" ?',
+      });
+
+      if (result.setupExports) {
+        pkg.exports = pkg.main;
+      }
+    }
+
     if (!this.options.updateOnly) {
       if (this.options.isMonorepo && this.options.isRoot) {
         pkg.private = true;

package/lib/generators/monorepo/PobMonorepoGenerator.js

@@ -322,6 +322,13 @@ export default class PobMonorepoGenerator extends Generator {
   writing() {
     if (!this.options.isAppProject) {
       const pkg = this.fs.readJSON(this.destinationPath("package.json"), {});
+      const rollupKinds = new Set();
+
+      this.packages.forEach((pkg) => {
+        if (pkg.pob?.bundler && pkg.pob.bundler.startsWith("rollup-")) {
+          rollupKinds.add(pkg.pob.bundler.slice("rollup-".length));
+        }
+      });
 
       const rollupConfigs = [];
       this.packageLocations.forEach((location) => {
@@ -351,10 +358,12 @@ export default class PobMonorepoGenerator extends Generator {
         build: "yarn clean:build && rollup --config rollup.config.mjs",
         watch: "yarn clean:build && rollup --config rollup.config.mjs --watch",
       });
-      packageUtils.addOrRemoveDevDependencies(pkg, rollupConfigs.length, [
-        "@babel/core",
-        "pob-babel",
-      ]);
+      packageUtils.addOrRemoveDevDependencies(
+        pkg,
+        rollupConfigs.length > 0 &&
+          (rollupKinds.size === 0 || rollupKinds.has("babel")),
+        ["@babel/core", "pob-babel"],
+      );
       this.fs.writeJSON(this.destinationPath("package.json"), pkg);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "22.1.1",
+  "version": "22.3.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/jest",
   "keywords": [
     "skeleton"
@@ -40,16 +40,16 @@
   "pob": {},
   "prettier": "@pob/root/prettier-config",
   "dependencies": {
-    "@pob/eslint-config": "56.0.0",
-    "@pob/eslint-config-typescript": "56.0.0",
-    "@pob/eslint-config-typescript-react": "56.0.0",
+    "@pob/eslint-config": "56.1.0",
+    "@pob/eslint-config-typescript": "56.1.0",
+    "@pob/eslint-config-typescript-react": "56.1.0",
     "@pob/sort-eslint-config": "5.3.1",
     "@pob/sort-object": "6.3.1",
-    "@pob/sort-pkg": "7.2.0",
+    "@pob/sort-pkg": "7.3.0",
     "@prettier/sync": "0.5.2",
     "@types/inquirer": "9.0.7",
-    "@yarnpkg/cli": "4.2.2",
-    "@yarnpkg/core": "4.0.5",
+    "@yarnpkg/cli": "4.3.1",
+    "@yarnpkg/core": "4.1.1",
     "@yarnpkg/fslib": "3.1.0",
     "@yeoman/types": "1.2.0",
     "eslint": "8.57.0",
@@ -64,17 +64,17 @@
     "mem-fs-editor": "11.0.1",
     "minimist": "1.2.8",
     "parse-author": "2.0.0",
-    "pob-dependencies": "13.1.0",
-    "prettier": "3.3.1",
-    "semver": "7.6.2",
+    "pob-dependencies": "13.3.0",
+    "prettier": "3.3.3",
+    "semver": "7.6.3",
     "validate-npm-package-name": "^5.0.0",
-    "yarn-workspace-utils": "5.0.0",
+    "yarn-workspace-utils": "5.1.1",
     "yeoman-environment": "4.4.1",
-    "yeoman-generator": "7.2.0"
+    "yeoman-generator": "7.3.2"
   },
   "devDependencies": {
-    "@pob/root": "12.1.1",
-    "@types/node": "20.14.2",
-    "typescript": "5.4.5"
+    "@pob/root": "12.2.1",
+    "@types/node": "20.14.13",
+    "typescript": "5.5.4"
   }
 }