skuba 10.0.0-node-22-20250115223210 → 10.0.0-node-22-20250213035014

package/lib/cli/init/prompts.d.ts

@@ -63,5 +63,5 @@ export declare const BASE_PROMPT_PROPS: {
 };
 export declare const SHOULD_CONTINUE_PROMPT: Select<"yes" | "no">;
 export declare const GIT_PATH_PROMPT: Input;
-export declare const TEMPLATE_PROMPT: Select<"express-rest-api" | "greeter" | "koa-rest-api" | "lambda-sqs-worker" | "lambda-sqs-worker-cdk" | "oss-npm-package" | "private-npm-package" | "github →">;
+export declare const TEMPLATE_PROMPT: Select<"express-rest-api" | "greeter" | "koa-rest-api" | "lambda-sqs-worker-cdk" | "oss-npm-package" | "private-npm-package" | "github →">;
 export {};

package/lib/cli/lint/internalLints/upgrade/patches/10.0.0/index.js

@@ -25,7 +25,7 @@ var import_upgradeNode = require("./upgradeNode");
 const patches = [
   {
     apply: import_upgradeNode.tryUpgradeNode,
-    description: "Upgrades Node.js to version 22"
+    description: "Upgrade Node.js to version 22"
   }
 ];
 // Annotate the CommonJS export names for ESM import in node:

package/lib/cli/lint/internalLints/upgrade/patches/10.0.0/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/10.0.0/index.ts"],
-  "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryUpgradeNode } from './upgradeNode';\n\nexport const patches: Patches = [\n  {\n    apply: tryUpgradeNode,\n    description: 'Upgrades Node.js to version 22',\n  },\n];\n"],
+  "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/migrate/nodeVersion/getNode22TypesVersion.d.ts

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

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

@@ -21,10 +21,28 @@ __export(getNode22TypesVersion_exports, {
   getNode22TypesVersion: () => getNode22TypesVersion
 });
 module.exports = __toCommonJS(getNode22TypesVersion_exports);
-var import_child_process = require("child_process");
-const getNode22TypesVersion = (major) => (0, import_child_process.execSync)(
-  `npm show @types/node@^${major} version --json | jq '.[-1]'`
-).toString();
+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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/migrate/nodeVersion/getNode22TypesVersion.ts"],
-  "sourcesContent": ["import { execSync } from 'child_process';\n\nexport const getNode22TypesVersion = (major: number) =>\n  execSync(\n    `npm show @types/node@^${major} version --json | jq '.[-1]'`,\n  ).toString();\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAAyB;AAElB,MAAM,wBAAwB,CAAC,cACpC;AAAA,EACE,yBAAyB,KAAK;AAChC,EAAE,SAAS;",
+  "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": []
 }

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

@@ -1,10 +1,4 @@
-type VersionResult = {
-    version: string;
-    err: string | undefined;
-};
-export declare const getNode22TypeVersion: (major: number, defaultVersion: string) => VersionResult;
 export declare const nodeVersionMigration: ({ nodeVersion, ECMAScriptVersion, }: {
     nodeVersion: number;
     ECMAScriptVersion: string;
 }, dir?: string) => Promise<void>;
-export {};

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

@@ -28,7 +28,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var nodeVersion_exports = {};
 __export(nodeVersion_exports, {
-  getNode22TypeVersion: () => getNode22TypeVersion,
   nodeVersionMigration: () => nodeVersionMigration
 });
 module.exports = __toCommonJS(nodeVersion_exports);
@@ -40,25 +39,6 @@ var import_project = require("../../configure/analysis/project");
 var import_getNode22TypesVersion = require("./getNode22TypesVersion");
 var import_packageJsonChecks = require("./packageJsonChecks");
 const DEFAULT_NODE_TYPES = "22.9.0";
