skuba 10.0.0-node-22-20250219000751 → 10.0.0

package/lib/cli/configure/analyseDependencies.js

@@ -53,7 +53,10 @@ const logDiff = (diff) => {
 const pinUnspecifiedVersions = async (dependencies) => {
   const updates = await Promise.all(
     Object.entries(dependencies).filter(([, version]) => version === "*").map(async ([name]) => {
-      const version = await (name === "skuba" ? (0, import_version.getSkubaVersion)() : (0, import_version.latestNpmVersion)(name));
+      const version = await (name === "skuba" ? (0, import_version.getSkubaVersion)() : (0, import_version.getLatestNpmVersion)(name));
+      if (version === null) {
+        throw new Error(`Failed to fetch latest version of ${name}`);
+      }
       return [name, version];
     })
   );

package/lib/cli/configure/analyseDependencies.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/analyseDependencies.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport type { NormalizedReadResult } from 'read-pkg-up';\n\nimport { type TextProcessor, copyFiles } from '../../utils/copy';\nimport { log } from '../../utils/logging';\nimport type { ProjectType } from '../../utils/manifest';\nimport { getSkubaVersion, latestNpmVersion } from '../../utils/version';\n\nimport { diffDependencies } from './analysis/package';\nimport * as dependencyMutators from './dependencies';\nimport { formatPackage } from './processing/package';\nimport type { DependencyDiff } from './types';\n\nconst logDiff = (diff: DependencyDiff): boolean => {\n  const entries = Object.entries(diff);\n\n  if (entries.length === 0) {\n    log.ok('\u2714 No changes');\n\n    return false;\n  }\n\n  Object.entries(diff)\n    .sort(([nameA], [nameB]) => nameA.localeCompare(nameB))\n    .forEach(([name, { operation, version }]) =>\n      log.plain(operation, name, log.formatSubtle(version)),\n    );\n\n  return true;\n};\n\nconst pinUnspecifiedVersions = async (\n  dependencies: Record<string, string>,\n): Promise<void> => {\n  const updates = await Promise.all(\n    Object.entries(dependencies)\n      .filter(([, version]) => version === '*')\n      .map(async ([name]) => {\n        const version = await (name === 'skuba'\n          ? getSkubaVersion()\n          : latestNpmVersion(name));\n\n        return [name, version] as const;\n      }),\n  );\n\n  updates.forEach(([name, version]) => {\n    dependencies[name] = version;\n  });\n};\n\ninterface Props {\n  destinationRoot: string;\n  include: (pathname: string) => boolean;\n  manifest: NormalizedReadResult;\n  type: ProjectType;\n}\n\nexport const analyseDependencies = async ({\n  destinationRoot,\n  include,\n  manifest: { packageJson },\n  type,\n}: Props): Promise<undefined | (() => Promise<void>)> => {\n  const input = {\n    dependencies: packageJson.dependencies ?? {},\n    devDependencies: packageJson.devDependencies ?? {},\n    type,\n  };\n\n  const output = {\n    dependencies: { ...input.dependencies },\n    devDependencies: { ...input.devDependencies },\n    type,\n  };\n\n  const processors = Object.values(dependencyMutators).reduce<TextProcessor[]>(\n    (acc, mutate) => {\n      const newProcessors = mutate(output);\n      acc.push(...newProcessors);\n      return acc;\n    },\n    [],\n  );\n\n  await Promise.all([\n    pinUnspecifiedVersions(output.dependencies),\n    pinUnspecifiedVersions(output.devDependencies),\n  ]);\n\n  const dependencyDiff = diffDependencies({\n    old: input.dependencies,\n    new: output.dependencies,\n  });\n\n  log.newline();\n  log.plain(log.bold('Dependencies:'));\n\n  log.newline();\n  const hasDependencyDiff = logDiff(dependencyDiff);\n\n  const devDependencyDiff = diffDependencies({\n    old: input.devDependencies,\n    new: output.devDependencies,\n  });\n\n  log.newline();\n  log.plain(log.bold('Dev dependencies:'));\n\n  log.newline();\n  const hasDevDependencyDiff = logDiff(devDependencyDiff);\n\n  const packageJsonFilepath = path.join(destinationRoot, 'package.json');\n\n  if (!hasDependencyDiff && !hasDevDependencyDiff) {\n    return;\n  }\n\n  return async () => {\n    const updatedPackageJson = await formatPackage({\n      ...packageJson,\n      dependencies: output.dependencies,\n      devDependencies: output.devDependencies,\n    });\n\n    await fs.promises.writeFile(packageJsonFilepath, updatedPackageJson);\n\n    if (processors.length === 0) {\n      return;\n    }\n\n    await copyFiles({\n      sourceRoot: destinationRoot,\n      destinationRoot,\n      include,\n      processors,\n    });\n  };\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport type { NormalizedReadResult } from 'read-pkg-up';\n\nimport { type TextProcessor, copyFiles } from '../../utils/copy';\nimport { log } from '../../utils/logging';\nimport type { ProjectType } from '../../utils/manifest';\nimport { getLatestNpmVersion, getSkubaVersion } from '../../utils/version';\n\nimport { diffDependencies } from './analysis/package';\nimport * as dependencyMutators from './dependencies';\nimport { formatPackage } from './processing/package';\nimport type { DependencyDiff } from './types';\n\nconst logDiff = (diff: DependencyDiff): boolean => {\n  const entries = Object.entries(diff);\n\n  if (entries.length === 0) {\n    log.ok('\u2714 No changes');\n\n    return false;\n  }\n\n  Object.entries(diff)\n    .sort(([nameA], [nameB]) => nameA.localeCompare(nameB))\n    .forEach(([name, { operation, version }]) =>\n      log.plain(operation, name, log.formatSubtle(version)),\n    );\n\n  return true;\n};\n\nconst pinUnspecifiedVersions = async (\n  dependencies: Record<string, string>,\n): Promise<void> => {\n  const updates = await Promise.all(\n    Object.entries(dependencies)\n      .filter(([, version]) => version === '*')\n      .map(async ([name]) => {\n        const version = await (name === 'skuba'\n          ? getSkubaVersion()\n          : getLatestNpmVersion(name));\n\n        if (version === null) {\n          throw new Error(`Failed to fetch latest version of ${name}`);\n        }\n\n        return [name, version] as const;\n      }),\n  );\n\n  updates.forEach(([name, version]) => {\n    dependencies[name] = version;\n  });\n};\n\ninterface Props {\n  destinationRoot: string;\n  include: (pathname: string) => boolean;\n  manifest: NormalizedReadResult;\n  type: ProjectType;\n}\n\nexport const analyseDependencies = async ({\n  destinationRoot,\n  include,\n  manifest: { packageJson },\n  type,\n}: Props): Promise<undefined | (() => Promise<void>)> => {\n  const input = {\n    dependencies: packageJson.dependencies ?? {},\n    devDependencies: packageJson.devDependencies ?? {},\n    type,\n  };\n\n  const output = {\n    dependencies: { ...input.dependencies },\n    devDependencies: { ...input.devDependencies },\n    type,\n  };\n\n  const processors = Object.values(dependencyMutators).reduce<TextProcessor[]>(\n    (acc, mutate) => {\n      const newProcessors = mutate(output);\n      acc.push(...newProcessors);\n      return acc;\n    },\n    [],\n  );\n\n  await Promise.all([\n    pinUnspecifiedVersions(output.dependencies),\n    pinUnspecifiedVersions(output.devDependencies),\n  ]);\n\n  const dependencyDiff = diffDependencies({\n    old: input.dependencies,\n    new: output.dependencies,\n  });\n\n  log.newline();\n  log.plain(log.bold('Dependencies:'));\n\n  log.newline();\n  const hasDependencyDiff = logDiff(dependencyDiff);\n\n  const devDependencyDiff = diffDependencies({\n    old: input.devDependencies,\n    new: output.devDependencies,\n  });\n\n  log.newline();\n  log.plain(log.bold('Dev dependencies:'));\n\n  log.newline();\n  const hasDevDependencyDiff = logDiff(devDependencyDiff);\n\n  const packageJsonFilepath = path.join(destinationRoot, 'package.json');\n\n  if (!hasDependencyDiff && !hasDevDependencyDiff) {\n    return;\n  }\n\n  return async () => {\n    const updatedPackageJson = await formatPackage({\n      ...packageJson,\n      dependencies: output.dependencies,\n      devDependencies: output.devDependencies,\n    });\n\n    await fs.promises.writeFile(packageJsonFilepath, updatedPackageJson);\n\n    if (processors.length === 0) {\n      return;\n    }\n\n    await copyFiles({\n      sourceRoot: destinationRoot,\n      destinationRoot,\n      include,\n      processors,\n    });\n  };\n};\n"],
+  "mappings": "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",
   "names": ["import_package", "path", "fs"]
 }

package/lib/cli/lint/internal.js

@@ -34,12 +34,13 @@ module.exports = __toCommonJS(internal_exports);
 var import_util = require("util");
 var import_chalk = __toESM(require("chalk"));
 var import_logging = require("../../utils/logging");
+var import_detectBadCodeowners = require("./internalLints/detectBadCodeowners");
 var import_noSkubaTemplateJs = require("./internalLints/noSkubaTemplateJs");
 var import_refreshConfigFiles = require("./internalLints/refreshConfigFiles");
 var import_upgrade = require("./internalLints/upgrade");
 const lints = [
   // Run upgradeSkuba before refreshConfigFiles for npmrc handling
-  [import_upgrade.upgradeSkuba],
+  [import_upgrade.upgradeSkuba, import_detectBadCodeowners.tryDetectBadCodeowners],
   [import_noSkubaTemplateJs.noSkubaTemplateJs, import_refreshConfigFiles.tryRefreshConfigFiles]
 ];
 const lintSerially = async (mode, logger) => {

package/lib/cli/lint/internal.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/internal.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport chalk from 'chalk';\n\nimport { type Logger, createLogger } from '../../utils/logging';\n\nimport { noSkubaTemplateJs } from './internalLints/noSkubaTemplateJs';\nimport { tryRefreshConfigFiles } from './internalLints/refreshConfigFiles';\nimport { upgradeSkuba } from './internalLints/upgrade';\nimport type { Input } from './types';\n\nexport type InternalLintResult = {\n  ok: boolean;\n  fixable: boolean;\n  annotations?: Array<{\n    start_line?: number;\n    end_line?: number;\n    path: string;\n    message: string;\n  }>;\n};\n\nconst lints: Array<\n  Array<\n    (mode: 'format' | 'lint', logger: Logger) => Promise<InternalLintResult>\n  >\n> = [\n  // Run upgradeSkuba before refreshConfigFiles for npmrc handling\n  [upgradeSkuba],\n  [noSkubaTemplateJs, tryRefreshConfigFiles],\n];\n\nconst lintSerially = async (mode: 'format' | 'lint', logger: Logger) => {\n  const results: InternalLintResult[] = [];\n  for (const lintGroup of lints) {\n    for (const lint of lintGroup) {\n      results.push(await lint(mode, logger));\n    }\n  }\n  return results;\n};\n\nconst lintConcurrently = async (mode: 'format' | 'lint', logger: Logger) => {\n  const results: InternalLintResult[] = [];\n\n  for (const lintGroup of lints) {\n    results.push(\n      ...(await Promise.all(lintGroup.map((lint) => lint(mode, logger)))),\n    );\n  }\n\n  return results;\n};\n\nconst selectLintFunction = (input?: Input) => {\n  const isSerial = input?.debug || input?.serial;\n  return isSerial ? lintSerially : lintConcurrently;\n};\n\nexport const internalLint = async (\n  mode: 'format' | 'lint',\n  input?: Input,\n): Promise<InternalLintResult> => {\n  const start = process.hrtime.bigint();\n  const logger = createLogger(\n    input?.debug ?? false,\n    ...(mode === 'lint' ? [chalk.blueBright('skuba    \u2502')] : []),\n  );\n\n  try {\n    const lint = selectLintFunction(input);\n    const results = await lint(mode, logger);\n    const result = combineResults(results);\n    const end = process.hrtime.bigint();\n    logger.plain(`Processed skuba lints in ${logger.timing(start, end)}.`);\n    return result;\n  } catch (err) {\n    logger.err(logger.bold('Failed to run skuba lints.'));\n    logger.subtle(inspect(err));\n\n    process.exitCode = 1;\n\n    return { ok: false, fixable: false, annotations: [] };\n  }\n};\n\nconst combineResults = (results: InternalLintResult[]): InternalLintResult =>\n  results.reduce(\n    (cur, next) => ({\n      ok: cur.ok && next.ok,\n      fixable: cur.fixable || next.fixable,\n      annotations: [...(cur.annotations ?? []), ...(next.annotations ?? [])],\n    }),\n    { ok: true, fixable: false },\n  );\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,mBAAkB;AAElB,qBAA0C;AAE1C,+BAAkC;AAClC,gCAAsC;AACtC,qBAA6B;AAc7B,MAAM,QAIF;AAAA;AAAA,EAEF,CAAC,2BAAY;AAAA,EACb,CAAC,4CAAmB,+CAAqB;AAC3C;AAEA,MAAM,eAAe,OAAO,MAAyB,WAAmB;AACtE,QAAM,UAAgC,CAAC;AACvC,aAAW,aAAa,OAAO;AAC7B,eAAW,QAAQ,WAAW;AAC5B,cAAQ,KAAK,MAAM,KAAK,MAAM,MAAM,CAAC;AAAA,IACvC;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,mBAAmB,OAAO,MAAyB,WAAmB;AAC1E,QAAM,UAAgC,CAAC;AAEvC,aAAW,aAAa,OAAO;AAC7B,YAAQ;AAAA,MACN,GAAI,MAAM,QAAQ,IAAI,UAAU,IAAI,CAAC,SAAS,KAAK,MAAM,MAAM,CAAC,CAAC;AAAA,IACnE;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,qBAAqB,CAAC,UAAkB;AAC5C,QAAM,WAAW,OAAO,SAAS,OAAO;AACxC,SAAO,WAAW,eAAe;AACnC;AAEO,MAAM,eAAe,OAC1B,MACA,UACgC;AAChC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AACpC,QAAM,aAAS;AAAA,IACb,OAAO,SAAS;AAAA,IAChB,GAAI,SAAS,SAAS,CAAC,aAAAA,QAAM,WAAW,iBAAY,CAAC,IAAI,CAAC;AAAA,EAC5D;AAEA,MAAI;AACF,UAAM,OAAO,mBAAmB,KAAK;AACrC,UAAM,UAAU,MAAM,KAAK,MAAM,MAAM;AACvC,UAAM,SAAS,eAAe,OAAO;AACrC,UAAM,MAAM,QAAQ,OAAO,OAAO;AAClC,WAAO,MAAM,4BAA4B,OAAO,OAAO,OAAO,GAAG,CAAC,GAAG;AACrE,WAAO;AAAA,EACT,SAAS,KAAK;AACZ,WAAO,IAAI,OAAO,KAAK,4BAA4B,CAAC;AACpD,WAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,YAAQ,WAAW;AAEnB,WAAO,EAAE,IAAI,OAAO,SAAS,OAAO,aAAa,CAAC,EAAE;AAAA,EACtD;AACF;AAEA,MAAM,iBAAiB,CAAC,YACtB,QAAQ;AAAA,EACN,CAAC,KAAK,UAAU;AAAA,IACd,IAAI,IAAI,MAAM,KAAK;AAAA,IACnB,SAAS,IAAI,WAAW,KAAK;AAAA,IAC7B,aAAa,CAAC,GAAI,IAAI,eAAe,CAAC,GAAI,GAAI,KAAK,eAAe,CAAC,CAAE;AAAA,EACvE;AAAA,EACA,EAAE,IAAI,MAAM,SAAS,MAAM;AAC7B;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport chalk from 'chalk';\n\nimport { type Logger, createLogger } from '../../utils/logging';\n\nimport { tryDetectBadCodeowners } from './internalLints/detectBadCodeowners';\nimport { noSkubaTemplateJs } from './internalLints/noSkubaTemplateJs';\nimport { tryRefreshConfigFiles } from './internalLints/refreshConfigFiles';\nimport { upgradeSkuba } from './internalLints/upgrade';\nimport type { Input } from './types';\n\nexport type InternalLintResult = {\n  ok: boolean;\n  fixable: boolean;\n  annotations?: Array<{\n    start_line?: number;\n    end_line?: number;\n    path: string;\n    message: string;\n  }>;\n};\n\nconst lints: Array<\n  Array<\n    (mode: 'format' | 'lint', logger: Logger) => Promise<InternalLintResult>\n  >\n> = [\n  // Run upgradeSkuba before refreshConfigFiles for npmrc handling\n  [upgradeSkuba, tryDetectBadCodeowners],\n  [noSkubaTemplateJs, tryRefreshConfigFiles],\n];\n\nconst lintSerially = async (mode: 'format' | 'lint', logger: Logger) => {\n  const results: InternalLintResult[] = [];\n  for (const lintGroup of lints) {\n    for (const lint of lintGroup) {\n      results.push(await lint(mode, logger));\n    }\n  }\n  return results;\n};\n\nconst lintConcurrently = async (mode: 'format' | 'lint', logger: Logger) => {\n  const results: InternalLintResult[] = [];\n\n  for (const lintGroup of lints) {\n    results.push(\n      ...(await Promise.all(lintGroup.map((lint) => lint(mode, logger)))),\n    );\n  }\n\n  return results;\n};\n\nconst selectLintFunction = (input?: Input) => {\n  const isSerial = input?.debug || input?.serial;\n  return isSerial ? lintSerially : lintConcurrently;\n};\n\nexport const internalLint = async (\n  mode: 'format' | 'lint',\n  input?: Input,\n): Promise<InternalLintResult> => {\n  const start = process.hrtime.bigint();\n  const logger = createLogger(\n    input?.debug ?? false,\n    ...(mode === 'lint' ? [chalk.blueBright('skuba    \u2502')] : []),\n  );\n\n  try {\n    const lint = selectLintFunction(input);\n    const results = await lint(mode, logger);\n    const result = combineResults(results);\n    const end = process.hrtime.bigint();\n    logger.plain(`Processed skuba lints in ${logger.timing(start, end)}.`);\n    return result;\n  } catch (err) {\n    logger.err(logger.bold('Failed to run skuba lints.'));\n    logger.subtle(inspect(err));\n\n    process.exitCode = 1;\n\n    return { ok: false, fixable: false, annotations: [] };\n  }\n};\n\nconst combineResults = (results: InternalLintResult[]): InternalLintResult =>\n  results.reduce(\n    (cur, next) => ({\n      ok: cur.ok && next.ok,\n      fixable: cur.fixable || next.fixable,\n      annotations: [...(cur.annotations ?? []), ...(next.annotations ?? [])],\n    }),\n    { ok: true, fixable: false },\n  );\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,mBAAkB;AAElB,qBAA0C;AAE1C,iCAAuC;AACvC,+BAAkC;AAClC,gCAAsC;AACtC,qBAA6B;AAc7B,MAAM,QAIF;AAAA;AAAA,EAEF,CAAC,6BAAc,iDAAsB;AAAA,EACrC,CAAC,4CAAmB,+CAAqB;AAC3C;AAEA,MAAM,eAAe,OAAO,MAAyB,WAAmB;AACtE,QAAM,UAAgC,CAAC;AACvC,aAAW,aAAa,OAAO;AAC7B,eAAW,QAAQ,WAAW;AAC5B,cAAQ,KAAK,MAAM,KAAK,MAAM,MAAM,CAAC;AAAA,IACvC;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,mBAAmB,OAAO,MAAyB,WAAmB;AAC1E,QAAM,UAAgC,CAAC;AAEvC,aAAW,aAAa,OAAO;AAC7B,YAAQ;AAAA,MACN,GAAI,MAAM,QAAQ,IAAI,UAAU,IAAI,CAAC,SAAS,KAAK,MAAM,MAAM,CAAC,CAAC;AAAA,IACnE;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,qBAAqB,CAAC,UAAkB;AAC5C,QAAM,WAAW,OAAO,SAAS,OAAO;AACxC,SAAO,WAAW,eAAe;AACnC;AAEO,MAAM,eAAe,OAC1B,MACA,UACgC;AAChC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AACpC,QAAM,aAAS;AAAA,IACb,OAAO,SAAS;AAAA,IAChB,GAAI,SAAS,SAAS,CAAC,aAAAA,QAAM,WAAW,iBAAY,CAAC,IAAI,CAAC;AAAA,EAC5D;AAEA,MAAI;AACF,UAAM,OAAO,mBAAmB,KAAK;AACrC,UAAM,UAAU,MAAM,KAAK,MAAM,MAAM;AACvC,UAAM,SAAS,eAAe,OAAO;AACrC,UAAM,MAAM,QAAQ,OAAO,OAAO;AAClC,WAAO,MAAM,4BAA4B,OAAO,OAAO,OAAO,GAAG,CAAC,GAAG;AACrE,WAAO;AAAA,EACT,SAAS,KAAK;AACZ,WAAO,IAAI,OAAO,KAAK,4BAA4B,CAAC;AACpD,WAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,YAAQ,WAAW;AAEnB,WAAO,EAAE,IAAI,OAAO,SAAS,OAAO,aAAa,CAAC,EAAE;AAAA,EACtD;AACF;AAEA,MAAM,iBAAiB,CAAC,YACtB,QAAQ;AAAA,EACN,CAAC,KAAK,UAAU;AAAA,IACd,IAAI,IAAI,MAAM,KAAK;AAAA,IACnB,SAAS,IAAI,WAAW,KAAK;AAAA,IAC7B,aAAa,CAAC,GAAI,IAAI,eAAe,CAAC,GAAI,GAAI,KAAK,eAAe,CAAC,CAAE;AAAA,EACvE;AAAA,EACA,EAAE,IAAI,MAAM,SAAS,MAAM;AAC7B;",
   "names": ["chalk"]
 }

package/lib/cli/lint/internalLints/detectBadCodeowners.d.ts

@@ -0,0 +1,4 @@
+import type { Logger } from '../../../utils/logging';
+import type { InternalLintResult } from '../internal';
+export declare const detectBadCodeowners: () => Promise<InternalLintResult>;
+export declare const tryDetectBadCodeowners: (_mode: "format" | "lint", logger: Logger) => Promise<InternalLintResult>;

package/lib/cli/lint/internalLints/detectBadCodeowners.js

@@ -0,0 +1,72 @@
+"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 detectBadCodeowners_exports = {};
+__export(detectBadCodeowners_exports, {
+  detectBadCodeowners: () => detectBadCodeowners,
+  tryDetectBadCodeowners: () => tryDetectBadCodeowners
+});
+module.exports = __toCommonJS(detectBadCodeowners_exports);
+var import_util = require("util");
+var import__ = require("../../..");
+var import_project = require("../../configure/analysis/project");
+const detectBadCodeowners = async () => {
+  const gitRoot = await import__.Git.findRoot({ dir: process.cwd() });
+  const reader = (0, import_project.createDestinationFileReader)(gitRoot ?? process.cwd());
+  const annotations = (await Promise.all(
+    [".github/CODEOWNERS", "CODEOWNERS", "docs/CODEOWNERS"].map(
+      async (filename) => {
+        const lines = (await reader(filename))?.split("\n");
+        if (lines?.some((line) => line.startsWith("- "))) {
+          return [
+            {
+              message: "CODEOWNERS file has a line starting with `- `. This is probably an autoformatting mistake, where your editor thinks this file is a markdown file and is trying to format a list item. Did you mean to use `*` instead?",
+              path: filename
+            }
+          ];
+        }
+        return [];
+      }
+    )
+  )).flat();
+  annotations.sort((a, b) => a.path.localeCompare(b.path));
+  return {
+    ok: annotations.length === 0,
+    fixable: false,
+    annotations
+  };
+};
+const tryDetectBadCodeowners = async (_mode, logger) => {
+  try {
+    return await detectBadCodeowners();
+  } catch (err) {
+    logger.warn("Failed to detect bad CODEOWNERS.");
+    logger.subtle((0, import_util.inspect)(err));
+    return {
+      ok: false,
+      fixable: false,
+      annotations: []
+    };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  detectBadCodeowners,
+  tryDetectBadCodeowners
+});
+//# sourceMappingURL=detectBadCodeowners.js.map

package/lib/cli/lint/internalLints/detectBadCodeowners.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/lint/internalLints/detectBadCodeowners.ts"],
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { Git } from '../../..';\nimport type { Logger } from '../../../utils/logging';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\nimport type { InternalLintResult } from '../internal';\n\nexport const detectBadCodeowners = async (): Promise<InternalLintResult> => {\n  const gitRoot = await Git.findRoot({ dir: process.cwd() });\n  const reader = createDestinationFileReader(gitRoot ?? process.cwd());\n\n  const annotations = (\n    await Promise.all(\n      ['.github/CODEOWNERS', 'CODEOWNERS', 'docs/CODEOWNERS'].map(\n        async (filename) => {\n          const lines = (await reader(filename))?.split('\\n');\n\n          if (lines?.some((line) => line.startsWith('- '))) {\n            return [\n              {\n                message:\n                  'CODEOWNERS file has a line starting with `- `. This is probably an autoformatting mistake, where your editor thinks this file is a markdown file and is trying to format a list item. Did you mean to use `*` instead?',\n                path: filename,\n              },\n            ];\n          }\n\n          return [];\n        },\n      ),\n    )\n  ).flat();\n\n  // TODO: Use `toSorted` once we drop support for Node 18.\n  annotations.sort((a, b) => a.path.localeCompare(b.path));\n\n  return {\n    ok: annotations.length === 0,\n    fixable: false,\n    annotations,\n  };\n};\n\nexport const tryDetectBadCodeowners = async (\n  _mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  try {\n    return await detectBadCodeowners();\n  } catch (err) {\n    logger.warn('Failed to detect bad CODEOWNERS.');\n    logger.subtle(inspect(err));\n\n    return {\n      ok: false,\n      fixable: false,\n      annotations: [],\n    };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,eAAoB;AAEpB,qBAA4C;AAGrC,MAAM,sBAAsB,YAAyC;AAC1E,QAAM,UAAU,MAAM,aAAI,SAAS,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC;AACzD,QAAM,aAAS,4CAA4B,WAAW,QAAQ,IAAI,CAAC;AAEnE,QAAM,eACJ,MAAM,QAAQ;AAAA,IACZ,CAAC,sBAAsB,cAAc,iBAAiB,EAAE;AAAA,MACtD,OAAO,aAAa;AAClB,cAAM,SAAS,MAAM,OAAO,QAAQ,IAAI,MAAM,IAAI;AAElD,YAAI,OAAO,KAAK,CAAC,SAAS,KAAK,WAAW,IAAI,CAAC,GAAG;AAChD,iBAAO;AAAA,YACL;AAAA,cACE,SACE;AAAA,cACF,MAAM;AAAA,YACR;AAAA,UACF;AAAA,QACF;AAEA,eAAO,CAAC;AAAA,MACV;AAAA,IACF;AAAA,EACF,GACA,KAAK;AAGP,cAAY,KAAK,CAAC,GAAG,MAAM,EAAE,KAAK,cAAc,EAAE,IAAI,CAAC;AAEvD,SAAO;AAAA,IACL,IAAI,YAAY,WAAW;AAAA,IAC3B,SAAS;AAAA,IACT;AAAA,EACF;AACF;AAEO,MAAM,yBAAyB,OACpC,OACA,WACgC;AAChC,MAAI;AACF,WAAO,MAAM,oBAAoB;AAAA,EACnC,SAAS,KAAK;AACZ,WAAO,KAAK,kCAAkC;AAC9C,WAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa,CAAC;AAAA,IAChB;AAAA,EACF;AACF;",
+  "names": []
+}

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

@@ -1,5 +1,14 @@
 import { type ZodRawShape, z } from 'zod';
-export declare const extractFromParentPackageJson: <T extends ZodRawShape>(schema: z.ZodObject<T>) => Promise<z.infer<typeof schema> | undefined>;
+export declare const extractFromParentPackageJson: <T extends ZodRawShape>(schema: z.ZodObject<T>) => Promise<{
+    packageJson: undefined;
+    packageJsonRelativePath: undefined;
+} | {
+    packageJson: undefined;
+    packageJsonRelativePath: string;
+} | {
+    packageJson: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<T>, any> extends infer T_1 ? { [k in keyof T_1]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<T>, any>[k]; } : never;
+    packageJsonRelativePath: string;
+}>;
 export declare const isPatchableServerlessVersion: () => Promise<boolean>;
 export declare const isPatchableSkubaType: () => Promise<boolean>;
 export declare const isPatchableNodeVersion: (targetNodeVersion: number) => Promise<boolean>;

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

@@ -42,80 +42,117 @@ var import_logging = require("../../../utils/logging");
 const getParentFile = async (file) => {
   const path = await (0, import_find_up.default)(file, { cwd: process.cwd() });
   if (!path) {
-    throw new Error(`${file} not found`);
+    return void 0;
   }
-  return import_fs_extra.default.readFile(path, "utf-8");
+  return {
+    fileContent: await import_fs_extra.default.readFile(path, "utf-8"),
+    path
+  };
 };
 const extractFromParentPackageJson = async (schema) => {
-  const packageJson = await getParentFile("package.json");
+  const file = await getParentFile("package.json");
+  if (!file) {
+    return { packageJson: void 0, packageJsonRelativePath: void 0 };
+  }
+  const { fileContent: packageJson, path } = file;
   let rawJSON;
   try {
     rawJSON = JSON.parse(packageJson);
   } catch {
-    throw new Error("package.json is not valid JSON");
+    throw new Error(`${path} is not valid JSON`);
   }
   const result = schema.safeParse(rawJSON);
   if (!result.success) {
-    return void 0;
+    return { packageJson: void 0, packageJsonRelativePath: path };
   }
-  return result.data;
+  return { packageJson: result.data, packageJsonRelativePath: path };
 };
 const isPatchableServerlessVersion = async () => {
-  const serverlessVersion = (await extractFromParentPackageJson(
+  const { packageJson, packageJsonRelativePath } = await extractFromParentPackageJson(
     import_zod.z.object({
       devDependencies: import_zod.z.object({
-        serverless: import_zod.z.string()
+        serverless: import_zod.z.string().optional()
       })
     })
-  ))?.devDependencies.serverless;
+  );
+  if (!packageJson) {
+    throw new Error(
+      "package.json not found, ensure it is in the correct location"
+    );
+  }
+  const serverlessVersion = packageJson?.devDependencies.serverless;
   if (!serverlessVersion) {
-    import_logging.log.subtle("Serverless version not found, assuming it is not a dependency");
+    import_logging.log.subtle(
+      `Serverless version not found in ${packageJsonRelativePath}, assuming it is not a dependency`
+    );
     return true;
   }
   if (!(0, import_semver.satisfies)(serverlessVersion, "4.x.x")) {
     import_logging.log.warn(
-      "Serverless version not supported, please upgrade to 4.x to automatically update serverless files"
+      `Serverless version ${serverlessVersion} cannot be migrated; use Serverless 4.x to automatically migrate Serverless files`
     );
     return false;
   }
-  import_logging.log.ok("Serverless version is supported, proceeding with migration");
+  import_logging.log.ok(
+    `Proceeding with migration of Serverless version ${serverlessVersion}`
+  );
   return true;
 };
 const isPatchableSkubaType = async () => {
-  const type = (await extractFromParentPackageJson(
+  const { packageJson, packageJsonRelativePath } = await extractFromParentPackageJson(
     import_zod.z.object({
       skuba: import_zod.z.object({
-        type: import_zod.z.string()
+        type: import_zod.z.string().optional()
       })
     })
-  ))?.skuba.type;
+  );
+  if (!packageJson) {
+    throw new Error(
+      "package.json not found, ensure it is in the correct location"
+    );
+  }
+  const type = packageJson?.skuba.type;
   if (!type) {
     import_logging.log.warn(
-      "skuba type couldn't be found, please specify the type of project in the package.json, to ensure the correct migration is applied"
+      `skuba project type not found in ${packageJsonRelativePath}; add a package.json#/skuba/type to ensure the correct migration can be applied`
     );
     return false;
   }
   if (type === "package") {
     import_logging.log.warn(
-      "skuba type package is not supported, packages should be updated manually to ensure major runtime deprecations are intended"
+      "Migrations are not supported for packages; update manually to ensure major runtime deprecations are intended"
     );
     return false;
   }
-  import_logging.log.ok("skuba type supported, proceeding with migration");
+  import_logging.log.ok(`Proceeding with migration of skuba project type ${type}`);
   return true;
 };
 const isPatchableNodeVersion = async (targetNodeVersion) => {
-  const currentNodeVersion = await getParentFile(".nvmrc");
+  const nvmrcFile = await getParentFile(".nvmrc");
+  const nodeVersionFile = await getParentFile(".node-version");
+  const { packageJson } = await extractFromParentPackageJson(
+    import_zod.z.object({
+      engines: import_zod.z.object({
+        node: import_zod.z.string()
+      })
+    })
+  );
+  const nvmrcNodeVersion = nvmrcFile?.fileContent;
+  const nodeVersion = nodeVersionFile?.fileContent;
+  const engineVersion = packageJson?.engines.node;
+  const currentNodeVersion = nvmrcNodeVersion || nodeVersion || engineVersion;
   const coercedTargetVersion = (0, import_semver.coerce)(targetNodeVersion.toString())?.version;
   const coercedCurrentVersion = (0, import_semver.coerce)(currentNodeVersion)?.version;
   const isNodeVersionValid = coercedTargetVersion && coercedCurrentVersion && (0, import_semver.lte)(coercedCurrentVersion, coercedTargetVersion);
   if (!isNodeVersionValid) {
     import_logging.log.warn(
-      `Node version in .nvmrc is higher than the target version ${coercedTargetVersion}, please ensure the target version is greater than the current version ${coercedCurrentVersion}`
+      `Node.js version ${coercedCurrentVersion ?? "unknown"} cannot be migrated to ${coercedTargetVersion}`
     );
     return false;
   }
-  import_logging.log.ok("Valid node version found, proceeding with migration");
+  import_logging.log.ok(
+    `Proceeding with migration from Node.js ${coercedCurrentVersion} to ${coercedTargetVersion}`
+  );
   return true;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/migrate/nodeVersion/checks.ts"],
-  "sourcesContent": ["import findUp from 'find-up';\nimport fs from 'fs-extra';\nimport { coerce, lte, satisfies } from 'semver';\nimport { type ZodRawShape, z } from 'zod';\n\nimport { log } from '../../../utils/logging';\n\nconst getParentFile = async (file: string) => {\n  const path = await findUp(file, { cwd: process.cwd() });\n  if (!path) {\n    throw new Error(`${file} not found`);\n  }\n  return fs.readFile(path, 'utf-8');\n};\n\nexport const extractFromParentPackageJson = async <T extends ZodRawShape>(\n  schema: z.ZodObject<T>,\n): Promise<z.infer<typeof schema> | undefined> => {\n  const packageJson = await getParentFile('package.json');\n  let rawJSON;\n  try {\n    rawJSON = JSON.parse(packageJson) as unknown;\n  } catch {\n    throw new Error('package.json is not valid JSON');\n  }\n  const result = schema.safeParse(rawJSON);\n  if (!result.success) {\n    return undefined;\n  }\n\n  return result.data;\n};\n\nexport const isPatchableServerlessVersion = async (): Promise<boolean> => {\n  const serverlessVersion = (\n    await extractFromParentPackageJson(\n      z.object({\n        devDependencies: z.object({\n          serverless: z.string(),\n        }),\n      }),\n    )\n  )?.devDependencies.serverless;\n\n  if (!serverlessVersion) {\n    log.subtle('Serverless version not found, assuming it is not a dependency');\n    return true;\n  }\n\n  if (!satisfies(serverlessVersion, '4.x.x')) {\n    log.warn(\n      'Serverless version not supported, please upgrade to 4.x to automatically update serverless files',\n    );\n    return false;\n  }\n\n  log.ok('Serverless version is supported, proceeding with migration');\n  return true;\n};\n\nexport const isPatchableSkubaType = async (): Promise<boolean> => {\n  const type = (\n    await extractFromParentPackageJson(\n      z.object({\n        skuba: z.object({\n          type: z.string(),\n        }),\n      }),\n    )\n  )?.skuba.type;\n\n  if (!type) {\n    log.warn(\n      \"skuba type couldn't be found, please specify the type of project in the package.json, to ensure the correct migration is applied\",\n    );\n    return false;\n  }\n  if (type === 'package') {\n    log.warn(\n      'skuba type package is not supported, packages should be updated manually to ensure major runtime deprecations are intended',\n    );\n    return false;\n  }\n\n  log.ok('skuba type supported, proceeding with migration');\n  return true;\n};\n\nexport const isPatchableNodeVersion = async (\n  targetNodeVersion: number,\n): Promise<boolean> => {\n  const currentNodeVersion = await getParentFile('.nvmrc');\n\n  const coercedTargetVersion = coerce(targetNodeVersion.toString())?.version;\n  const coercedCurrentVersion = coerce(currentNodeVersion)?.version;\n\n  const isNodeVersionValid =\n    coercedTargetVersion &&\n    coercedCurrentVersion &&\n    lte(coercedCurrentVersion, coercedTargetVersion);\n\n  if (!isNodeVersionValid) {\n    log.warn(\n      `Node version in .nvmrc is higher than the target version ${coercedTargetVersion}, please ensure the target version is greater than the current version ${coercedCurrentVersion}`,\n    );\n    return false;\n  }\n\n  log.ok('Valid node version found, proceeding with migration');\n  return true;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAmB;AACnB,sBAAe;AACf,oBAAuC;AACvC,iBAAoC;AAEpC,qBAAoB;AAEpB,MAAM,gBAAgB,OAAO,SAAiB;AAC5C,QAAM,OAAO,UAAM,eAAAA,SAAO,MAAM,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC;AACtD,MAAI,CAAC,MAAM;AACT,UAAM,IAAI,MAAM,GAAG,IAAI,YAAY;AAAA,EACrC;AACA,SAAO,gBAAAC,QAAG,SAAS,MAAM,OAAO;AAClC;AAEO,MAAM,+BAA+B,OAC1C,WACgD;AAChD,QAAM,cAAc,MAAM,cAAc,cAAc;AACtD,MAAI;AACJ,MAAI;AACF,cAAU,KAAK,MAAM,WAAW;AAAA,EAClC,QAAQ;AACN,UAAM,IAAI,MAAM,gCAAgC;AAAA,EAClD;AACA,QAAM,SAAS,OAAO,UAAU,OAAO;AACvC,MAAI,CAAC,OAAO,SAAS;AACnB,WAAO;AAAA,EACT;AAEA,SAAO,OAAO;AAChB;AAEO,MAAM,+BAA+B,YAA8B;AACxE,QAAM,qBACJ,MAAM;AAAA,IACJ,aAAE,OAAO;AAAA,MACP,iBAAiB,aAAE,OAAO;AAAA,QACxB,YAAY,aAAE,OAAO;AAAA,MACvB,CAAC;AAAA,IACH,CAAC;AAAA,EACH,IACC,gBAAgB;AAEnB,MAAI,CAAC,mBAAmB;AACtB,uBAAI,OAAO,+DAA+D;AAC1E,WAAO;AAAA,EACT;AAEA,MAAI,KAAC,yBAAU,mBAAmB,OAAO,GAAG;AAC1C,uBAAI;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAEA,qBAAI,GAAG,4DAA4D;AACnE,SAAO;AACT;AAEO,MAAM,uBAAuB,YAA8B;AAChE,QAAM,QACJ,MAAM;AAAA,IACJ,aAAE,OAAO;AAAA,MACP,OAAO,aAAE,OAAO;AAAA,QACd,MAAM,aAAE,OAAO;AAAA,MACjB,CAAC;AAAA,IACH,CAAC;AAAA,EACH,IACC,MAAM;AAET,MAAI,CAAC,MAAM;AACT,uBAAI;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACA,MAAI,SAAS,WAAW;AACtB,uBAAI;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAEA,qBAAI,GAAG,iDAAiD;AACxD,SAAO;AACT;AAEO,MAAM,yBAAyB,OACpC,sBACqB;AACrB,QAAM,qBAAqB,MAAM,cAAc,QAAQ;AAEvD,QAAM,2BAAuB,sBAAO,kBAAkB,SAAS,CAAC,GAAG;AACnE,QAAM,4BAAwB,sBAAO,kBAAkB,GAAG;AAE1D,QAAM,qBACJ,wBACA,6BACA,mBAAI,uBAAuB,oBAAoB;AAEjD,MAAI,CAAC,oBAAoB;AACvB,uBAAI;AAAA,MACF,4DAA4D,oBAAoB,0EAA0E,qBAAqB;AAAA,IACjL;AACA,WAAO;AAAA,EACT;AAEA,qBAAI,GAAG,qDAAqD;AAC5D,SAAO;AACT;",
+  "sourcesContent": ["import findUp from 'find-up';\nimport fs from 'fs-extra';\nimport { coerce, lte, satisfies } from 'semver';\nimport { type ZodRawShape, z } from 'zod';\n\nimport { log } from '../../../utils/logging';\n\nconst getParentFile = async (file: string) => {\n  const path = await findUp(file, { cwd: process.cwd() });\n  if (!path) {\n    return undefined;\n  }\n  return {\n    fileContent: await fs.readFile(path, 'utf-8'),\n    path,\n  };\n};\n\nexport const extractFromParentPackageJson = async <T extends ZodRawShape>(\n  schema: z.ZodObject<T>,\n) => {\n  const file = await getParentFile('package.json');\n  if (!file) {\n    return { packageJson: undefined, packageJsonRelativePath: undefined };\n  }\n  const { fileContent: packageJson, path } = file;\n  let rawJSON;\n  try {\n    rawJSON = JSON.parse(packageJson) as unknown;\n  } catch {\n    throw new Error(`${path} is not valid JSON`);\n  }\n  const result = schema.safeParse(rawJSON);\n  if (!result.success) {\n    return { packageJson: undefined, packageJsonRelativePath: path };\n  }\n\n  return { packageJson: result.data, packageJsonRelativePath: path };\n};\n\nexport const isPatchableServerlessVersion = async (): Promise<boolean> => {\n  const { packageJson, packageJsonRelativePath } =\n    await extractFromParentPackageJson(\n      z.object({\n        devDependencies: z.object({\n          serverless: z.string().optional(),\n        }),\n      }),\n    );\n  if (!packageJson) {\n    throw new Error(\n      'package.json not found, ensure it is in the correct location',\n    );\n  }\n\n  const serverlessVersion = packageJson?.devDependencies.serverless;\n\n  if (!serverlessVersion) {\n    log.subtle(\n      `Serverless version not found in ${packageJsonRelativePath}, assuming it is not a dependency`,\n    );\n    return true;\n  }\n\n  if (!satisfies(serverlessVersion, '4.x.x')) {\n    log.warn(\n      `Serverless version ${serverlessVersion} cannot be migrated; use Serverless 4.x to automatically migrate Serverless files`,\n    );\n    return false;\n  }\n\n  log.ok(\n    `Proceeding with migration of Serverless version ${serverlessVersion}`,\n  );\n  return true;\n};\n\nexport const isPatchableSkubaType = async (): Promise<boolean> => {\n  const { packageJson, packageJsonRelativePath } =\n    await extractFromParentPackageJson(\n      z.object({\n        skuba: z.object({\n          type: z.string().optional(),\n        }),\n      }),\n    );\n\n  if (!packageJson) {\n    throw new Error(\n      'package.json not found, ensure it is in the correct location',\n    );\n  }\n\n  const type = packageJson?.skuba.type;\n\n  if (!type) {\n    log.warn(\n      `skuba project type not found in ${packageJsonRelativePath}; add a package.json#/skuba/type to ensure the correct migration can be applied`,\n    );\n    return false;\n  }\n  if (type === 'package') {\n    log.warn(\n      'Migrations are not supported for packages; update manually to ensure major runtime deprecations are intended',\n    );\n    return false;\n  }\n\n  log.ok(`Proceeding with migration of skuba project type ${type}`);\n  return true;\n};\n\nexport const isPatchableNodeVersion = async (\n  targetNodeVersion: number,\n): Promise<boolean> => {\n  const nvmrcFile = await getParentFile('.nvmrc');\n  const nodeVersionFile = await getParentFile('.node-version');\n  const { packageJson } = await extractFromParentPackageJson(\n    z.object({\n      engines: z.object({\n        node: z.string(),\n      }),\n    }),\n  );\n\n  const nvmrcNodeVersion = nvmrcFile?.fileContent;\n  const nodeVersion = nodeVersionFile?.fileContent;\n  const engineVersion = packageJson?.engines.node;\n\n  const currentNodeVersion = nvmrcNodeVersion || nodeVersion || engineVersion;\n\n  const coercedTargetVersion = coerce(targetNodeVersion.toString())?.version;\n  const coercedCurrentVersion = coerce(currentNodeVersion)?.version;\n\n  const isNodeVersionValid =\n    coercedTargetVersion &&\n    coercedCurrentVersion &&\n    lte(coercedCurrentVersion, coercedTargetVersion);\n\n  if (!isNodeVersionValid) {\n    log.warn(\n      `Node.js version ${coercedCurrentVersion ?? 'unknown'} cannot be migrated to ${coercedTargetVersion}`,\n    );\n    return false;\n  }\n\n  log.ok(\n    `Proceeding with migration from Node.js ${coercedCurrentVersion} to ${coercedTargetVersion}`,\n  );\n  return true;\n};\n"],
+  "mappings": "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",
   "names": ["findUp", "fs"]
 }

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,54 +15,39 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var getNodeTypesVersion_exports = {};
 __export(getNodeTypesVersion_exports, {
   getNodeTypesVersion: () => getNodeTypesVersion
 });
 module.exports = __toCommonJS(getNodeTypesVersion_exports);
-var import_npm_registry_fetch = __toESM(require("npm-registry-fetch"));
+var import_util = require("util");
 var import_semver = require("semver");
-var import_zod = require("zod");
-const NpmFetchResponse = import_zod.z.object({
-  versions: import_zod.z.record(
-    import_zod.z.string(),
-    import_zod.z.object({
-      name: import_zod.z.string(),
-      version: import_zod.z.string(),
-      deprecated: import_zod.z.string().optional()
-    })
-  )
-});
+var import_logging = require("../../../utils/logging");
+var import_version = require("../../../utils/version");
 const getNodeTypesVersion = async (major, defaultVersion) => {
   try {
-    const response = await import_npm_registry_fetch.default.json("@types/node", {
-      headers: {
-        Accept: "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"
-      }
-    });
-    const parsedVersions = NpmFetchResponse.safeParse(response);
-    if (!parsedVersions.success) {
-      throw new Error("Failed to parse response");
-    }
-    const version = Object.values(parsedVersions.data.versions).filter(
+    const versions = await (0, import_version.getNpmVersions)("@types/node");
+    const matchingVersions = Object.values(versions ?? {}).filter(
       (v) => (0, import_semver.valid)(v.version) && (0, import_semver.satisfies)(v.version, `${major}.x.x`) && !v.deprecated
-    ).reduce((a, b) => (0, import_semver.gt)(a.version, b.version) ? a : b).version;
+    );
+    if (!matchingVersions.length) {
+      return {
+        version: defaultVersion,
+        err: `No matching @types/node versions for Node.js ${major}`
+      };
+    }
+    const { version } = matchingVersions.reduce(
+      (a, b) => (0, import_semver.gt)(a.version, b.version) ? a : b
+    );
     return {
       version
     };
-  } catch {
+  } catch (err) {
+    import_logging.log.subtle((0, import_util.inspect)(err));
     return {
       version: defaultVersion,
-      err: "Failed to fetch latest @types/node version, using fallback version"
+      err: `Failed to fetch latest @types/node version, using fallback version ${defaultVersion}`
     };
   }
 };

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/migrate/nodeVersion/getNodeTypesVersion.ts"],
-  "sourcesContent": ["import npmFetch from 'npm-registry-fetch';\nimport { gt, satisfies, valid } from 'semver';\nimport { z } from 'zod';\n\ntype VersionResult = {\n  version: string;\n  err?: string;\n};\n\nconst NpmFetchResponse = z.object({\n  versions: z.record(\n    z.string(),\n    z.object({\n      name: z.string(),\n      version: z.string(),\n      deprecated: z.string().optional(),\n    }),\n  ),\n});\n\nexport const getNodeTypesVersion = async (\n  major: number,\n  defaultVersion: string,\n): Promise<VersionResult> => {\n  try {\n    const response = await npmFetch.json('@types/node', {\n      headers: {\n        Accept:\n          'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*',\n      },\n    });\n\n    const parsedVersions = NpmFetchResponse.safeParse(response);\n    if (!parsedVersions.success) {\n      throw new Error('Failed to parse response');\n    }\n\n    const version = Object.values(parsedVersions.data.versions)\n      .filter(\n        (v) =>\n          valid(v.version) &&\n          satisfies(v.version, `${major}.x.x`) &&\n          !v.deprecated,\n      )\n      .reduce((a, b) => (gt(a.version, b.version) ? a : b)).version;\n\n    return {\n      version,\n    };\n  } catch {\n    return {\n      version: defaultVersion,\n      err: 'Failed to fetch latest @types/node version, using fallback version',\n    };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAqB;AACrB,oBAAqC;AACrC,iBAAkB;AAOlB,MAAM,mBAAmB,aAAE,OAAO;AAAA,EAChC,UAAU,aAAE;AAAA,IACV,aAAE,OAAO;AAAA,IACT,aAAE,OAAO;AAAA,MACP,MAAM,aAAE,OAAO;AAAA,MACf,SAAS,aAAE,OAAO;AAAA,MAClB,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,IAClC,CAAC;AAAA,EACH;AACF,CAAC;AAEM,MAAM,sBAAsB,OACjC,OACA,mBAC2B;AAC3B,MAAI;AACF,UAAM,WAAW,MAAM,0BAAAA,QAAS,KAAK,eAAe;AAAA,MAClD,SAAS;AAAA,QACP,QACE;AAAA,MACJ;AAAA,IACF,CAAC;AAED,UAAM,iBAAiB,iBAAiB,UAAU,QAAQ;AAC1D,QAAI,CAAC,eAAe,SAAS;AAC3B,YAAM,IAAI,MAAM,0BAA0B;AAAA,IAC5C;AAEA,UAAM,UAAU,OAAO,OAAO,eAAe,KAAK,QAAQ,EACvD;AAAA,MACC,CAAC,UACC,qBAAM,EAAE,OAAO,SACf,yBAAU,EAAE,SAAS,GAAG,KAAK,MAAM,KACnC,CAAC,EAAE;AAAA,IACP,EACC,OAAO,CAAC,GAAG,UAAO,kBAAG,EAAE,SAAS,EAAE,OAAO,IAAI,IAAI,CAAE,EAAE;AAExD,WAAO;AAAA,MACL;AAAA,IACF;AAAA,EACF,QAAQ;AACN,WAAO;AAAA,MACL,SAAS;AAAA,MACT,KAAK;AAAA,IACP;AAAA,EACF;AACF;",
-  "names": ["npmFetch"]
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { gt, satisfies, valid } from 'semver';\n\nimport { log } from '../../../utils/logging';\nimport { getNpmVersions } from '../../../utils/version';\n\ntype VersionResult = {\n  version: string;\n  err?: string;\n};\n\nexport const getNodeTypesVersion = async (\n  major: number,\n  defaultVersion: string,\n): Promise<VersionResult> => {\n  try {\n    const versions = await getNpmVersions('@types/node');\n\n    const matchingVersions = Object.values(versions ?? {}).filter(\n      (v) =>\n        valid(v.version) &&\n        satisfies(v.version, `${major}.x.x`) &&\n        !v.deprecated,\n    );\n\n    if (!matchingVersions.length) {\n      return {\n        version: defaultVersion,\n        err: `No matching @types/node versions for Node.js ${major}`,\n      };\n    }\n\n    const { version } = matchingVersions.reduce((a, b) =>\n      gt(a.version, b.version) ? a : b,\n    );\n\n    return {\n      version,\n    };\n  } catch (err) {\n    log.subtle(inspect(err));\n    return {\n      version: defaultVersion,\n      err: `Failed to fetch latest @types/node version, using fallback version ${defaultVersion}`,\n    };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,oBAAqC;AAErC,qBAAoB;AACpB,qBAA+B;AAOxB,MAAM,sBAAsB,OACjC,OACA,mBAC2B;AAC3B,MAAI;AACF,UAAM,WAAW,UAAM,+BAAe,aAAa;AAEnD,UAAM,mBAAmB,OAAO,OAAO,YAAY,CAAC,CAAC,EAAE;AAAA,MACrD,CAAC,UACC,qBAAM,EAAE,OAAO,SACf,yBAAU,EAAE,SAAS,GAAG,KAAK,MAAM,KACnC,CAAC,EAAE;AAAA,IACP;AAEA,QAAI,CAAC,iBAAiB,QAAQ;AAC5B,aAAO;AAAA,QACL,SAAS;AAAA,QACT,KAAK,gDAAgD,KAAK;AAAA,MAC5D;AAAA,IACF;AAEA,UAAM,EAAE,QAAQ,IAAI,iBAAiB;AAAA,MAAO,CAAC,GAAG,UAC9C,kBAAG,EAAE,SAAS,EAAE,OAAO,IAAI,IAAI;AAAA,IACjC;AAEA,WAAO;AAAA,MACL;AAAA,IACF;AAAA,EACF,SAAS,KAAK;AACZ,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO;AAAA,MACL,SAAS;AAAA,MACT,KAAK,sEAAsE,cAAc;AAAA,IAC3F;AAAA,EACF;AACF;",
+  "names": []
 }

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

@@ -55,32 +55,28 @@ const subPatches = ({
     regex: /^FROM(.*) gcr.io\/distroless\/nodejs\d+-debian(\d+)(@sha256:[a-f0-9]{64})?(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
     replace: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$2$4$5$6`
   },
-  [
-    {
-      files: "**/serverless*.y*ml",
-      regex: /nodejs\d+.x/gm,
-      tests: [import_checks.isPatchableServerlessVersion],
-      replace: `nodejs${nodeVersion}.x`
-    },
-    {
-      files: "**/serverless*.y*ml",
-      regex: /node\d+/gm,
-      tests: [import_checks.isPatchableServerlessVersion],
-      replace: `node${nodeVersion}`
-    }
-  ],
-  [
-    {
-      files: "**/infra/**/*.ts",
-      regex: /NODEJS_\d+_X/g,
-      replace: `NODEJS_${nodeVersion}_X`
-    },
-    {
-      files: "**/infra/**/*.ts",
-      regex: /(target:\s*'node)(\d+)(.+)$/gm,
-      replace: `$1${nodeVersion}$3`
-    }
-  ],
+  {
+    files: "**/serverless*.y*ml",
+    regex: /\bnodejs\d+.x\b/gm,
+    tests: [import_checks.isPatchableServerlessVersion],
+    replace: `nodejs${nodeVersion}.x`
+  },
+  {
+    files: "**/serverless*.y*ml",
+    regex: /\bnode\d+\b/gm,
+    tests: [import_checks.isPatchableServerlessVersion],
+    replace: `node${nodeVersion}`
+  },
+  {
+    files: "**/infra/**/*.ts",
+    regex: /NODEJS_\d+_X/g,
+    replace: `NODEJS_${nodeVersion}_X`
+  },
+  {
+    files: "**/infra/**/*.ts",
+    regex: /(target:\s*'node)(\d+)(.+)$/gm,
+    replace: `$1${nodeVersion}$3`
+  },
   {
     files: "**/.buildkite/*",
     regex: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
@@ -88,37 +84,33 @@ const subPatches = ({
   },
   {
     files: ".node-version*",
-    regex: /(v)?\d+\.\d+\.\d+(.+)?/gm,
-    replace: `$1${nodeVersion}$2`
+    regex: /(\d+(?:\.\d+)*)/g,
+    replace: `${nodeVersion}`
+  },
+  {
+    files: "**/package.json",
+    regex: /("@types\/node":\s*")(\^)?(\d+\.\d+\.\d+)(")/gm,
+    tests: [import_checks.isPatchableServerlessVersion],
+    replace: `$1$2${nodeTypesVersion}$4`
+  },
+  {
+    files: "**/package.json",
+    regex: /(["']engines["']:\s*{[\s\S]*?["']node["']:\s*["']>=)(\d+(?:\.\d+)*)(['"]\s*})/gm,
+    tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
+    replace: `$1${nodeVersion}$3`
+  },
+  {
+    files: "**/tsconfig*.json",
+    regex: /("target":\s*")(ES\d+)"/gim,
+    tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
+    replace: `$1${ECMAScriptVersion}"`
+  },
+  {
+    files: "**/tsconfig*.json",
+    regex: /("lib":\s*\[)([\S\s]*?)(ES\d+)([\S\s]*?)(\])/gim,
+    tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
+    replace: `$1$2${ECMAScriptVersion}$4$5`
   },
-  [
-    {
-      files: "**/package.json",
-      regex: /(\\?"@types\/node\\?": \\?")(\^)?[0-9.]+(\\?(",?)\\?n?)/gm,
-      tests: [import_checks.isPatchableServerlessVersion],
-      replace: `$1$2${nodeTypesVersion}$4`
-    },
-    {
-      files: "**/package.json",
-      regex: /(\\?"engines\\?":\s*{\\?n?[^}]*\\?"node\\?":\s*\\?">=)(\d+)\\?("[^}]*})(?![^}]*\\?"skuba\\?":\s*{\\?n?[^}]*\\?"type\\?":\s*\\?"package\\?")/gm,
-      tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
-      replace: `$1${nodeVersion}$3`
-    }
-  ],
-  [
-    {
-      files: "**/tsconfig*.json",
-      regex: /("target":\s*")(ES\d+)"/gim,
-      tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
-      replace: `$1${ECMAScriptVersion}"`
-    },
-    {
-      files: "**/tsconfig*.json",
-      regex: /("lib":\s*\[)([\S\s]*?)(ES\d+)([\S\s]*?)(\])/gim,
-      tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
-      replace: `$1$2${ECMAScriptVersion}$4$5`
-    }
-  ],
   {
     files: "**/docker-compose*.y*ml",
     regex: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
@@ -126,12 +118,6 @@ const subPatches = ({
   }
 ];
 const runSubPatch = async (dir, patch) => {
-  if (Array.isArray(patch)) {
-    for (const subPatch of patch) {
-      await runSubPatch(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(
@@ -171,9 +157,9 @@ const writePatchedContents = async ({
   regex ? contents.replaceAll(regex, templated) : templated
 );
 const upgrade = async (versions, dir) => {
-  await Promise.all(
-    subPatches(versions).map((subPatch) => runSubPatch(dir, subPatch))
-  );
+  for (const subPatch of subPatches(versions)) {
+    await runSubPatch(dir, subPatch);
+  }
 };
 const nodeVersionMigration = async ({
   nodeVersion,
@@ -183,7 +169,7 @@ const nodeVersionMigration = async ({
   import_logging.log.ok(`Upgrading to Node.js ${nodeVersion}`);
   try {
     if (!await (0, import_checks.isPatchableNodeVersion)(nodeVersion)) {
-      throw new Error("Node version is not patchable");
+      throw new Error("Node.js version is not patchable");
     }
     const { version: nodeTypesVersion, err } = await (0, import_getNodeTypesVersion.getNodeTypesVersion)(
       nodeVersion,

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

package/lib/utils/copy.d.ts

@@ -1,4 +1,4 @@
-export type TextProcessor = (contents: string) => string;
+export type TextProcessor = (sourcePath: string, contents: string) => string;
 export declare const copyFile: (sourcePath: string, destinationPath: string, { overwrite, processors, }: Pick<CopyFilesOptions, "overwrite" | "processors">) => Promise<void>;
 interface CopyFilesOptions {
     sourceRoot: string;

package/lib/utils/copy.js

@@ -45,7 +45,7 @@ const copyFile = async (sourcePath, destinationPath, {
 }) => {
   const oldContents = await import_fs_extra.default.promises.readFile(sourcePath, "utf8");
   const newContents = processors.reduce(
-    (contents, process) => process(contents),
+    (contents, process) => process(sourcePath, contents),
     oldContents
   );
   if (oldContents === newContents && sourcePath === destinationPath) {
@@ -62,8 +62,16 @@ const copyFile = async (sourcePath, destinationPath, {
     throw err;
   }
 };
-const createEjsRenderer = (templateData) => (contents) => import_ejs.default.render(contents, templateData);
-const createStringReplacer = (replacements) => (contents) => replacements.reduce(
+const createEjsRenderer = (templateData) => (sourcePath, contents) => {
+  try {
+    return import_ejs.default.render(contents, templateData, { strict: false });
+  } catch (err) {
+    import_logging.log.err("Failed to render", import_logging.log.bold(sourcePath));
+    import_logging.log.subtle(err);
+    return contents;
+  }
+};
+const createStringReplacer = (replacements) => (_sourcePath, contents) => replacements.reduce(
   (newContents, { input, output }) => newContents.replace(input, output),
   contents
 );

package/lib/utils/copy.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/copy.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport ejs from 'ejs';\nimport fs from 'fs-extra';\n\nimport { isErrorWithCode } from './error';\nimport { log } from './logging';\n\nexport type TextProcessor = (contents: string) => string;\n\nexport const copyFile = async (\n  sourcePath: string,\n  destinationPath: string,\n  {\n    overwrite = true,\n    processors,\n  }: Pick<CopyFilesOptions, 'overwrite' | 'processors'>,\n) => {\n  const oldContents = await fs.promises.readFile(sourcePath, 'utf8');\n\n  const newContents = processors.reduce(\n    (contents, process) => process(contents),\n    oldContents,\n  );\n\n  if (oldContents === newContents && sourcePath === destinationPath) {\n    return;\n  }\n\n  try {\n    await fs.promises.writeFile(destinationPath, newContents, {\n      flag: overwrite ? 'w' : 'wx',\n    });\n  } catch (err) {\n    if (isErrorWithCode(err, 'EEXIST')) {\n      return;\n    }\n\n    throw err;\n  }\n};\n\ninterface CopyFilesOptions {\n  sourceRoot: string;\n  destinationRoot: string;\n\n  include: (pathname: string) => boolean;\n  overwrite?: boolean;\n  processors: TextProcessor[];\n  stripUnderscorePrefix?: boolean;\n}\n\nexport const createEjsRenderer =\n  (templateData: Record<string, unknown>): TextProcessor =>\n  (contents) =>\n    ejs.render(contents, templateData);\n\nexport const createStringReplacer =\n  (\n    replacements: Array<{\n      input: RegExp;\n      output: string;\n    }>,\n  ): TextProcessor =>\n  (contents) =>\n    replacements.reduce(\n      (newContents, { input, output }) => newContents.replace(input, output),\n      contents,\n    );\n\nexport const copyFiles = async (\n  opts: CopyFilesOptions,\n  currentSourceDir: string = opts.sourceRoot,\n  currentDestinationDir: string = opts.destinationRoot,\n) => {\n  const filenames = await fs.promises.readdir(currentSourceDir);\n\n  const toDestinationPath = (filename: string) =>\n    path.join(\n      currentDestinationDir,\n      opts.stripUnderscorePrefix\n        ? filename\n            .replace(/^_\\./, '.')\n            .replace(/^_package\\.json/, 'package.json')\n            .replace(/^_eslint\\.config\\.js/, 'eslint.config.js')\n        : filename,\n    );\n\n  const filteredFilenames = filenames.filter((filename) =>\n    opts.include(\n      path.relative(opts.destinationRoot, toDestinationPath(filename)),\n    ),\n  );\n\n  await Promise.all(\n    filteredFilenames.map(async (filename) => {\n      const sourcePath = path.join(currentSourceDir, filename);\n      const destinationPath = toDestinationPath(filename);\n\n      try {\n        await copyFile(sourcePath, destinationPath, opts);\n      } catch (err) {\n        if (isErrorWithCode(err, 'EISDIR')) {\n          await fs.promises.mkdir(destinationPath, { recursive: true });\n          return copyFiles(opts, sourcePath, destinationPath);\n        }\n\n        log.err('Failed to render', log.bold(sourcePath));\n\n        throw err;\n      }\n    }),\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,iBAAgB;AAChB,sBAAe;AAEf,mBAAgC;AAChC,qBAAoB;AAIb,MAAM,WAAW,OACtB,YACA,iBACA;AAAA,EACE,YAAY;AAAA,EACZ;AACF,MACG;AACH,QAAM,cAAc,MAAM,gBAAAA,QAAG,SAAS,SAAS,YAAY,MAAM;AAEjE,QAAM,cAAc,WAAW;AAAA,IAC7B,CAAC,UAAU,YAAY,QAAQ,QAAQ;AAAA,IACvC;AAAA,EACF;AAEA,MAAI,gBAAgB,eAAe,eAAe,iBAAiB;AACjE;AAAA,EACF;AAEA,MAAI;AACF,UAAM,gBAAAA,QAAG,SAAS,UAAU,iBAAiB,aAAa;AAAA,MACxD,MAAM,YAAY,MAAM;AAAA,IAC1B,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,YAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,IACF;AAEA,UAAM;AAAA,EACR;AACF;AAYO,MAAM,oBACX,CAAC,iBACD,CAAC,aACC,WAAAC,QAAI,OAAO,UAAU,YAAY;AAE9B,MAAM,uBACX,CACE,iBAKF,CAAC,aACC,aAAa;AAAA,EACX,CAAC,aAAa,EAAE,OAAO,OAAO,MAAM,YAAY,QAAQ,OAAO,MAAM;AAAA,EACrE;AACF;AAEG,MAAM,YAAY,OACvB,MACA,mBAA2B,KAAK,YAChC,wBAAgC,KAAK,oBAClC;AACH,QAAM,YAAY,MAAM,gBAAAD,QAAG,SAAS,QAAQ,gBAAgB;AAE5D,QAAM,oBAAoB,CAAC,aACzB,YAAAE,QAAK;AAAA,IACH;AAAA,IACA,KAAK,wBACD,SACG,QAAQ,QAAQ,GAAG,EACnB,QAAQ,mBAAmB,cAAc,EACzC,QAAQ,wBAAwB,kBAAkB,IACrD;AAAA,EACN;AAEF,QAAM,oBAAoB,UAAU;AAAA,IAAO,CAAC,aAC1C,KAAK;AAAA,MACH,YAAAA,QAAK,SAAS,KAAK,iBAAiB,kBAAkB,QAAQ,CAAC;AAAA,IACjE;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,kBAAkB,IAAI,OAAO,aAAa;AACxC,YAAM,aAAa,YAAAA,QAAK,KAAK,kBAAkB,QAAQ;AACvD,YAAM,kBAAkB,kBAAkB,QAAQ;AAElD,UAAI;AACF,cAAM,SAAS,YAAY,iBAAiB,IAAI;AAAA,MAClD,SAAS,KAAK;AACZ,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC,gBAAM,gBAAAF,QAAG,SAAS,MAAM,iBAAiB,EAAE,WAAW,KAAK,CAAC;AAC5D,iBAAO,UAAU,MAAM,YAAY,eAAe;AAAA,QACpD;AAEA,2BAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAEhD,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport ejs from 'ejs';\nimport fs from 'fs-extra';\n\nimport { isErrorWithCode } from './error';\nimport { log } from './logging';\n\nexport type TextProcessor = (sourcePath: string, contents: string) => string;\n\nexport const copyFile = async (\n  sourcePath: string,\n  destinationPath: string,\n  {\n    overwrite = true,\n    processors,\n  }: Pick<CopyFilesOptions, 'overwrite' | 'processors'>,\n) => {\n  const oldContents = await fs.promises.readFile(sourcePath, 'utf8');\n\n  const newContents = processors.reduce(\n    (contents, process) => process(sourcePath, contents),\n    oldContents,\n  );\n\n  if (oldContents === newContents && sourcePath === destinationPath) {\n    return;\n  }\n\n  try {\n    await fs.promises.writeFile(destinationPath, newContents, {\n      flag: overwrite ? 'w' : 'wx',\n    });\n  } catch (err) {\n    if (isErrorWithCode(err, 'EEXIST')) {\n      return;\n    }\n\n    throw err;\n  }\n};\n\ninterface CopyFilesOptions {\n  sourceRoot: string;\n  destinationRoot: string;\n\n  include: (pathname: string) => boolean;\n  overwrite?: boolean;\n  processors: TextProcessor[];\n  stripUnderscorePrefix?: boolean;\n}\n\nexport const createEjsRenderer =\n  (templateData: Record<string, unknown>): TextProcessor =>\n  (sourcePath: string, contents) => {\n    try {\n      return ejs.render(contents, templateData, { strict: false });\n    } catch (err) {\n      log.err('Failed to render', log.bold(sourcePath));\n      log.subtle(err);\n      return contents;\n    }\n  };\n\nexport const createStringReplacer =\n  (\n    replacements: Array<{\n      input: RegExp;\n      output: string;\n    }>,\n  ): TextProcessor =>\n  (_sourcePath: string, contents) =>\n    replacements.reduce(\n      (newContents, { input, output }) => newContents.replace(input, output),\n      contents,\n    );\n\nexport const copyFiles = async (\n  opts: CopyFilesOptions,\n  currentSourceDir: string = opts.sourceRoot,\n  currentDestinationDir: string = opts.destinationRoot,\n) => {\n  const filenames = await fs.promises.readdir(currentSourceDir);\n\n  const toDestinationPath = (filename: string) =>\n    path.join(\n      currentDestinationDir,\n      opts.stripUnderscorePrefix\n        ? filename\n            .replace(/^_\\./, '.')\n            .replace(/^_package\\.json/, 'package.json')\n            .replace(/^_eslint\\.config\\.js/, 'eslint.config.js')\n        : filename,\n    );\n\n  const filteredFilenames = filenames.filter((filename) =>\n    opts.include(\n      path.relative(opts.destinationRoot, toDestinationPath(filename)),\n    ),\n  );\n\n  await Promise.all(\n    filteredFilenames.map(async (filename) => {\n      const sourcePath = path.join(currentSourceDir, filename);\n      const destinationPath = toDestinationPath(filename);\n\n      try {\n        await copyFile(sourcePath, destinationPath, opts);\n      } catch (err) {\n        if (isErrorWithCode(err, 'EISDIR')) {\n          await fs.promises.mkdir(destinationPath, { recursive: true });\n          return copyFiles(opts, sourcePath, destinationPath);\n        }\n\n        log.err('Failed to render', log.bold(sourcePath));\n\n        throw err;\n      }\n    }),\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,iBAAgB;AAChB,sBAAe;AAEf,mBAAgC;AAChC,qBAAoB;AAIb,MAAM,WAAW,OACtB,YACA,iBACA;AAAA,EACE,YAAY;AAAA,EACZ;AACF,MACG;AACH,QAAM,cAAc,MAAM,gBAAAA,QAAG,SAAS,SAAS,YAAY,MAAM;AAEjE,QAAM,cAAc,WAAW;AAAA,IAC7B,CAAC,UAAU,YAAY,QAAQ,YAAY,QAAQ;AAAA,IACnD;AAAA,EACF;AAEA,MAAI,gBAAgB,eAAe,eAAe,iBAAiB;AACjE;AAAA,EACF;AAEA,MAAI;AACF,UAAM,gBAAAA,QAAG,SAAS,UAAU,iBAAiB,aAAa;AAAA,MACxD,MAAM,YAAY,MAAM;AAAA,IAC1B,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,YAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC;AAAA,IACF;AAEA,UAAM;AAAA,EACR;AACF;AAYO,MAAM,oBACX,CAAC,iBACD,CAAC,YAAoB,aAAa;AAChC,MAAI;AACF,WAAO,WAAAC,QAAI,OAAO,UAAU,cAAc,EAAE,QAAQ,MAAM,CAAC;AAAA,EAC7D,SAAS,KAAK;AACZ,uBAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAChD,uBAAI,OAAO,GAAG;AACd,WAAO;AAAA,EACT;AACF;AAEK,MAAM,uBACX,CACE,iBAKF,CAAC,aAAqB,aACpB,aAAa;AAAA,EACX,CAAC,aAAa,EAAE,OAAO,OAAO,MAAM,YAAY,QAAQ,OAAO,MAAM;AAAA,EACrE;AACF;AAEG,MAAM,YAAY,OACvB,MACA,mBAA2B,KAAK,YAChC,wBAAgC,KAAK,oBAClC;AACH,QAAM,YAAY,MAAM,gBAAAD,QAAG,SAAS,QAAQ,gBAAgB;AAE5D,QAAM,oBAAoB,CAAC,aACzB,YAAAE,QAAK;AAAA,IACH;AAAA,IACA,KAAK,wBACD,SACG,QAAQ,QAAQ,GAAG,EACnB,QAAQ,mBAAmB,cAAc,EACzC,QAAQ,wBAAwB,kBAAkB,IACrD;AAAA,EACN;AAEF,QAAM,oBAAoB,UAAU;AAAA,IAAO,CAAC,aAC1C,KAAK;AAAA,MACH,YAAAA,QAAK,SAAS,KAAK,iBAAiB,kBAAkB,QAAQ,CAAC;AAAA,IACjE;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,kBAAkB,IAAI,OAAO,aAAa;AACxC,YAAM,aAAa,YAAAA,QAAK,KAAK,kBAAkB,QAAQ;AACvD,YAAM,kBAAkB,kBAAkB,QAAQ;AAElD,UAAI;AACF,cAAM,SAAS,YAAY,iBAAiB,IAAI;AAAA,MAClD,SAAS,KAAK;AACZ,gBAAI,8BAAgB,KAAK,QAAQ,GAAG;AAClC,gBAAM,gBAAAF,QAAG,SAAS,MAAM,iBAAiB,EAAE,WAAW,KAAK,CAAC;AAC5D,iBAAO,UAAU,MAAM,YAAY,eAAe;AAAA,QACpD;AAEA,2BAAI,IAAI,oBAAoB,mBAAI,KAAK,UAAU,CAAC;AAEhD,cAAM;AAAA,MACR;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
   "names": ["fs", "ejs", "path"]
 }

package/lib/utils/version.d.ts

@@ -1,4 +1,20 @@
-export declare const latestNpmVersion: (packageName: string) => Promise<string>;
+import { z } from 'zod';
+declare const NpmVersions: z.ZodRecord<z.ZodString, z.ZodObject<{
+    name: z.ZodString;
+    version: z.ZodString;
+    deprecated: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    name: string;
+    version: string;
+    deprecated?: string | undefined;
+}, {
+    name: string;
+    version: string;
+    deprecated?: string | undefined;
+}>>;
+export type NpmVersions = z.infer<typeof NpmVersions>;
+export declare const getNpmVersions: (packageName: string) => Promise<NpmVersions | null>;
+export declare const getLatestNpmVersion: (packageName: string) => Promise<string | null>;
 export declare const getSkubaVersion: () => Promise<string>;
 type SkubaVersionInfo = {
     isStale: true;

package/lib/utils/version.js

@@ -28,31 +28,60 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var version_exports = {};
 __export(version_exports, {
+  getLatestNpmVersion: () => getLatestNpmVersion,
+  getNpmVersions: () => getNpmVersions,
   getSkubaVersion: () => getSkubaVersion,
-  getSkubaVersionInfo: () => getSkubaVersionInfo,
-  latestNpmVersion: () => latestNpmVersion
+  getSkubaVersionInfo: () => getSkubaVersionInfo
 });
 module.exports = __toCommonJS(version_exports);
-var import_libnpmsearch = __toESM(require("libnpmsearch"));
-var import_validate_npm_package_name = __toESM(require("validate-npm-package-name"));
+var import_npm_registry_fetch = __toESM(require("npm-registry-fetch"));
+var import_zod = require("zod");
 var import_manifest = require("./manifest");
 var import_wait = require("./wait");
-const latestNpmVersion = async (packageName) => {
-  const { validForNewPackages } = (0, import_validate_npm_package_name.default)(packageName);
-  if (!validForNewPackages) {
-    throw new Error(`Package "${packageName}" does not have a valid name`);
-  }
-  const [result] = await (0, import_libnpmsearch.default)(packageName, { limit: 1, timeout: 5e3 });
-  if (result?.name !== packageName) {
-    throw new Error(
-      `Package "${packageName}" does not exist on the npm registry`
-    );
+const NpmVersions = import_zod.z.record(
+  import_zod.z.string(),
+  import_zod.z.object({
+    name: import_zod.z.string(),
+    version: import_zod.z.string(),
+    deprecated: import_zod.z.string().optional()
+  })
+);
+const PackageResponse = import_zod.z.object({
+  "dist-tags": import_zod.z.record(import_zod.z.string(), import_zod.z.string()).optional(),
+  versions: NpmVersions
+});
+const getNpmPackage = async (packageName) => {
+  try {
+    const response = await import_npm_registry_fetch.default.json(packageName, {
+      headers: {
+        Accept: "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"
+      }
+    });
+    const parsedResponse = PackageResponse.safeParse(response);
+    if (!parsedResponse.success) {
+      throw new Error(
+        `Failed to parse package response from npm for package ${packageName}`
+      );
+    }
+    return parsedResponse.data;
+  } catch (error) {
+    if (error instanceof Error && "statusCode" in error && error.statusCode === 404) {
+      return null;
+    }
+    throw error;
   }
-  return result.version;
+};
+const getNpmVersions = async (packageName) => {
+  const response = await getNpmPackage(packageName);
+  return response?.versions ?? null;
+};
+const getLatestNpmVersion = async (packageName) => {
+  const response = await getNpmPackage(packageName);
+  return response?.["dist-tags"]?.latest ?? null;
 };
 const latestSkubaVersion = async () => {
   try {
-    const result = await (0, import_wait.withTimeout)(latestNpmVersion("skuba"), { s: 2 });
+    const result = await (0, import_wait.withTimeout)(getLatestNpmVersion("skuba"), { s: 2 });
     return result.ok ? result.value : null;
   } catch {
     return null;
@@ -82,8 +111,9 @@ const getSkubaVersionInfo = async () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getLatestNpmVersion,
+  getNpmVersions,
   getSkubaVersion,
-  getSkubaVersionInfo,
-  latestNpmVersion
+  getSkubaVersionInfo
 });
 //# sourceMappingURL=version.js.map

package/lib/utils/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/version.ts"],
-  "sourcesContent": ["import searchNpm from 'libnpmsearch';\nimport validatePackageName from 'validate-npm-package-name';\n\nimport { getSkubaManifest } from './manifest';\nimport { withTimeout } from './wait';\n\nexport const latestNpmVersion = async (\n  packageName: string,\n): Promise<string> => {\n  const { validForNewPackages } = validatePackageName(packageName);\n\n  if (!validForNewPackages) {\n    throw new Error(`Package \"${packageName}\" does not have a valid name`);\n  }\n\n  const [result] = await searchNpm(packageName, { limit: 1, timeout: 5_000 });\n\n  if (result?.name !== packageName) {\n    throw new Error(\n      `Package \"${packageName}\" does not exist on the npm registry`,\n    );\n  }\n\n  return result.version;\n};\n\nconst latestSkubaVersion = async (): Promise<string | null> => {\n  try {\n    const result = await withTimeout(latestNpmVersion('skuba'), { s: 2 });\n\n    return result.ok ? result.value : null;\n  } catch {\n    return null;\n  }\n};\n\nexport const getSkubaVersion = async (): Promise<string> => {\n  const { version } = await getSkubaManifest();\n\n  return version;\n};\n\ntype SkubaVersionInfo =\n  | {\n      isStale: true;\n\n      local: string;\n      latest: string;\n    }\n  | {\n      isStale: false;\n\n      local: string;\n      latest: string | null;\n    };\n\nexport const getSkubaVersionInfo = async (): Promise<SkubaVersionInfo> => {\n  const [local, latest] = await Promise.all([\n    getSkubaVersion(),\n    latestSkubaVersion(),\n  ]);\n\n  if (latest === null) {\n    // Assume we're up to date if we can't reach the npm registry\n    return {\n      isStale: false,\n      local,\n      latest,\n    };\n  }\n\n  return {\n    isStale: latest !== local,\n    local,\n    latest,\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAsB;AACtB,uCAAgC;AAEhC,sBAAiC;AACjC,kBAA4B;AAErB,MAAM,mBAAmB,OAC9B,gBACoB;AACpB,QAAM,EAAE,oBAAoB,QAAI,iCAAAA,SAAoB,WAAW;AAE/D,MAAI,CAAC,qBAAqB;AACxB,UAAM,IAAI,MAAM,YAAY,WAAW,8BAA8B;AAAA,EACvE;AAEA,QAAM,CAAC,MAAM,IAAI,UAAM,oBAAAC,SAAU,aAAa,EAAE,OAAO,GAAG,SAAS,IAAM,CAAC;AAE1E,MAAI,QAAQ,SAAS,aAAa;AAChC,UAAM,IAAI;AAAA,MACR,YAAY,WAAW;AAAA,IACzB;AAAA,EACF;AAEA,SAAO,OAAO;AAChB;AAEA,MAAM,qBAAqB,YAAoC;AAC7D,MAAI;AACF,UAAM,SAAS,UAAM,yBAAY,iBAAiB,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC;AAEpE,WAAO,OAAO,KAAK,OAAO,QAAQ;AAAA,EACpC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,MAAM,kBAAkB,YAA6B;AAC1D,QAAM,EAAE,QAAQ,IAAI,UAAM,kCAAiB;AAE3C,SAAO;AACT;AAgBO,MAAM,sBAAsB,YAAuC;AACxE,QAAM,CAAC,OAAO,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxC,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,EACrB,CAAC;AAED,MAAI,WAAW,MAAM;AAEnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,SAAS,WAAW;AAAA,IACpB;AAAA,IACA;AAAA,EACF;AACF;",
-  "names": ["validatePackageName", "searchNpm"]
+  "sourcesContent": ["import npmFetch from 'npm-registry-fetch';\nimport { z } from 'zod';\n\nimport { getSkubaManifest } from './manifest';\nimport { withTimeout } from './wait';\n\nconst NpmVersions = z.record(\n  z.string(),\n  z.object({\n    name: z.string(),\n    version: z.string(),\n    deprecated: z.string().optional(),\n  }),\n);\n\nexport type NpmVersions = z.infer<typeof NpmVersions>;\n\nconst PackageResponse = z.object({\n  'dist-tags': z.record(z.string(), z.string()).optional(),\n  versions: NpmVersions,\n});\n\nconst getNpmPackage = async (packageName: string) => {\n  try {\n    const response = await npmFetch.json(packageName, {\n      headers: {\n        Accept:\n          'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*',\n      },\n    });\n\n    const parsedResponse = PackageResponse.safeParse(response);\n    if (!parsedResponse.success) {\n      throw new Error(\n        `Failed to parse package response from npm for package ${packageName}`,\n      );\n    }\n\n    return parsedResponse.data;\n  } catch (error) {\n    if (\n      error instanceof Error &&\n      'statusCode' in error &&\n      error.statusCode === 404\n    ) {\n      return null;\n    }\n    throw error;\n  }\n};\n\nexport const getNpmVersions = async (\n  packageName: string,\n): Promise<NpmVersions | null> => {\n  const response = await getNpmPackage(packageName);\n  return response?.versions ?? null;\n};\n\nexport const getLatestNpmVersion = async (\n  packageName: string,\n): Promise<string | null> => {\n  const response = await getNpmPackage(packageName);\n  return response?.['dist-tags']?.latest ?? null;\n};\n\nconst latestSkubaVersion = async (): Promise<string | null> => {\n  try {\n    const result = await withTimeout(getLatestNpmVersion('skuba'), { s: 2 });\n\n    return result.ok ? result.value : null;\n  } catch {\n    return null;\n  }\n};\n\nexport const getSkubaVersion = async (): Promise<string> => {\n  const { version } = await getSkubaManifest();\n\n  return version;\n};\n\ntype SkubaVersionInfo =\n  | {\n      isStale: true;\n\n      local: string;\n      latest: string;\n    }\n  | {\n      isStale: false;\n\n      local: string;\n      latest: string | null;\n    };\n\nexport const getSkubaVersionInfo = async (): Promise<SkubaVersionInfo> => {\n  const [local, latest] = await Promise.all([\n    getSkubaVersion(),\n    latestSkubaVersion(),\n  ]);\n\n  if (latest === null) {\n    // Assume we're up to date if we can't reach the npm registry\n    return {\n      isStale: false,\n      local,\n      latest,\n    };\n  }\n\n  return {\n    isStale: latest !== local,\n    local,\n    latest,\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAqB;AACrB,iBAAkB;AAElB,sBAAiC;AACjC,kBAA4B;AAE5B,MAAM,cAAc,aAAE;AAAA,EACpB,aAAE,OAAO;AAAA,EACT,aAAE,OAAO;AAAA,IACP,MAAM,aAAE,OAAO;AAAA,IACf,SAAS,aAAE,OAAO;AAAA,IAClB,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,EAClC,CAAC;AACH;AAIA,MAAM,kBAAkB,aAAE,OAAO;AAAA,EAC/B,aAAa,aAAE,OAAO,aAAE,OAAO,GAAG,aAAE,OAAO,CAAC,EAAE,SAAS;AAAA,EACvD,UAAU;AACZ,CAAC;AAED,MAAM,gBAAgB,OAAO,gBAAwB;AACnD,MAAI;AACF,UAAM,WAAW,MAAM,0BAAAA,QAAS,KAAK,aAAa;AAAA,MAChD,SAAS;AAAA,QACP,QACE;AAAA,MACJ;AAAA,IACF,CAAC;AAED,UAAM,iBAAiB,gBAAgB,UAAU,QAAQ;AACzD,QAAI,CAAC,eAAe,SAAS;AAC3B,YAAM,IAAI;AAAA,QACR,yDAAyD,WAAW;AAAA,MACtE;AAAA,IACF;AAEA,WAAO,eAAe;AAAA,EACxB,SAAS,OAAO;AACd,QACE,iBAAiB,SACjB,gBAAgB,SAChB,MAAM,eAAe,KACrB;AACA,aAAO;AAAA,IACT;AACA,UAAM;AAAA,EACR;AACF;AAEO,MAAM,iBAAiB,OAC5B,gBACgC;AAChC,QAAM,WAAW,MAAM,cAAc,WAAW;AAChD,SAAO,UAAU,YAAY;AAC/B;AAEO,MAAM,sBAAsB,OACjC,gBAC2B;AAC3B,QAAM,WAAW,MAAM,cAAc,WAAW;AAChD,SAAO,WAAW,WAAW,GAAG,UAAU;AAC5C;AAEA,MAAM,qBAAqB,YAAoC;AAC7D,MAAI;AACF,UAAM,SAAS,UAAM,yBAAY,oBAAoB,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC;AAEvE,WAAO,OAAO,KAAK,OAAO,QAAQ;AAAA,EACpC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,MAAM,kBAAkB,YAA6B;AAC1D,QAAM,EAAE,QAAQ,IAAI,UAAM,kCAAiB;AAE3C,SAAO;AACT;AAgBO,MAAM,sBAAsB,YAAuC;AACxE,QAAM,CAAC,OAAO,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxC,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,EACrB,CAAC;AAED,MAAI,WAAW,MAAM;AAEnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,SAAS,WAAW;AAAA,IACpB;AAAA,IACA;AAAA,EACF;AACF;",
+  "names": ["npmFetch"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "10.0.0-node-22-20250219000751",
+  "version": "10.0.0",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -78,7 +78,6 @@
     "isomorphic-git": "^1.11.1",
     "jest": "^29.0.1",
     "jest-watch-typeahead": "^2.1.1",
-    "libnpmsearch": "^8.0.0",
     "lodash.mergewith": "^4.6.2",
     "minimist": "^1.2.6",
     "normalize-package-data": "^7.0.0",
@@ -97,13 +96,12 @@
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
     "tsx": "^4.16.2",
-    "typescript": "~5.7.0",
-    "validate-npm-package-name": "^6.0.0",
+    "typescript": "~5.8.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.1.0-node-22-20250219000751"
+    "eslint-config-skuba": "5.1.0"
   },
   "devDependencies": {
-    "@changesets/cli": "2.27.12",
+    "@changesets/cli": "2.28.1",
     "@changesets/get-github-info": "0.6.0",
     "@jest/reporters": "29.7.0",
     "@jest/test-result": "29.7.0",
@@ -111,7 +109,6 @@
     "@types/express": "5.0.0",
     "@types/fs-extra": "11.0.4",
     "@types/koa": "2.15.0",
-    "@types/libnpmsearch": "2.0.7",
     "@types/lodash.mergewith": "4.6.9",
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
@@ -120,13 +117,12 @@
     "@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.1",
     "express": "5.0.1",
     "fastify": "5.2.1",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
-    "koa": "2.15.4",
+    "koa": "2.16.0",
     "memfs": "4.17.0",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.1",
@@ -153,7 +149,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "9.1.0"
+    "version": "10.0.0"
   },
   "scripts": {
     "build": "scripts/build.sh",

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

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

package/template/express-rest-api/Dockerfile.dev-deps

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.13
+# syntax=docker/dockerfile:1.14
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

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

@@ -21,14 +21,14 @@
   },
   "devDependencies": {
     "@types/express": "^5.0.0",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "@types/supertest": "^6.0.0",
     "mime": "^4.0.1",
     "pino-pretty": "^13.0.0",
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.15.4",
+  "packageManager": "pnpm@10.6.2",
   "engines": {
     "node": ">=22"
   }

package/template/greeter/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.13
+# syntax=docker/dockerfile:1.14
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

package/template/greeter/package.json

@@ -16,10 +16,10 @@
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.1",
-    "skuba": "10.0.0-node-22-20250219000751"
+    "@types/node": "^22.13.10",
+    "skuba": "*"
   },
-  "packageManager": "pnpm@9.15.4",
+  "packageManager": "pnpm@10.6.2",
   "engines": {
     "node": ">=22"
   }

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

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

package/template/koa-rest-api/Dockerfile.dev-deps

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.13
+# syntax=docker/dockerfile:1.14
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

package/template/koa-rest-api/package.json

@@ -36,7 +36,7 @@
     "@types/co-body": "^6.1.3",
     "@types/koa": "^2.13.4",
     "@types/koa__router": "^12.0.0",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "@types/supertest": "^6.0.0",
     "chance": "^1.1.8",
     "mime": "^4.0.1",
@@ -44,7 +44,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.15.4",
+  "packageManager": "pnpm@10.6.2",
   "engines": {
     "node": ">=22"
   }

package/template/lambda-sqs-worker-cdk/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.13
+# syntax=docker/dockerfile:1.14
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

package/template/lambda-sqs-worker-cdk/infra/appStack.ts

@@ -13,7 +13,7 @@ import {
   aws_sqs,
 } from 'aws-cdk-lib';
 import type { Construct } from 'constructs';
-import { Datadog } from 'datadog-cdk-constructs-v2';
+import { DatadogLambda } from 'datadog-cdk-constructs-v2';
 
 import { config } from './config';
 
@@ -117,7 +117,7 @@ export class AppStack extends Stack {
       config.datadogApiKeySecretArn,
     );
 
-    const datadog = new Datadog(this, 'datadog', {
+    const datadog = new DatadogLambda(this, 'datadog', {
       apiKeySecret: datadogSecret,
       addLayers: false,
       enableDatadogLogs: false,

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

@@ -18,7 +18,7 @@
     "@aws-sdk/client-lambda": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/logger": "^9.0.0",
-    "datadog-lambda-js": "^9.0.0",
+    "datadog-lambda-js": "^10.0.0",
     "dd-trace": "^5.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
@@ -27,18 +27,18 @@
     "@seek/aws-codedeploy-infra": "^2.1.0",
     "@types/aws-lambda": "^8.10.82",
     "@types/chance": "^1.1.3",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "aws-cdk": "^2.167.1",
     "aws-cdk-lib": "^2.167.1",
     "aws-sdk-client-mock": "^4.0.0",
     "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
     "constructs": "^10.0.17",
-    "datadog-cdk-constructs-v2": "^1.18.0",
+    "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "10.0.0-node-22-20250219000751"
+    "skuba": "*"
   },
-  "packageManager": "pnpm@9.15.4",
+  "packageManager": "pnpm@10.6.2",
   "engines": {
     "node": ">=22"
   }

package/template/oss-npm-package/_package.json

@@ -34,7 +34,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },

package/template/private-npm-package/_package.json

@@ -34,7 +34,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },