skuba 10.0.0-node-22-20250213082332 → 10.0.0-node-22-20250218222641

package/lib/cli/lint/internalLints/upgrade/patches/{10.0.0 → 9.1.0}/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/10.0.0/index.ts"],
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/9.1.0/index.ts"],
   "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryUpgradeNode } from './upgradeNode';\n\nexport const patches: Patches = [\n  {\n    apply: tryUpgradeNode,\n    description: 'Upgrade Node.js to version 22',\n  },\n];\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAA+B;AAExB,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
   "names": []

package/lib/cli/lint/internalLints/upgrade/patches/{10.0.0 → 9.1.0}/upgradeNode.js

@@ -36,7 +36,11 @@ const upgradeNode = async ({
   if (mode === "lint") {
     return { result: "apply" };
   }
-  await (0, import_nodeVersion.nodeVersionMigration)({ nodeVersion: 22, ECMAScriptVersion: "ES2024" });
+  await (0, import_nodeVersion.nodeVersionMigration)({
+    nodeVersion: 22,
+    ECMAScriptVersion: "ES2024",
+    defaultNodeTypesVersion: "22.9.0"
+  });
   return { result: "apply" };
 };
 const tryUpgradeNode = async (config) => {

package/lib/cli/lint/internalLints/upgrade/patches/{10.0.0 → 9.1.0}/upgradeNode.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
-  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/10.0.0/upgradeNode.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { nodeVersionMigration } from '../../../../../migrate/nodeVersion';\n\nconst upgradeNode: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  if (process.env.SKIP_NODE_UPGRADE) {\n    return {\n      result: 'skip',\n      reason: 'SKIP_NODE_UPGRADE environment variable set',\n    };\n  }\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await nodeVersionMigration({ nodeVersion: 22, ECMAScriptVersion: 'ES2024' });\n\n  return { result: 'apply' };\n};\n\nexport const tryUpgradeNode: PatchFunction = async (config) => {\n  try {\n    return await upgradeNode(config);\n  } catch (err) {\n    log.warn('Failed to upgrade node version');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAGxB,qBAAoB;AACpB,yBAAqC;AAErC,MAAM,cAA6B,OAAO;AAAA,EACxC;AACF,MAAgC;AAC9B,MAAI,QAAQ,IAAI,mBAAmB;AACjC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AACA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,YAAM,yCAAqB,EAAE,aAAa,IAAI,mBAAmB,SAAS,CAAC;AAE3E,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,iBAAgC,OAAO,WAAW;AAC7D,MAAI;AACF,WAAO,MAAM,YAAY,MAAM;AAAA,EACjC,SAAS,KAAK;AACZ,uBAAI,KAAK,gCAAgC;AACzC,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/9.1.0/upgradeNode.ts"],
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { nodeVersionMigration } from '../../../../../migrate/nodeVersion';\n\nconst upgradeNode: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  if (process.env.SKIP_NODE_UPGRADE) {\n    return {\n      result: 'skip',\n      reason: 'SKIP_NODE_UPGRADE environment variable set',\n    };\n  }\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await nodeVersionMigration({\n    nodeVersion: 22,\n    ECMAScriptVersion: 'ES2024',\n    defaultNodeTypesVersion: '22.9.0',\n  });\n\n  return { result: 'apply' };\n};\n\nexport const tryUpgradeNode: PatchFunction = async (config) => {\n  try {\n    return await upgradeNode(config);\n  } catch (err) {\n    log.warn('Failed to upgrade node version');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAGxB,qBAAoB;AACpB,yBAAqC;AAErC,MAAM,cAA6B,OAAO;AAAA,EACxC;AACF,MAAgC;AAC9B,MAAI,QAAQ,IAAI,mBAAmB;AACjC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AACA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,YAAM,yCAAqB;AAAA,IACzB,aAAa;AAAA,IACb,mBAAmB;AAAA,IACnB,yBAAyB;AAAA,EAC3B,CAAC;AAED,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,iBAAgC,OAAO,WAAW;AAC7D,MAAI;AACF,WAAO,MAAM,YAAY,MAAM;AAAA,EACjC,SAAS,KAAK;AACZ,uBAAI,KAAK,gCAAgC;AACzC,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": []
 }

package/lib/cli/migrate/index.js

@@ -24,8 +24,16 @@ module.exports = __toCommonJS(migrate_exports);
 var import_logging = require("../../utils/logging");
 var import_nodeVersion = require("./nodeVersion");
 const migrations = {
-  node20: () => (0, import_nodeVersion.nodeVersionMigration)({ nodeVersion: 20, ECMAScriptVersion: "ES2023" }),
-  node22: () => (0, import_nodeVersion.nodeVersionMigration)({ nodeVersion: 22, ECMAScriptVersion: "ES2024" })
+  node20: () => (0, import_nodeVersion.nodeVersionMigration)({
+    nodeVersion: 20,
+    ECMAScriptVersion: "ES2023",
+    defaultNodeTypesVersion: "20.14.8"
+  }),
+  node22: () => (0, import_nodeVersion.nodeVersionMigration)({
+    nodeVersion: 22,
+    ECMAScriptVersion: "ES2024",
+    defaultNodeTypesVersion: "22.9.0"
+  })
 };
 const logAvailableMigrations = () => {
   import_logging.log.ok("Available migrations:");

package/lib/cli/migrate/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/migrate/index.ts"],
-  "sourcesContent": ["import { log } from '../../utils/logging';\n\nimport { nodeVersionMigration } from './nodeVersion';\n\nconst migrations: Record<string, () => Promise<void>> = {\n  node20: () =>\n    nodeVersionMigration({ nodeVersion: 20, ECMAScriptVersion: 'ES2023' }),\n  node22: () =>\n    nodeVersionMigration({ nodeVersion: 22, ECMAScriptVersion: 'ES2024' }),\n};\n\nconst logAvailableMigrations = () => {\n  log.ok('Available migrations:');\n  Object.keys(migrations).forEach((migration) => {\n    log.ok(`- ${migration}`);\n  });\n};\n\nexport const migrate = async (args = process.argv.slice(2)) => {\n  if (!args[0]) {\n    log.err('Provide a migration to run.');\n    logAvailableMigrations();\n    process.exitCode = 1;\n    return;\n  }\n\n  if (args.includes('--help') || args.includes('-h') || args[0] === 'help') {\n    logAvailableMigrations();\n    return;\n  }\n\n  const migration = migrations[args[0]];\n\n  if (!migration) {\n    log.err(`Migration \"${args[0]}\" is not a valid option.`);\n    logAvailableMigrations();\n    process.exitCode = 1;\n    return;\n  }\n\n  await migration();\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAoB;AAEpB,yBAAqC;AAErC,MAAM,aAAkD;AAAA,EACtD,QAAQ,UACN,yCAAqB,EAAE,aAAa,IAAI,mBAAmB,SAAS,CAAC;AAAA,EACvE,QAAQ,UACN,yCAAqB,EAAE,aAAa,IAAI,mBAAmB,SAAS,CAAC;AACzE;AAEA,MAAM,yBAAyB,MAAM;AACnC,qBAAI,GAAG,uBAAuB;AAC9B,SAAO,KAAK,UAAU,EAAE,QAAQ,CAAC,cAAc;AAC7C,uBAAI,GAAG,KAAK,SAAS,EAAE;AAAA,EACzB,CAAC;AACH;AAEO,MAAM,UAAU,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AAC7D,MAAI,CAAC,KAAK,CAAC,GAAG;AACZ,uBAAI,IAAI,6BAA6B;AACrC,2BAAuB;AACvB,YAAQ,WAAW;AACnB;AAAA,EACF;AAEA,MAAI,KAAK,SAAS,QAAQ,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,CAAC,MAAM,QAAQ;AACxE,2BAAuB;AACvB;AAAA,EACF;AAEA,QAAM,YAAY,WAAW,KAAK,CAAC,CAAC;AAEpC,MAAI,CAAC,WAAW;AACd,uBAAI,IAAI,cAAc,KAAK,CAAC,CAAC,0BAA0B;AACvD,2BAAuB;AACvB,YAAQ,WAAW;AACnB;AAAA,EACF;AAEA,QAAM,UAAU;AAClB;",
+  "sourcesContent": ["import { log } from '../../utils/logging';\n\nimport { nodeVersionMigration } from './nodeVersion';\n\nconst migrations: Record<string, () => Promise<void>> = {\n  node20: () =>\n    nodeVersionMigration({\n      nodeVersion: 20,\n      ECMAScriptVersion: 'ES2023',\n      defaultNodeTypesVersion: '20.14.8',\n    }),\n  node22: () =>\n    nodeVersionMigration({\n      nodeVersion: 22,\n      ECMAScriptVersion: 'ES2024',\n      defaultNodeTypesVersion: '22.9.0',\n    }),\n};\n\nconst logAvailableMigrations = () => {\n  log.ok('Available migrations:');\n  Object.keys(migrations).forEach((migration) => {\n    log.ok(`- ${migration}`);\n  });\n};\n\nexport const migrate = async (args = process.argv.slice(2)) => {\n  if (!args[0]) {\n    log.err('Provide a migration to run.');\n    logAvailableMigrations();\n    process.exitCode = 1;\n    return;\n  }\n\n  if (args.includes('--help') || args.includes('-h') || args[0] === 'help') {\n    logAvailableMigrations();\n    return;\n  }\n\n  const migration = migrations[args[0]];\n\n  if (!migration) {\n    log.err(`Migration \"${args[0]}\" is not a valid option.`);\n    logAvailableMigrations();\n    process.exitCode = 1;\n    return;\n  }\n\n  await migration();\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAoB;AAEpB,yBAAqC;AAErC,MAAM,aAAkD;AAAA,EACtD,QAAQ,UACN,yCAAqB;AAAA,IACnB,aAAa;AAAA,IACb,mBAAmB;AAAA,IACnB,yBAAyB;AAAA,EAC3B,CAAC;AAAA,EACH,QAAQ,UACN,yCAAqB;AAAA,IACnB,aAAa;AAAA,IACb,mBAAmB;AAAA,IACnB,yBAAyB;AAAA,EAC3B,CAAC;AACL;AAEA,MAAM,yBAAyB,MAAM;AACnC,qBAAI,GAAG,uBAAuB;AAC9B,SAAO,KAAK,UAAU,EAAE,QAAQ,CAAC,cAAc;AAC7C,uBAAI,GAAG,KAAK,SAAS,EAAE;AAAA,EACzB,CAAC;AACH;AAEO,MAAM,UAAU,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AAC7D,MAAI,CAAC,KAAK,CAAC,GAAG;AACZ,uBAAI,IAAI,6BAA6B;AACrC,2BAAuB;AACvB,YAAQ,WAAW;AACnB;AAAA,EACF;AAEA,MAAI,KAAK,SAAS,QAAQ,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,CAAC,MAAM,QAAQ;AACxE,2BAAuB;AACvB;AAAA,EACF;AAEA,QAAM,YAAY,WAAW,KAAK,CAAC,CAAC;AAEpC,MAAI,CAAC,WAAW;AACd,uBAAI,IAAI,cAAc,KAAK,CAAC,CAAC,0BAA0B;AACvD,2BAAuB;AACvB,YAAQ,WAAW;AACnB;AAAA,EACF;AAEA,QAAM,UAAU;AAClB;",
   "names": []
 }

package/lib/cli/migrate/nodeVersion/getNodeTypesVersion.d.ts

@@ -0,0 +1,6 @@
+type VersionResult = {
+    version: string;
+    err?: string;
+};
+export declare const getNodeTypesVersion: (major: number, defaultVersion: string) => Promise<VersionResult>;
+export {};

package/lib/cli/migrate/nodeVersion/getNodeTypesVersion.js

@@ -0,0 +1,73 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var getNodeTypesVersion_exports = {};
+__export(getNodeTypesVersion_exports, {
+  getNodeTypesVersion: () => getNodeTypesVersion
+});
+module.exports = __toCommonJS(getNodeTypesVersion_exports);
+var import_npm_registry_fetch = __toESM(require("npm-registry-fetch"));
+var import_semver = require("semver");
+var import_zod = require("zod");
+const NpmFetchResponse = import_zod.z.record(
+  import_zod.z.string(),
+  import_zod.z.object({
+    name: import_zod.z.string(),
+    version: import_zod.z.string(),
+    deprecated: import_zod.z.string().optional()
+  })
+);
+const getNodeTypesVersion = async (major, defaultVersion) => {
+  try {
+    const response = await import_npm_registry_fetch.default.json("@types/node", {
+      headers: {
+        Accept: "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"
+      }
+    });
+    const parsedVersion = NpmFetchResponse.safeParse(response);
+    if (!parsedVersion.success) {
+      throw new Error("Failed to parse response");
+    }
+    const version = Object.values(parsedVersion.data).filter(
+      (v) => (0, import_semver.valid)(v.version) && (0, import_semver.satisfies)(v.version, `${major}.x.x`) && !v.deprecated
+    ).reduce((a, b) => (0, import_semver.gt)(a.version, b.version) ? a : b).version;
+    return {
+      version
+    };
+  } catch {
+    return {
+      version: defaultVersion,
+      err: "Failed to fetch latest version, using fallback version"
+    };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getNodeTypesVersion
+});
+//# sourceMappingURL=getNodeTypesVersion.js.map

package/lib/cli/migrate/nodeVersion/getNodeTypesVersion.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/migrate/nodeVersion/getNodeTypesVersion.ts"],
+  "sourcesContent": ["import npmFetch from 'npm-registry-fetch';\nimport { gt, satisfies, valid } from 'semver';\nimport { z } from 'zod';\n\ntype VersionResult = {\n  version: string;\n  err?: string;\n};\n\nconst NpmFetchResponse = z.record(\n  z.string(),\n  z.object({\n    name: z.string(),\n    version: z.string(),\n    deprecated: z.string().optional(),\n  }),\n);\n\nexport const getNodeTypesVersion = async (\n  major: number,\n  defaultVersion: string,\n): Promise<VersionResult> => {\n  try {\n    const response = await npmFetch.json('@types/node', {\n      headers: {\n        Accept:\n          'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*',\n      },\n    });\n\n    const parsedVersion = NpmFetchResponse.safeParse(response);\n    if (!parsedVersion.success) {\n      throw new Error('Failed to parse response');\n    }\n\n    const version = Object.values(parsedVersion.data)\n      .filter(\n        (v) =>\n          valid(v.version) &&\n          satisfies(v.version, `${major}.x.x`) &&\n          !v.deprecated,\n      )\n      .reduce((a, b) => (gt(a.version, b.version) ? a : b)).version;\n\n    return {\n      version,\n    };\n  } catch {\n    return {\n      version: defaultVersion,\n      err: 'Failed to fetch latest version, using fallback version',\n    };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAqB;AACrB,oBAAqC;AACrC,iBAAkB;AAOlB,MAAM,mBAAmB,aAAE;AAAA,EACzB,aAAE,OAAO;AAAA,EACT,aAAE,OAAO;AAAA,IACP,MAAM,aAAE,OAAO;AAAA,IACf,SAAS,aAAE,OAAO;AAAA,IAClB,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,EAClC,CAAC;AACH;AAEO,MAAM,sBAAsB,OACjC,OACA,mBAC2B;AAC3B,MAAI;AACF,UAAM,WAAW,MAAM,0BAAAA,QAAS,KAAK,eAAe;AAAA,MAClD,SAAS;AAAA,QACP,QACE;AAAA,MACJ;AAAA,IACF,CAAC;AAED,UAAM,gBAAgB,iBAAiB,UAAU,QAAQ;AACzD,QAAI,CAAC,cAAc,SAAS;AAC1B,YAAM,IAAI,MAAM,0BAA0B;AAAA,IAC5C;AAEA,UAAM,UAAU,OAAO,OAAO,cAAc,IAAI,EAC7C;AAAA,MACC,CAAC,UACC,qBAAM,EAAE,OAAO,SACf,yBAAU,EAAE,SAAS,GAAG,KAAK,MAAM,KACnC,CAAC,EAAE;AAAA,IACP,EACC,OAAO,CAAC,GAAG,UAAO,kBAAG,EAAE,SAAS,EAAE,OAAO,IAAI,IAAI,CAAE,EAAE;AAExD,WAAO;AAAA,MACL;AAAA,IACF;AAAA,EACF,QAAQ;AACN,WAAO;AAAA,MACL,SAAS;AAAA,MACT,KAAK;AAAA,IACP;AAAA,EACF;AACF;",
+  "names": ["npmFetch"]
+}

package/lib/cli/migrate/nodeVersion/index.d.ts

@@ -1,4 +1,5 @@
-export declare const nodeVersionMigration: ({ nodeVersion, ECMAScriptVersion, }: {
+export declare const nodeVersionMigration: ({ nodeVersion, ECMAScriptVersion, defaultNodeTypesVersion, }: {
     nodeVersion: number;
     ECMAScriptVersion: string;
+    defaultNodeTypesVersion: string;
 }, dir?: string) => Promise<void>;

package/lib/cli/migrate/nodeVersion/index.js

@@ -36,100 +36,91 @@ var import_fast_glob = require("fast-glob");
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_logging = require("../../../utils/logging");
 var import_project = require("../../configure/analysis/project");
-var import_getNode22TypesVersion = require("./getNode22TypesVersion");
+var import_getNodeTypesVersion = require("./getNodeTypesVersion");
 var import_packageJsonChecks = require("./packageJsonChecks");
-const DEFAULT_NODE_TYPES = "22.9.0";
-const SHA_REGEX = /(?<=node.*)(@sha256:[a-f0-9]{64})/gm;
-const subPatches = [
-  { id: "nvmrc", file: ".nvmrc", replace: "<%- version %>\n" },
+const subPatches = ({
+  nodeVersion,
+  nodeTypesVersion,
+  ECMAScriptVersion
+}) => [
+  { file: ".nvmrc", replace: `${nodeVersion}
+` },
   {
-    id: "Dockerfile-1",
     files: "**/Dockerfile*",
-    test: /^FROM(.*) (public.ecr.aws\/docker\/library\/)?node:[0-9.]+(@sha256:[a-f0-9]{64})?(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
-    replace: "FROM$1 $2node:<%- version %>$3$5$6"
+    regex: /^FROM(.*) (public.ecr.aws\/docker\/library\/)?node:([0-9]+(?:\.[0-9]+(?:\.[0-9]+)?)?)(-[a-z0-9]+)?(@sha256:[a-f0-9]{64})?( .*)?$/gm,
+    replace: `FROM$1 $2node:${nodeVersion}$4$6`
   },
   {
-    id: "Dockerfile-2",
     files: "**/Dockerfile*",
-    test: /^FROM(.*) gcr.io\/distroless\/nodejs\d+-debian(.+)$/gm,
-    replace: "FROM$1 gcr.io/distroless/nodejs<%- version %>-debian$2"
+    regex: /^FROM(.*) gcr.io\/distroless\/nodejs\d+-debian(\d+)(@sha256:[a-f0-9]{64})?(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
+    replace: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$2$4$5$6`
   },
   {
-    id: "serverless",
     files: "**/serverless*.y*ml",
-    test: /nodejs\d+.x/gm,
-    replace: "nodejs<%- version %>.x"
+    regex: /nodejs\d+.x/gm,
+    tests: [import_packageJsonChecks.isPatchableServerlessVersion],
+    replace: `nodejs${nodeVersion}.x`
   },
   [
     {
-      id: "cdk-1",
       files: "**/infra/**/*.ts",
-      test: /NODEJS_\d+_X/g,
-      replace: "NODEJS_<%- version %>_X"
+      regex: /NODEJS_\d+_X/g,
+      replace: `NODEJS_${nodeVersion}_X`
     },
     {
-      id: "cdk-2",
       files: "**/infra/**/*.ts",
-      test: /(target:\s*'node)(\d+)(.+)$/gm,
-      replace: "$1<%- version %>$3"
+      regex: /(target:\s*'node)(\d+)(.+)$/gm,
+      replace: `$1${nodeVersion}$3`
     }
   ],
   {
-    id: "buildkite",
     files: "**/.buildkite/*",
-    test: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
-    replace: "$1$2$3<%- version %>$5"
+    regex: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    replace: `$1$2$3${nodeVersion}$5`
   },
   {
-    id: "node-version",
     files: ".node-version*",
-    test: /(v)?\d+\.\d+\.\d+(.+)?/gm,
-    replace: "$1<%- version %>$2"
+    regex: /(v)?\d+\.\d+\.\d+(.+)?/gm,
+    replace: `$1${nodeVersion}$2`
   },
   [
     {
-      id: "package-json-1",
       files: "**/package.json",
-      test: /(\\?"@types\/node\\?": \\?")(\^)?[0-9.]+(\\?(",?)\\?n?)/gm,
-      replace: "$1$2<%- version %>$4"
+      regex: /(\\?"@types\/node\\?": \\?")(\^)?[0-9.]+(\\?(",?)\\?n?)/gm,
+      tests: [import_packageJsonChecks.isPatchableServerlessVersion],
+      replace: `$1$2${nodeTypesVersion}$4`
     },
     {
-      id: "package-json-2",
       files: "**/package.json",
-      test: /(\\?"engines\\?":\s*{\\?n?[^}]*\\?"node\\?":\s*\\?">=)(\d+)\\?("[^}]*})(?![^}]*\\?"skuba\\?":\s*{\\?n?[^}]*\\?"type\\?":\s*\\?"package\\?")/gm,
-      replace: "$1<%- version %>$3"
+      regex: /(\\?"engines\\?":\s*{\\?n?[^}]*\\?"node\\?":\s*\\?">=)(\d+)\\?("[^}]*})(?![^}]*\\?"skuba\\?":\s*{\\?n?[^}]*\\?"type\\?":\s*\\?"package\\?")/gm,
+      tests: [import_packageJsonChecks.isPatchableServerlessVersion, import_packageJsonChecks.isPatchableSkubaType],
+      replace: `$1${nodeVersion}$3`
     }
   ],
   [
     {
-      id: "tsconfig-target",
       files: "**/tsconfig*.json",
-      test: /("target":\s*")(ES\d+)"/gim,
-      replace: '$1<%- version %>"'
+      regex: /("target":\s*")(ES\d+)"/gim,
+      tests: [import_packageJsonChecks.isPatchableServerlessVersion, import_packageJsonChecks.isPatchableSkubaType],
+      replace: `$1${ECMAScriptVersion}"`
     },
     {
-      id: "tsconfig-lib",
       files: "**/tsconfig*.json",
-      test: /("lib":\s*\[)([\S\s]*?)(ES\d+)([\S\s]*?)(\])/gim,
-      replace: "$1$2<%- version %>$4$5"
+      regex: /("lib":\s*\[)([\S\s]*?)(ES\d+)([\S\s]*?)(\])/gim,
+      tests: [import_packageJsonChecks.isPatchableServerlessVersion, import_packageJsonChecks.isPatchableSkubaType],
+      replace: `$1$2${ECMAScriptVersion}$4$5`
     }
   ],
   {
-    id: "docker-compose",
     files: "**/docker-compose*.y*ml",
-    test: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
-    replace: "$1$2$3<%- version %>$5"
+    regex: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    replace: `$1$2$3${nodeVersion}$5`
   }
 ];
-const removeNodeShas = (content) => content.replace(SHA_REGEX, "");
-const runSubPatch = async ({ nodeVersion, nodeTypesVersion, ECMAScriptVersion }, dir, patch) => {
+const runSubPatch = async (dir, patch) => {
   if (Array.isArray(patch)) {
     for (const subPatch of patch) {
-      await runSubPatch(
-        { nodeVersion, nodeTypesVersion, ECMAScriptVersion },
-        dir,
-        subPatch
-      );
+      await runSubPatch(dir, subPatch);
     }
     return;
   }
@@ -144,56 +135,20 @@ const runSubPatch = async ({ nodeVersion, nodeTypesVersion, ECMAScriptVersion },
       if (!contents) {
         return;
       }
-      if (patch.test && !patch.test.test(contents)) {
+      if (patch.regex && !patch.regex.test(contents)) {
         return;
       }
-      const unPinnedContents = removeNodeShas(contents);
-      if (patch.id === "serverless") {
-        if (!await (0, import_packageJsonChecks.validServerlessVersion)()) {
-          return;
-        }
-      }
-      if (patch.id === "package-json-1") {
-        if (!await (0, import_packageJsonChecks.validServerlessVersion)()) {
-          return;
-        }
-        return await writePatchedContents({
-          path,
-          contents: unPinnedContents,
-          templated: patch.replace.replaceAll(
-            "<%- version %>",
-            nodeTypesVersion
-          ),
-          test: patch.test
-        });
-      }
-      if (patch.id.includes("tsconfig")) {
-        if (!await (0, import_packageJsonChecks.validServerlessVersion)() || !await (0, import_packageJsonChecks.validSkubaType)()) {
-          return;
-        }
-        return await writePatchedContents({
-          path,
-          contents: unPinnedContents,
-          templated: patch.replace.replaceAll(
-            "<%- version %>",
-            ECMAScriptVersion
-          ),
-          test: patch.test
-        });
-      }
-      if (patch.id === "package-json-2") {
-        if (!await (0, import_packageJsonChecks.validServerlessVersion)() || !await (0, import_packageJsonChecks.validSkubaType)()) {
+      if (patch.tests) {
+        const results = await Promise.all(patch.tests.map((test) => test()));
+        if (!results.every(Boolean)) {
           return;
         }
       }
       await writePatchedContents({
         path,
-        contents: unPinnedContents,
-        templated: patch.replace.replaceAll(
-          "<%- version %>",
-          nodeVersion.toString()
-        ),
-        test: patch.test
+        contents,
+        templated: patch.replace,
+        regex: patch.regex
       });
     })
   );
@@ -202,31 +157,26 @@ const writePatchedContents = async ({
   path,
   contents,
   templated,
-  test
+  regex
 }) => await import_fs_extra.default.promises.writeFile(
   path,
-  test ? contents.replaceAll(test, templated) : templated
+  regex ? contents.replaceAll(regex, templated) : templated
 );
-const upgrade = async ({ nodeVersion, nodeTypesVersion, ECMAScriptVersion }, dir) => {
+const upgrade = async (versions, dir) => {
   await Promise.all(
-    subPatches.map(
-      (subPatch) => runSubPatch(
-        { nodeVersion, nodeTypesVersion, ECMAScriptVersion },
-        dir,
-        subPatch
-      )
-    )
+    subPatches(versions).map((subPatch) => runSubPatch(dir, subPatch))
   );
 };
 const nodeVersionMigration = async ({
   nodeVersion,
-  ECMAScriptVersion
+  ECMAScriptVersion,
+  defaultNodeTypesVersion
 }, dir = process.cwd()) => {
   import_logging.log.ok(`Upgrading to Node.js ${nodeVersion}`);
   try {
-    const { version: nodeTypesVersion, err } = await (0, import_getNode22TypesVersion.getNode22TypesVersion)(
+    const { version: nodeTypesVersion, err } = await (0, import_getNodeTypesVersion.getNodeTypesVersion)(
       nodeVersion,
-      DEFAULT_NODE_TYPES
+      defaultNodeTypesVersion
     );
     if (err) {
       import_logging.log.warn(err);

package/lib/cli/migrate/nodeVersion/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/migrate/nodeVersion/index.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../utils/logging';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\n\nimport { getNode22TypesVersion } from './getNode22TypesVersion';\nimport { validServerlessVersion, validSkubaType } from './packageJsonChecks';\n\nconst DEFAULT_NODE_TYPES = '22.9.0';\n\ntype SubPatch =\n  | (({ files: string; file?: never } | { file: string; files?: never }) & {\n      test?: RegExp;\n      replace: string;\n      id: string;\n    })\n  | Array<\n      ({ files: string; file?: never } | { file: string; files?: never }) & {\n        test?: RegExp;\n        replace: string;\n        id: string;\n      }\n    >;\n\nconst SHA_REGEX = /(?<=node.*)(@sha256:[a-f0-9]{64})/gm;\n\nconst subPatches: SubPatch[] = [\n  { id: 'nvmrc', file: '.nvmrc', replace: '<%- version %>\\n' },\n  {\n    id: 'Dockerfile-1',\n    files: '**/Dockerfile*',\n    test: /^FROM(.*) (public.ecr.aws\\/docker\\/library\\/)?node:[0-9.]+(@sha256:[a-f0-9]{64})?(\\.[^- \\n]+)?(-[^ \\n]+)?( .+|)$/gm,\n    replace: 'FROM$1 $2node:<%- version %>$3$5$6',\n  },\n  {\n    id: 'Dockerfile-2',\n    files: '**/Dockerfile*',\n    test: /^FROM(.*) gcr.io\\/distroless\\/nodejs\\d+-debian(.+)$/gm,\n    replace: 'FROM$1 gcr.io/distroless/nodejs<%- version %>-debian$2',\n  },\n  {\n    id: 'serverless',\n    files: '**/serverless*.y*ml',\n    test: /nodejs\\d+.x/gm,\n    replace: 'nodejs<%- version %>.x',\n  },\n  [\n    {\n      id: 'cdk-1',\n      files: '**/infra/**/*.ts',\n      test: /NODEJS_\\d+_X/g,\n      replace: 'NODEJS_<%- version %>_X',\n    },\n    {\n      id: 'cdk-2',\n      files: '**/infra/**/*.ts',\n      test: /(target:\\s*'node)(\\d+)(.+)$/gm,\n      replace: '$1<%- version %>$3',\n    },\n  ],\n  {\n    id: 'buildkite',\n    files: '**/.buildkite/*',\n    test: /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n    replace: '$1$2$3<%- version %>$5',\n  },\n  {\n    id: 'node-version',\n    files: '.node-version*',\n    test: /(v)?\\d+\\.\\d+\\.\\d+(.+)?/gm,\n    replace: '$1<%- version %>$2',\n  },\n  [\n    {\n      id: 'package-json-1',\n      files: '**/package.json',\n      test: /(\\\\?\"@types\\/node\\\\?\": \\\\?\")(\\^)?[0-9.]+(\\\\?(\",?)\\\\?n?)/gm,\n      replace: '$1$2<%- version %>$4',\n    },\n    {\n      id: 'package-json-2',\n      files: '**/package.json',\n      test: /(\\\\?\"engines\\\\?\":\\s*{\\\\?n?[^}]*\\\\?\"node\\\\?\":\\s*\\\\?\">=)(\\d+)\\\\?(\"[^}]*})(?![^}]*\\\\?\"skuba\\\\?\":\\s*{\\\\?n?[^}]*\\\\?\"type\\\\?\":\\s*\\\\?\"package\\\\?\")/gm,\n      replace: '$1<%- version %>$3',\n    },\n  ],\n  [\n    {\n      id: 'tsconfig-target',\n      files: '**/tsconfig*.json',\n      test: /(\"target\":\\s*\")(ES\\d+)\"/gim,\n      replace: '$1<%- version %>\"',\n    },\n    {\n      id: 'tsconfig-lib',\n      files: '**/tsconfig*.json',\n      test: /(\"lib\":\\s*\\[)([\\S\\s]*?)(ES\\d+)([\\S\\s]*?)(\\])/gim,\n      replace: '$1$2<%- version %>$4$5',\n    },\n  ],\n  {\n    id: 'docker-compose',\n    files: '**/docker-compose*.y*ml',\n    test: /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n    replace: '$1$2$3<%- version %>$5',\n  },\n];\n\nconst removeNodeShas = (content: string): string =>\n  content.replace(SHA_REGEX, '');\n\ntype Versions = {\n  nodeVersion: number;\n  nodeTypesVersion: string;\n  ECMAScriptVersion: string;\n};\n\nconst runSubPatch = async (\n  { nodeVersion, nodeTypesVersion, ECMAScriptVersion }: Versions,\n  dir: string,\n  patch: SubPatch,\n) => {\n  if (Array.isArray(patch)) {\n    for (const subPatch of patch) {\n      await runSubPatch(\n        { nodeVersion, nodeTypesVersion, ECMAScriptVersion },\n        dir,\n        subPatch,\n      );\n    }\n    return;\n  }\n  const readFile = createDestinationFileReader(dir);\n  const paths = patch.file\n    ? [patch.file]\n    : await glob(patch.files ?? [], { cwd: dir });\n\n  await Promise.all(\n    paths.map(async (path) => {\n      if (path.includes('node_modules')) {\n        return;\n      }\n      const contents = await readFile(path);\n      if (!contents) {\n        return;\n      }\n\n      if (patch.test && !patch.test.test(contents)) {\n        return;\n      }\n\n      const unPinnedContents = removeNodeShas(contents);\n\n      if (patch.id === 'serverless') {\n        if (!(await validServerlessVersion())) {\n          return;\n        }\n      }\n\n      if (patch.id === 'package-json-1') {\n        if (!(await validServerlessVersion())) {\n          return;\n        }\n        return await writePatchedContents({\n          path,\n          contents: unPinnedContents,\n          templated: patch.replace.replaceAll(\n            '<%- version %>',\n            nodeTypesVersion,\n          ),\n          test: patch.test,\n        });\n      }\n      if (patch.id.includes('tsconfig')) {\n        if (!(await validServerlessVersion()) || !(await validSkubaType())) {\n          return;\n        }\n        return await writePatchedContents({\n          path,\n          contents: unPinnedContents,\n          templated: patch.replace.replaceAll(\n            '<%- version %>',\n            ECMAScriptVersion,\n          ),\n          test: patch.test,\n        });\n      }\n\n      if (patch.id === 'package-json-2') {\n        if (!(await validServerlessVersion()) || !(await validSkubaType())) {\n          return;\n        }\n      }\n\n      await writePatchedContents({\n        path,\n        contents: unPinnedContents,\n        templated: patch.replace.replaceAll(\n          '<%- version %>',\n          nodeVersion.toString(),\n        ),\n        test: patch.test,\n      });\n    }),\n  );\n};\n\nconst writePatchedContents = async ({\n  path,\n  contents,\n  templated,\n  test,\n}: {\n  path: string;\n  contents: string;\n  templated: string;\n  test?: RegExp;\n}) =>\n  await fs.promises.writeFile(\n    path,\n    test ? contents.replaceAll(test, templated) : templated,\n  );\n\nconst upgrade = async (\n  { nodeVersion, nodeTypesVersion, ECMAScriptVersion }: Versions,\n  dir: string,\n) => {\n  await Promise.all(\n    subPatches.map((subPatch) =>\n      runSubPatch(\n        { nodeVersion, nodeTypesVersion, ECMAScriptVersion },\n        dir,\n        subPatch,\n      ),\n    ),\n  );\n};\n\nexport const nodeVersionMigration = async (\n  {\n    nodeVersion,\n    ECMAScriptVersion,\n  }: { nodeVersion: number; ECMAScriptVersion: string },\n  dir = process.cwd(),\n) => {\n  log.ok(`Upgrading to Node.js ${nodeVersion}`);\n  try {\n    const { version: nodeTypesVersion, err } = await getNode22TypesVersion(\n      nodeVersion,\n      DEFAULT_NODE_TYPES,\n    );\n    if (err) {\n      log.warn(err);\n    }\n    await upgrade({ nodeVersion, nodeTypesVersion, ECMAScriptVersion }, dir);\n    log.ok('Upgraded to Node.js', nodeVersion);\n  } catch (err) {\n    log.err('Failed to upgrade');\n    log.subtle(inspect(err));\n    process.exitCode = 1;\n  }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../utils/logging';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\n\nimport { getNodeTypesVersion } from './getNodeTypesVersion';\nimport {\n  isPatchableServerlessVersion,\n  isPatchableSkubaType,\n} from './packageJsonChecks';\n\ntype FileSelector =\n  | { files: string; file?: never }\n  | { file: string; files?: never };\n\ntype SubPatch = FileSelector & {\n  tests?: Array<() => Promise<boolean>>;\n  regex?: RegExp;\n  replace: string;\n};\n\ntype SubPatches = SubPatch | SubPatch[];\n\nconst subPatches = ({\n  nodeVersion,\n  nodeTypesVersion,\n  ECMAScriptVersion,\n}: Versions): SubPatches[] => [\n  { file: '.nvmrc', replace: `${nodeVersion}\\n` },\n  {\n    files: '**/Dockerfile*',\n\n    regex:\n      /^FROM(.*) (public.ecr.aws\\/docker\\/library\\/)?node:([0-9]+(?:\\.[0-9]+(?:\\.[0-9]+)?)?)(-[a-z0-9]+)?(@sha256:[a-f0-9]{64})?( .*)?$/gm,\n    replace: `FROM$1 $2node:${nodeVersion}$4$6`,\n  },\n  {\n    files: '**/Dockerfile*',\n    regex:\n      /^FROM(.*) gcr.io\\/distroless\\/nodejs\\d+-debian(\\d+)(@sha256:[a-f0-9]{64})?(\\.[^- \\n]+)?(-[^ \\n]+)?( .+|)$/gm,\n    replace: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$2$4$5$6`,\n  },\n  {\n    files: '**/serverless*.y*ml',\n    regex: /nodejs\\d+.x/gm,\n    tests: [isPatchableServerlessVersion],\n    replace: `nodejs${nodeVersion}.x`,\n  },\n  [\n    {\n      files: '**/infra/**/*.ts',\n      regex: /NODEJS_\\d+_X/g,\n      replace: `NODEJS_${nodeVersion}_X`,\n    },\n    {\n      files: '**/infra/**/*.ts',\n      regex: /(target:\\s*'node)(\\d+)(.+)$/gm,\n      replace: `$1${nodeVersion}$3`,\n    },\n  ],\n  {\n    files: '**/.buildkite/*',\n    regex:\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n    replace: `$1$2$3${nodeVersion}$5`,\n  },\n  {\n    files: '.node-version*',\n    regex: /(v)?\\d+\\.\\d+\\.\\d+(.+)?/gm,\n    replace: `$1${nodeVersion}$2`,\n  },\n  [\n    {\n      files: '**/package.json',\n      regex: /(\\\\?\"@types\\/node\\\\?\": \\\\?\")(\\^)?[0-9.]+(\\\\?(\",?)\\\\?n?)/gm,\n      tests: [isPatchableServerlessVersion],\n      replace: `$1$2${nodeTypesVersion}$4`,\n    },\n    {\n      files: '**/package.json',\n      regex:\n        /(\\\\?\"engines\\\\?\":\\s*{\\\\?n?[^}]*\\\\?\"node\\\\?\":\\s*\\\\?\">=)(\\d+)\\\\?(\"[^}]*})(?![^}]*\\\\?\"skuba\\\\?\":\\s*{\\\\?n?[^}]*\\\\?\"type\\\\?\":\\s*\\\\?\"package\\\\?\")/gm,\n      tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n      replace: `$1${nodeVersion}$3`,\n    },\n  ],\n  [\n    {\n      files: '**/tsconfig*.json',\n      regex: /(\"target\":\\s*\")(ES\\d+)\"/gim,\n      tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n      replace: `$1${ECMAScriptVersion}\"`,\n    },\n    {\n      files: '**/tsconfig*.json',\n      regex: /(\"lib\":\\s*\\[)([\\S\\s]*?)(ES\\d+)([\\S\\s]*?)(\\])/gim,\n      tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n      replace: `$1$2${ECMAScriptVersion}$4$5`,\n    },\n  ],\n  {\n    files: '**/docker-compose*.y*ml',\n    regex:\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n\n    replace: `$1$2$3${nodeVersion}$5`,\n  },\n];\n\ntype Versions = {\n  nodeVersion: number;\n  nodeTypesVersion: string;\n  ECMAScriptVersion: string;\n};\n\nconst runSubPatch = async (dir: string, patch: SubPatches) => {\n  if (Array.isArray(patch)) {\n    for (const subPatch of patch) {\n      await runSubPatch(dir, subPatch);\n    }\n    return;\n  }\n  const readFile = createDestinationFileReader(dir);\n  const paths = patch.file\n    ? [patch.file]\n    : await glob(patch.files ?? [], { cwd: dir });\n\n  await Promise.all(\n    paths.map(async (path) => {\n      if (path.includes('node_modules')) {\n        return;\n      }\n      const contents = await readFile(path);\n      if (!contents) {\n        return;\n      }\n\n      if (patch.regex && !patch.regex.test(contents)) {\n        return;\n      }\n\n      if (patch.tests) {\n        const results = await Promise.all(patch.tests.map((test) => test()));\n        if (!results.every(Boolean)) {\n          return;\n        }\n      }\n\n      await writePatchedContents({\n        path,\n        contents,\n        templated: patch.replace,\n        regex: patch.regex,\n      });\n    }),\n  );\n};\n\nconst writePatchedContents = async ({\n  path,\n  contents,\n  templated,\n  regex,\n}: {\n  path: string;\n  contents: string;\n  templated: string;\n  regex?: RegExp;\n}) =>\n  await fs.promises.writeFile(\n    path,\n    regex ? contents.replaceAll(regex, templated) : templated,\n  );\n\nconst upgrade = async (versions: Versions, dir: string) => {\n  await Promise.all(\n    subPatches(versions).map((subPatch) => runSubPatch(dir, subPatch)),\n  );\n};\n\nexport const nodeVersionMigration = async (\n  {\n    nodeVersion,\n    ECMAScriptVersion,\n    defaultNodeTypesVersion,\n  }: {\n    nodeVersion: number;\n    ECMAScriptVersion: string;\n    defaultNodeTypesVersion: string;\n  },\n  dir = process.cwd(),\n) => {\n  log.ok(`Upgrading to Node.js ${nodeVersion}`);\n  try {\n    const { version: nodeTypesVersion, err } = await getNodeTypesVersion(\n      nodeVersion,\n      defaultNodeTypesVersion,\n    );\n    if (err) {\n      log.warn(err);\n    }\n    await upgrade({ nodeVersion, nodeTypesVersion, ECMAScriptVersion }, dir);\n    log.ok('Upgraded to Node.js', nodeVersion);\n  } catch (err) {\n    log.err('Failed to upgrade');\n    log.subtle(inspect(err));\n    process.exitCode = 1;\n  }\n};\n"],
+  "mappings": "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",
   "names": ["fs"]
 }

package/lib/cli/migrate/nodeVersion/packageJsonChecks.d.ts

@@ -1,2 +1,4 @@
-export declare const validServerlessVersion: () => Promise<boolean>;
-export declare const validSkubaType: () => Promise<boolean>;
+import { type ZodRawShape, z } from 'zod';
+export declare const extractFromParentPackageJson: <T extends ZodRawShape>(schema: z.ZodObject<T>) => Promise<z.infer<typeof schema> | undefined>;
+export declare const isPatchableServerlessVersion: () => Promise<boolean>;
+export declare const isPatchableSkubaType: () => Promise<boolean>;

package/lib/cli/migrate/nodeVersion/packageJsonChecks.js

@@ -28,67 +28,85 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var packageJsonChecks_exports = {};
 __export(packageJsonChecks_exports, {
-  validServerlessVersion: () => validServerlessVersion,
-  validSkubaType: () => validSkubaType
+  extractFromParentPackageJson: () => extractFromParentPackageJson,
+  isPatchableServerlessVersion: () => isPatchableServerlessVersion,
+  isPatchableSkubaType: () => isPatchableSkubaType
 });
 module.exports = __toCommonJS(packageJsonChecks_exports);
 var import_find_up = __toESM(require("find-up"));
 var import_fs_extra = __toESM(require("fs-extra"));
+var import_semver = require("semver");
+var import_zod = require("zod");
 var import_logging = require("../../../utils/logging");
 const getParentPackageJson = async () => {
   const packageJsonPath = await (0, import_find_up.default)("package.json", { cwd: process.cwd() });
   if (!packageJsonPath) {
     throw new Error("package.json not found");
   }
-  return import_fs_extra.default.readFile(packageJsonPath);
+  return import_fs_extra.default.readFile(packageJsonPath, "utf-8");
 };
-const isTypeError = (error) => error instanceof TypeError && error.message.includes("Cannot read properties of undefined");
-const isSyntaxError = (error) => error instanceof SyntaxError && error.message.includes("Unexpected token");
-const validServerlessVersion = async () => {
+const extractFromParentPackageJson = async (schema) => {
   const packageJson = await getParentPackageJson();
+  let rawJSON;
   try {
-    const serverlessVersion = JSON.parse(packageJson.toString()).devDependencies.serverless;
-    if (!serverlessVersion) {
-      return true;
-    }
-    if (!serverlessVersion.startsWith("4")) {
-      import_logging.log.warn(
-        "Serverless version not supported, please upgrade to 4.x to automatically update serverless files"
-      );
-      return false;
-    }
-  } catch (error) {
-    if (isTypeError(error) || isSyntaxError(error)) {
-      return true;
-    }
-    throw error;
+    rawJSON = JSON.parse(packageJson);
+  } catch {
+    throw new Error("package.json is not valid JSON");
   }
+  const result = schema.safeParse(rawJSON);
+  if (!result.success) {
+    return void 0;
+  }
+  return result.data;
+};
+const isPatchableServerlessVersion = async () => {
+  const serverlessVersion = (await extractFromParentPackageJson(
+    import_zod.z.object({
+      devDependencies: import_zod.z.object({
+        serverless: import_zod.z.string()
+      })
+    })
+  ))?.devDependencies.serverless;
+  if (!serverlessVersion) {
+    import_logging.log.subtle("Serverless version not found, assuming it is not a dependency");
+    return true;
+  }
+  if (!(0, import_semver.satisfies)(serverlessVersion, "4.x.x")) {
+    import_logging.log.warn(
+      "Serverless version not supported, please upgrade to 4.x to automatically update serverless files"
+    );
+    return false;
+  }
+  import_logging.log.ok("Serverless version is supported, proceeding with migration");
   return true;
 };
-const validSkubaType = async () => {
-  const packageJson = await getParentPackageJson();
-  try {
-    const type = JSON.parse(packageJson.toString()).skuba.type;
-    if (!type) {
-      return true;
-    }
-    if (type === "package") {
-      import_logging.log.warn(
-        "skuba type package is not supported, packages should be updated manually to ensure major runtime deprecations are intended"
-      );
-      return false;
-    }
-  } catch (error) {
-    if (isTypeError(error) || isSyntaxError(error)) {
-      return true;
-    }
-    throw error;
+const isPatchableSkubaType = async () => {
+  const type = (await extractFromParentPackageJson(
+    import_zod.z.object({
+      skuba: import_zod.z.object({
+        type: import_zod.z.string()
+      })
+    })
+  ))?.skuba.type;
+  if (!type) {
+    import_logging.log.warn(
+      "skuba type couldn't be found, please specify the type of project in the package.json, to ensure the correct migration is applied"
+    );
+    return false;
+  }
+  if (type === "package") {
+    import_logging.log.warn(
+      "skuba type package is not supported, packages should be updated manually to ensure major runtime deprecations are intended"
+    );
+    return false;
   }
+  import_logging.log.ok("skuba type supported, proceeding with migration");
   return true;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  validServerlessVersion,
-  validSkubaType
+  extractFromParentPackageJson,
+  isPatchableServerlessVersion,
+  isPatchableSkubaType
 });
 //# sourceMappingURL=packageJsonChecks.js.map

package/lib/cli/migrate/nodeVersion/packageJsonChecks.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/migrate/nodeVersion/packageJsonChecks.ts"],
-  "sourcesContent": ["import findUp from 'find-up';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../utils/logging';\n\nconst getParentPackageJson = async () => {\n  const packageJsonPath = await findUp('package.json', { cwd: process.cwd() });\n  if (!packageJsonPath) {\n    throw new Error('package.json not found');\n  }\n  return fs.readFile(packageJsonPath);\n};\n\nconst isTypeError = (error: unknown): error is TypeError =>\n  error instanceof TypeError &&\n  error.message.includes('Cannot read properties of undefined');\n\nconst isSyntaxError = (error: unknown): error is SyntaxError =>\n  error instanceof SyntaxError && error.message.includes('Unexpected token');\n\nexport const validServerlessVersion = async (): Promise<boolean> => {\n  const packageJson = await getParentPackageJson();\n\n  try {\n    const serverlessVersion = (\n      JSON.parse(packageJson.toString()) as {\n        devDependencies: Record<string, string>;\n      }\n    ).devDependencies.serverless;\n    if (!serverlessVersion) {\n      return true;\n    }\n\n    if (!serverlessVersion.startsWith('4')) {\n      log.warn(\n        'Serverless version not supported, please upgrade to 4.x to automatically update serverless files',\n      );\n      return false;\n    }\n  } catch (error) {\n    if (isTypeError(error) || isSyntaxError(error)) {\n      return true;\n    }\n    throw error;\n  }\n  return true;\n};\n\nexport const validSkubaType = async () => {\n  const packageJson = await getParentPackageJson();\n\n  try {\n    const type = (\n      JSON.parse(packageJson.toString()) as {\n        skuba: Record<string, string>;\n      }\n    ).skuba.type;\n    if (!type) {\n      return true;\n    }\n\n    if (type === 'package') {\n      log.warn(\n        'skuba type package is not supported, packages should be updated manually to ensure major runtime deprecations are intended',\n      );\n      return false;\n    }\n  } catch (error) {\n    if (isTypeError(error) || isSyntaxError(error)) {\n      return true;\n    }\n    throw error;\n  }\n  return true;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAmB;AACnB,sBAAe;AAEf,qBAAoB;AAEpB,MAAM,uBAAuB,YAAY;AACvC,QAAM,kBAAkB,UAAM,eAAAA,SAAO,gBAAgB,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC;AAC3E,MAAI,CAAC,iBAAiB;AACpB,UAAM,IAAI,MAAM,wBAAwB;AAAA,EAC1C;AACA,SAAO,gBAAAC,QAAG,SAAS,eAAe;AACpC;AAEA,MAAM,cAAc,CAAC,UACnB,iBAAiB,aACjB,MAAM,QAAQ,SAAS,qCAAqC;AAE9D,MAAM,gBAAgB,CAAC,UACrB,iBAAiB,eAAe,MAAM,QAAQ,SAAS,kBAAkB;AAEpE,MAAM,yBAAyB,YAA8B;AAClE,QAAM,cAAc,MAAM,qBAAqB;AAE/C,MAAI;AACF,UAAM,oBACJ,KAAK,MAAM,YAAY,SAAS,CAAC,EAGjC,gBAAgB;AAClB,QAAI,CAAC,mBAAmB;AACtB,aAAO;AAAA,IACT;AAEA,QAAI,CAAC,kBAAkB,WAAW,GAAG,GAAG;AACtC,yBAAI;AAAA,QACF;AAAA,MACF;AACA,aAAO;AAAA,IACT;AAAA,EACF,SAAS,OAAO;AACd,QAAI,YAAY,KAAK,KAAK,cAAc,KAAK,GAAG;AAC9C,aAAO;AAAA,IACT;AACA,UAAM;AAAA,EACR;AACA,SAAO;AACT;AAEO,MAAM,iBAAiB,YAAY;AACxC,QAAM,cAAc,MAAM,qBAAqB;AAE/C,MAAI;AACF,UAAM,OACJ,KAAK,MAAM,YAAY,SAAS,CAAC,EAGjC,MAAM;AACR,QAAI,CAAC,MAAM;AACT,aAAO;AAAA,IACT;AAEA,QAAI,SAAS,WAAW;AACtB,yBAAI;AAAA,QACF;AAAA,MACF;AACA,aAAO;AAAA,IACT;AAAA,EACF,SAAS,OAAO;AACd,QAAI,YAAY,KAAK,KAAK,cAAc,KAAK,GAAG;AAC9C,aAAO;AAAA,IACT;AACA,UAAM;AAAA,EACR;AACA,SAAO;AACT;",
+  "sourcesContent": ["import findUp from 'find-up';\nimport fs from 'fs-extra';\nimport { satisfies } from 'semver';\nimport { type ZodRawShape, z } from 'zod';\n\nimport { log } from '../../../utils/logging';\n\nconst getParentPackageJson = async () => {\n  const packageJsonPath = await findUp('package.json', { cwd: process.cwd() });\n  if (!packageJsonPath) {\n    throw new Error('package.json not found');\n  }\n  return fs.readFile(packageJsonPath, 'utf-8');\n};\n\nexport const extractFromParentPackageJson = async <T extends ZodRawShape>(\n  schema: z.ZodObject<T>,\n): Promise<z.infer<typeof schema> | undefined> => {\n  const packageJson = await getParentPackageJson();\n  let rawJSON;\n  try {\n    rawJSON = JSON.parse(packageJson) as unknown;\n  } catch {\n    throw new Error('package.json is not valid JSON');\n  }\n  const result = schema.safeParse(rawJSON);\n  if (!result.success) {\n    return undefined;\n  }\n\n  return result.data;\n};\n\nexport const isPatchableServerlessVersion = async (): Promise<boolean> => {\n  const serverlessVersion = (\n    await extractFromParentPackageJson(\n      z.object({\n        devDependencies: z.object({\n          serverless: z.string(),\n        }),\n      }),\n    )\n  )?.devDependencies.serverless;\n\n  if (!serverlessVersion) {\n    log.subtle('Serverless version not found, assuming it is not a dependency');\n    return true;\n  }\n\n  if (!satisfies(serverlessVersion, '4.x.x')) {\n    log.warn(\n      'Serverless version not supported, please upgrade to 4.x to automatically update serverless files',\n    );\n    return false;\n  }\n\n  log.ok('Serverless version is supported, proceeding with migration');\n  return true;\n};\n\nexport const isPatchableSkubaType = async () => {\n  const type = (\n    await extractFromParentPackageJson(\n      z.object({\n        skuba: z.object({\n          type: z.string(),\n        }),\n      }),\n    )\n  )?.skuba.type;\n\n  if (!type) {\n    log.warn(\n      \"skuba type couldn't be found, please specify the type of project in the package.json, to ensure the correct migration is applied\",\n    );\n    return false;\n  }\n  if (type === 'package') {\n    log.warn(\n      'skuba type package is not supported, packages should be updated manually to ensure major runtime deprecations are intended',\n    );\n    return false;\n  }\n\n  log.ok('skuba type supported, proceeding with migration');\n  return true;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAmB;AACnB,sBAAe;AACf,oBAA0B;AAC1B,iBAAoC;AAEpC,qBAAoB;AAEpB,MAAM,uBAAuB,YAAY;AACvC,QAAM,kBAAkB,UAAM,eAAAA,SAAO,gBAAgB,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC;AAC3E,MAAI,CAAC,iBAAiB;AACpB,UAAM,IAAI,MAAM,wBAAwB;AAAA,EAC1C;AACA,SAAO,gBAAAC,QAAG,SAAS,iBAAiB,OAAO;AAC7C;AAEO,MAAM,+BAA+B,OAC1C,WACgD;AAChD,QAAM,cAAc,MAAM,qBAAqB;AAC/C,MAAI;AACJ,MAAI;AACF,cAAU,KAAK,MAAM,WAAW;AAAA,EAClC,QAAQ;AACN,UAAM,IAAI,MAAM,gCAAgC;AAAA,EAClD;AACA,QAAM,SAAS,OAAO,UAAU,OAAO;AACvC,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO;AAAA,EACT;AAEA,SAAO,OAAO;AAChB;AAEO,MAAM,+BAA+B,YAA8B;AACxE,QAAM,qBACJ,MAAM;AAAA,IACJ,aAAE,OAAO;AAAA,MACP,iBAAiB,aAAE,OAAO;AAAA,QACxB,YAAY,aAAE,OAAO;AAAA,MACvB,CAAC;AAAA,IACH,CAAC;AAAA,EACH,IACC,gBAAgB;AAEnB,MAAI,CAAC,mBAAmB;AACtB,uBAAI,OAAO,+DAA+D;AAC1E,WAAO;AAAA,EACT;AAEA,MAAI,KAAC,yBAAU,mBAAmB,OAAO,GAAG;AAC1C,uBAAI;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAEA,qBAAI,GAAG,4DAA4D;AACnE,SAAO;AACT;AAEO,MAAM,uBAAuB,YAAY;AAC9C,QAAM,QACJ,MAAM;AAAA,IACJ,aAAE,OAAO;AAAA,MACP,OAAO,aAAE,OAAO;AAAA,QACd,MAAM,aAAE,OAAO;AAAA,MACjB,CAAC;AAAA,IACH,CAAC;AAAA,EACH,IACC,MAAM;AAET,MAAI,CAAC,MAAM;AACT,uBAAI;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACA,MAAI,SAAS,WAAW;AACtB,uBAAI;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAEA,qBAAI,GAAG,iDAAiD;AACxD,SAAO;AACT;",
   "names": ["findUp", "fs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "10.0.0-node-22-20250213082332",
+  "version": "10.0.0-node-22-20250218222641",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -82,6 +82,7 @@
     "lodash.mergewith": "^4.6.2",
     "minimist": "^1.2.6",
     "normalize-package-data": "^7.0.0",
+    "npm-registry-fetch": "^18.0.2",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
@@ -99,7 +100,7 @@
     "typescript": "~5.7.0",
     "validate-npm-package-name": "^6.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.1.0-node-22-20250213082332"
+    "eslint-config-skuba": "5.1.0-node-22-20250218222641"
   },
   "devDependencies": {
     "@changesets/cli": "2.27.12",
@@ -114,6 +115,7 @@
     "@types/lodash.mergewith": "4.6.9",
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
+    "@types/npm-registry-fetch": "8.0.7",
     "@types/npm-which": "3.0.3",
     "@types/picomatch": "3.0.2",
     "@types/semver": "7.5.8",

package/template/greeter/package.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.13.1",
-    "skuba": "10.0.0-node-22-20250213082332"
+    "skuba": "10.0.0-node-22-20250218222641"
   },
   "packageManager": "pnpm@9.15.4",
   "engines": {

package/template/lambda-sqs-worker-cdk/package.json

@@ -36,7 +36,7 @@
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^1.18.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "10.0.0-node-22-20250213082332"
+    "skuba": "10.0.0-node-22-20250218222641"
   },
   "packageManager": "pnpm@9.15.4",
   "engines": {

package/lib/cli/migrate/nodeVersion/getNode22TypesVersion.d.ts

@@ -1,6 +0,0 @@
-type VersionResult = {
-    version: string;
-    err?: string;
-};
-export declare const getNode22TypesVersion: (major: number, defaultVersion: string) => Promise<VersionResult>;
-export {};

package/lib/cli/migrate/nodeVersion/getNode22TypesVersion.js

@@ -1,50 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var getNode22TypesVersion_exports = {};
-__export(getNode22TypesVersion_exports, {
-  getNode22TypesVersion: () => getNode22TypesVersion
-});
-module.exports = __toCommonJS(getNode22TypesVersion_exports);
-const getNode22TypesVersion = async (major, defaultVersion) => {
-  try {
-    const response = await fetch("https://registry.npmjs.org/@types/node");
-    if (!response.ok)
-      throw new Error(`Failed to fetch: ${response.statusText}`);
-    const json = await response.json();
-    const versions = Object.keys(json.versions).filter((v) => v.startsWith(`${major}.`)).sort((a, b) => b.localeCompare(a, void 0, { numeric: true }));
-    const latestVersion = versions[0];
-    const versionRegex = /(22\.\d+\.\d+)/;
-    if (!latestVersion || !versionRegex.test(latestVersion)) {
-      throw new Error("No version found");
-    }
-    return {
-      version: versionRegex.exec(latestVersion)?.[0] ?? defaultVersion
-    };
-  } catch {
-    return {
-      version: defaultVersion,
-      err: "Failed to fetch latest version, using fallback version"
-    };
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getNode22TypesVersion
-});
-//# sourceMappingURL=getNode22TypesVersion.js.map

package/lib/cli/migrate/nodeVersion/getNode22TypesVersion.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/cli/migrate/nodeVersion/getNode22TypesVersion.ts"],
-  "sourcesContent": ["type VersionResult = {\n  version: string;\n  err?: string;\n};\n\nexport const getNode22TypesVersion = async (\n  major: number,\n  defaultVersion: string,\n): Promise<VersionResult> => {\n  try {\n    const response = await fetch('https://registry.npmjs.org/@types/node');\n    if (!response.ok)\n      throw new Error(`Failed to fetch: ${response.statusText}`);\n\n    const json = (await response.json()) as {\n      versions: Record<string, unknown>;\n    };\n    const versions = Object.keys(json.versions)\n      .filter((v) => v.startsWith(`${major}.`))\n      .sort((a, b) => b.localeCompare(a, undefined, { numeric: true }));\n\n    const latestVersion = versions[0];\n    const versionRegex = /(22\\.\\d+\\.\\d+)/;\n\n    if (!latestVersion || !versionRegex.test(latestVersion)) {\n      throw new Error('No version found');\n    }\n\n    return {\n      version: versionRegex.exec(latestVersion)?.[0] ?? defaultVersion,\n    };\n  } catch {\n    return {\n      version: defaultVersion,\n      err: 'Failed to fetch latest version, using fallback version',\n    };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKO,MAAM,wBAAwB,OACnC,OACA,mBAC2B;AAC3B,MAAI;AACF,UAAM,WAAW,MAAM,MAAM,wCAAwC;AACrE,QAAI,CAAC,SAAS;AACZ,YAAM,IAAI,MAAM,oBAAoB,SAAS,UAAU,EAAE;AAE3D,UAAM,OAAQ,MAAM,SAAS,KAAK;AAGlC,UAAM,WAAW,OAAO,KAAK,KAAK,QAAQ,EACvC,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,KAAK,GAAG,CAAC,EACvC,KAAK,CAAC,GAAG,MAAM,EAAE,cAAc,GAAG,QAAW,EAAE,SAAS,KAAK,CAAC,CAAC;AAElE,UAAM,gBAAgB,SAAS,CAAC;AAChC,UAAM,eAAe;AAErB,QAAI,CAAC,iBAAiB,CAAC,aAAa,KAAK,aAAa,GAAG;AACvD,YAAM,IAAI,MAAM,kBAAkB;AAAA,IACpC;AAEA,WAAO;AAAA,MACL,SAAS,aAAa,KAAK,aAAa,IAAI,CAAC,KAAK;AAAA,IACpD;AAAA,EACF,QAAQ;AACN,WAAO;AAAA,MACL,SAAS;AAAA,MACT,KAAK;AAAA,IACP;AAAA,EACF;AACF;",
-  "names": []
-}