-const getNode22TypeVersion = (major, defaultVersion) => {
-  try {
-    const version = (0, import_getNode22TypesVersion.getNode22TypesVersion)(major);
-    const versionRegex = /(22\.\d+\.\d+)/;
-    if (!version || !versionRegex.test(version)) {
-      throw new Error("No version found");
-    }
-    const sanitizedVersion = version.replace(versionRegex, "$1").replace(/"/g, "").trim();
-    return {
-      version: sanitizedVersion,
-      err: void 0
-    };
-  } catch {
-    return {
-      version: defaultVersion,
-      err: "Failed to fetch latest version, using fallback version"
-    };
-  }
-};
 const SHA_REGEX = /(?<=node.*)(@sha256:[a-f0-9]{64})/gm;
 const subPatches = [
   { id: "nvmrc", file: ".nvmrc", replace: "<%- version %>\n" },
@@ -120,12 +100,20 @@ const subPatches = [
       replace: "$1<%- version %>$3"
     }
   ],
-  {
-    id: "tsconfig",
-    files: "**/tsconfig.json",
-    test: /("target":\s*")(ES?:[0-9]+|Next|[A-Za-z]+[0-9]*)"/gim,
-    replace: '$1<%- version %>"'
-  },
+  [
+    {
+      id: "tsconfig-target",
+      files: "**/tsconfig.json",
+      test: /("target":\s*")(ES\d+)"/gim,
+      replace: '$1<%- version %>"'
+    },
+    {
+      id: "tsconfig-lib",
+      files: "**/tsconfig.json",
+      test: /("lib":\s*\[)([\S\s]*?)(ES\d+)([\S\s]*?)(\])/gim,
+      replace: "$1$2<%- version %>$4$5"
+    }
+  ],
   {
     id: "docker-compose",
     files: "**/docker-compose*.y*ml",
@@ -161,10 +149,14 @@ const runSubPatch = async ({ nodeVersion, nodeTypesVersion, ECMAScriptVersion },
       }
       const unPinnedContents = removeNodeShas(contents);
       if (patch.id === "serverless") {
-        await (0, import_packageJsonChecks.checkServerlessVersion)();
+        if (!await (0, import_packageJsonChecks.validServerlessVersion)()) {
+          return;
+        }
       }
       if (patch.id === "package-json-1") {
-        await (0, import_packageJsonChecks.checkServerlessVersion)();
+        if (!await (0, import_packageJsonChecks.validServerlessVersion)()) {
+          return;
+        }
         return await writePatchedContents({
           path,
           contents: unPinnedContents,
@@ -175,9 +167,10 @@ const runSubPatch = async ({ nodeVersion, nodeTypesVersion, ECMAScriptVersion },
           test: patch.test
         });
       }
-      if (patch.id === "tsconfig") {
-        await (0, import_packageJsonChecks.checkSkubaType)();
-        await (0, import_packageJsonChecks.checkServerlessVersion)();
+      if (patch.id.includes("tsconfig")) {
+        if (!await (0, import_packageJsonChecks.validServerlessVersion)() || !await (0, import_packageJsonChecks.validSkubaType)()) {
+          return;
+        }
         return await writePatchedContents({
           path,
           contents: unPinnedContents,
@@ -189,8 +182,9 @@ const runSubPatch = async ({ nodeVersion, nodeTypesVersion, ECMAScriptVersion },
         });
       }
       if (patch.id === "package-json-2") {
-        await (0, import_packageJsonChecks.checkSkubaType)();
-        await (0, import_packageJsonChecks.checkServerlessVersion)();
+        if (!await (0, import_packageJsonChecks.validServerlessVersion)() || !await (0, import_packageJsonChecks.validSkubaType)()) {
+          return;
+        }
       }
       await writePatchedContents({
         path,
@@ -230,7 +224,7 @@ const nodeVersionMigration = async ({
 }, dir = process.cwd()) => {
   import_logging.log.ok(`Upgrading to Node.js ${nodeVersion}`);
   try {
-    const { version: nodeTypesVersion, err } = getNode22TypeVersion(
+    const { version: nodeTypesVersion, err } = await (0, import_getNode22TypesVersion.getNode22TypesVersion)(
       nodeVersion,
       DEFAULT_NODE_TYPES
     );
@@ -247,7 +241,6 @@ const nodeVersionMigration = async ({
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getNode22TypeVersion,
   nodeVersionMigration
 });
 //# sourceMappingURL=index.js.map

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 { checkServerlessVersion, checkSkubaType } 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\ntype VersionResult = {\n  version: string;\n  err: string | undefined;\n};\n\nexport const getNode22TypeVersion = (\n  major: number,\n  defaultVersion: string,\n): VersionResult => {\n  try {\n    const version = getNode22TypesVersion(major);\n    const versionRegex = /(22\\.\\d+\\.\\d+)/;\n    if (!version || !versionRegex.test(version)) {\n      throw new Error('No version found');\n    }\n    const sanitizedVersion = version\n      .replace(versionRegex, '$1')\n      .replace(/\"/g, '')\n      .trim();\n    return {\n      version: sanitizedVersion,\n      err: undefined,\n    };\n  } catch {\n    return {\n      version: defaultVersion,\n      err: 'Failed to fetch latest version, using fallback version',\n    };\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    id: 'tsconfig',\n    files: '**/tsconfig.json',\n    test: /(\"target\":\\s*\")(ES?:[0-9]+|Next|[A-Za-z]+[0-9]*)\"/gim,\n    replace: '$1<%- version %>\"',\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        await checkServerlessVersion();\n      }\n\n      if (patch.id === 'package-json-1') {\n        await checkServerlessVersion();\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 === 'tsconfig') {\n        await checkSkubaType();\n        await checkServerlessVersion();\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        await checkSkubaType();\n        await checkServerlessVersion();\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 } = getNode22TypeVersion(\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 { 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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",
   "names": ["fs"]
 }

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

@@ -1,2 +1,2 @@
-export declare const checkServerlessVersion: () => Promise<void>;
-export declare const checkSkubaType: () => Promise<void>;
+export declare const validServerlessVersion: () => Promise<boolean>;
+export declare const validSkubaType: () => Promise<boolean>;

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

@@ -28,12 +28,13 @@ 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, {
-  checkServerlessVersion: () => checkServerlessVersion,
-  checkSkubaType: () => checkSkubaType
+  validServerlessVersion: () => validServerlessVersion,
+  validSkubaType: () => validSkubaType
 });
 module.exports = __toCommonJS(packageJsonChecks_exports);
 var import_find_up = __toESM(require("find-up"));
 var import_fs_extra = __toESM(require("fs-extra"));
+var import_logging = require("../../../utils/logging");
 const getParentPackageJson = async () => {
   const packageJsonPath = await (0, import_find_up.default)("package.json", { cwd: process.cwd() });
   if (!packageJsonPath) {
@@ -43,47 +44,51 @@ const getParentPackageJson = async () => {
 };
 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 checkServerlessVersion = async () => {
+const validServerlessVersion = async () => {
   const packageJson = await getParentPackageJson();
   try {
     const serverlessVersion = JSON.parse(packageJson.toString()).devDependencies.serverless;
     if (!serverlessVersion) {
-      return;
+      return true;
     }
     if (!serverlessVersion.startsWith("4")) {
-      throw new Error(
-        "Serverless version not supported, please upgrade to 4.x"
+      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;
+      return true;
     }
     throw error;
   }
+  return true;
 };
-const checkSkubaType = async () => {
+const validSkubaType = async () => {
   const packageJson = await getParentPackageJson();
   try {
     const type = JSON.parse(packageJson.toString()).skuba.type;
     if (!type) {
-      return;
+      return true;
     }
     if (type === "package") {
-      throw new Error(
-        "Skuba type package is not supported, packages should be updated manually to ensure major runtime depreciations are intended"
+      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;
+      return true;
     }
     throw error;
   }
+  return true;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  checkServerlessVersion,
-  checkSkubaType
+  validServerlessVersion,
+  validSkubaType
 });
 //# 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\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 checkServerlessVersion = async () => {\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;\n    }\n\n    if (!serverlessVersion.startsWith('4')) {\n      throw new Error(\n        'Serverless version not supported, please upgrade to 4.x',\n      );\n    }\n  } catch (error) {\n    if (isTypeError(error) || isSyntaxError(error)) {\n      return;\n    }\n    throw error;\n  }\n};\n\nexport const checkSkubaType = 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;\n    }\n\n    if (type === 'package') {\n      throw new Error(\n        'Skuba type package is not supported, packages should be updated manually to ensure major runtime depreciations are intended',\n      );\n    }\n  } catch (error) {\n    if (isTypeError(error) || isSyntaxError(error)) {\n      return;\n    }\n    throw error;\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAmB;AACnB,sBAAe;AAEf,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,YAAY;AAChD,QAAM,cAAc,MAAM,qBAAqB;AAE/C,MAAI;AACF,UAAM,oBACJ,KAAK,MAAM,YAAY,SAAS,CAAC,EAGjC,gBAAgB;AAClB,QAAI,CAAC,mBAAmB;AACtB;AAAA,IACF;AAEA,QAAI,CAAC,kBAAkB,WAAW,GAAG,GAAG;AACtC,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAAA,EACF,SAAS,OAAO;AACd,QAAI,YAAY,KAAK,KAAK,cAAc,KAAK,GAAG;AAC9C;AAAA,IACF;AACA,UAAM;AAAA,EACR;AACF;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;AAAA,IACF;AAEA,QAAI,SAAS,WAAW;AACtB,YAAM,IAAI;AAAA,QACR;AAAA,MACF;AAAA,IACF;AAAA,EACF,SAAS,OAAO;AACd,QAAI,YAAY,KAAK,KAAK,cAAc,KAAK,GAAG;AAC9C;AAAA,IACF;AACA,UAAM;AAAA,EACR;AACF;",
+  "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;",
   "names": ["findUp", "fs"]
 }

package/lib/index.js

@@ -26,15 +26,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   Buildkite: () => Buildkite,
   Git: () => Git,
   GitHub: () => GitHub,
   Jest: () => Jest,
   Net: () => Net
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 var Buildkite = __toESM(require("./api/buildkite"));
 var Git = __toESM(require("./api/git"));
 var GitHub = __toESM(require("./api/github"));

package/lib/utils/template.d.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
-export declare const TEMPLATE_NAMES: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package"];
+export declare const TEMPLATE_NAMES: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package"];
 export type TemplateName = (typeof TEMPLATE_NAMES)[number];
-export declare const TEMPLATE_NAMES_WITH_BYO: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package", "github →"];
+export declare const TEMPLATE_NAMES_WITH_BYO: readonly ["express-rest-api", "greeter", "koa-rest-api", "lambda-sqs-worker-cdk", "oss-npm-package", "private-npm-package", "github →"];
 interface TemplateDocumentationConfig {
     /**
      * The semantic version in which the template was first added.

package/lib/utils/template.js

@@ -48,7 +48,6 @@ const TEMPLATE_NAMES = [
   "express-rest-api",
   "greeter",
   "koa-rest-api",
-  "lambda-sqs-worker",
   "lambda-sqs-worker-cdk",
   "oss-npm-package",
   "private-npm-package"
@@ -67,10 +66,6 @@ const TEMPLATE_DOCUMENTATION_CONFIG = {
     added: "3.4.1",
     filename: "api.md"
   },
-  "lambda-sqs-worker": {
-    added: "3.4.1",
-    filename: "worker.md"
-  },
   "lambda-sqs-worker-cdk": {
     added: "3.13.0",
     filename: "worker.md"

package/lib/utils/template.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/template.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport { z } from 'zod';\n\nimport { projectTypeSchema } from './manifest';\nimport { packageManagerSchema } from './packageManager';\n\nexport const TEMPLATE_NAMES = [\n  'express-rest-api',\n  'greeter',\n  'koa-rest-api',\n  'lambda-sqs-worker',\n  'lambda-sqs-worker-cdk',\n  'oss-npm-package',\n  'private-npm-package',\n] as const;\n\nexport type TemplateName = (typeof TEMPLATE_NAMES)[number];\n\nexport const TEMPLATE_NAMES_WITH_BYO = [...TEMPLATE_NAMES, 'github \u2192'] as const;\n\ninterface TemplateDocumentationConfig {\n  /**\n   * The semantic version in which the template was first added.\n   *\n   * This is used to filter out historical changelogs.\n   */\n  added: string;\n\n  /**\n   * The Markdown file for the template in our `/docs`.\n   *\n   * This is used to compile per-template changelogs for our documentation site.\n   */\n  filename: string;\n}\n\nexport const TEMPLATE_DOCUMENTATION_CONFIG: Record<\n  TemplateName,\n  TemplateDocumentationConfig\n> = {\n  'express-rest-api': {\n    added: '3.8.0',\n    filename: 'api.md',\n  },\n  greeter: {\n    added: '3.4.1',\n    filename: 'barebones.md',\n  },\n  'koa-rest-api': {\n    added: '3.4.1',\n    filename: 'api.md',\n  },\n  'lambda-sqs-worker': {\n    added: '3.4.1',\n    filename: 'worker.md',\n  },\n  'lambda-sqs-worker-cdk': {\n    added: '3.13.0',\n    filename: 'worker.md',\n  },\n  'oss-npm-package': {\n    added: '3.7.0',\n    filename: 'package.md',\n  },\n  'private-npm-package': {\n    added: '3.6.0',\n    filename: 'package.md',\n  },\n};\n\nexport type TemplateConfig = z.infer<typeof templateConfigSchema>;\n\nexport const templateConfigSchema = z.object({\n  fields: z.array(\n    z.object({\n      name: z.string(),\n      message: z.string(),\n      initial: z.string(),\n      validate: z\n        .function()\n        .args(z.string())\n        .returns(z.union([z.boolean(), z.string()]))\n        .optional(),\n    }),\n  ),\n  entryPoint: z.string().optional(),\n  noSkip: z.boolean().optional(),\n  packageManager: packageManagerSchema,\n  type: projectTypeSchema.optional(),\n});\n\nexport const TEMPLATE_CONFIG_FILENAME = 'skuba.template.js';\n\nexport const TEMPLATE_DIR = path.join(__dirname, '..', '..', 'template');\n\nexport const BASE_TEMPLATE_DIR = path.join(TEMPLATE_DIR, 'base');\n\nexport const ensureTemplateConfigDeletion = (dir: string): Promise<void> =>\n  fs.promises.rm(path.join(dir, TEMPLATE_CONFIG_FILENAME));\n\nexport const readBaseTemplateFile = (src: string): Promise<string> =>\n  fs.promises.readFile(path.join(BASE_TEMPLATE_DIR, src), 'utf8');\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AACf,iBAAkB;AAElB,sBAAkC;AAClC,4BAAqC;AAE9B,MAAM,iBAAiB;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAIO,MAAM,0BAA0B,CAAC,GAAG,gBAAgB,eAAU;AAkB9D,MAAM,gCAGT;AAAA,EACF,oBAAoB;AAAA,IAClB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,SAAS;AAAA,IACP,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,gBAAgB;AAAA,IACd,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,qBAAqB;AAAA,IACnB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,yBAAyB;AAAA,IACvB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,mBAAmB;AAAA,IACjB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,uBAAuB;AAAA,IACrB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AACF;AAIO,MAAM,uBAAuB,aAAE,OAAO;AAAA,EAC3C,QAAQ,aAAE;AAAA,IACR,aAAE,OAAO;AAAA,MACP,MAAM,aAAE,OAAO;AAAA,MACf,SAAS,aAAE,OAAO;AAAA,MAClB,SAAS,aAAE,OAAO;AAAA,MAClB,UAAU,aACP,SAAS,EACT,KAAK,aAAE,OAAO,CAAC,EACf,QAAQ,aAAE,MAAM,CAAC,aAAE,QAAQ,GAAG,aAAE,OAAO,CAAC,CAAC,CAAC,EAC1C,SAAS;AAAA,IACd,CAAC;AAAA,EACH;AAAA,EACA,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,EAChC,QAAQ,aAAE,QAAQ,EAAE,SAAS;AAAA,EAC7B,gBAAgB;AAAA,EAChB,MAAM,kCAAkB,SAAS;AACnC,CAAC;AAEM,MAAM,2BAA2B;AAEjC,MAAM,eAAe,YAAAA,QAAK,KAAK,WAAW,MAAM,MAAM,UAAU;AAEhE,MAAM,oBAAoB,YAAAA,QAAK,KAAK,cAAc,MAAM;AAExD,MAAM,+BAA+B,CAAC,QAC3C,gBAAAC,QAAG,SAAS,GAAG,YAAAD,QAAK,KAAK,KAAK,wBAAwB,CAAC;AAElD,MAAM,uBAAuB,CAAC,QACnC,gBAAAC,QAAG,SAAS,SAAS,YAAAD,QAAK,KAAK,mBAAmB,GAAG,GAAG,MAAM;",
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport { z } from 'zod';\n\nimport { projectTypeSchema } from './manifest';\nimport { packageManagerSchema } from './packageManager';\n\nexport const TEMPLATE_NAMES = [\n  'express-rest-api',\n  'greeter',\n  'koa-rest-api',\n  'lambda-sqs-worker-cdk',\n  'oss-npm-package',\n  'private-npm-package',\n] as const;\n\nexport type TemplateName = (typeof TEMPLATE_NAMES)[number];\n\nexport const TEMPLATE_NAMES_WITH_BYO = [...TEMPLATE_NAMES, 'github \u2192'] as const;\n\ninterface TemplateDocumentationConfig {\n  /**\n   * The semantic version in which the template was first added.\n   *\n   * This is used to filter out historical changelogs.\n   */\n  added: string;\n\n  /**\n   * The Markdown file for the template in our `/docs`.\n   *\n   * This is used to compile per-template changelogs for our documentation site.\n   */\n  filename: string;\n}\n\nexport const TEMPLATE_DOCUMENTATION_CONFIG: Record<\n  TemplateName,\n  TemplateDocumentationConfig\n> = {\n  'express-rest-api': {\n    added: '3.8.0',\n    filename: 'api.md',\n  },\n  greeter: {\n    added: '3.4.1',\n    filename: 'barebones.md',\n  },\n  'koa-rest-api': {\n    added: '3.4.1',\n    filename: 'api.md',\n  },\n  'lambda-sqs-worker-cdk': {\n    added: '3.13.0',\n    filename: 'worker.md',\n  },\n  'oss-npm-package': {\n    added: '3.7.0',\n    filename: 'package.md',\n  },\n  'private-npm-package': {\n    added: '3.6.0',\n    filename: 'package.md',\n  },\n};\n\nexport type TemplateConfig = z.infer<typeof templateConfigSchema>;\n\nexport const templateConfigSchema = z.object({\n  fields: z.array(\n    z.object({\n      name: z.string(),\n      message: z.string(),\n      initial: z.string(),\n      validate: z\n        .function()\n        .args(z.string())\n        .returns(z.union([z.boolean(), z.string()]))\n        .optional(),\n    }),\n  ),\n  entryPoint: z.string().optional(),\n  noSkip: z.boolean().optional(),\n  packageManager: packageManagerSchema,\n  type: projectTypeSchema.optional(),\n});\n\nexport const TEMPLATE_CONFIG_FILENAME = 'skuba.template.js';\n\nexport const TEMPLATE_DIR = path.join(__dirname, '..', '..', 'template');\n\nexport const BASE_TEMPLATE_DIR = path.join(TEMPLATE_DIR, 'base');\n\nexport const ensureTemplateConfigDeletion = (dir: string): Promise<void> =>\n  fs.promises.rm(path.join(dir, TEMPLATE_CONFIG_FILENAME));\n\nexport const readBaseTemplateFile = (src: string): Promise<string> =>\n  fs.promises.readFile(path.join(BASE_TEMPLATE_DIR, src), 'utf8');\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AACf,iBAAkB;AAElB,sBAAkC;AAClC,4BAAqC;AAE9B,MAAM,iBAAiB;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAIO,MAAM,0BAA0B,CAAC,GAAG,gBAAgB,eAAU;AAkB9D,MAAM,gCAGT;AAAA,EACF,oBAAoB;AAAA,IAClB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,SAAS;AAAA,IACP,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,gBAAgB;AAAA,IACd,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,yBAAyB;AAAA,IACvB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,mBAAmB;AAAA,IACjB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AAAA,EACA,uBAAuB;AAAA,IACrB,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AACF;AAIO,MAAM,uBAAuB,aAAE,OAAO;AAAA,EAC3C,QAAQ,aAAE;AAAA,IACR,aAAE,OAAO;AAAA,MACP,MAAM,aAAE,OAAO;AAAA,MACf,SAAS,aAAE,OAAO;AAAA,MAClB,SAAS,aAAE,OAAO;AAAA,MAClB,UAAU,aACP,SAAS,EACT,KAAK,aAAE,OAAO,CAAC,EACf,QAAQ,aAAE,MAAM,CAAC,aAAE,QAAQ,GAAG,aAAE,OAAO,CAAC,CAAC,CAAC,EAC1C,SAAS;AAAA,IACd,CAAC;AAAA,EACH;AAAA,EACA,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,EAChC,QAAQ,aAAE,QAAQ,EAAE,SAAS;AAAA,EAC7B,gBAAgB;AAAA,EAChB,MAAM,kCAAkB,SAAS;AACnC,CAAC;AAEM,MAAM,2BAA2B;AAEjC,MAAM,eAAe,YAAAA,QAAK,KAAK,WAAW,MAAM,MAAM,UAAU;AAEhE,MAAM,oBAAoB,YAAAA,QAAK,KAAK,cAAc,MAAM;AAExD,MAAM,+BAA+B,CAAC,QAC3C,gBAAAC,QAAG,SAAS,GAAG,YAAAD,QAAK,KAAK,KAAK,wBAAwB,CAAC;AAElD,MAAM,uBAAuB,CAAC,QACnC,gBAAAC,QAAG,SAAS,SAAS,YAAAD,QAAK,KAAK,mBAAmB,GAAG,GAAG,MAAM;",
   "names": ["path", "fs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "10.0.0-node-22-20250115223210",
+  "version": "10.0.0-node-22-20250213035014",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -64,7 +64,7 @@
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
-    "esbuild": "~0.24.0",
+    "esbuild": "~0.25.0",
     "eslint": "^9.11.1",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
@@ -85,7 +85,7 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
-    "prettier": "~3.4.0",
+    "prettier": "~3.5.0",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
     "semantic-release": "^22.0.12",
@@ -99,15 +99,15 @@
     "typescript": "~5.7.0",
     "validate-npm-package-name": "^6.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.1.0-node-22-20250115223210"
+    "eslint-config-skuba": "5.1.0-node-22-20250213035014"
   },
   "devDependencies": {
-    "@changesets/cli": "2.27.11",
+    "@changesets/cli": "2.27.12",
     "@changesets/get-github-info": "0.6.0",
     "@jest/reporters": "29.7.0",
     "@jest/test-result": "29.7.0",
     "@types/ejs": "3.1.5",
-    "@types/express": "4.17.21",
+    "@types/express": "5.0.0",
     "@types/fs-extra": "11.0.4",
     "@types/koa": "2.15.0",
     "@types/libnpmsearch": "2.0.7",
@@ -115,20 +115,20 @@
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
     "@types/npm-which": "3.0.3",
-    "@types/picomatch": "3.0.1",
+    "@types/picomatch": "3.0.2",
     "@types/semver": "7.5.8",
     "@types/supertest": "6.0.2",
     "@types/validate-npm-package-name": "4.0.2",
-    "enhanced-resolve": "5.18.0",
-    "express": "4.21.2",
-    "fastify": "5.2.0",
+    "enhanced-resolve": "5.18.1",
+    "express": "5.0.1",
+    "fastify": "5.2.1",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
-    "koa": "2.15.3",
-    "memfs": "4.15.1",
+    "koa": "2.15.4",
+    "memfs": "4.17.0",
     "remark-cli": "12.0.1",
-    "remark-preset-lint-recommended": "7.0.0",
-    "semver": "7.6.3",
+    "remark-preset-lint-recommended": "7.0.1",
+    "semver": "7.7.1",
     "supertest": "7.0.0",
     "type-fest": "2.19.0"
   },

package/template/base/tsconfig.json

@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
-    "lib": ["ES2022"],
+    "lib": ["ES2024"],
     "outDir": "lib",
     "paths": {
       "src": ["src"]
     },
-    "target": "ES2022"
+    "target": "ES2024"
   },
   "exclude": ["lib*/**/*"],
   "extends": "skuba/config/tsconfig.json"

package/template/express-rest-api/.buildkite/pipeline.yml

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -70,7 +70,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -87,7 +87,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -102,7 +102,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/express-rest-api/.gantry/common.yml

@@ -9,6 +9,5 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:source:sha: '{{.CommitSHA}}'
   seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
-  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
+  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema'

package/template/express-rest-api/.nvmrc

@@ -1 +1 @@
-20
+22

package/template/express-rest-api/Dockerfile

@@ -12,7 +12,7 @@ RUN pnpm install --offline --prod
 
 ###
 
-FROM gcr.io/distroless/nodejs20-debian12 AS runtime
+FROM gcr.io/distroless/nodejs22-debian12 AS runtime
 
 WORKDIR /workdir