pob 40.5.1 → 40.7.0

package/lib/utils/nodeEngines.js

@@ -3,13 +3,19 @@ import semver from "semver";
 import { latestLTS, maintenanceLTS } from "./nodeVersions.js";
 import * as packageUtils from "./package.js";
 
-// 22.18.0 is the version with strip typescript out of experimental status
-const minVersionForMajor = new Map([
-  ["22", "22.18.0"],
-  ["24", "24.14.1"],
-  ["26", "26.0.0"],
+// 22.18.0 is the version with strip typescript out of experimental status.
+// 22 skips node 23: features backported to 22 are experimental there.
+const enginesNodeForMajor = new Map([
+  ["22", "^22.18.0 || >=24.14.1"],
+  ["24", ">=24.14.1"],
+  ["26", ">=26.0.0"],
 ]);
 
+const minVersionForMajor = (major) => {
+  const enginesNode = enginesNodeForMajor.get(major);
+  return enginesNode && semver.minVersion(enginesNode).version;
+};
+
 const legacyMajors = ["4", "6", "8", "10", "12", "14", "16", "18", "20"];
 
 /**
@@ -61,7 +67,7 @@ export const resolveEnginesNode = (
   const major = legacyMajors.includes(String(minNodeMajor))
     ? maintenanceLTS
     : String(minNodeMajor);
-  const minVersion = minVersionForMajor.get(major);
+  const minVersion = minVersionForMajor(major);
   if (!minVersion) {
     throw new Error(`Invalid min node version: ${minNodeMajor}`);
   }
@@ -75,7 +81,7 @@ export const resolveEnginesNode = (
     return currentEnginesNode;
   }
 
-  return `>=${minVersion}`;
+  return enginesNodeForMajor.get(major);
 };
 
 /**
@@ -129,15 +135,18 @@ export const updateNodeEngines = (pkg, { onlyLatestLTS } = {}) => {
     packageUtils.removeDevDependencies(pkg, ["@types/node"]);
 
     // Supports oldest current or active LTS version of node
-    const minVersion = minVersionForMajor.get(
+    const enginesNode = enginesNodeForMajor.get(
       onlyLatestLTS ? latestLTS : maintenanceLTS,
     );
 
     if (
       !pkg.engines.node ||
-      semver.lt(semver.minVersion(pkg.engines.node), minVersion)
+      semver.lte(
+        semver.minVersion(pkg.engines.node),
+        semver.minVersion(enginesNode),
+      )
     ) {
-      pkg.engines.node = `>=${minVersion}`;
+      pkg.engines.node = enginesNode;
     }
   }
 };

package/lib/utils/nodeEngines.test.js

@@ -6,6 +6,8 @@ import {
   updateTypesNodeFromEngines,
 } from "./nodeEngines.js";
 
+const NODE_22 = "^22.18.0 || >=24.14.1";
+
 describe("updateTypesNodeFromEngines", () => {
   it("keeps pinned devDependencies pinned when lower than engines min major", () => {
     const pkg = {
@@ -97,8 +99,8 @@ describe("updateTypesNodeFromEngines", () => {
 
 describe("resolveEnginesNode", () => {
   it.each([
-    ["18", ">=22.18.0"],
-    ["22", ">=22.18.0"],
+    ["18", NODE_22],
+    ["22", NODE_22],
     ["24", ">=24.14.1"],
     ["26", ">=26.0.0"],
   ])("resolves min major %s from envs", (minMajor, expected) => {
@@ -112,11 +114,11 @@ describe("resolveEnginesNode", () => {
   });
 
   it("migrates >=22.11.x", () => {
-    expect(resolveEnginesNode(">=22.11.0", "22", false)).toBe(">=22.18.0");
+    expect(resolveEnginesNode(">=22.11.0", "22", false)).toBe(NODE_22);
   });
 
   it("raises a lower engines.node without envs", () => {
-    expect(resolveEnginesNode(">=18.0.0", "22", false)).toBe(">=22.18.0");
+    expect(resolveEnginesNode(">=18.0.0", "22", false)).toBe(NODE_22);
   });
 
   it("keeps a higher engines.node without envs", () => {
@@ -124,7 +126,7 @@ describe("resolveEnginesNode", () => {
   });
 
   it("lets envs lower engines.node", () => {
-    expect(resolveEnginesNode(">=24.14.1", "22", true)).toBe(">=22.18.0");
+    expect(resolveEnginesNode(">=24.14.1", "22", true)).toBe(NODE_22);
   });
 
   it.each([true, false])(
@@ -161,7 +163,7 @@ describe("updateNodeEngines", () => {
   it("uses the maintenance LTS without envs", () => {
     const pkg = {};
     updateNodeEngines(pkg, {});
-    expect(pkg.engines.node).toBe(">=22.18.0");
+    expect(pkg.engines.node).toBe(NODE_22);
   });
 
   it("uses the latest LTS without envs when onlyLatestLTS", () => {
@@ -179,7 +181,16 @@ describe("updateNodeEngines", () => {
     updateNodeEngines(pkg, {});
     expect(pkg.dependencies).toBeUndefined();
     expect(pkg.devDependencies["@types/node"]).toBeUndefined();
-    expect(pkg.engines.node).toBe(">=22.18.0");
+    expect(pkg.engines.node).toBe(NODE_22);
+  });
+
+  it("migrates >=22.18.0 when there is no node target", () => {
+    const pkg = {
+      pob: { envs: [{ target: "browser" }] },
+      engines: { node: ">=22.18.0" },
+    };
+    updateNodeEngines(pkg, {});
+    expect(pkg.engines.node).toBe(NODE_22);
   });
 
   it("keeps a higher engines.node when there is no node target", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pob",
-  "version": "40.5.1",
+  "version": "40.7.0",
   "description": "Pile of bones, library generator with git/babel/typescript/typedoc/readme/vitest",
   "keywords": [
     "skeleton"
@@ -32,11 +32,10 @@
   },
   "dependencies": {
     "@pob/codemods": "0.18.2",
-    "@pob/eslint-config": "68.2.0",
-    "@pob/eslint-config-typescript-react": "68.2.0",
-    "@pob/sort-object": "11.2.0",
-    "@pob/sort-pkg": "13.2.0",
-    "@types/inquirer": "9.0.10",
+    "@pob/eslint-config": "68.3.0",
+    "@pob/eslint-config-typescript-react": "68.4.0",
+    "@pob/sort-object": "11.3.0",
+    "@pob/sort-pkg": "13.3.0",
     "@yeoman/adapter": "4.0.3",
     "eslint": "10.14.0",
     "findup-sync": "^5.0.0",
@@ -49,9 +48,9 @@
     "mem-fs": "4.1.5",
     "mem-fs-editor": "12.1.0",
     "minimist": "1.2.8",
-    "oxfmt": "0.72.0",
+    "oxfmt": "0.75.0",
     "parse-author": "2.0.0",
-    "pob-dependencies": "28.4.0",
+    "pob-dependencies": "28.6.0",
     "semver": "7.8.5",
     "typescript": "npm:@typescript/typescript6@6.0.2",
     "validate-npm-package-name": "^8.0.0",
@@ -59,7 +58,7 @@
     "yeoman-generator": "10.3.0"
   },
   "devDependencies": {
-    "@pob/root": "28.4.0",
+    "@pob/root": "28.6.0",
     "@types/node": "24.19.1",
     "@typescript/native": "npm:typescript@7.0.2",
     "@yeoman/types": "1.13.1",