skuba 9.1.0 → 10.0.0-node-22-20250110051224

package/lib/cli/adapter/prettier.js

@@ -163,7 +163,10 @@ const runPrettier = async (mode, logger, cwd = process.cwd()) => {
   if (result.errored.length) {
     logger.plain(`Flagged ${(0, import_logging.pluralise)(result.errored.length, "file")}:`);
     for (const { err, filepath } of result.errored) {
-      logger.warn(filepath, ...err ? [String(err)] : []);
+      logger.warn(
+        filepath,
+        ...typeof err === "string" || err instanceof Error ? [String(err)] : []
+      );
     }
   }
   return { ok: result.errored.length === 0, result };

package/lib/cli/adapter/prettier.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/adapter/prettier.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport {\n  type Options,\n  type SupportLanguage,\n  check,\n  format,\n  getSupportInfo,\n  resolveConfig,\n} from 'prettier';\n\nimport { crawlDirectory } from '../../utils/dir';\nimport { type Logger, pluralise } from '../../utils/logging';\nimport { getConsumerManifest } from '../../utils/manifest';\nimport { formatPackage, parsePackage } from '../configure/processing/package';\n\nlet languages: SupportLanguage[] | undefined;\n\n/**\n * Infers a parser for the specified filepath.\n *\n * This is a cut-down version of Prettier's built-in function of the same name;\n * ours operates purely on the `filepath` string and does not perform file I/O.\n * Prettier's internal `getInterpreter` function can open a file to read the\n * shebang, and its file descriptor usage can throw warnings on worker threads:\n *\n * ```console\n * Warning: File descriptor 123 closed but not opened in unmanaged mode\n *     at Object.closeSync (node:fs:530:11)\n *     at Object.closeSync (node_modules/graceful-fs/graceful-fs.js:74:20)\n *     ...\n * ```\n *\n * References:\n *\n * - https://github.com/prettier/prettier/blob/2.4.1/src/main/options.js#L167\n * - seek-oss/skuba#659\n */\nexport const inferParser = async (\n  filepath: string,\n): Promise<string | undefined> => {\n  const filename = path.basename(filepath).toLowerCase();\n\n  languages ??= (await getSupportInfo()).languages;\n\n  const firstLanguage = languages.find(\n    (language) =>\n      language.extensions?.some((extension) => filename.endsWith(extension)) ||\n      language.filenames?.some((name) => name.toLowerCase() === filename),\n  );\n\n  return firstLanguage?.parsers[0];\n};\n\nconst isPackageJsonOk = async ({\n  data,\n  filepath,\n}: {\n  data: string;\n  filepath: string;\n}): Promise<boolean> => {\n  if (path.basename(filepath) !== 'package.json') {\n    return true;\n  }\n\n  try {\n    const packageJson = parsePackage(data);\n\n    return !packageJson || (await formatPackage(packageJson)) === data;\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  return true;\n};\n\ninterface File {\n  data: string;\n  options: Options;\n  filepath: string;\n}\n\ninterface Result {\n  count: number;\n  errored: Array<{ err?: unknown; filepath: string }>;\n  touched: string[];\n  unparsed: string[];\n}\n\nexport const formatOrLintFile = async (\n  { data, filepath, options }: File,\n  mode: 'format' | 'lint',\n  result: Result | null,\n): Promise<string | undefined> => {\n  if (mode === 'lint') {\n    let ok: boolean;\n    try {\n      ok =\n        (await check(data, options)) &&\n        (await isPackageJsonOk({ data, filepath }));\n    } catch (err) {\n      result?.errored.push({ err, filepath });\n      return;\n    }\n\n    if (!ok) {\n      result?.errored.push({ filepath });\n    }\n\n    return;\n  }\n\n  let formatted: string;\n  try {\n    formatted = await format(data, options);\n  } catch (err) {\n    result?.errored.push({ err, filepath });\n    return;\n  }\n\n  // Perform additional formatting (i.e. sorting) on a `package.json` manifest.\n  try {\n    if (path.basename(filepath) === 'package.json') {\n      const packageJson = parsePackage(formatted);\n      if (packageJson) {\n        formatted = await formatPackage(packageJson);\n      }\n    }\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  if (formatted === data) {\n    return;\n  }\n\n  result?.touched.push(filepath);\n  return formatted;\n};\n\nexport interface PrettierOutput {\n  ok: boolean;\n  result: Result;\n}\n\n/**\n * Formats/lints files with Prettier.\n *\n * Prettier doesn't provide a higher-level Node.js API that replicates the\n * behaviour of its CLI, so we have to plumb together its lower-level functions.\n * On the other hand, this affords more flexibility in how we track and report\n * on progress and results.\n */\nexport const runPrettier = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  cwd = process.cwd(),\n): Promise<PrettierOutput> => {\n  logger.debug('Initialising Prettier...');\n\n  const start = process.hrtime.bigint();\n\n  const manifest = await getConsumerManifest(cwd);\n\n  const directory = manifest ? path.dirname(manifest.path) : cwd;\n\n  logger.debug(\n    manifest ? 'Detected project root:' : 'Detected working directory:',\n    directory,\n  );\n\n  logger.debug('Discovering files...');\n\n  // Match Prettier's opinion of respecting `.gitignore`.\n  // This avoids exhibiting different behaviour than a Prettier IDE integration,\n  // though it may present headaches if `.gitignore` and `.prettierignore` rules\n  // conflict.\n  const relativeFilepaths = await crawlDirectory(directory, [\n    '.gitignore',\n    '.prettierignore',\n  ]);\n\n  logger.debug(`Discovered ${pluralise(relativeFilepaths.length, 'file')}.`);\n\n  const result: Result = {\n    count: relativeFilepaths.length,\n    errored: [],\n    touched: [],\n    unparsed: [],\n  };\n\n  logger.debug(mode === 'format' ? 'Formatting' : 'Linting', 'files...');\n\n  for (const relativeFilepath of relativeFilepaths) {\n    // Use relative paths to keep log output cleaner, particularly in the common\n    // case where we are executing against the current working directory.\n    const filepath = path.relative(\n      process.cwd(),\n      path.join(directory, relativeFilepath),\n    );\n\n    // Infer parser upfront so we can skip unsupported files.\n    const parser = await inferParser(filepath);\n\n    logger.debug(filepath);\n    logger.debug('  parser:', parser ?? '-');\n\n    if (!parser) {\n      result.unparsed.push(filepath);\n      continue;\n    }\n\n    const [config, data] = await Promise.all([\n      resolveConfig(filepath),\n      fs.promises.readFile(filepath, 'utf-8'),\n    ]);\n\n    const file: File = {\n      data,\n      filepath,\n      options: { ...config, filepath },\n    };\n\n    const formatted = await formatOrLintFile(file, mode, result);\n\n    if (typeof formatted === 'string') {\n      await fs.promises.writeFile(filepath, formatted);\n    }\n  }\n\n  const end = process.hrtime.bigint();\n\n  logger.plain(\n    `Processed ${pluralise(\n      result.count - result.unparsed.length,\n      'file',\n    )} in ${logger.timing(start, end)}.`,\n  );\n\n  if (result.touched.length) {\n    logger.plain(`Formatted ${pluralise(result.touched.length, 'file')}:`);\n    for (const filepath of result.touched) {\n      logger.warn(filepath);\n    }\n  }\n\n  if (result.errored.length) {\n    logger.plain(`Flagged ${pluralise(result.errored.length, 'file')}:`);\n    for (const { err, filepath } of result.errored) {\n      logger.warn(filepath, ...(err ? [String(err)] : []));\n    }\n  }\n\n  return { ok: result.errored.length === 0, result };\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport {\n  type Options,\n  type SupportLanguage,\n  check,\n  format,\n  getSupportInfo,\n  resolveConfig,\n} from 'prettier';\n\nimport { crawlDirectory } from '../../utils/dir';\nimport { type Logger, pluralise } from '../../utils/logging';\nimport { getConsumerManifest } from '../../utils/manifest';\nimport { formatPackage, parsePackage } from '../configure/processing/package';\n\nlet languages: SupportLanguage[] | undefined;\n\n/**\n * Infers a parser for the specified filepath.\n *\n * This is a cut-down version of Prettier's built-in function of the same name;\n * ours operates purely on the `filepath` string and does not perform file I/O.\n * Prettier's internal `getInterpreter` function can open a file to read the\n * shebang, and its file descriptor usage can throw warnings on worker threads:\n *\n * ```console\n * Warning: File descriptor 123 closed but not opened in unmanaged mode\n *     at Object.closeSync (node:fs:530:11)\n *     at Object.closeSync (node_modules/graceful-fs/graceful-fs.js:74:20)\n *     ...\n * ```\n *\n * References:\n *\n * - https://github.com/prettier/prettier/blob/2.4.1/src/main/options.js#L167\n * - seek-oss/skuba#659\n */\nexport const inferParser = async (\n  filepath: string,\n): Promise<string | undefined> => {\n  const filename = path.basename(filepath).toLowerCase();\n\n  languages ??= (await getSupportInfo()).languages;\n\n  const firstLanguage = languages.find(\n    (language) =>\n      language.extensions?.some((extension) => filename.endsWith(extension)) ||\n      language.filenames?.some((name) => name.toLowerCase() === filename),\n  );\n\n  return firstLanguage?.parsers[0];\n};\n\nconst isPackageJsonOk = async ({\n  data,\n  filepath,\n}: {\n  data: string;\n  filepath: string;\n}): Promise<boolean> => {\n  if (path.basename(filepath) !== 'package.json') {\n    return true;\n  }\n\n  try {\n    const packageJson = parsePackage(data);\n\n    return !packageJson || (await formatPackage(packageJson)) === data;\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  return true;\n};\n\ninterface File {\n  data: string;\n  options: Options;\n  filepath: string;\n}\n\ninterface Result {\n  count: number;\n  errored: Array<{ err?: unknown; filepath: string }>;\n  touched: string[];\n  unparsed: string[];\n}\n\nexport const formatOrLintFile = async (\n  { data, filepath, options }: File,\n  mode: 'format' | 'lint',\n  result: Result | null,\n): Promise<string | undefined> => {\n  if (mode === 'lint') {\n    let ok: boolean;\n    try {\n      ok =\n        (await check(data, options)) &&\n        (await isPackageJsonOk({ data, filepath }));\n    } catch (err) {\n      result?.errored.push({ err, filepath });\n      return;\n    }\n\n    if (!ok) {\n      result?.errored.push({ filepath });\n    }\n\n    return;\n  }\n\n  let formatted: string;\n  try {\n    formatted = await format(data, options);\n  } catch (err) {\n    result?.errored.push({ err, filepath });\n    return;\n  }\n\n  // Perform additional formatting (i.e. sorting) on a `package.json` manifest.\n  try {\n    if (path.basename(filepath) === 'package.json') {\n      const packageJson = parsePackage(formatted);\n      if (packageJson) {\n        formatted = await formatPackage(packageJson);\n      }\n    }\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  if (formatted === data) {\n    return;\n  }\n\n  result?.touched.push(filepath);\n  return formatted;\n};\n\nexport interface PrettierOutput {\n  ok: boolean;\n  result: Result;\n}\n\n/**\n * Formats/lints files with Prettier.\n *\n * Prettier doesn't provide a higher-level Node.js API that replicates the\n * behaviour of its CLI, so we have to plumb together its lower-level functions.\n * On the other hand, this affords more flexibility in how we track and report\n * on progress and results.\n */\nexport const runPrettier = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  cwd = process.cwd(),\n): Promise<PrettierOutput> => {\n  logger.debug('Initialising Prettier...');\n\n  const start = process.hrtime.bigint();\n\n  const manifest = await getConsumerManifest(cwd);\n\n  const directory = manifest ? path.dirname(manifest.path) : cwd;\n\n  logger.debug(\n    manifest ? 'Detected project root:' : 'Detected working directory:',\n    directory,\n  );\n\n  logger.debug('Discovering files...');\n\n  // Match Prettier's opinion of respecting `.gitignore`.\n  // This avoids exhibiting different behaviour than a Prettier IDE integration,\n  // though it may present headaches if `.gitignore` and `.prettierignore` rules\n  // conflict.\n  const relativeFilepaths = await crawlDirectory(directory, [\n    '.gitignore',\n    '.prettierignore',\n  ]);\n\n  logger.debug(`Discovered ${pluralise(relativeFilepaths.length, 'file')}.`);\n\n  const result: Result = {\n    count: relativeFilepaths.length,\n    errored: [],\n    touched: [],\n    unparsed: [],\n  };\n\n  logger.debug(mode === 'format' ? 'Formatting' : 'Linting', 'files...');\n\n  for (const relativeFilepath of relativeFilepaths) {\n    // Use relative paths to keep log output cleaner, particularly in the common\n    // case where we are executing against the current working directory.\n    const filepath = path.relative(\n      process.cwd(),\n      path.join(directory, relativeFilepath),\n    );\n\n    // Infer parser upfront so we can skip unsupported files.\n    const parser = await inferParser(filepath);\n\n    logger.debug(filepath);\n    logger.debug('  parser:', parser ?? '-');\n\n    if (!parser) {\n      result.unparsed.push(filepath);\n      continue;\n    }\n\n    const [config, data] = await Promise.all([\n      resolveConfig(filepath),\n      fs.promises.readFile(filepath, 'utf-8'),\n    ]);\n\n    const file: File = {\n      data,\n      filepath,\n      options: { ...config, filepath },\n    };\n\n    const formatted = await formatOrLintFile(file, mode, result);\n\n    if (typeof formatted === 'string') {\n      await fs.promises.writeFile(filepath, formatted);\n    }\n  }\n\n  const end = process.hrtime.bigint();\n\n  logger.plain(\n    `Processed ${pluralise(\n      result.count - result.unparsed.length,\n      'file',\n    )} in ${logger.timing(start, end)}.`,\n  );\n\n  if (result.touched.length) {\n    logger.plain(`Formatted ${pluralise(result.touched.length, 'file')}:`);\n    for (const filepath of result.touched) {\n      logger.warn(filepath);\n    }\n  }\n\n  if (result.errored.length) {\n    logger.plain(`Flagged ${pluralise(result.errored.length, 'file')}:`);\n    for (const { err, filepath } of result.errored) {\n      logger.warn(\n        filepath,\n        ...(typeof err === 'string' || err instanceof Error\n          ? [String(err)]\n          : []),\n      );\n    }\n  }\n\n  return { ok: result.errored.length === 0, result };\n};\n"],
+  "mappings": "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",
   "names": ["path", "fs"]
 }

package/lib/cli/configure/analysis/git.js

@@ -37,14 +37,27 @@ var import_dir = require("../../../utils/dir");
 var import_logging = require("../../../utils/logging");
 const auditWorkingTree = async (dir) => {
   const filepaths = await (0, import_dir.crawlDirectory)(dir);
+  let anyFailed = false;
   const statuses = await Promise.all(
-    filepaths.map((filepath) => import_isomorphic_git.default.status({ dir, fs: import_fs_extra.default, filepath }))
+    filepaths.map(async (filepath) => {
+      try {
+        return await import_isomorphic_git.default.status({ dir, fs: import_fs_extra.default, filepath });
+      } catch {
+        anyFailed = true;
+        return "absent";
+      }
+    })
   );
   if (statuses.some(
     (status) => status !== "absent" && status !== "ignored" && status !== "unmodified"
   )) {
     import_logging.log.newline();
     import_logging.log.warn("You have dirty/untracked files that may be overwritten.");
+  } else if (anyFailed) {
+    import_logging.log.newline();
+    import_logging.log.warn(
+      "Some files failed to be read. Check that you don't have any dirty/untracked files that may be overwritten."
+    );
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/cli/configure/analysis/git.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/analysis/git.ts"],
-  "sourcesContent": ["import fs from 'fs-extra';\nimport git from 'isomorphic-git';\n\nimport { crawlDirectory } from '../../../utils/dir';\nimport { log } from '../../../utils/logging';\n\nexport const auditWorkingTree = async (dir: string) => {\n  const filepaths = await crawlDirectory(dir);\n\n  const statuses = await Promise.all(\n    filepaths.map((filepath) => git.status({ dir, fs, filepath })),\n  );\n\n  if (\n    statuses.some(\n      (status) =>\n        status !== 'absent' && status !== 'ignored' && status !== 'unmodified',\n    )\n  ) {\n    log.newline();\n    log.warn('You have dirty/untracked files that may be overwritten.');\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAe;AACf,4BAAgB;AAEhB,iBAA+B;AAC/B,qBAAoB;AAEb,MAAM,mBAAmB,OAAO,QAAgB;AACrD,QAAM,YAAY,UAAM,2BAAe,GAAG;AAE1C,QAAM,WAAW,MAAM,QAAQ;AAAA,IAC7B,UAAU,IAAI,CAAC,aAAa,sBAAAA,QAAI,OAAO,EAAE,KAAK,oBAAAC,SAAI,SAAS,CAAC,CAAC;AAAA,EAC/D;AAEA,MACE,SAAS;AAAA,IACP,CAAC,WACC,WAAW,YAAY,WAAW,aAAa,WAAW;AAAA,EAC9D,GACA;AACA,uBAAI,QAAQ;AACZ,uBAAI,KAAK,yDAAyD;AAAA,EACpE;AACF;",
+  "sourcesContent": ["import fs from 'fs-extra';\nimport git from 'isomorphic-git';\n\nimport { crawlDirectory } from '../../../utils/dir';\nimport { log } from '../../../utils/logging';\n\nexport const auditWorkingTree = async (dir: string) => {\n  const filepaths = await crawlDirectory(dir);\n\n  let anyFailed = false;\n\n  const statuses = await Promise.all(\n    filepaths.map(async (filepath) => {\n      try {\n        return await git.status({ dir, fs, filepath });\n      } catch {\n        // TODO: Why does isomorphic-git sometimes just _fail_?\n        anyFailed = true;\n        return 'absent';\n      }\n    }),\n  );\n\n  if (\n    statuses.some(\n      (status) =>\n        status !== 'absent' && status !== 'ignored' && status !== 'unmodified',\n    )\n  ) {\n    log.newline();\n    log.warn('You have dirty/untracked files that may be overwritten.');\n  } else if (anyFailed) {\n    log.newline();\n    log.warn(\n      \"Some files failed to be read. Check that you don't have any dirty/untracked files that may be overwritten.\",\n    );\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAe;AACf,4BAAgB;AAEhB,iBAA+B;AAC/B,qBAAoB;AAEb,MAAM,mBAAmB,OAAO,QAAgB;AACrD,QAAM,YAAY,UAAM,2BAAe,GAAG;AAE1C,MAAI,YAAY;AAEhB,QAAM,WAAW,MAAM,QAAQ;AAAA,IAC7B,UAAU,IAAI,OAAO,aAAa;AAChC,UAAI;AACF,eAAO,MAAM,sBAAAA,QAAI,OAAO,EAAE,KAAK,oBAAAC,SAAI,SAAS,CAAC;AAAA,MAC/C,QAAQ;AAEN,oBAAY;AACZ,eAAO;AAAA,MACT;AAAA,IACF,CAAC;AAAA,EACH;AAEA,MACE,SAAS;AAAA,IACP,CAAC,WACC,WAAW,YAAY,WAAW,aAAa,WAAW;AAAA,EAC9D,GACA;AACA,uBAAI,QAAQ;AACZ,uBAAI,KAAK,yDAAyD;AAAA,EACpE,WAAW,WAAW;AACpB,uBAAI,QAAQ;AACZ,uBAAI;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;",
   "names": ["git", "fs"]
 }

package/lib/cli/lint/annotate/buildkite/prettier.js

@@ -36,7 +36,10 @@ const createPrettierAnnotations = (prettier) => !prettier.ok ? [
   "**Prettier**",
   Buildkite.md.terminal(
     prettier.result.errored.map(
-      ({ err, filepath }) => [filepath, ...err ? [String(err)] : []].join(" ")
+      ({ err, filepath }) => [
+        filepath,
+        ...typeof err === "string" || err instanceof Error ? [String(err)] : []
+      ].join(" ")
     ).join("\n")
   )
 ] : [];

package/lib/cli/lint/annotate/buildkite/prettier.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lint/annotate/buildkite/prettier.ts"],
-  "sourcesContent": ["import * as Buildkite from '../../../../api/buildkite';\nimport type { PrettierOutput } from '../../../adapter/prettier';\n\nexport const createPrettierAnnotations = (\n  prettier: PrettierOutput,\n): string[] =>\n  !prettier.ok\n    ? [\n        '**Prettier**',\n        Buildkite.md.terminal(\n          prettier.result.errored\n            .map(({ err, filepath }) =>\n              [filepath, ...(err ? [String(err)] : [])].join(' '),\n            )\n            .join('\\n'),\n        ),\n      ]\n    : [];\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAA2B;AAGpB,MAAM,4BAA4B,CACvC,aAEA,CAAC,SAAS,KACN;AAAA,EACE;AAAA,EACA,UAAU,GAAG;AAAA,IACX,SAAS,OAAO,QACb;AAAA,MAAI,CAAC,EAAE,KAAK,SAAS,MACpB,CAAC,UAAU,GAAI,MAAM,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAE,EAAE,KAAK,GAAG;AAAA,IACpD,EACC,KAAK,IAAI;AAAA,EACd;AACF,IACA,CAAC;",
+  "sourcesContent": ["import * as Buildkite from '../../../../api/buildkite';\nimport type { PrettierOutput } from '../../../adapter/prettier';\n\nexport const createPrettierAnnotations = (\n  prettier: PrettierOutput,\n): string[] =>\n  !prettier.ok\n    ? [\n        '**Prettier**',\n        Buildkite.md.terminal(\n          prettier.result.errored\n            .map(({ err, filepath }) =>\n              [\n                filepath,\n                ...(typeof err === 'string' || err instanceof Error\n                  ? [String(err)]\n                  : []),\n              ].join(' '),\n            )\n            .join('\\n'),\n        ),\n      ]\n    : [];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gBAA2B;AAGpB,MAAM,4BAA4B,CACvC,aAEA,CAAC,SAAS,KACN;AAAA,EACE;AAAA,EACA,UAAU,GAAG;AAAA,IACX,SAAS,OAAO,QACb;AAAA,MAAI,CAAC,EAAE,KAAK,SAAS,MACpB;AAAA,QACE;AAAA,QACA,GAAI,OAAO,QAAQ,YAAY,eAAe,QAC1C,CAAC,OAAO,GAAG,CAAC,IACZ,CAAC;AAAA,MACP,EAAE,KAAK,GAAG;AAAA,IACZ,EACC,KAAK,IAAI;AAAA,EACd;AACF,IACA,CAAC;",
   "names": []
 }

package/lib/cli/lint/annotate/github/prettier.js

@@ -28,7 +28,7 @@ const createPrettierAnnotations = (prettier) => prettier.result.errored.map((res
     start_line: 1,
     end_line: 1,
     path: result.filepath,
-    message: message ? String(message) : "This file has not been formatted.",
+    message: typeof message === "string" || message instanceof Error ? String(message) : "This file has not been formatted.",
     title: "Prettier"
   };
 });

package/lib/cli/lint/annotate/github/prettier.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lint/annotate/github/prettier.ts"],
-  "sourcesContent": ["import type * as GitHub from '../../../../api/github';\nimport type { PrettierOutput } from '../../../adapter/prettier';\n\nexport const createPrettierAnnotations = (\n  prettier: PrettierOutput,\n): GitHub.Annotation[] =>\n  prettier.result.errored.map((result) => {\n    const message =\n      result.err instanceof Error ? result.err.message : result.err;\n\n    return {\n      annotation_level: 'failure',\n      start_line: 1,\n      end_line: 1,\n      path: result.filepath,\n      message: message ? String(message) : 'This file has not been formatted.',\n      title: 'Prettier',\n    };\n  });\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,4BAA4B,CACvC,aAEA,SAAS,OAAO,QAAQ,IAAI,CAAC,WAAW;AACtC,QAAM,UACJ,OAAO,eAAe,QAAQ,OAAO,IAAI,UAAU,OAAO;AAE5D,SAAO;AAAA,IACL,kBAAkB;AAAA,IAClB,YAAY;AAAA,IACZ,UAAU;AAAA,IACV,MAAM,OAAO;AAAA,IACb,SAAS,UAAU,OAAO,OAAO,IAAI;AAAA,IACrC,OAAO;AAAA,EACT;AACF,CAAC;",
+  "sourcesContent": ["import type * as GitHub from '../../../../api/github';\nimport type { PrettierOutput } from '../../../adapter/prettier';\n\nexport const createPrettierAnnotations = (\n  prettier: PrettierOutput,\n): GitHub.Annotation[] =>\n  prettier.result.errored.map((result) => {\n    const message =\n      result.err instanceof Error ? result.err.message : result.err;\n\n    return {\n      annotation_level: 'failure',\n      start_line: 1,\n      end_line: 1,\n      path: result.filepath,\n      message:\n        typeof message === 'string' || message instanceof Error\n          ? String(message)\n          : 'This file has not been formatted.',\n      title: 'Prettier',\n    };\n  });\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,4BAA4B,CACvC,aAEA,SAAS,OAAO,QAAQ,IAAI,CAAC,WAAW;AACtC,QAAM,UACJ,OAAO,eAAe,QAAQ,OAAO,IAAI,UAAU,OAAO;AAE5D,SAAO;AAAA,IACL,kBAAkB;AAAA,IAClB,YAAY;AAAA,IACZ,UAAU;AAAA,IACV,MAAM,OAAO;AAAA,IACb,SACE,OAAO,YAAY,YAAY,mBAAmB,QAC9C,OAAO,OAAO,IACd;AAAA,IACN,OAAO;AAAA,EACT;AACF,CAAC;",
   "names": []
 }

package/lib/cli/lint/internalLints/upgrade/patches/10.0.0/index.d.ts

@@ -0,0 +1,2 @@
+import type { Patches } from '../..';
+export declare const patches: Patches;

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

@@ -0,0 +1,35 @@
+"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 __exports = {};
+__export(__exports, {
+  patches: () => patches
+});
+module.exports = __toCommonJS(__exports);
+var import_upgradeNode = require("./upgradeNode");
+const patches = [
+  {
+    apply: import_upgradeNode.tryUpgradeNode,
+    description: "Upgrades Node.js to version 22"
+  }
+];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  patches
+});
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +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"],
+  "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/upgradeNode.d.ts

@@ -0,0 +1,2 @@
+import type { PatchFunction } from '../..';
+export declare const tryUpgradeNode: PatchFunction;

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

@@ -0,0 +1,51 @@
+"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 upgradeNode_exports = {};
+__export(upgradeNode_exports, {
+  tryUpgradeNode: () => tryUpgradeNode
+});
+module.exports = __toCommonJS(upgradeNode_exports);
+var import_util = require("util");
+var import_logging = require("../../../../../../utils/logging");
+var import_nodeVersion = require("../../../../../migrate/nodeVersion");
+const upgradeNode = async ({
+  mode
+}) => {
+  if (mode === "lint" || process.env.SKIP_NODE_UPGRADE) {
+    return {
+      result: "skip"
+    };
+  }
+  await (0, import_nodeVersion.nodeVersionMigration)({ nodeVersion: 22, ECMAScriptVersion: "ES2024" });
+  return { result: "apply" };
+};
+const tryUpgradeNode = async (config) => {
+  try {
+    return await upgradeNode(config);
+  } catch (err) {
+    import_logging.log.warn("Failed to patch Docker images");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  tryUpgradeNode
+});
+//# sourceMappingURL=upgradeNode.js.map

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

@@ -0,0 +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 (mode === 'lint' || process.env.SKIP_NODE_UPGRADE) {\n    return {\n      result: 'skip',\n    };\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 patch Docker images');\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,SAAS,UAAU,QAAQ,IAAI,mBAAmB;AACpD,WAAO;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;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,+BAA+B;AACxC,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "names": []
+}

package/lib/cli/migrate/index.js

@@ -24,7 +24,8 @@ module.exports = __toCommonJS(migrate_exports);
 var import_logging = require("../../utils/logging");
 var import_nodeVersion = require("./nodeVersion");
 const migrations = {
-  node20: () => (0, import_nodeVersion.nodeVersionMigration)(20)
+  node20: () => (0, import_nodeVersion.nodeVersionMigration)({ nodeVersion: 20, ECMAScriptVersion: "ES2023" }),
+  node22: () => (0, import_nodeVersion.nodeVersionMigration)({ nodeVersion: 22, ECMAScriptVersion: "ES2024" })
 };
 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: () => nodeVersionMigration(20),\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,UAAM,yCAAqB,EAAE;AACvC;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({ 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;",
   "names": []
 }

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

@@ -0,0 +1 @@
+export declare const getNode22TypesVersion: (major: number) => string;

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

@@ -0,0 +1,32 @@
+"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);
+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();
+// 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

@@ -0,0 +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;",
+  "names": []
+}

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

@@ -1 +1,10 @@
-export declare const nodeVersionMigration: (version: number, dir?: string) => Promise<void>;
+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,6 +28,7 @@ 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);
@@ -36,35 +37,110 @@ 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_packageJsonChecks = require("./packageJsonChecks");
+const DEFAULT_NODE_TYPES = "22.9.0";
+const getNode22TypeVersion = (major, defaultVersion) => {
+  try {
+    const version = (0, import_getNode22TypesVersion.getNode22TypesVersion)(major);
+    if (!version || !/^22.\d+\.\d+$/.test(version)) {
+      throw new Error("No version found");
+    }
+    return {
+      version,
+      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 = [
-  { file: ".nvmrc", replace: "<%- version %>\n" },
+  { id: "nvmrc", file: ".nvmrc", replace: "<%- version %>\n" },
   {
+    id: "Dockerfile-1",
     files: "Dockerfile*",
-    test: /^FROM(.*) node:[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
-    replace: "FROM$1 node:<%- version %>$3$4"
+    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"
   },
   {
+    id: "Dockerfile-2",
     files: "Dockerfile*",
     test: /^FROM(.*) gcr.io\/distroless\/nodejs\d+-debian(.+)$/gm,
     replace: "FROM$1 gcr.io/distroless/nodejs<%- version %>-debian$2"
   },
   {
+    id: "serverless",
     files: "serverless*.y*ml",
     test: /nodejs\d+.x/gm,
     replace: "nodejs<%- version %>.x"
   },
+  [
+    {
+      id: "cdk-1",
+      files: "infra/**/*.ts",
+      test: /NODEJS_\d+_X/g,
+      replace: "NODEJS_<%- version %>_X"
+    },
+    {
+      id: "cdk-2",
+      files: "infra/**/*.ts",
+      test: /(target:\s*'node)(\d+)(.+)$/gm,
+      replace: "$1<%- version %>$3"
+    }
+  ],
+  {
+    id: "buildkite",
+    files: "**/.buildkite/*",
+    test: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    replace: "$1$2$3<%- version %>$5"
+  },
+  {
+    id: "node-version",
+    files: ".node-version*",
+    test: /(v)?\d+\.\d+\.\d+(.+)?/gm,
+    replace: "$1<%- version %>$2"
+  },
+  {
+    id: "package-json-1",
+    files: "**/package.json",
+    test: /("@types\/node": ")(\^)?[0-9.]+"/gm,
+    replace: '$1$2<%- version %>"'
+  },
   {
-    files: "infra/**/*.ts",
-    test: /NODEJS_\d+_X/g,
-    replace: "NODEJS_<%- version %>_X"
+    id: "package-json-2",
+    files: "**/package.json",
+    test: /("engines":\s*{[^}]*"node":\s*">=)(\d+)("[^}]*})(?![^}]*"skuba":\s*{[^}]*"type":\s*"package")/gm,
+    replace: "$1<%- version %>$3"
   },
   {
-    files: ".buildkite/*",
-    test: /image: node:[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
-    replace: "image: node:<%- version %>$2"
+    id: "tsconfig",
+    files: "**/tsconfig.json",
+    test: /("target":\s*")(ES?:[0-9]+|Next|[A-Za-z]+[0-9]*)"/gim,
+    replace: '$1<%- version %>"'
+  },
+  {
+    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"
   }
 ];
-const runSubPatch = async (version, dir, patch) => {
+const removeNodeShas = (content) => content.replace(SHA_REGEX, "");
+const runSubPatch = async ({ nodeVersion, nodeTypesVersion, ECMAScriptVersion }, dir, patch) => {
+  if (Array.isArray(patch)) {
+    for (const subPatch of patch) {
+      await runSubPatch(
+        { nodeVersion, nodeTypesVersion, ECMAScriptVersion },
+        dir,
+        subPatch
+      );
+    }
+    return;
+  }
   const readFile = (0, import_project.createDestinationFileReader)(dir);
   const paths = patch.file ? [patch.file] : await (0, import_fast_glob.glob)(patch.files ?? [], { cwd: dir });
   await Promise.all(
@@ -76,27 +152,81 @@ const runSubPatch = async (version, dir, patch) => {
       if (patch.test && !patch.test.test(contents)) {
         return;
       }
-      const templated = patch.replace.replaceAll(
-        "<%- version %>",
-        version.toString()
-      );
-      await import_fs_extra.default.promises.writeFile(
+      const unPinnedContents = removeNodeShas(contents);
+      if (patch.id === "package-json-1") {
+        return await writePatchedContents({
+          path,
+          contents: unPinnedContents,
+          templated: patch.replace.replaceAll(
+            "<%- version %>",
+            nodeTypesVersion
+          ),
+          test: patch.test
+        });
+      }
+      if (patch.id === "tsconfig") {
+        await (0, import_packageJsonChecks.checkSkubaType)();
+        return await writePatchedContents({
+          path,
+          contents: unPinnedContents,
+          templated: patch.replace.replaceAll(
+            "<%- version %>",
+            ECMAScriptVersion
+          ),
+          test: patch.test
+        });
+      }
+      if (patch.id === "package-json-2") {
+        await (0, import_packageJsonChecks.checkSkubaType)();
+      }
+      await writePatchedContents({
         path,
-        patch.test ? contents.replaceAll(patch.test, templated) : templated
-      );
+        contents: unPinnedContents,
+        templated: patch.replace.replaceAll(
+          "<%- version %>",
+          nodeVersion.toString()
+        ),
+        test: patch.test
+      });
     })
   );
 };
-const upgrade = async (version, dir) => {
+const writePatchedContents = async ({
+  path,
+  contents,
+  templated,
+  test
+}) => await import_fs_extra.default.promises.writeFile(
+  path,
+  test ? contents.replaceAll(test, templated) : templated
+);
+const upgrade = async ({ nodeVersion, nodeTypesVersion, ECMAScriptVersion }, dir) => {
   await Promise.all(
-    subPatches.map((subPatch) => runSubPatch(version, dir, subPatch))
+    subPatches.map(
+      (subPatch) => runSubPatch(
+        { nodeVersion, nodeTypesVersion, ECMAScriptVersion },
+        dir,
+        subPatch
+      )
+    )
   );
 };
-const nodeVersionMigration = async (version, dir = process.cwd()) => {
-  import_logging.log.ok(`Upgrading to Node.js ${version}`);
+const nodeVersionMigration = async ({
+  nodeVersion,
+  ECMAScriptVersion
+}, dir = process.cwd()) => {
+  import_logging.log.ok(`Upgrading to Node.js ${nodeVersion}`);
   try {
-    await upgrade(version, dir);
-    import_logging.log.ok("Upgraded to Node.js", version);
+    await (0, import_packageJsonChecks.checkServerlessVersion)();
+    const { version: nodeTypesVersion, err } = getNode22TypeVersion(
+      nodeVersion,
+      DEFAULT_NODE_TYPES
+    );
+    if (err) {
+      import_logging.log.warn(err);
+    }
+    await upgrade({ nodeVersion, nodeTypesVersion, ECMAScriptVersion }, dir);
+    import_logging.log.ok("Upgraded to Node.js", nodeVersion);
   } catch (err) {
     import_logging.log.err("Failed to upgrade");
     import_logging.log.subtle((0, import_util.inspect)(err));
@@ -105,6 +235,7 @@ const nodeVersionMigration = async (version, dir = process.cwd()) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getNode22TypeVersion,
   nodeVersionMigration
 });
 //# sourceMappingURL=index.js.map