skuba 13.1.0 → 14.0.0-esbuild-bundle-support-20260101041935

package/lib/cli/migrate/nodeVersion/checks.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,157 +15,53 @@ 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 checks_exports = {};
 __export(checks_exports, {
-  extractFromParentPackageJson: () => extractFromParentPackageJson,
-  isPatchableNodeVersion: () => isPatchableNodeVersion,
-  isPatchableServerlessVersion: () => isPatchableServerlessVersion,
-  isPatchableSkubaType: () => isPatchableSkubaType
+  isLikelyPackage: () => isLikelyPackage
 });
 module.exports = __toCommonJS(checks_exports);
-var import_find_up = __toESM(require("find-up"));
-var import_fs_extra = __toESM(require("fs-extra"));
-var import_semver = require("semver");
-var z = __toESM(require("zod/v4"));
 var import_logging = require("../../../utils/logging.js");
-const getParentFile = async (file, cwd = process.cwd()) => {
-  const path = await (0, import_find_up.default)(file, { cwd });
-  if (!path) {
-    return void 0;
-  }
-  return {
-    fileContent: await import_fs_extra.default.readFile(path, "utf-8"),
-    path
-  };
-};
-const extractFromParentPackageJson = async (schema, currentPath) => {
-  const file = await getParentFile("package.json", currentPath);
-  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(`${path} is not valid JSON`);
-  }
-  const result = schema.safeParse(rawJSON);
-  if (!result.success) {
-    return { packageJson: void 0, packageJsonRelativePath: path };
+var import_manifest = require("../../../utils/manifest.js");
+const isLikelyPackage = async (currentPath) => {
+  const nearestPackageJsonResult = await (0, import_manifest.getConsumerManifest)(currentPath);
+  if (!nearestPackageJsonResult) {
+    import_logging.log.warn("package.json not found");
+    return false;
   }
-  return { packageJson: result.data, packageJsonRelativePath: path };
-};
-const isPatchableServerlessVersion = async (currentPath) => {
-  const { packageJson, packageJsonRelativePath } = await extractFromParentPackageJson(
-    z.object({
-      devDependencies: z.object({
-        serverless: z.string().optional()
-      })
-    }),
-    currentPath
-  );
-  if (!packageJson) {
-    import_logging.log.warn("package.json not found, ensure it is in the correct location");
+  const { packageJson } = nearestPackageJsonResult;
+  const type = packageJson.skuba?.type;
+  if (type === "application") {
     return false;
   }
-  const serverlessVersion = packageJson?.devDependencies.serverless;
-  if (!serverlessVersion) {
-    import_logging.log.subtle(
-      `Serverless version not found in ${packageJsonRelativePath}, assuming it is not a dependency`
-    );
+  if (type === "package") {
     return true;
   }
-  if (!(0, import_semver.satisfies)(serverlessVersion, "4.x.x")) {
-    import_logging.log.warn(
-      `Serverless version ${serverlessVersion} cannot be migrated; use Serverless 4.x to automatically migrate Serverless files`
-    );
-    return false;
+  if (typeof packageJson.sideEffects === "boolean") {
+    return true;
   }
-  import_logging.log.ok(
-    `Proceeding with migration of Serverless version ${serverlessVersion}`
-  );
-  return true;
-};
-const isPatchableSkubaType = async (currentPath) => {
-  const { packageJson, packageJsonRelativePath } = await extractFromParentPackageJson(
-    z.object({
-      skuba: z.object({
-        type: z.string().optional()
-      }).optional(),
-      files: z.string().array().optional()
-    }),
-    currentPath
-  );
-  if (!packageJson) {
-    import_logging.log.warn("package.json not found, ensure it is in the correct location");
-    return false;
+  if (typeof packageJson.types === "string" && typeof packageJson.module === "string" && typeof packageJson.main === "string") {
+    return true;
   }
-  if (packageJson.files) {
-    import_logging.log.warn(
-      "Migrations are not supported for packages; update manually to ensure major runtime deprecations are intended"
-    );
-    return false;
+  if (typeof packageJson.exports === "object") {
+    return true;
   }
-  const type = packageJson?.skuba?.type;
-  if (!type) {
-    import_logging.log.warn(
-      `skuba project type not found in ${packageJsonRelativePath}; add a package.json#/skuba/type to ensure the correct migration can be applied`
-    );
+  if (packageJson.private === true) {
     return false;
   }
-  if (type === "package") {
-    import_logging.log.warn(
-      "Migrations are not supported for packages; update manually to ensure major runtime deprecations are intended"
-    );
-    return false;
+  if (packageJson.publishConfig) {
+    return true;
   }
-  import_logging.log.ok(`Proceeding with migration of skuba project type ${type}`);
-  return true;
-};
-const isPatchableNodeVersion = async (targetNodeVersion, currentPath) => {
-  const nvmrcFile = await getParentFile(".nvmrc");
-  const nodeVersionFile = await getParentFile(".node-version");
-  const { packageJson } = await extractFromParentPackageJson(
-    z.object({
-      engines: z.object({
-        node: z.string()
-      })
-    }),
-    currentPath
-  );
-  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.js version ${coercedCurrentVersion ?? "unknown"} cannot be migrated to ${coercedTargetVersion}`
-    );
-    return false;
+  if (typeof packageJson.types === "string") {
+    return true;
+  }
+  if (typeof packageJson.module === "string") {
+    return true;
   }
-  import_logging.log.ok(
-    `Proceeding with migration from Node.js ${coercedCurrentVersion} to ${coercedTargetVersion}`
-  );
-  return true;
+  return false;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  extractFromParentPackageJson,
-  isPatchableNodeVersion,
-  isPatchableServerlessVersion,
-  isPatchableSkubaType
+  isLikelyPackage
 });
 //# sourceMappingURL=checks.js.map

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 * as z from 'zod/v4';\n\nimport { log } from '../../../utils/logging.js';\n\nconst getParentFile = async (file: string, cwd: string = process.cwd()) => {\n  const path = await findUp(file, { 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 z.ZodRawShape>(\n  schema: z.ZodObject<T>,\n  currentPath: string,\n) => {\n  const file = await getParentFile('package.json', currentPath);\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 (\n  currentPath: string,\n): Promise<boolean> => {\n  const { packageJson, packageJsonRelativePath } =\n    await extractFromParentPackageJson(\n      z.object({\n        devDependencies: z.object({\n          serverless: z.string().optional(),\n        }),\n      }),\n      currentPath,\n    );\n  if (!packageJson) {\n    log.warn('package.json not found, ensure it is in the correct location');\n    return false;\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 (\n  currentPath: string,\n): Promise<boolean> => {\n  const { packageJson, packageJsonRelativePath } =\n    await extractFromParentPackageJson(\n      z.object({\n        skuba: z\n          .object({\n            type: z.string().optional(),\n          })\n          .optional(),\n        files: z.string().array().optional(),\n      }),\n      currentPath,\n    );\n\n  if (!packageJson) {\n    log.warn('package.json not found, ensure it is in the correct location');\n    return false;\n  }\n\n  if (packageJson.files) {\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  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  currentPath: string,\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    currentPath,\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"]
+  "sourcesContent": ["import { log } from '../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../utils/manifest.js';\nimport type { SkubaPackageJson } from '../../init/writePackageJson.js';\n\nexport const isLikelyPackage = async (\n  currentPath: string,\n): Promise<boolean> => {\n  const nearestPackageJsonResult = await getConsumerManifest(currentPath);\n  if (!nearestPackageJsonResult) {\n    log.warn('package.json not found');\n    return false;\n  }\n\n  const { packageJson } = nearestPackageJsonResult;\n\n  const type = (packageJson.skuba as SkubaPackageJson)?.type;\n\n  if (type === 'application') {\n    return false;\n  }\n\n  if (type === 'package') {\n    return true;\n  }\n\n  if (typeof packageJson.sideEffects === 'boolean') {\n    return true;\n  }\n\n  if (\n    typeof packageJson.types === 'string' &&\n    typeof packageJson.module === 'string' &&\n    typeof packageJson.main === 'string'\n  ) {\n    return true;\n  }\n\n  if (typeof packageJson.exports === 'object') {\n    return true;\n  }\n\n  // private true would imply this is either an internal package or application\n  if (packageJson.private === true) {\n    return false;\n  }\n\n  if (packageJson.publishConfig) {\n    return true;\n  }\n\n  if (typeof packageJson.types === 'string') {\n    return true;\n  }\n\n  if (typeof packageJson.module === 'string') {\n    return true;\n  }\n\n  return false;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAoB;AACpB,sBAAoC;AAG7B,MAAM,kBAAkB,OAC7B,gBACqB;AACrB,QAAM,2BAA2B,UAAM,qCAAoB,WAAW;AACtE,MAAI,CAAC,0BAA0B;AAC7B,uBAAI,KAAK,wBAAwB;AACjC,WAAO;AAAA,EACT;AAEA,QAAM,EAAE,YAAY,IAAI;AAExB,QAAM,OAAQ,YAAY,OAA4B;AAEtD,MAAI,SAAS,eAAe;AAC1B,WAAO;AAAA,EACT;AAEA,MAAI,SAAS,WAAW;AACtB,WAAO;AAAA,EACT;AAEA,MAAI,OAAO,YAAY,gBAAgB,WAAW;AAChD,WAAO;AAAA,EACT;AAEA,MACE,OAAO,YAAY,UAAU,YAC7B,OAAO,YAAY,WAAW,YAC9B,OAAO,YAAY,SAAS,UAC5B;AACA,WAAO;AAAA,EACT;AAEA,MAAI,OAAO,YAAY,YAAY,UAAU;AAC3C,WAAO;AAAA,EACT;AAGA,MAAI,YAAY,YAAY,MAAM;AAChC,WAAO;AAAA,EACT;AAEA,MAAI,YAAY,eAAe;AAC7B,WAAO;AAAA,EACT;AAEA,MAAI,OAAO,YAAY,UAAU,UAAU;AACzC,WAAO;AAAA,EACT;AAEA,MAAI,OAAO,YAAY,WAAW,UAAU;AAC1C,WAAO;AAAA,EACT;AAEA,SAAO;AACT;",
+  "names": []
 }

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

@@ -1,4 +1,10 @@
-export declare const nodeVersionMigration: ({ nodeVersion, ECMAScriptVersion, }: {
-    nodeVersion: number;
+export declare const nodeVersionMigration: ({ nodeVersion, ECMAScriptVersion, packageNodeVersion, packageECMAScriptVersion, infraPackages, }: {
+    nodeVersion: string;
     ECMAScriptVersion: string;
+    packageNodeVersion: string;
+    packageECMAScriptVersion: string;
+    infraPackages: Array<{
+        name: string;
+        version: string;
+    }>;
 }, dir?: string) => Promise<void>;

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

@@ -34,81 +34,199 @@ module.exports = __toCommonJS(nodeVersion_exports);
 var import_util = require("util");
 var import_fast_glob = require("fast-glob");
 var import_fs_extra = __toESM(require("fs-extra"));
+var import_semver = require("semver");
 var import_logging = require("../../../utils/logging.js");
 var import_project = require("../../configure/analysis/project.js");
 var import_checks = require("./checks.js");
+var import_upgrade = require("./upgrade.js");
 const subPatches = ({
   nodeVersion,
-  ECMAScriptVersion
+  ECMAScriptVersion,
+  packageECMAScriptVersion,
+  packageNodeVersion
 }) => [
-  { file: ".nvmrc", replace: `${nodeVersion}
-` },
   {
+    type: "nodejs",
+    file: ".nvmrc",
+    regex: () => /.*([0-9.]+).*/gm,
+    replace: {
+      default: {
+        captureGroup: 1,
+        string: nodeVersion,
+        version: nodeVersion
+      }
+    }
+  },
+  {
+    type: "nodejs",
     files: "**/Dockerfile*",
     regex: () => /^FROM(.*) (public.ecr.aws\/docker\/library\/)?node:([0-9]+(?:\.[0-9]+(?:\.[0-9]+)?)?)(-[a-z0-9]+)?(@sha256:[a-f0-9]{64})?( .*)?$/gm,
-    replace: `FROM$1 $2node:${nodeVersion}$4$6`
+    replace: {
+      default: {
+        captureGroup: 3,
+        string: `FROM$1 $2node:${nodeVersion}$4$6`,
+        version: nodeVersion
+      }
+    }
   },
   {
+    type: "nodejs",
     files: "**/Dockerfile*",
-    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`
+    regex: () => /^FROM(.*) gcr.io\/distroless\/nodejs(\d+)-debian(\d+)(@sha256:[a-f0-9]{64})?(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
+    replace: {
+      default: {
+        captureGroup: 2,
+        string: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$3$6$7`,
+        version: nodeVersion
+      }
+    }
   },
   {
+    type: "nodejs",
     files: "**/serverless*.y*ml",
-    regex: () => /\bnodejs\d+.x\b/gm,
-    tests: [import_checks.isPatchableServerlessVersion],
-    replace: `nodejs${nodeVersion}.x`
+    regex: () => /\bnodejs(\d+).x\b/gm,
+    replace: {
+      default: {
+        captureGroup: 1,
+        string: `nodejs${nodeVersion}.x`,
+        version: nodeVersion
+      }
+    }
   },
   {
+    type: "nodejs",
     files: "**/serverless*.y*ml",
-    regex: () => /\bnode\d+\b/gm,
-    tests: [import_checks.isPatchableServerlessVersion],
-    replace: `node${nodeVersion}`
+    regex: () => /\bnode(\d+)\b/gm,
+    replace: {
+      default: {
+        captureGroup: 1,
+        string: `node${nodeVersion}`,
+        version: nodeVersion
+      }
+    }
   },
   {
+    type: "nodejs",
     files: "**/infra/**/*.ts",
-    regex: () => /NODEJS_\d+_X/g,
-    replace: `NODEJS_${nodeVersion}_X`
+    regex: () => /NODEJS_(\d+)_X/g,
+    replace: {
+      default: {
+        captureGroup: 1,
+        string: `NODEJS_${nodeVersion}_X`,
+        version: nodeVersion
+      }
+    }
   },
   {
+    type: "nodejs",
     files: "**/infra/**/*.ts",
     regex: () => /(target:\s*'node)(\d+)(.+)$/gm,
-    replace: `$1${nodeVersion}$3`
+    replace: {
+      default: {
+        captureGroup: 2,
+        string: `$1${nodeVersion}$3`,
+        version: nodeVersion
+      }
+    }
   },
   {
+    type: "nodejs",
     files: "**/.buildkite/*",
-    regex: () => /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
-    replace: `$1$2$3${nodeVersion}$5`
+    regex: () => /(image: )(public.ecr.aws\/docker\/library\/)?(node:)([0-9.]+)(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    replace: {
+      default: {
+        captureGroup: 4,
+        string: `$1$2$3${nodeVersion}$5$6`,
+        version: nodeVersion
+      }
+    }
   },
   {
+    type: "nodejs",
     files: ".node-version*",
     regex: () => /(\d+(?:\.\d+)*)/g,
-    replace: `${nodeVersion}`
+    replace: {
+      default: {
+        captureGroup: 1,
+        string: `${nodeVersion}`,
+        version: nodeVersion
+      }
+    }
   },
   {
+    type: "nodejs",
     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`
+    replace: {
+      package: {
+        string: `$1${packageNodeVersion}$3`,
+        version: packageNodeVersion,
+        captureGroup: 2
+      },
+      default: {
+        string: `$1${nodeVersion}$3`,
+        version: nodeVersion,
+        captureGroup: 2
+      }
+    }
   },
   {
+    type: "nodejs",
+    files: "**/docker-compose*.y*ml",
+    regex: () => /(image: )(public.ecr.aws\/docker\/library\/)?(node:)([0-9.]+)(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    replace: {
+      default: {
+        captureGroup: 4,
+        string: `$1$2$3${nodeVersion}$5$6`,
+        version: nodeVersion
+      }
+    }
+  },
+  {
+    type: "ecmascript",
     files: "**/tsconfig*.json",
     regex: () => /("target":\s*")(ES\d+)"/gim,
-    tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
-    replace: `$1${ECMAScriptVersion}"`
+    replace: {
+      package: {
+        string: `$1${packageECMAScriptVersion}"`,
+        version: packageECMAScriptVersion,
+        captureGroup: 2
+      },
+      default: {
+        string: `$1${ECMAScriptVersion}"`,
+        version: ECMAScriptVersion,
+        captureGroup: 2
+      }
+    }
   },
   {
+    type: "ecmascript",
     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,
-    replace: `$1$2$3${nodeVersion}$5`
+    replace: {
+      package: {
+        string: `$1$2${packageECMAScriptVersion}$4$5`,
+        version: packageECMAScriptVersion,
+        captureGroup: 3
+      },
+      default: {
+        string: `$1$2${ECMAScriptVersion}$4$5`,
+        version: ECMAScriptVersion,
+        captureGroup: 3
+      }
+    }
   }
 ];
+const getTemplatedReplace = async (path, replace) => {
+  if (!replace.package) {
+    return replace.default;
+  }
+  const isPackage = await (0, import_checks.isLikelyPackage)(path);
+  if (isPackage) {
+    return replace.package;
+  }
+  return replace.default;
+};
 const runSubPatch = async (dir, patch) => {
   const readFile = (0, import_project.createDestinationFileReader)(dir);
   const paths = patch.file ? [patch.file] : await (0, import_fast_glob.glob)(patch.files ?? [], {
@@ -121,35 +239,48 @@ const runSubPatch = async (dir, patch) => {
       if (!contents) {
         return;
       }
-      if (patch.regex && !patch.regex().test(contents)) {
+      const regexResult = patch.regex().exec(contents);
+      if (!regexResult) {
         return;
       }
-      if (patch.tests) {
-        const results = await Promise.all(
-          patch.tests.map((test) => test(path))
-        );
-        if (!results.every(Boolean)) {
-          return;
-        }
+      const templateReplace = await getTemplatedReplace(path, patch.replace);
+      if (!lessThan(
+        regexResult[templateReplace.captureGroup],
+        templateReplace.version
+      )) {
+        return;
       }
       await writePatchedContents({
         path,
         contents,
-        templated: patch.replace,
+        templated: templateReplace.string,
         regex: patch.regex
       });
     })
   );
 };
+const lessThan = (versionA, versionB) => {
+  if (versionA.toLowerCase().startsWith("es")) {
+    return Number(versionA.slice(2)) < Number(versionB.slice(2));
+  }
+  const coersedA = (0, import_semver.coerce)(versionA);
+  const coersedB = (0, import_semver.coerce)(versionB);
+  if (!coersedA || !coersedB) {
+    throw new Error(
+      `Unable to coerce versions for comparison: "${versionA}" and "${versionB}"`
+    );
+  }
+  return (0, import_semver.lt)(coersedA, coersedB);
+};
 const writePatchedContents = async ({
   path,
   contents,
   templated,
   regex
-}) => await import_fs_extra.default.promises.writeFile(
-  path,
-  regex ? contents.replaceAll(regex(), templated) : templated
-);
+}) => {
+  const modified = contents.replaceAll(regex(), templated);
+  await import_fs_extra.default.promises.writeFile(path, modified);
+};
 const upgrade = async (versions, dir) => {
   for (const subPatch of subPatches(versions)) {
     await runSubPatch(dir, subPatch);
@@ -157,15 +288,28 @@ const upgrade = async (versions, dir) => {
 };
 const nodeVersionMigration = async ({
   nodeVersion,
-  ECMAScriptVersion
+  ECMAScriptVersion,
+  packageNodeVersion,
+  packageECMAScriptVersion,
+  infraPackages
 }, dir = process.cwd()) => {
-  import_logging.log.ok(`Upgrading to Node.js ${nodeVersion}`);
+  import_logging.log.ok(
+    `Upgrading project to Node.js ${nodeVersion} and package targets to Node.js ${packageNodeVersion}`
+  );
   try {
-    if (!await (0, import_checks.isPatchableNodeVersion)(nodeVersion, dir)) {
-      throw new Error("Node.js version is not patchable");
-    }
-    await upgrade({ nodeVersion, ECMAScriptVersion }, dir);
-    import_logging.log.ok("Upgraded to Node.js", nodeVersion);
+    await (0, import_upgrade.tryUpgradeInfraPackages)("format", infraPackages);
+    await upgrade(
+      {
+        nodeVersion,
+        ECMAScriptVersion,
+        packageNodeVersion,
+        packageECMAScriptVersion
+      },
+      dir
+    );
+    import_logging.log.ok(
+      `Upgraded project to Node.js ${nodeVersion} and package targets to Node.js ${packageNodeVersion}`
+    );
   } catch (error) {
     import_logging.log.err("Failed to upgrade");
     import_logging.log.subtle((0, import_util.inspect)(error));

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.js';\nimport { createDestinationFileReader } from '../../configure/analysis/project.js';\n\nimport {\n  isPatchableNodeVersion,\n  isPatchableServerlessVersion,\n  isPatchableSkubaType,\n} from './checks.js';\n\ntype FileSelector =\n  | { files: string; file?: never }\n  | { file: string; files?: never };\n\ntype SubPatch = FileSelector & {\n  tests?: Array<(path: string) => Promise<boolean>>;\n  regex?: () => RegExp;\n  replace: string;\n};\n\nconst subPatches = ({\n  nodeVersion,\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: () =>\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  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 ?? [], {\n        cwd: dir,\n        ignore: ['**/node_modules/**'],\n      });\n\n  await Promise.all(\n    paths.map(async (path) => {\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(\n          patch.tests.map((test) => test(path)),\n        );\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  }: {\n    nodeVersion: number;\n    ECMAScriptVersion: string;\n  },\n  dir = process.cwd(),\n) => {\n  log.ok(`Upgrading to Node.js ${nodeVersion}`);\n  try {\n    if (!(await isPatchableNodeVersion(nodeVersion, dir))) {\n      throw new Error('Node.js version is not patchable');\n    }\n\n    await upgrade({ nodeVersion, ECMAScriptVersion }, dir);\n\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';\nimport { coerce, lt } from 'semver';\n\nimport { log } from '../../../utils/logging.js';\nimport { createDestinationFileReader } from '../../configure/analysis/project.js';\n\nimport { isLikelyPackage } from './checks.js';\nimport { tryUpgradeInfraPackages } from './upgrade.js';\n\ntype FileSelector =\n  | { files: string; file?: never }\n  | { file: string; files?: never };\n\ntype ReplaceOptions = {\n  version: string;\n  string: string;\n  captureGroup: number;\n};\n\ntype SubPatch = FileSelector & {\n  type: 'nodejs' | 'ecmascript';\n  regex: () => RegExp;\n  replace: {\n    package?: ReplaceOptions;\n    default: ReplaceOptions;\n  };\n};\n\nconst subPatches = ({\n  nodeVersion,\n  ECMAScriptVersion,\n  packageECMAScriptVersion,\n  packageNodeVersion,\n}: Versions): SubPatch[] => [\n  {\n    type: 'nodejs',\n    file: '.nvmrc',\n    regex: () => /.*([0-9.]+).*/gm,\n    replace: {\n      default: {\n        captureGroup: 1,\n        string: nodeVersion,\n        version: nodeVersion,\n      },\n    },\n  },\n  {\n    type: 'nodejs',\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: {\n      default: {\n        captureGroup: 3,\n        string: `FROM$1 $2node:${nodeVersion}$4$6`,\n        version: nodeVersion,\n      },\n    },\n  },\n  {\n    type: 'nodejs',\n    files: '**/Dockerfile*',\n    regex: () =>\n      /^FROM(.*) gcr.io\\/distroless\\/nodejs(\\d+)-debian(\\d+)(@sha256:[a-f0-9]{64})?(\\.[^- \\n]+)?(-[^ \\n]+)?( .+|)$/gm,\n    replace: {\n      default: {\n        captureGroup: 2,\n        string: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$3$6$7`,\n        version: nodeVersion,\n      },\n    },\n  },\n\n  {\n    type: 'nodejs',\n    files: '**/serverless*.y*ml',\n    regex: () => /\\bnodejs(\\d+).x\\b/gm,\n    replace: {\n      default: {\n        captureGroup: 1,\n        string: `nodejs${nodeVersion}.x`,\n        version: nodeVersion,\n      },\n    },\n  },\n  {\n    type: 'nodejs',\n    files: '**/serverless*.y*ml',\n    regex: () => /\\bnode(\\d+)\\b/gm,\n    replace: {\n      default: {\n        captureGroup: 1,\n        string: `node${nodeVersion}`,\n        version: nodeVersion,\n      },\n    },\n  },\n\n  {\n    type: 'nodejs',\n    files: '**/infra/**/*.ts',\n    regex: () => /NODEJS_(\\d+)_X/g,\n    replace: {\n      default: {\n        captureGroup: 1,\n        string: `NODEJS_${nodeVersion}_X`,\n        version: nodeVersion,\n      },\n    },\n  },\n  {\n    type: 'nodejs',\n    files: '**/infra/**/*.ts',\n    regex: () => /(target:\\s*'node)(\\d+)(.+)$/gm,\n    replace: {\n      default: {\n        captureGroup: 2,\n        string: `$1${nodeVersion}$3`,\n        version: nodeVersion,\n      },\n    },\n  },\n\n  {\n    type: 'nodejs',\n    files: '**/.buildkite/*',\n    regex: () =>\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)([0-9.]+)(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n    replace: {\n      default: {\n        captureGroup: 4,\n        string: `$1$2$3${nodeVersion}$5$6`,\n        version: nodeVersion,\n      },\n    },\n  },\n  {\n    type: 'nodejs',\n    files: '.node-version*',\n    regex: () => /(\\d+(?:\\.\\d+)*)/g,\n    replace: {\n      default: {\n        captureGroup: 1,\n        string: `${nodeVersion}`,\n        version: nodeVersion,\n      },\n    },\n  },\n\n  {\n    type: 'nodejs',\n    files: '**/package.json',\n    regex: () =>\n      /([\"']engines[\"']:\\s*{[\\s\\S]*?[\"']node[\"']:\\s*[\"']>=)(\\d+(?:\\.\\d+)*)(['\"]\\s*})/gm,\n    replace: {\n      package: {\n        string: `$1${packageNodeVersion}$3`,\n        version: packageNodeVersion,\n        captureGroup: 2,\n      },\n      default: {\n        string: `$1${nodeVersion}$3`,\n        version: nodeVersion,\n        captureGroup: 2,\n      },\n    },\n  },\n  {\n    type: 'nodejs',\n    files: '**/docker-compose*.y*ml',\n    regex: () =>\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)([0-9.]+)(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n\n    replace: {\n      default: {\n        captureGroup: 4,\n        string: `$1$2$3${nodeVersion}$5$6`,\n        version: nodeVersion,\n      },\n    },\n  },\n  {\n    type: 'ecmascript',\n    files: '**/tsconfig*.json',\n    regex: () => /(\"target\":\\s*\")(ES\\d+)\"/gim,\n    replace: {\n      package: {\n        string: `$1${packageECMAScriptVersion}\"`,\n        version: packageECMAScriptVersion,\n        captureGroup: 2,\n      },\n      default: {\n        string: `$1${ECMAScriptVersion}\"`,\n        version: ECMAScriptVersion,\n        captureGroup: 2,\n      },\n    },\n  },\n  {\n    type: 'ecmascript',\n    files: '**/tsconfig*.json',\n    regex: () => /(\"lib\":\\s*\\[)([\\S\\s]*?)(ES\\d+)([\\S\\s]*?)(\\])/gim,\n    replace: {\n      package: {\n        string: `$1$2${packageECMAScriptVersion}$4$5`,\n        version: packageECMAScriptVersion,\n        captureGroup: 3,\n      },\n      default: {\n        string: `$1$2${ECMAScriptVersion}$4$5`,\n        version: ECMAScriptVersion,\n        captureGroup: 3,\n      },\n    },\n  },\n];\n\ntype Versions = {\n  nodeVersion: string;\n  ECMAScriptVersion: string;\n  packageNodeVersion: string;\n  packageECMAScriptVersion: string;\n};\n\nconst getTemplatedReplace = async (\n  path: string,\n  replace: SubPatch['replace'],\n): Promise<ReplaceOptions> => {\n  if (!replace.package) {\n    return replace.default;\n  }\n\n  const isPackage = await isLikelyPackage(path);\n\n  if (isPackage) {\n    return replace.package;\n  }\n\n  return replace.default;\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 ?? [], {\n        cwd: dir,\n        ignore: ['**/node_modules/**'],\n      });\n\n  await Promise.all(\n    paths.map(async (path) => {\n      const contents = await readFile(path);\n      if (!contents) {\n        return;\n      }\n\n      const regexResult = patch.regex().exec(contents);\n\n      if (!regexResult) {\n        return;\n      }\n\n      const templateReplace = await getTemplatedReplace(path, patch.replace);\n\n      if (\n        !lessThan(\n          regexResult[templateReplace.captureGroup] as string,\n          templateReplace.version,\n        )\n      ) {\n        return;\n      }\n\n      await writePatchedContents({\n        path,\n        contents,\n        templated: templateReplace.string,\n        regex: patch.regex,\n      });\n    }),\n  );\n};\n\nconst lessThan = (versionA: string, versionB: string) => {\n  if (versionA.toLowerCase().startsWith('es')) {\n    return Number(versionA.slice(2)) < Number(versionB.slice(2));\n  }\n\n  const coersedA = coerce(versionA);\n  const coersedB = coerce(versionB);\n\n  if (!coersedA || !coersedB) {\n    throw new Error(\n      `Unable to coerce versions for comparison: \"${versionA}\" and \"${versionB}\"`,\n    );\n  }\n\n  return lt(coersedA, coersedB);\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  const modified = contents.replaceAll(regex(), templated);\n  await fs.promises.writeFile(path, modified);\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    packageNodeVersion,\n    packageECMAScriptVersion,\n    infraPackages,\n  }: {\n    nodeVersion: string;\n    ECMAScriptVersion: string;\n    packageNodeVersion: string;\n    packageECMAScriptVersion: string;\n    infraPackages: Array<{ name: string; version: string }>;\n  },\n  dir = process.cwd(),\n) => {\n  log.ok(\n    `Upgrading project to Node.js ${nodeVersion} and package targets to Node.js ${packageNodeVersion}`,\n  );\n\n  try {\n    await tryUpgradeInfraPackages('format', infraPackages);\n    await upgrade(\n      {\n        nodeVersion,\n        ECMAScriptVersion,\n        packageNodeVersion,\n        packageECMAScriptVersion,\n      },\n      dir,\n    );\n\n    log.ok(\n      `Upgraded project to Node.js ${nodeVersion} and package targets to Node.js ${packageNodeVersion}`,\n    );\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/cli/migrate/nodeVersion/upgrade.d.ts

@@ -0,0 +1,8 @@
+import type { PatchReturnType } from '../../lint/internalLints/upgrade/index.js';
+type PackageInfo = {
+    name: string;
+    version: string;
+};
+export declare const upgradeInfraPackages: (mode: "lint" | "format", packages: PackageInfo[]) => Promise<PatchReturnType>;
+export declare const tryUpgradeInfraPackages: (mode: "lint" | "format", packages: PackageInfo[]) => Promise<PatchReturnType>;
+export {};