skuba 7.3.1 → 7.4.0-horrible-hacks-20240206024353

package/lib/cli/configure/patchRenovateConfig.js

@@ -90,12 +90,15 @@ const patchByFiletype = {
   json: patchJson,
   json5: patchJson5
 };
-const patchRenovateConfig = async (dir) => {
+const patchRenovateConfig = async (mode, dir) => {
   const readFile = (0, import_project.createDestinationFileReader)(dir);
   const { owner } = await Git.getOwnerAndRepo({ dir });
   const presetToAdd = ownerToRenovatePreset(owner);
   if (!presetToAdd) {
-    return;
+    return {
+      result: "skip",
+      reason: "owner does not map to a SEEK preset"
+    };
   }
   const maybeConfigs = await Promise.all(
     import_renovate.RENOVATE_CONFIG_FILENAMES.map(async (filepath) => ({
@@ -104,15 +107,22 @@ const patchRenovateConfig = async (dir) => {
     }))
   );
   const config = maybeConfigs.find((maybeConfig) => Boolean(maybeConfig.input));
+  if (!config?.input) {
+    return { result: "skip", reason: "no config found" };
+  }
   if (
-    // No file was found.
-    !config?.input || // The file appears to mention the baseline preset for the configured Git
-    // owner. This is a very naive check that we don't want to overcomplicate
-    // because it is invoked before each skuba format and lint.
+    // The file appears to mention the baseline preset for the configured Git
+    // owner. This is a naive check for simplicity.
     config.input.includes(presetToAdd) || // Ignore any renovate configuration which already extends a SEEK-Jobs or seekasia config
     EXISTING_REPO_PRESET_REGEX.exec(config.input)
   ) {
-    return;
+    return {
+      result: "skip",
+      reason: "config already has a SEEK preset"
+    };
+  }
+  if (mode === "lint") {
+    return { result: "apply" };
   }
   const filetype = config.filepath.toLowerCase().endsWith(".json5") ? "json5" : "json";
   const patchFile = patchByFiletype[filetype];
@@ -121,16 +131,19 @@ const patchRenovateConfig = async (dir) => {
     input: config.input,
     presetToAdd
   });
+  return { result: "apply" };
 };
-const tryPatchRenovateConfig = async (dir = process.cwd()) => {
+const tryPatchRenovateConfig = async (mode, dir = process.cwd()) => {
   try {
     const gitRoot = await Git.findRoot({ dir });
-    if (gitRoot) {
-      await patchRenovateConfig(gitRoot);
+    if (!gitRoot) {
+      return { result: "skip", reason: "no Git root found" };
     }
+    return await patchRenovateConfig(mode, gitRoot);
   } catch (err) {
     import_logging.log.warn("Failed to patch Renovate config.");
     import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/patchRenovateConfig.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport * as fleece from 'golden-fleece';\nimport { z } from 'zod';\n\nimport * as Git from '../../api/git';\nimport { log } from '../../utils/logging';\n\nimport { createDestinationFileReader } from './analysis/project';\nimport { RENOVATE_CONFIG_FILENAMES } from './modules/renovate';\nimport { formatPrettier } from './processing/prettier';\n\nconst RENOVATE_PRESETS = [\n  'local>seekasia/renovate-config',\n  'local>seek-jobs/renovate-config',\n] as const;\n\nconst EXISTING_REPO_PRESET_REGEX = /(github|local)>(seek-jobs|seekasia)\\//;\n\ntype RenovateFiletype = 'json' | 'json5';\n\ntype RenovatePreset = (typeof RENOVATE_PRESETS)[number];\n\nconst renovateConfigSchema = z.object({\n  extends: z.array(z.string()),\n});\n\nconst ownerToRenovatePreset = (owner: string): RenovatePreset | undefined => {\n  const lowercaseOwner = owner.toLowerCase();\n\n  switch (lowercaseOwner) {\n    case 'seekasia':\n      return 'local>seekasia/renovate-config';\n\n    case 'seek-jobs':\n      return 'local>seek-jobs/renovate-config';\n\n    default:\n      return;\n  }\n};\n\ntype PatchFile = (props: {\n  filepath: string;\n  input: string;\n  presetToAdd: RenovatePreset;\n}) => Promise<void>;\n\nconst patchJson: PatchFile = async ({ filepath, input, presetToAdd }) => {\n  const json: unknown = JSON.parse(input);\n\n  const config = renovateConfigSchema.safeParse(json);\n\n  if (!config.success) {\n    return;\n  }\n\n  config.data.extends.unshift(presetToAdd);\n\n  await fs.promises.writeFile(\n    filepath,\n    await formatPrettier(JSON.stringify(config.data), { parser: 'json' }),\n  );\n\n  return;\n};\n\nconst patchJson5: PatchFile = async ({ filepath, input, presetToAdd }) => {\n  const json: unknown = fleece.evaluate(input);\n\n  const config = renovateConfigSchema.safeParse(json);\n\n  if (!config.success) {\n    return;\n  }\n\n  config.data.extends.unshift(presetToAdd);\n\n  await fs.promises.writeFile(\n    filepath,\n    await formatPrettier(fleece.patch(input, config.data), { parser: 'json5' }),\n  );\n\n  return;\n};\n\nconst patchByFiletype: Record<RenovateFiletype, PatchFile> = {\n  json: patchJson,\n  json5: patchJson5,\n};\n\nconst patchRenovateConfig = async (dir: string) => {\n  const readFile = createDestinationFileReader(dir);\n\n  const { owner } = await Git.getOwnerAndRepo({ dir });\n\n  const presetToAdd = ownerToRenovatePreset(owner);\n\n  if (!presetToAdd) {\n    // No baseline preset needs to be added for the configured Git owner.\n    return;\n  }\n\n  const maybeConfigs = await Promise.all(\n    RENOVATE_CONFIG_FILENAMES.map(async (filepath) => ({\n      input: await readFile(filepath),\n      filepath,\n    })),\n  );\n\n  const config = maybeConfigs.find((maybeConfig) => Boolean(maybeConfig.input));\n\n  if (\n    // No file was found.\n    !config?.input ||\n    // The file appears to mention the baseline preset for the configured Git\n    // owner. This is a very naive check that we don't want to overcomplicate\n    // because it is invoked before each skuba format and lint.\n    config.input.includes(presetToAdd) ||\n    // Ignore any renovate configuration which already extends a SEEK-Jobs or seekasia config\n    EXISTING_REPO_PRESET_REGEX.exec(config.input)\n  ) {\n    return;\n  }\n\n  const filetype: RenovateFiletype = config.filepath\n    .toLowerCase()\n    .endsWith('.json5')\n    ? 'json5'\n    : 'json';\n\n  const patchFile = patchByFiletype[filetype];\n\n  await patchFile({\n    filepath: path.resolve(dir, config.filepath),\n    input: config.input,\n    presetToAdd,\n  });\n};\n\nexport const tryPatchRenovateConfig = async (dir = process.cwd()) => {\n  try {\n    // In a monorepo we may be invoked within a subdirectory, but we are working\n    // with Renovate config that should be relative to the repository root.\n    const gitRoot = await Git.findRoot({ dir });\n\n    if (gitRoot) {\n      await patchRenovateConfig(gitRoot);\n    }\n  } catch (err) {\n    log.warn('Failed to patch Renovate config.');\n    log.subtle(inspect(err));\n  }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport * as fleece from 'golden-fleece';\nimport { z } from 'zod';\n\nimport * as Git from '../../api/git';\nimport { log } from '../../utils/logging';\n\nimport { createDestinationFileReader } from './analysis/project';\nimport { RENOVATE_CONFIG_FILENAMES } from './modules/renovate';\nimport { formatPrettier } from './processing/prettier';\nimport type { PatchFunction, PatchReturnType } from './upgrade';\n\nconst RENOVATE_PRESETS = [\n  'local>seekasia/renovate-config',\n  'local>seek-jobs/renovate-config',\n] as const;\n\nconst EXISTING_REPO_PRESET_REGEX = /(github|local)>(seek-jobs|seekasia)\\//;\n\ntype RenovateFiletype = 'json' | 'json5';\n\ntype RenovatePreset = (typeof RENOVATE_PRESETS)[number];\n\nconst renovateConfigSchema = z.object({\n  extends: z.array(z.string()),\n});\n\nconst ownerToRenovatePreset = (owner: string): RenovatePreset | undefined => {\n  const lowercaseOwner = owner.toLowerCase();\n\n  switch (lowercaseOwner) {\n    case 'seekasia':\n      return 'local>seekasia/renovate-config';\n\n    case 'seek-jobs':\n      return 'local>seek-jobs/renovate-config';\n\n    default:\n      return;\n  }\n};\n\ntype PatchFile = (props: {\n  filepath: string;\n  input: string;\n  presetToAdd: RenovatePreset;\n}) => Promise<void>;\n\nconst patchJson: PatchFile = async ({ filepath, input, presetToAdd }) => {\n  const json: unknown = JSON.parse(input);\n\n  const config = renovateConfigSchema.safeParse(json);\n\n  if (!config.success) {\n    return;\n  }\n\n  config.data.extends.unshift(presetToAdd);\n\n  await fs.promises.writeFile(\n    filepath,\n    await formatPrettier(JSON.stringify(config.data), { parser: 'json' }),\n  );\n\n  return;\n};\n\nconst patchJson5: PatchFile = async ({ filepath, input, presetToAdd }) => {\n  const json: unknown = fleece.evaluate(input);\n\n  const config = renovateConfigSchema.safeParse(json);\n\n  if (!config.success) {\n    return;\n  }\n\n  config.data.extends.unshift(presetToAdd);\n\n  await fs.promises.writeFile(\n    filepath,\n    await formatPrettier(fleece.patch(input, config.data), { parser: 'json5' }),\n  );\n\n  return;\n};\n\nconst patchByFiletype: Record<RenovateFiletype, PatchFile> = {\n  json: patchJson,\n  json5: patchJson5,\n};\n\nconst patchRenovateConfig = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const { owner } = await Git.getOwnerAndRepo({ dir });\n\n  const presetToAdd = ownerToRenovatePreset(owner);\n\n  if (!presetToAdd) {\n    return {\n      result: 'skip',\n      reason: 'owner does not map to a SEEK preset',\n    };\n  }\n\n  const maybeConfigs = await Promise.all(\n    RENOVATE_CONFIG_FILENAMES.map(async (filepath) => ({\n      input: await readFile(filepath),\n      filepath,\n    })),\n  );\n\n  const config = maybeConfigs.find((maybeConfig) => Boolean(maybeConfig.input));\n  if (!config?.input) {\n    return { result: 'skip', reason: 'no config found' };\n  }\n\n  if (\n    // The file appears to mention the baseline preset for the configured Git\n    // owner. This is a naive check for simplicity.\n    config.input.includes(presetToAdd) ||\n    // Ignore any renovate configuration which already extends a SEEK-Jobs or seekasia config\n    EXISTING_REPO_PRESET_REGEX.exec(config.input)\n  ) {\n    return {\n      result: 'skip',\n      reason: 'config already has a SEEK preset',\n    };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  const filetype: RenovateFiletype = config.filepath\n    .toLowerCase()\n    .endsWith('.json5')\n    ? 'json5'\n    : 'json';\n\n  const patchFile = patchByFiletype[filetype];\n\n  await patchFile({\n    filepath: path.resolve(dir, config.filepath),\n    input: config.input,\n    presetToAdd,\n  });\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchRenovateConfig = (async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    // In a monorepo we may be invoked within a subdirectory, but we are working\n    // with Renovate config that should be relative to the repository root.\n    const gitRoot = await Git.findRoot({ dir });\n    if (!gitRoot) {\n      return { result: 'skip', reason: 'no Git root found' };\n    }\n\n    return await patchRenovateConfig(mode, gitRoot);\n  } catch (err) {\n    log.warn('Failed to patch Renovate config.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n}) satisfies PatchFunction;\n"],
+  "mappings": "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",
   "names": ["fs", "path"]
 }

package/lib/cli/configure/types.d.ts

@@ -1,5 +1,6 @@
 import type { PackageJson as TypeFestPackageJson } from 'type-fest';
 import type { ProjectType } from '../../utils/manifest';
+import type { PackageManagerConfig } from '../../utils/packageManager';
 export type { TsConfigJson } from 'type-fest';
 export type PackageJson = TypeFestPackageJson & Record<string, unknown>;
 export interface DependencySet {
@@ -22,5 +23,6 @@ export interface Options {
     destinationRoot: string;
     entryPoint: string;
     firstRun: boolean;
+    packageManager: PackageManagerConfig;
     type: ProjectType;
 }

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/types.ts"],
-  "sourcesContent": ["import type { PackageJson as TypeFestPackageJson } from 'type-fest';\n\nimport type { ProjectType } from '../../utils/manifest';\n\nexport type { TsConfigJson } from 'type-fest';\n\nexport type PackageJson = TypeFestPackageJson & Record<string, unknown>;\n\nexport interface DependencySet {\n  dependencies: Record<string, string>;\n  devDependencies: Record<string, string>;\n  type: ProjectType;\n}\n\nexport type DependencyDiff = Record<\n  string,\n  { operation: string; version: string }\n>;\n\ntype FileProcessor = (\n  file: string | undefined,\n  files: Files,\n  initialFiles: Readonly<Files>,\n) => Promise<string | undefined> | string | undefined;\n\nexport type FileDiff = Record<\n  string,\n  { data: string | undefined; operation: string }\n>;\n\nexport type Files = Record<string, string | undefined>;\n\nexport type Module = Record<string, FileProcessor>;\n\nexport interface Options {\n  destinationRoot: string;\n  entryPoint: string;\n  firstRun: boolean;\n  type: ProjectType;\n}\n"],
+  "sourcesContent": ["import type { PackageJson as TypeFestPackageJson } from 'type-fest';\n\nimport type { ProjectType } from '../../utils/manifest';\nimport type { PackageManagerConfig } from '../../utils/packageManager';\n\nexport type { TsConfigJson } from 'type-fest';\n\nexport type PackageJson = TypeFestPackageJson & Record<string, unknown>;\n\nexport interface DependencySet {\n  dependencies: Record<string, string>;\n  devDependencies: Record<string, string>;\n  type: ProjectType;\n}\n\nexport type DependencyDiff = Record<\n  string,\n  { operation: string; version: string }\n>;\n\ntype FileProcessor = (\n  file: string | undefined,\n  files: Files,\n  initialFiles: Readonly<Files>,\n) => Promise<string | undefined> | string | undefined;\n\nexport type FileDiff = Record<\n  string,\n  { data: string | undefined; operation: string }\n>;\n\nexport type Files = Record<string, string | undefined>;\n\nexport type Module = Record<string, FileProcessor>;\n\nexport interface Options {\n  destinationRoot: string;\n  entryPoint: string;\n  firstRun: boolean;\n  packageManager: PackageManagerConfig;\n  type: ProjectType;\n}\n"],
   "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;",
   "names": []
 }

package/lib/cli/configure/upgrade/index.d.ts

@@ -0,0 +1,15 @@
+import type { Logger } from '../../../utils/logging';
+import type { InternalLintResult } from '../../lint/internal';
+export type Patches = Patch[];
+export type Patch = {
+    apply: PatchFunction;
+    description: string;
+};
+export type PatchReturnType = {
+    result: 'apply';
+} | {
+    result: 'skip';
+    reason?: string;
+};
+export type PatchFunction = (mode: 'format' | 'lint') => Promise<PatchReturnType>;
+export declare const upgradeSkuba: (mode: 'lint' | 'format', logger: Logger) => Promise<InternalLintResult>;

package/lib/cli/configure/upgrade/index.js

@@ -0,0 +1,130 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var upgrade_exports = {};
+__export(upgrade_exports, {
+  upgradeSkuba: () => upgradeSkuba
+});
+module.exports = __toCommonJS(upgrade_exports);
+var import_path = __toESM(require("path"));
+var import_fs_extra = require("fs-extra");
+var import_semver = require("semver");
+var import_manifest = require("../../../utils/manifest");
+var import_packageManager = require("../../../utils/packageManager");
+var import_version = require("../../../utils/version");
+var import_package = require("../processing/package");
+const getPatches = async (manifestVersion) => {
+  const patches = await (0, import_fs_extra.readdir)(import_path.default.join(__dirname, "patches"));
+  const patchesForVersion = (0, import_semver.sort)(
+    patches.filter((filename) => (0, import_semver.gte)(filename, manifestVersion))
+  );
+  return (await Promise.all(patchesForVersion.map(resolvePatches))).flat();
+};
+const fileExtensions = ["js", "ts"];
+const resolvePatches = async (version) => {
+  for (const extension of fileExtensions) {
+    try {
+      return (await import(`./patches/${version}/index.${extension}`)).patches;
+    } catch {
+    }
+  }
+  throw new Error(`Could not resolve patches for ${version}`);
+};
+const upgradeSkuba = async (mode, logger) => {
+  const [currentVersion, manifest] = await Promise.all([
+    (0, import_version.getSkubaVersion)(),
+    (0, import_manifest.getConsumerManifest)()
+  ]);
+  if (!manifest) {
+    throw new Error("Could not find a package json for this project");
+  }
+  manifest.packageJson.skuba ??= { version: "1.0.0" };
+  const manifestVersion = manifest.packageJson.skuba.version;
+  if ((0, import_semver.gte)(manifestVersion, currentVersion)) {
+    return { ok: true, fixable: false };
+  }
+  const patches = await getPatches(manifestVersion);
+  if (patches.length === 0) {
+    return { ok: true, fixable: false };
+  }
+  if (mode === "lint") {
+    const results = await Promise.all(
+      patches.map(async ({ apply }) => await apply(mode))
+    );
+    if (results.every(({ result }) => result === "skip")) {
+      return { ok: true, fixable: false };
+    }
+    const packageManager = await (0, import_packageManager.detectPackageManager)();
+    logger.warn(
+      `skuba has patches to apply. Run ${logger.bold(
+        packageManager.exec,
+        "skuba",
+        "format"
+      )} to run them. ${logger.dim("skuba-patches")}`
+    );
+    return {
+      ok: false,
+      fixable: true,
+      annotations: [
+        {
+          // package.json as likely skuba version has changed
+          // TODO: locate the "skuba": {} config in the package.json and annotate on the version property
+          path: manifest.path,
+          message: `skuba has patches to apply. Run ${packageManager.exec} skuba format to run them.`
+        }
+      ]
+    };
+  }
+  logger.plain("Updating skuba...");
+  for (const { apply, description } of patches) {
+    const result = await apply(mode);
+    logger.newline();
+    if (result.result === "skip") {
+      logger.plain(
+        `Patch skipped: ${description}${result.reason ? ` - ${result.reason}` : ""}`
+      );
+    } else {
+      logger.plain(`Patch applied: ${description}`);
+    }
+  }
+  manifest.packageJson.skuba.version = currentVersion;
+  const updatedPackageJson = await (0, import_package.formatPackage)(manifest.packageJson);
+  await (0, import_fs_extra.writeFile)(manifest.path, updatedPackageJson);
+  logger.newline();
+  logger.plain("skuba update complete.");
+  logger.newline();
+  return {
+    ok: true,
+    fixable: false
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  upgradeSkuba
+});
+//# sourceMappingURL=index.js.map

package/lib/cli/configure/upgrade/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/configure/upgrade/index.ts"],
+  "sourcesContent": ["import path from 'path';\n\nimport { readdir, writeFile } from 'fs-extra';\nimport { gte, sort } from 'semver';\n\nimport type { Logger } from '../../../utils/logging';\nimport { getConsumerManifest } from '../../../utils/manifest';\nimport { detectPackageManager } from '../../../utils/packageManager';\nimport { getSkubaVersion } from '../../../utils/version';\nimport type { SkubaPackageJson } from '../../init/writePackageJson';\nimport type { InternalLintResult } from '../../lint/internal';\nimport { formatPackage } from '../processing/package';\n\nexport type Patches = Patch[];\nexport type Patch = {\n  apply: PatchFunction;\n  description: string;\n};\nexport type PatchReturnType =\n  | { result: 'apply' }\n  | { result: 'skip'; reason?: string };\nexport type PatchFunction = (\n  mode: 'format' | 'lint',\n) => Promise<PatchReturnType>;\n\nconst getPatches = async (manifestVersion: string): Promise<Patches> => {\n  const patches = await readdir(path.join(__dirname, 'patches'));\n\n  // The patches are sorted by the version they were added from.\n  // Only return patches that are newer or equal to the current version.\n  const patchesForVersion = sort(\n    patches.filter((filename) => gte(filename, manifestVersion)),\n  );\n\n  return (await Promise.all(patchesForVersion.map(resolvePatches))).flat();\n};\n\nconst fileExtensions = ['js', 'ts'];\n\n// Hack to allow our Jest environment/transform to resolve the patches\n// In normal scenarios this will resolve immediately after the .js import\nconst resolvePatches = async (version: string): Promise<Patches> => {\n  for (const extension of fileExtensions) {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access\n      return (await import(`./patches/${version}/index.${extension}`)).patches;\n    } catch {\n      // Ignore\n    }\n  }\n  throw new Error(`Could not resolve patches for ${version}`);\n};\n\nexport const upgradeSkuba = async (\n  mode: 'lint' | 'format',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  const [currentVersion, manifest] = await Promise.all([\n    getSkubaVersion(),\n    getConsumerManifest(),\n  ]);\n\n  if (!manifest) {\n    throw new Error('Could not find a package json for this project');\n  }\n\n  manifest.packageJson.skuba ??= { version: '1.0.0' };\n\n  const manifestVersion = (manifest.packageJson.skuba as SkubaPackageJson)\n    .version;\n\n  // We are up to date, skip patches\n  if (gte(manifestVersion, currentVersion)) {\n    return { ok: true, fixable: false };\n  }\n\n  const patches = await getPatches(manifestVersion);\n  // No patches to apply even if version out of date. Early exit to avoid unnecessary commits.\n  if (patches.length === 0) {\n    return { ok: true, fixable: false };\n  }\n\n  if (mode === 'lint') {\n    const results = await Promise.all(\n      patches.map(async ({ apply }) => await apply(mode)),\n    );\n\n    // No patches are applicable. Early exit to avoid unnecessary commits.\n    if (results.every(({ result }) => result === 'skip')) {\n      return { ok: true, fixable: false };\n    }\n\n    const packageManager = await detectPackageManager();\n\n    logger.warn(\n      `skuba has patches to apply. Run ${logger.bold(\n        packageManager.exec,\n        'skuba',\n        'format',\n      )} to run them. ${logger.dim('skuba-patches')}`,\n    );\n\n    return {\n      ok: false,\n      fixable: true,\n      annotations: [\n        {\n          // package.json as likely skuba version has changed\n          // TODO: locate the \"skuba\": {} config in the package.json and annotate on the version property\n          path: manifest.path,\n          message: `skuba has patches to apply. Run ${packageManager.exec} skuba format to run them.`,\n        },\n      ],\n    };\n  }\n\n  logger.plain('Updating skuba...');\n\n  // Run these in series in case a subsequent patch relies on a previous patch\n  for (const { apply, description } of patches) {\n    const result = await apply(mode);\n    logger.newline();\n    if (result.result === 'skip') {\n      logger.plain(\n        `Patch skipped: ${description}${\n          result.reason ? ` - ${result.reason}` : ''\n        }`,\n      );\n    } else {\n      logger.plain(`Patch applied: ${description}`);\n    }\n  }\n\n  (manifest.packageJson.skuba as SkubaPackageJson).version = currentVersion;\n\n  const updatedPackageJson = await formatPackage(manifest.packageJson);\n\n  await writeFile(manifest.path, updatedPackageJson);\n  logger.newline();\n  logger.plain('skuba update complete.');\n  logger.newline();\n\n  return {\n    ok: true,\n    fixable: false,\n  };\n};\n"],
+  "mappings": "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",
+  "names": ["path"]
+}

package/lib/cli/configure/{addEmptyExports.d.ts → upgrade/patches/7.3.1/addEmptyExports.d.ts}

@@ -1,6 +1,6 @@
-export declare const JEST_SETUP_FILES: string[];
+import type { PatchFunction } from '../..';
 /**
  * Tries to add an empty `export {}` statement to the bottom of Jest setup files
  * for compliance with TypeScript isolated modules.
  */
-export declare const tryAddEmptyExports: () => Promise<void>;
+export declare const tryAddEmptyExports: PatchFunction;

package/lib/cli/configure/{addEmptyExports.js → upgrade/patches/7.3.1/addEmptyExports.js}

@@ -28,19 +28,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var addEmptyExports_exports = {};
 __export(addEmptyExports_exports, {
-  JEST_SETUP_FILES: () => JEST_SETUP_FILES,
   tryAddEmptyExports: () => tryAddEmptyExports
 });
 module.exports = __toCommonJS(addEmptyExports_exports);
 var import_path = __toESM(require("path"));
 var import_util = require("util");
 var import_fs_extra = __toESM(require("fs-extra"));
-var import_logging = require("../../utils/logging");
-var import_package = require("./analysis/package");
-var import_project = require("./analysis/project");
-var import_prettier = require("./processing/prettier");
+var import_logging = require("../../../../../utils/logging");
+var import_package = require("../../../analysis/package");
+var import_project = require("../../../analysis/project");
+var import_prettier = require("../../../processing/prettier");
 const JEST_SETUP_FILES = ["jest.setup.ts", "jest.setup.int.ts"];
-const addEmptyExports = async () => {
+const addEmptyExports = async (mode) => {
   const manifest = await (0, import_package.getDestinationManifest)();
   const destinationRoot = import_path.default.dirname(manifest.path);
   const readDestinationFile = (0, import_project.createDestinationFileReader)(destinationRoot);
@@ -50,27 +49,32 @@ const addEmptyExports = async () => {
     // with isolated modules. This is a very naive check that we don't want to
     // overcomplicate because it is invoked before many skuba commands.
     inputFile.includes("import ") || inputFile.includes("export ")) {
-      return;
+      return "skip";
+    }
+    if (mode === "lint") {
+      return "apply";
     }
     const data = await (0, import_prettier.formatPrettier)([inputFile, "export {}"].join("\n\n"), {
       parser: "typescript"
     });
     const filepath = import_path.default.join(destinationRoot, filename);
     await import_fs_extra.default.promises.writeFile(filepath, data);
+    return "apply";
   };
-  await Promise.all(JEST_SETUP_FILES.map(addEmptyExport));
+  const results = await Promise.all(JEST_SETUP_FILES.map(addEmptyExport));
+  return results.every((result) => result === "skip") ? "skip" : "apply";
 };
-const tryAddEmptyExports = async () => {
+const tryAddEmptyExports = async (mode) => {
   try {
-    await addEmptyExports();
+    return { result: await addEmptyExports(mode) };
   } catch (err) {
     import_logging.log.warn("Failed to convert Jest setup files to isolated modules.");
     import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  JEST_SETUP_FILES,
   tryAddEmptyExports
 });
 //# sourceMappingURL=addEmptyExports.js.map

package/lib/cli/configure/upgrade/patches/7.3.1/addEmptyExports.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../src/cli/configure/upgrade/patches/7.3.1/addEmptyExports.ts"],
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction } from '../..';\nimport { log } from '../../../../../utils/logging';\nimport { getDestinationManifest } from '../../../analysis/package';\nimport { createDestinationFileReader } from '../../../analysis/project';\nimport { formatPrettier } from '../../../processing/prettier';\n\nconst JEST_SETUP_FILES = ['jest.setup.ts', 'jest.setup.int.ts'];\n\nconst addEmptyExports = async (mode: 'format' | 'lint') => {\n  const manifest = await getDestinationManifest();\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  const readDestinationFile = createDestinationFileReader(destinationRoot);\n\n  const addEmptyExport = async (filename: string) => {\n    const inputFile = await readDestinationFile(filename);\n\n    if (\n      !inputFile ||\n      // The file appears to have an import or export so it should be compatible\n      // with isolated modules. This is a very naive check that we don't want to\n      // overcomplicate because it is invoked before many skuba commands.\n      inputFile.includes('import ') ||\n      inputFile.includes('export ')\n    ) {\n      return 'skip';\n    }\n\n    if (mode === 'lint') {\n      return 'apply';\n    }\n\n    const data = await formatPrettier([inputFile, 'export {}'].join('\\n\\n'), {\n      parser: 'typescript',\n    });\n\n    const filepath = path.join(destinationRoot, filename);\n\n    await fs.promises.writeFile(filepath, data);\n\n    return 'apply';\n  };\n\n  const results = await Promise.all(JEST_SETUP_FILES.map(addEmptyExport));\n  return results.every((result) => result === 'skip') ? 'skip' : 'apply';\n};\n\n/**\n * Tries to add an empty `export {}` statement to the bottom of Jest setup files\n * for compliance with TypeScript isolated modules.\n */\nexport const tryAddEmptyExports: PatchFunction = async (\n  mode: 'format' | 'lint',\n) => {\n  try {\n    return { result: await addEmptyExports(mode) };\n  } catch (err) {\n    log.warn('Failed to convert Jest setup files to isolated modules.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,qBAAuC;AACvC,qBAA4C;AAC5C,sBAA+B;AAE/B,MAAM,mBAAmB,CAAC,iBAAiB,mBAAmB;AAE9D,MAAM,kBAAkB,OAAO,SAA4B;AACzD,QAAM,WAAW,UAAM,uCAAuB;AAE9C,QAAM,kBAAkB,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAElD,QAAM,0BAAsB,4CAA4B,eAAe;AAEvE,QAAM,iBAAiB,OAAO,aAAqB;AACjD,UAAM,YAAY,MAAM,oBAAoB,QAAQ;AAEpD,QACE,CAAC;AAAA;AAAA;AAAA,IAID,UAAU,SAAS,SAAS,KAC5B,UAAU,SAAS,SAAS,GAC5B;AACA,aAAO;AAAA,IACT;AAEA,QAAI,SAAS,QAAQ;AACnB,aAAO;AAAA,IACT;AAEA,UAAM,OAAO,UAAM,gCAAe,CAAC,WAAW,WAAW,EAAE,KAAK,MAAM,GAAG;AAAA,MACvE,QAAQ;AAAA,IACV,CAAC;AAED,UAAM,WAAW,YAAAA,QAAK,KAAK,iBAAiB,QAAQ;AAEpD,UAAM,gBAAAC,QAAG,SAAS,UAAU,UAAU,IAAI;AAE1C,WAAO;AAAA,EACT;AAEA,QAAM,UAAU,MAAM,QAAQ,IAAI,iBAAiB,IAAI,cAAc,CAAC;AACtE,SAAO,QAAQ,MAAM,CAAC,WAAW,WAAW,MAAM,IAAI,SAAS;AACjE;AAMO,MAAM,qBAAoC,OAC/C,SACG;AACH,MAAI;AACF,WAAO,EAAE,QAAQ,MAAM,gBAAgB,IAAI,EAAE;AAAA,EAC/C,SAAS,KAAK;AACZ,uBAAI,KAAK,yDAAyD;AAClE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "names": ["path", "fs"]
+}

package/lib/cli/configure/upgrade/patches/7.3.1/index.d.ts

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

package/lib/cli/configure/upgrade/patches/7.3.1/index.js

@@ -0,0 +1,55 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __exports = {};
+__export(__exports, {
+  patches: () => patches
+});
+module.exports = __toCommonJS(__exports);
+var import_patchRenovateConfig = require("../../../patchRenovateConfig");
+var import_addEmptyExports = require("./addEmptyExports");
+var import_moveNpmrcOutOfGitignoreManagedSection = require("./moveNpmrcOutOfGitignoreManagedSection");
+var import_patchDockerfile = require("./patchDockerfile");
+var import_patchServerListener = require("./patchServerListener");
+const patches = [
+  {
+    apply: import_addEmptyExports.tryAddEmptyExports,
+    description: "Add empty exports to Jest files for compliance with TypeScript isolated modules"
+  },
+  {
+    apply: import_patchRenovateConfig.tryPatchRenovateConfig,
+    description: "Update Renovate config to support private SEEK packages"
+  },
+  {
+    apply: import_patchDockerfile.tryPatchDockerfile,
+    description: "Upgrade Node.js Distroless Docker image to -debian12 variant"
+  },
+  {
+    apply: import_patchServerListener.tryPatchServerListener,
+    description: "Add keepAliveTimeout to server listener"
+  },
+  {
+    apply: import_moveNpmrcOutOfGitignoreManagedSection.tryMoveNpmrcOutOfGitignoreManagedSection,
+    description: "Move .npmrc out of the .gitignore managed section"
+  }
+];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  patches
+});
+//# sourceMappingURL=index.js.map

package/lib/cli/configure/upgrade/patches/7.3.1/index.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../src/cli/configure/upgrade/patches/7.3.1/index.ts"],
+  "sourcesContent": ["import type { Patches } from '../..';\nimport { tryPatchRenovateConfig } from '../../../patchRenovateConfig';\n\nimport { tryAddEmptyExports } from './addEmptyExports';\nimport { tryMoveNpmrcOutOfGitignoreManagedSection } from './moveNpmrcOutOfGitignoreManagedSection';\nimport { tryPatchDockerfile } from './patchDockerfile';\nimport { tryPatchServerListener } from './patchServerListener';\n\nexport const patches: Patches = [\n  {\n    apply: tryAddEmptyExports,\n    description:\n      'Add empty exports to Jest files for compliance with TypeScript isolated modules',\n  },\n  {\n    apply: tryPatchRenovateConfig,\n    description: 'Update Renovate config to support private SEEK packages',\n  },\n  {\n    apply: tryPatchDockerfile,\n    description: 'Upgrade Node.js Distroless Docker image to -debian12 variant',\n  },\n  {\n    apply: tryPatchServerListener,\n    description: 'Add keepAliveTimeout to server listener',\n  },\n  {\n    apply: tryMoveNpmrcOutOfGitignoreManagedSection,\n    description: 'Move .npmrc out of the .gitignore managed section',\n  },\n];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iCAAuC;AAEvC,6BAAmC;AACnC,mDAAyD;AACzD,6BAAmC;AACnC,iCAAuC;AAEhC,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aACE;AAAA,EACJ;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
+  "names": []
+}

package/lib/cli/configure/upgrade/patches/7.3.1/moveNpmrcOutOfGitignoreManagedSection.d.ts

@@ -0,0 +1,2 @@
+import type { PatchReturnType } from '../..';
+export declare const tryMoveNpmrcOutOfGitignoreManagedSection: (mode: 'format' | 'lint', dir?: string) => Promise<PatchReturnType>;

package/lib/cli/configure/upgrade/patches/7.3.1/moveNpmrcOutOfGitignoreManagedSection.js

@@ -0,0 +1,94 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var moveNpmrcOutOfGitignoreManagedSection_exports = {};
+__export(moveNpmrcOutOfGitignoreManagedSection_exports, {
+  tryMoveNpmrcOutOfGitignoreManagedSection: () => tryMoveNpmrcOutOfGitignoreManagedSection
+});
+module.exports = __toCommonJS(moveNpmrcOutOfGitignoreManagedSection_exports);
+var import_path = __toESM(require("path"));
+var import_util = require("util");
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_logging = require("../../../../../utils/logging");
+var import_project = require("../../../analysis/project");
+const NPMRC_IGNORE_SECTION = `
+
+# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.
+# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.
+# You can use \`skuba format\` to generate the file or otherwise commit an empty file.
+# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.
+.npmrc
+`;
+const moveNpmrcOutOfGitignoreManagedSection = async (mode, dir) => {
+  const readFile = (0, import_project.createDestinationFileReader)(dir);
+  const gitignore = await readFile(".gitignore");
+  if (!gitignore) {
+    return { result: "skip", reason: "no .gitignore file found" };
+  }
+  let isIgnored;
+  let currentlyInManagedSection = false;
+  for (const line of gitignore.split("\n")) {
+    if (line.trim() === "# managed by skuba") {
+      currentlyInManagedSection = true;
+    } else if (line.trim() === "# end managed by skuba") {
+      currentlyInManagedSection = false;
+    }
+    if (line.trim() === ".npmrc" || line.trim() === "/.npmrc") {
+      isIgnored = { inManaged: currentlyInManagedSection };
+    }
+    if (line.trim() === "!.npmrc" || line.trim() === "!/.npmrc") {
+      isIgnored = void 0;
+    }
+  }
+  if (isIgnored && !isIgnored.inManaged) {
+    return { result: "skip", reason: "already ignored in unmanaged section" };
+  }
+  if (!isIgnored) {
+    return { result: "skip", reason: "not ignored" };
+  }
+  if (mode === "lint") {
+    return { result: "apply" };
+  }
+  const newGitignore = gitignore.split("\n").filter((line) => line.trim().replace(/^[!/]+/g, "") !== ".npmrc").join("\n").trim() + NPMRC_IGNORE_SECTION;
+  await import_fs_extra.default.promises.writeFile(import_path.default.join(dir, ".gitignore"), newGitignore);
+  return { result: "apply" };
+};
+const tryMoveNpmrcOutOfGitignoreManagedSection = async (mode, dir = process.cwd()) => {
+  try {
+    return await moveNpmrcOutOfGitignoreManagedSection(mode, dir);
+  } catch (err) {
+    import_logging.log.warn("Failed to move .npmrc out of .gitignore managed section.");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  tryMoveNpmrcOutOfGitignoreManagedSection
+});
+//# sourceMappingURL=moveNpmrcOutOfGitignoreManagedSection.js.map

package/lib/cli/configure/upgrade/patches/7.3.1/moveNpmrcOutOfGitignoreManagedSection.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../src/cli/configure/upgrade/patches/7.3.1/moveNpmrcOutOfGitignoreManagedSection.ts"],
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../analysis/project';\n\nconst NPMRC_IGNORE_SECTION = `\n\n# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.\n# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.\n# You can use \\`skuba format\\` to generate the file or otherwise commit an empty file.\n# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.\n.npmrc\n`;\n\nconst moveNpmrcOutOfGitignoreManagedSection = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const gitignore = await readFile('.gitignore');\n\n  if (!gitignore) {\n    return { result: 'skip', reason: 'no .gitignore file found' };\n  }\n\n  let isIgnored: { inManaged: boolean } | undefined;\n  let currentlyInManagedSection = false;\n\n  for (const line of gitignore.split('\\n')) {\n    if (line.trim() === '# managed by skuba') {\n      currentlyInManagedSection = true;\n    } else if (line.trim() === '# end managed by skuba') {\n      currentlyInManagedSection = false;\n    }\n\n    if (line.trim() === '.npmrc' || line.trim() === '/.npmrc') {\n      isIgnored = { inManaged: currentlyInManagedSection };\n    }\n\n    if (line.trim() === '!.npmrc' || line.trim() === '!/.npmrc') {\n      isIgnored = undefined;\n    }\n  }\n\n  if (isIgnored && !isIgnored.inManaged) {\n    return { result: 'skip', reason: 'already ignored in unmanaged section' };\n  }\n\n  if (!isIgnored) {\n    return { result: 'skip', reason: 'not ignored' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  const newGitignore =\n    gitignore\n      .split('\\n')\n      .filter((line) => line.trim().replace(/^[!/]+/g, '') !== '.npmrc')\n      .join('\\n')\n      .trim() + NPMRC_IGNORE_SECTION;\n\n  await fs.promises.writeFile(path.join(dir, '.gitignore'), newGitignore);\n\n  return { result: 'apply' };\n};\n\nexport const tryMoveNpmrcOutOfGitignoreManagedSection = (async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    return await moveNpmrcOutOfGitignoreManagedSection(mode, dir);\n  } catch (err) {\n    log.warn('Failed to move .npmrc out of .gitignore managed section.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n}) satisfies PatchFunction;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,qBAA4C;AAE5C,MAAM,uBAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAS7B,MAAM,wCAAwC,OAC5C,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,YAAY,MAAM,SAAS,YAAY;AAE7C,MAAI,CAAC,WAAW;AACd,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,MAAI;AACJ,MAAI,4BAA4B;AAEhC,aAAW,QAAQ,UAAU,MAAM,IAAI,GAAG;AACxC,QAAI,KAAK,KAAK,MAAM,sBAAsB;AACxC,kCAA4B;AAAA,IAC9B,WAAW,KAAK,KAAK,MAAM,0BAA0B;AACnD,kCAA4B;AAAA,IAC9B;AAEA,QAAI,KAAK,KAAK,MAAM,YAAY,KAAK,KAAK,MAAM,WAAW;AACzD,kBAAY,EAAE,WAAW,0BAA0B;AAAA,IACrD;AAEA,QAAI,KAAK,KAAK,MAAM,aAAa,KAAK,KAAK,MAAM,YAAY;AAC3D,kBAAY;AAAA,IACd;AAAA,EACF;AAEA,MAAI,aAAa,CAAC,UAAU,WAAW;AACrC,WAAO,EAAE,QAAQ,QAAQ,QAAQ,uCAAuC;AAAA,EAC1E;AAEA,MAAI,CAAC,WAAW;AACd,WAAO,EAAE,QAAQ,QAAQ,QAAQ,cAAc;AAAA,EACjD;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,eACJ,UACG,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,KAAK,KAAK,EAAE,QAAQ,WAAW,EAAE,MAAM,QAAQ,EAChE,KAAK,IAAI,EACT,KAAK,IAAI;AAEd,QAAM,gBAAAA,QAAG,SAAS,UAAU,YAAAC,QAAK,KAAK,KAAK,YAAY,GAAG,YAAY;AAEtE,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,2CAA4C,OACvD,MACA,MAAM,QAAQ,IAAI,MACf;AACH,MAAI;AACF,WAAO,MAAM,sCAAsC,MAAM,GAAG;AAAA,EAC9D,SAAS,KAAK;AACZ,uBAAI,KAAK,0DAA0D;AACnE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "names": ["fs", "path"]
+}

package/lib/cli/configure/upgrade/patches/7.3.1/patchDockerfile.d.ts

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

package/lib/cli/configure/{patchDockerfile.js → upgrade/patches/7.3.1/patchDockerfile.js}

@@ -33,29 +33,35 @@ __export(patchDockerfile_exports, {
 module.exports = __toCommonJS(patchDockerfile_exports);
 var import_util = require("util");
 var import_fs_extra = __toESM(require("fs-extra"));
-var import_logging = require("../../utils/logging");
-var import_project = require("./analysis/project");
+var import_logging = require("../../../../../utils/logging");
+var import_project = require("../../../analysis/project");
 const DOCKERFILE_FILENAME = "Dockerfile";
-const VERSION_REGEX = /gcr.io\/distroless\/nodejs:(16|18|20)/g;
-const VERSION_DEBIAN_REPLACE = "gcr.io/distroless/nodejs$1-debian11";
-const patchDockerfile = async (dir) => {
+const NON_DEBIAN_REGEX = /gcr.io\/distroless\/nodejs:(18|20)/g;
+const DEBIAN_REGEX = /gcr.io\/distroless\/nodejs(18|20)-debian11/g;
+const VERSION_DEBIAN_REPLACE = "gcr.io/distroless/nodejs$1-debian12";
+const patchDockerfile = async (mode, dir) => {
   const readFile = (0, import_project.createDestinationFileReader)(dir);
   const maybeDockerfile = await readFile(DOCKERFILE_FILENAME);
   if (!maybeDockerfile) {
-    return;
+    return { result: "skip", reason: "no Dockerfile found" };
+  }
+  const patched = maybeDockerfile.replaceAll(NON_DEBIAN_REGEX, VERSION_DEBIAN_REPLACE).replaceAll(DEBIAN_REGEX, VERSION_DEBIAN_REPLACE);
+  if (patched === maybeDockerfile) {
+    return { result: "skip" };
+  }
+  if (mode === "lint") {
+    return { result: "apply" };
   }
-  const patched = maybeDockerfile.replaceAll(
-    VERSION_REGEX,
-    VERSION_DEBIAN_REPLACE
-  );
   await import_fs_extra.default.promises.writeFile(DOCKERFILE_FILENAME, patched);
+  return { result: "apply" };
 };
-const tryPatchDockerfile = async (dir = process.cwd()) => {
+const tryPatchDockerfile = async (mode, dir = process.cwd()) => {
   try {
-    await patchDockerfile(dir);
+    return await patchDockerfile(mode, dir);
   } catch (err) {
     import_logging.log.warn("Failed to patch Dockerfile.");
     import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
   }
 };
 // Annotate the CommonJS export names for ESM import in node: