skuba 8.1.0-patch-pnpm-package-20240411042949 → 8.1.0-pm-20240506055052

package/lib/api/git/index.d.ts

@@ -9,3 +9,4 @@ export { getOwnerAndRepo } from './remote';
 export { push } from './push';
 export { fastForwardBranch } from './pull';
 export { reset } from './reset';
+export { isFileGitIgnored } from './isFileGitIgnored';

package/lib/api/git/index.js

@@ -27,6 +27,7 @@ __export(git_exports, {
   getHeadCommitId: () => import_log.getHeadCommitId,
   getHeadCommitMessage: () => import_log.getHeadCommitMessage,
   getOwnerAndRepo: () => import_remote.getOwnerAndRepo,
+  isFileGitIgnored: () => import_isFileGitIgnored.isFileGitIgnored,
   push: () => import_push.push,
   reset: () => import_reset.reset
 });
@@ -41,6 +42,7 @@ var import_remote = require("./remote");
 var import_push = require("./push");
 var import_pull = require("./pull");
 var import_reset = require("./reset");
+var import_isFileGitIgnored = require("./isFileGitIgnored");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   commit,
@@ -52,6 +54,7 @@ var import_reset = require("./reset");
   getHeadCommitId,
   getHeadCommitMessage,
   getOwnerAndRepo,
+  isFileGitIgnored,
   push,
   reset
 });

package/lib/api/git/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/api/git/index.ts"],
-  "sourcesContent": ["export { commit } from './commit';\nexport { commitAllChanges } from './commitAllChanges';\nexport { currentBranch } from './currentBranch';\nexport { findRoot } from './findRoot';\nexport type { ChangedFile } from './getChangedFiles';\nexport { getChangedFiles } from './getChangedFiles';\nexport { getHeadCommitId, getHeadCommitMessage } from './log';\nexport { getOwnerAndRepo } from './remote';\nexport { push } from './push';\nexport { fastForwardBranch } from './pull';\nexport { reset } from './reset';\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAuB;AACvB,8BAAiC;AACjC,2BAA8B;AAC9B,sBAAyB;AAEzB,6BAAgC;AAChC,iBAAsD;AACtD,oBAAgC;AAChC,kBAAqB;AACrB,kBAAkC;AAClC,mBAAsB;",
+  "sourcesContent": ["export { commit } from './commit';\nexport { commitAllChanges } from './commitAllChanges';\nexport { currentBranch } from './currentBranch';\nexport { findRoot } from './findRoot';\nexport type { ChangedFile } from './getChangedFiles';\nexport { getChangedFiles } from './getChangedFiles';\nexport { getHeadCommitId, getHeadCommitMessage } from './log';\nexport { getOwnerAndRepo } from './remote';\nexport { push } from './push';\nexport { fastForwardBranch } from './pull';\nexport { reset } from './reset';\nexport { isFileGitIgnored } from './isFileGitIgnored';\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAuB;AACvB,8BAAiC;AACjC,2BAA8B;AAC9B,sBAAyB;AAEzB,6BAAgC;AAChC,iBAAsD;AACtD,oBAAgC;AAChC,kBAAqB;AACrB,kBAAkC;AAClC,mBAAsB;AACtB,8BAAiC;",
   "names": []
 }

package/lib/api/git/isFileGitIgnored.d.ts

@@ -0,0 +1,4 @@
+export declare const isFileGitIgnored: ({ absolutePath, gitRoot, }: {
+    absolutePath: string;
+    gitRoot: string;
+}) => Promise<boolean>;

package/lib/api/git/isFileGitIgnored.js

@@ -0,0 +1,49 @@
+"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 isFileGitIgnored_exports = {};
+__export(isFileGitIgnored_exports, {
+  isFileGitIgnored: () => isFileGitIgnored
+});
+module.exports = __toCommonJS(isFileGitIgnored_exports);
+var import_path = __toESM(require("path"));
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_isomorphic_git = __toESM(require("isomorphic-git"));
+const isFileGitIgnored = ({
+  absolutePath,
+  gitRoot
+}) => import_isomorphic_git.default.isIgnored({
+  dir: gitRoot,
+  filepath: import_path.default.relative(gitRoot, absolutePath),
+  fs: import_fs_extra.default
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isFileGitIgnored
+});
+//# sourceMappingURL=isFileGitIgnored.js.map

package/lib/api/git/isFileGitIgnored.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/api/git/isFileGitIgnored.ts"],
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport git from 'isomorphic-git';\n\nexport const isFileGitIgnored = ({\n  absolutePath,\n  gitRoot,\n}: {\n  absolutePath: string;\n  gitRoot: string;\n}): Promise<boolean> =>\n  git.isIgnored({\n    dir: gitRoot,\n    filepath: path.relative(gitRoot, absolutePath),\n    fs,\n  });\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AACf,4BAAgB;AAET,MAAM,mBAAmB,CAAC;AAAA,EAC/B;AAAA,EACA;AACF,MAIE,sBAAAA,QAAI,UAAU;AAAA,EACZ,KAAK;AAAA,EACL,UAAU,YAAAC,QAAK,SAAS,SAAS,YAAY;AAAA,EAC7C,oBAAAC;AACF,CAAC;",
+  "names": ["git", "path", "fs"]
+}

package/lib/cli/init/index.js

@@ -40,8 +40,6 @@ var import_dir = require("../../utils/dir");
 var import_exec = require("../../utils/exec");
 var import_logging = require("../../utils/logging");
 var import_logo = require("../../utils/logo");
-var import_manifest = require("../../utils/manifest");
-var import_packageManager = require("../../utils/packageManager");
 var import_template = require("../../utils/template");
 var import_prettier = require("../adapter/prettier");
 var import_patchRenovateConfig = require("../lint/internalLints/patchRenovateConfig");
@@ -101,19 +99,7 @@ const init = async (args = process.argv.slice(2)) => {
   });
   import_logging.log.newline();
   await (0, import_git2.initialiseRepo)(destinationDir, templateData);
-  const [manifest, packageManagerConfig] = await Promise.all([
-    (0, import_manifest.getConsumerManifest)(),
-    (0, import_packageManager.detectPackageManager)()
-  ]);
-  if (!manifest) {
-    throw new Error("Repository doesn't contain a package.json file.");
-  }
-  await (0, import_patchRenovateConfig.tryPatchRenovateConfig)({
-    mode: "format",
-    dir: destinationDir,
-    manifest,
-    packageManager: packageManagerConfig
-  });
+  await (0, import_patchRenovateConfig.tryPatchRenovateConfig)("format", destinationDir);
   const skubaSlug = `skuba@${skubaVersionInfo.local}`;
   let depsInstalled = false;
   try {

package/lib/cli/init/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/init/index.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { commitAllChanges } from '../../api/git';\nimport { hasDebugFlag } from '../../utils/args';\nimport { copyFiles, createEjsRenderer } from '../../utils/copy';\nimport { createInclusionFilter } from '../../utils/dir';\nimport { createExec, ensureCommands } from '../../utils/exec';\nimport { createLogger, log } from '../../utils/logging';\nimport { showLogoAndVersionInfo } from '../../utils/logo';\nimport { getConsumerManifest } from '../../utils/manifest';\nimport { detectPackageManager } from '../../utils/packageManager';\nimport {\n  BASE_TEMPLATE_DIR,\n  ensureTemplateConfigDeletion,\n} from '../../utils/template';\nimport { runPrettier } from '../adapter/prettier';\nimport { tryPatchRenovateConfig } from '../lint/internalLints/patchRenovateConfig';\n\nimport { getConfig } from './getConfig';\nimport { initialiseRepo } from './git';\nimport type { Input } from './types';\nimport { writePackageJson } from './writePackageJson';\n\nexport const init = async (args = process.argv.slice(2)) => {\n  const opts: Input = {\n    debug: hasDebugFlag(args),\n  };\n\n  const skubaVersionInfo = await showLogoAndVersionInfo();\n\n  const {\n    destinationDir,\n    entryPoint,\n    packageManager,\n    templateComplete,\n    templateData,\n    templateName,\n    type,\n  } = await getConfig();\n\n  await ensureCommands(packageManager);\n\n  const include = await createInclusionFilter([\n    path.join(destinationDir, '.gitignore'),\n    path.join(BASE_TEMPLATE_DIR, '_.gitignore'),\n  ]);\n\n  const processors = [createEjsRenderer(templateData)];\n\n  await copyFiles({\n    sourceRoot: BASE_TEMPLATE_DIR,\n    destinationRoot: destinationDir,\n    include,\n    // prefer template-specific files\n    overwrite: false,\n    processors,\n    // base template has files like _.eslintrc.js\n    stripUnderscorePrefix: true,\n  });\n\n  await copyFiles({\n    sourceRoot: destinationDir,\n    destinationRoot: destinationDir,\n    include,\n    processors,\n  });\n\n  await Promise.all([\n    templateComplete\n      ? ensureTemplateConfigDeletion(destinationDir)\n      : Promise.resolve(),\n\n    writePackageJson({\n      cwd: destinationDir,\n      entryPoint,\n      template: templateName,\n      type,\n      version: skubaVersionInfo.local,\n    }),\n  ]);\n\n  const exec = createExec({\n    cwd: destinationDir,\n    stdio: 'pipe',\n    streamStdio: packageManager,\n  });\n\n  log.newline();\n  await initialiseRepo(destinationDir, templateData);\n\n  const [manifest, packageManagerConfig] = await Promise.all([\n    getConsumerManifest(),\n    detectPackageManager(),\n  ]);\n\n  if (!manifest) {\n    throw new Error(\"Repository doesn't contain a package.json file.\");\n  }\n\n  // Patch in a baseline Renovate preset based on the configured Git owner.\n  await tryPatchRenovateConfig({\n    mode: 'format',\n    dir: destinationDir,\n    manifest,\n    packageManager: packageManagerConfig,\n  });\n\n  const skubaSlug = `skuba@${skubaVersionInfo.local}`;\n\n  let depsInstalled = false;\n  try {\n    // The `-D` shorthand is portable across our package managers.\n    await exec(packageManager, 'add', '-D', skubaSlug);\n\n    // Templating can initially leave certain files in an unformatted state;\n    // consider a Markdown table with columns sized based on content length.\n    await runPrettier('format', createLogger(opts.debug), destinationDir);\n\n    depsInstalled = true;\n  } catch (err) {\n    log.warn(inspect(err));\n  }\n\n  await commitAllChanges({\n    dir: destinationDir,\n    message: `Clone ${templateName}`,\n  });\n\n  const logGitHubRepoCreation = () => {\n    log.plain(\n      'Next, create an empty',\n      log.bold(`${templateData.orgName}/${templateData.repoName}`),\n      'repository:',\n    );\n    log.ok('https://github.com/new');\n  };\n\n  if (!depsInstalled) {\n    log.newline();\n    log.warn(log.bold('\u2717 Failed to install dependencies.'));\n\n    log.newline();\n    logGitHubRepoCreation();\n\n    log.newline();\n    log.plain('Then, resume initialisation:');\n    log.ok('cd', destinationDir);\n    // The `-D` shorthand is portable across our package managers.\n    log.ok(packageManager, 'add', '-D', skubaSlug);\n    log.ok(packageManager, 'run', 'format');\n    log.ok('git add --all');\n    log.ok('git commit --message', `'Pin ${skubaSlug}'`);\n    log.ok(`git push --set-upstream origin ${templateData.defaultBranch}`);\n\n    log.newline();\n    process.exitCode = 1;\n    return;\n  }\n\n  log.newline();\n  log.ok(log.bold('\u2714 Project initialised!'));\n\n  log.newline();\n  logGitHubRepoCreation();\n\n  log.newline();\n  log.plain('Then, push your local changes:');\n  log.ok('cd', destinationDir);\n  log.ok(`git push --set-upstream origin ${templateData.defaultBranch}`);\n\n  log.newline();\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { commitAllChanges } from '../../api/git';\nimport { hasDebugFlag } from '../../utils/args';\nimport { copyFiles, createEjsRenderer } from '../../utils/copy';\nimport { createInclusionFilter } from '../../utils/dir';\nimport { createExec, ensureCommands } from '../../utils/exec';\nimport { createLogger, log } from '../../utils/logging';\nimport { showLogoAndVersionInfo } from '../../utils/logo';\nimport {\n  BASE_TEMPLATE_DIR,\n  ensureTemplateConfigDeletion,\n} from '../../utils/template';\nimport { runPrettier } from '../adapter/prettier';\nimport { tryPatchRenovateConfig } from '../lint/internalLints/patchRenovateConfig';\n\nimport { getConfig } from './getConfig';\nimport { initialiseRepo } from './git';\nimport type { Input } from './types';\nimport { writePackageJson } from './writePackageJson';\n\nexport const init = async (args = process.argv.slice(2)) => {\n  const opts: Input = {\n    debug: hasDebugFlag(args),\n  };\n\n  const skubaVersionInfo = await showLogoAndVersionInfo();\n\n  const {\n    destinationDir,\n    entryPoint,\n    packageManager,\n    templateComplete,\n    templateData,\n    templateName,\n    type,\n  } = await getConfig();\n\n  await ensureCommands(packageManager);\n\n  const include = await createInclusionFilter([\n    path.join(destinationDir, '.gitignore'),\n    path.join(BASE_TEMPLATE_DIR, '_.gitignore'),\n  ]);\n\n  const processors = [createEjsRenderer(templateData)];\n\n  await copyFiles({\n    sourceRoot: BASE_TEMPLATE_DIR,\n    destinationRoot: destinationDir,\n    include,\n    // prefer template-specific files\n    overwrite: false,\n    processors,\n    // base template has files like _.eslintrc.js\n    stripUnderscorePrefix: true,\n  });\n\n  await copyFiles({\n    sourceRoot: destinationDir,\n    destinationRoot: destinationDir,\n    include,\n    processors,\n  });\n\n  await Promise.all([\n    templateComplete\n      ? ensureTemplateConfigDeletion(destinationDir)\n      : Promise.resolve(),\n\n    writePackageJson({\n      cwd: destinationDir,\n      entryPoint,\n      template: templateName,\n      type,\n      version: skubaVersionInfo.local,\n    }),\n  ]);\n\n  const exec = createExec({\n    cwd: destinationDir,\n    stdio: 'pipe',\n    streamStdio: packageManager,\n  });\n\n  log.newline();\n  await initialiseRepo(destinationDir, templateData);\n\n  // Patch in a baseline Renovate preset based on the configured Git owner.\n  await tryPatchRenovateConfig('format', destinationDir);\n\n  const skubaSlug = `skuba@${skubaVersionInfo.local}`;\n\n  let depsInstalled = false;\n  try {\n    // The `-D` shorthand is portable across our package managers.\n    await exec(packageManager, 'add', '-D', skubaSlug);\n\n    // Templating can initially leave certain files in an unformatted state;\n    // consider a Markdown table with columns sized based on content length.\n    await runPrettier('format', createLogger(opts.debug), destinationDir);\n\n    depsInstalled = true;\n  } catch (err) {\n    log.warn(inspect(err));\n  }\n\n  await commitAllChanges({\n    dir: destinationDir,\n    message: `Clone ${templateName}`,\n  });\n\n  const logGitHubRepoCreation = () => {\n    log.plain(\n      'Next, create an empty',\n      log.bold(`${templateData.orgName}/${templateData.repoName}`),\n      'repository:',\n    );\n    log.ok('https://github.com/new');\n  };\n\n  if (!depsInstalled) {\n    log.newline();\n    log.warn(log.bold('\u2717 Failed to install dependencies.'));\n\n    log.newline();\n    logGitHubRepoCreation();\n\n    log.newline();\n    log.plain('Then, resume initialisation:');\n    log.ok('cd', destinationDir);\n    // The `-D` shorthand is portable across our package managers.\n    log.ok(packageManager, 'add', '-D', skubaSlug);\n    log.ok(packageManager, 'run', 'format');\n    log.ok('git add --all');\n    log.ok('git commit --message', `'Pin ${skubaSlug}'`);\n    log.ok(`git push --set-upstream origin ${templateData.defaultBranch}`);\n\n    log.newline();\n    process.exitCode = 1;\n    return;\n  }\n\n  log.newline();\n  log.ok(log.bold('\u2714 Project initialised!'));\n\n  log.newline();\n  logGitHubRepoCreation();\n\n  log.newline();\n  log.plain('Then, push your local changes:');\n  log.ok('cd', destinationDir);\n  log.ok(`git push --set-upstream origin ${templateData.defaultBranch}`);\n\n  log.newline();\n};\n"],
+  "mappings": "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",
   "names": ["import_git", "path"]
 }

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

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

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

@@ -133,10 +133,7 @@ const patchRenovateConfig = async (mode, dir) => {
   });
   return { result: "apply" };
 };
-const tryPatchRenovateConfig = async ({
-  mode,
-  dir = process.cwd()
-}) => {
+const tryPatchRenovateConfig = async (mode, dir = process.cwd()) => {
   try {
     const gitRoot = await Git.findRoot({ dir });
     if (!gitRoot) {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/lint/internalLints/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';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\nimport { RENOVATE_CONFIG_FILENAMES } from '../../configure/modules/renovate';\nimport { formatPrettier } from '../../configure/processing/prettier';\n\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,\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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",
+  "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';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\nimport { RENOVATE_CONFIG_FILENAMES } from '../../configure/modules/renovate';\nimport { formatPrettier } from '../../configure/processing/prettier';\n\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/lint/internalLints/refreshConfigFiles.js

@@ -37,6 +37,7 @@ var import_path = __toESM(require("path"));
 var import_util = require("util");
 var import_fs_extra = require("fs-extra");
 var import_strip_ansi = __toESM(require("strip-ansi"));
+var import__ = require("../../..");
 var import_npmrc = require("../../../utils/npmrc");
 var import_packageManager = require("../../../utils/packageManager");
 var import_template = require("../../../utils/template");
@@ -72,7 +73,10 @@ const REFRESHABLE_CONFIG_FILES = [
   }
 ];
 const refreshConfigFiles = async (mode, logger) => {
-  const manifest = await (0, import_package.getDestinationManifest)();
+  const [manifest, gitRoot] = await Promise.all([
+    (0, import_package.getDestinationManifest)(),
+    import__.Git.findRoot({ dir: process.cwd() })
+  ]);
   const destinationRoot = import_path.default.dirname(manifest.path);
   const readDestinationFile = (0, import_project.createDestinationFileReader)(destinationRoot);
   const refreshConfigFile = async ({
@@ -84,10 +88,17 @@ const refreshConfigFiles = async (mode, logger) => {
     if (!condition(packageManager2)) {
       return { needsChange: false };
     }
-    const [inputFile, templateFile] = await Promise.all([
+    const [inputFile, templateFile, isGitIgnored] = await Promise.all([
       readDestinationFile(filename),
-      (0, import_template.readBaseTemplateFile)(`_${filename}`)
+      (0, import_template.readBaseTemplateFile)(`_${filename}`),
+      gitRoot ? import__.Git.isFileGitIgnored({
+        gitRoot,
+        absolutePath: import_path.default.join(destinationRoot, filename)
+      }) : false
     ]);
+    if (inputFile === void 0 && isGitIgnored) {
+      return { needsChange: false };
+    }
     const data = additionalMapping(
       inputFile ? (0, import_configFile.mergeWithConfigFile)(templateFile, fileType)(inputFile) : templateFile,
       packageManager2

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/lint/internalLints/refreshConfigFiles.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { writeFile } from 'fs-extra';\nimport stripAnsi from 'strip-ansi';\n\nimport type { Logger } from '../../../utils/logging';\nimport { NPMRC_LINES, hasNpmrcSecret } from '../../../utils/npmrc';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../utils/packageManager';\nimport { readBaseTemplateFile } from '../../../utils/template';\nimport { getDestinationManifest } from '../../configure/analysis/package';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\nimport { mergeWithConfigFile } from '../../configure/processing/configFile';\nimport type { InternalLintResult } from '../internal';\n\nconst ensureNoAuthToken = (fileContents: string) =>\n  fileContents\n    .split('\\n')\n    .filter((line) => !hasNpmrcSecret(line))\n    .join('\\n');\n\ntype RefreshableConfigFile = {\n  name: string;\n  type: 'ignore' | 'npmrc';\n  additionalMapping?: (\n    s: string,\n    packageManager: PackageManagerConfig,\n  ) => string;\n  if?: (packageManager: PackageManagerConfig) => boolean;\n};\n\nconst removeRedundantNpmrc = (contents: string) => {\n  const npmrcLines = contents\n    .split('\\n')\n    .filter((line) => NPMRC_LINES.includes(line.trim()));\n\n  // If we're only left with !.npmrc line we can remove it\n  // TODO: Consider if we should generalise this\n  if (npmrcLines.length > 0 && npmrcLines.every((line) => line.includes('!'))) {\n    return contents\n      .split('\\n')\n      .filter((line) => !NPMRC_LINES.includes(line.trim()))\n      .join('\\n');\n  }\n  return contents;\n};\n\nexport const REFRESHABLE_CONFIG_FILES: RefreshableConfigFile[] = [\n  { name: '.eslintignore', type: 'ignore' },\n  {\n    name: '.gitignore',\n    type: 'ignore',\n    additionalMapping: removeRedundantNpmrc,\n  },\n  { name: '.prettierignore', type: 'ignore' },\n  {\n    name: '.npmrc',\n    type: 'npmrc',\n    additionalMapping: ensureNoAuthToken,\n    if: (packageManager: PackageManagerConfig) =>\n      packageManager.command === 'pnpm',\n  },\n  {\n    name: '.dockerignore',\n    type: 'ignore',\n    additionalMapping: removeRedundantNpmrc,\n  },\n];\n\nexport const refreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n) => {\n  const manifest = await getDestinationManifest();\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  const readDestinationFile = createDestinationFileReader(destinationRoot);\n\n  const refreshConfigFile = async (\n    {\n      name: filename,\n      type: fileType,\n      additionalMapping = (s) => s,\n      if: condition = () => true,\n    }: RefreshableConfigFile,\n    packageManager: PackageManagerConfig,\n  ) => {\n    if (!condition(packageManager)) {\n      return { needsChange: false };\n    }\n\n    const [inputFile, templateFile] = await Promise.all([\n      readDestinationFile(filename),\n      readBaseTemplateFile(`_${filename}`),\n    ]);\n\n    const data = additionalMapping(\n      inputFile\n        ? mergeWithConfigFile(templateFile, fileType)(inputFile)\n        : templateFile,\n      packageManager,\n    );\n\n    const filepath = path.join(destinationRoot, filename);\n\n    if (mode === 'format') {\n      if (data === inputFile) {\n        return { needsChange: false };\n      }\n\n      await writeFile(filepath, data);\n      return {\n        needsChange: false,\n        msg: `Refreshed ${logger.bold(filename)}.`,\n        filename,\n      };\n    }\n\n    if (data !== inputFile) {\n      return {\n        needsChange: true,\n        msg: `The ${logger.bold(\n          filename,\n        )} file is out of date. Run \\`${logger.bold(\n          packageManager.exec,\n          'skuba',\n          'format',\n        )}\\` to update it.`,\n        filename,\n      };\n    }\n\n    return { needsChange: false };\n  };\n\n  const packageManager = await detectPackageManager(destinationRoot);\n\n  const results = await Promise.all(\n    REFRESHABLE_CONFIG_FILES.map((conf) =>\n      refreshConfigFile(conf, packageManager),\n    ),\n  );\n\n  // Log after for reproducible test output ordering\n  results.forEach((result) => {\n    if (result.msg) {\n      logger.warn(result.msg, logger.dim('refresh-config-files'));\n    }\n  });\n\n  const anyNeedChanging = results.some(({ needsChange }) => needsChange);\n\n  return {\n    ok: !anyNeedChanging,\n    fixable: anyNeedChanging,\n    annotations: results.flatMap(({ needsChange, filename, msg }) =>\n      needsChange && msg\n        ? [\n            {\n              path: filename,\n              message: stripAnsi(msg),\n            },\n          ]\n        : [],\n    ),\n  };\n};\n\nexport const tryRefreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  try {\n    return await refreshConfigFiles(mode, logger);\n  } catch (err) {\n    logger.warn('Failed to refresh config files.');\n    logger.subtle(inspect(err));\n\n    return {\n      ok: false,\n      fixable: false,\n      annotations: [],\n    };\n  }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { writeFile } from 'fs-extra';\nimport stripAnsi from 'strip-ansi';\n\nimport { Git } from '../../..';\nimport type { Logger } from '../../../utils/logging';\nimport { NPMRC_LINES, hasNpmrcSecret } from '../../../utils/npmrc';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../utils/packageManager';\nimport { readBaseTemplateFile } from '../../../utils/template';\nimport { getDestinationManifest } from '../../configure/analysis/package';\nimport { createDestinationFileReader } from '../../configure/analysis/project';\nimport { mergeWithConfigFile } from '../../configure/processing/configFile';\nimport type { InternalLintResult } from '../internal';\n\nconst ensureNoAuthToken = (fileContents: string) =>\n  fileContents\n    .split('\\n')\n    .filter((line) => !hasNpmrcSecret(line))\n    .join('\\n');\n\ntype RefreshableConfigFile = {\n  name: string;\n  type: 'ignore' | 'npmrc';\n  additionalMapping?: (\n    s: string,\n    packageManager: PackageManagerConfig,\n  ) => string;\n  if?: (packageManager: PackageManagerConfig) => boolean;\n};\n\nconst removeRedundantNpmrc = (contents: string) => {\n  const npmrcLines = contents\n    .split('\\n')\n    .filter((line) => NPMRC_LINES.includes(line.trim()));\n\n  // If we're only left with !.npmrc line we can remove it\n  // TODO: Consider if we should generalise this\n  if (npmrcLines.length > 0 && npmrcLines.every((line) => line.includes('!'))) {\n    return contents\n      .split('\\n')\n      .filter((line) => !NPMRC_LINES.includes(line.trim()))\n      .join('\\n');\n  }\n  return contents;\n};\n\nexport const REFRESHABLE_CONFIG_FILES: RefreshableConfigFile[] = [\n  { name: '.eslintignore', type: 'ignore' },\n  {\n    name: '.gitignore',\n    type: 'ignore',\n    additionalMapping: removeRedundantNpmrc,\n  },\n  { name: '.prettierignore', type: 'ignore' },\n  {\n    name: '.npmrc',\n    type: 'npmrc',\n    additionalMapping: ensureNoAuthToken,\n    if: (packageManager: PackageManagerConfig) =>\n      packageManager.command === 'pnpm',\n  },\n  {\n    name: '.dockerignore',\n    type: 'ignore',\n    additionalMapping: removeRedundantNpmrc,\n  },\n];\n\nexport const refreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n) => {\n  const [manifest, gitRoot] = await Promise.all([\n    getDestinationManifest(),\n    Git.findRoot({ dir: process.cwd() }),\n  ]);\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  const readDestinationFile = createDestinationFileReader(destinationRoot);\n\n  const refreshConfigFile = async (\n    {\n      name: filename,\n      type: fileType,\n      additionalMapping = (s) => s,\n      if: condition = () => true,\n    }: RefreshableConfigFile,\n    packageManager: PackageManagerConfig,\n  ) => {\n    if (!condition(packageManager)) {\n      return { needsChange: false };\n    }\n\n    const [inputFile, templateFile, isGitIgnored] = await Promise.all([\n      readDestinationFile(filename),\n      readBaseTemplateFile(`_${filename}`),\n      gitRoot\n        ? Git.isFileGitIgnored({\n            gitRoot,\n            absolutePath: path.join(destinationRoot, filename),\n          })\n        : false,\n    ]);\n\n    // If the file is gitignored and doesn't exist, don't make it\n    if (inputFile === undefined && isGitIgnored) {\n      return { needsChange: false };\n    }\n\n    const data = additionalMapping(\n      inputFile\n        ? mergeWithConfigFile(templateFile, fileType)(inputFile)\n        : templateFile,\n      packageManager,\n    );\n\n    const filepath = path.join(destinationRoot, filename);\n\n    if (mode === 'format') {\n      if (data === inputFile) {\n        return { needsChange: false };\n      }\n\n      await writeFile(filepath, data);\n      return {\n        needsChange: false,\n        msg: `Refreshed ${logger.bold(filename)}.`,\n        filename,\n      };\n    }\n\n    if (data !== inputFile) {\n      return {\n        needsChange: true,\n        msg: `The ${logger.bold(\n          filename,\n        )} file is out of date. Run \\`${logger.bold(\n          packageManager.exec,\n          'skuba',\n          'format',\n        )}\\` to update it.`,\n        filename,\n      };\n    }\n\n    return { needsChange: false };\n  };\n\n  const packageManager = await detectPackageManager(destinationRoot);\n\n  const results = await Promise.all(\n    REFRESHABLE_CONFIG_FILES.map((conf) =>\n      refreshConfigFile(conf, packageManager),\n    ),\n  );\n\n  // Log after for reproducible test output ordering\n  results.forEach((result) => {\n    if (result.msg) {\n      logger.warn(result.msg, logger.dim('refresh-config-files'));\n    }\n  });\n\n  const anyNeedChanging = results.some(({ needsChange }) => needsChange);\n\n  return {\n    ok: !anyNeedChanging,\n    fixable: anyNeedChanging,\n    annotations: results.flatMap(({ needsChange, filename, msg }) =>\n      needsChange && msg\n        ? [\n            {\n              path: filename,\n              message: stripAnsi(msg),\n            },\n          ]\n        : [],\n    ),\n  };\n};\n\nexport const tryRefreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  try {\n    return await refreshConfigFiles(mode, logger);\n  } catch (err) {\n    logger.warn('Failed to refresh config files.');\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;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAA0B;AAC1B,wBAAsB;AAEtB,eAAoB;AAEpB,mBAA4C;AAC5C,4BAGO;AACP,sBAAqC;AACrC,qBAAuC;AACvC,qBAA4C;AAC5C,wBAAoC;AAGpC,MAAM,oBAAoB,CAAC,iBACzB,aACG,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,KAAC,6BAAe,IAAI,CAAC,EACtC,KAAK,IAAI;AAYd,MAAM,uBAAuB,CAAC,aAAqB;AACjD,QAAM,aAAa,SAChB,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,yBAAY,SAAS,KAAK,KAAK,CAAC,CAAC;AAIrD,MAAI,WAAW,SAAS,KAAK,WAAW,MAAM,CAAC,SAAS,KAAK,SAAS,GAAG,CAAC,GAAG;AAC3E,WAAO,SACJ,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,CAAC,yBAAY,SAAS,KAAK,KAAK,CAAC,CAAC,EACnD,KAAK,IAAI;AAAA,EACd;AACA,SAAO;AACT;AAEO,MAAM,2BAAoD;AAAA,EAC/D,EAAE,MAAM,iBAAiB,MAAM,SAAS;AAAA,EACxC;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,IACN,mBAAmB;AAAA,EACrB;AAAA,EACA,EAAE,MAAM,mBAAmB,MAAM,SAAS;AAAA,EAC1C;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,IACN,mBAAmB;AAAA,IACnB,IAAI,CAAC,mBACH,eAAe,YAAY;AAAA,EAC/B;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,IACN,mBAAmB;AAAA,EACrB;AACF;AAEO,MAAM,qBAAqB,OAChC,MACA,WACG;AACH,QAAM,CAAC,UAAU,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC5C,uCAAuB;AAAA,IACvB,aAAI,SAAS,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC;AAAA,EACrC,CAAC;AAED,QAAM,kBAAkB,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAElD,QAAM,0BAAsB,4CAA4B,eAAe;AAEvE,QAAM,oBAAoB,OACxB;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,IACN,oBAAoB,CAAC,MAAM;AAAA,IAC3B,IAAI,YAAY,MAAM;AAAA,EACxB,GACAC,oBACG;AACH,QAAI,CAAC,UAAUA,eAAc,GAAG;AAC9B,aAAO,EAAE,aAAa,MAAM;AAAA,IAC9B;AAEA,UAAM,CAAC,WAAW,cAAc,YAAY,IAAI,MAAM,QAAQ,IAAI;AAAA,MAChE,oBAAoB,QAAQ;AAAA,UAC5B,sCAAqB,IAAI,QAAQ,EAAE;AAAA,MACnC,UACI,aAAI,iBAAiB;AAAA,QACnB;AAAA,QACA,cAAc,YAAAD,QAAK,KAAK,iBAAiB,QAAQ;AAAA,MACnD,CAAC,IACD;AAAA,IACN,CAAC;AAGD,QAAI,cAAc,UAAa,cAAc;AAC3C,aAAO,EAAE,aAAa,MAAM;AAAA,IAC9B;AAEA,UAAM,OAAO;AAAA,MACX,gBACI,uCAAoB,cAAc,QAAQ,EAAE,SAAS,IACrD;AAAA,MACJC;AAAA,IACF;AAEA,UAAM,WAAW,YAAAD,QAAK,KAAK,iBAAiB,QAAQ;AAEpD,QAAI,SAAS,UAAU;AACrB,UAAI,SAAS,WAAW;AACtB,eAAO,EAAE,aAAa,MAAM;AAAA,MAC9B;AAEA,gBAAM,2BAAU,UAAU,IAAI;AAC9B,aAAO;AAAA,QACL,aAAa;AAAA,QACb,KAAK,aAAa,OAAO,KAAK,QAAQ,CAAC;AAAA,QACvC;AAAA,MACF;AAAA,IACF;AAEA,QAAI,SAAS,WAAW;AACtB,aAAO;AAAA,QACL,aAAa;AAAA,QACb,KAAK,OAAO,OAAO;AAAA,UACjB;AAAA,QACF,CAAC,+BAA+B,OAAO;AAAA,UACrCC,gBAAe;AAAA,UACf;AAAA,UACA;AAAA,QACF,CAAC;AAAA,QACD;AAAA,MACF;AAAA,IACF;AAEA,WAAO,EAAE,aAAa,MAAM;AAAA,EAC9B;AAEA,QAAM,iBAAiB,UAAM,4CAAqB,eAAe;AAEjE,QAAM,UAAU,MAAM,QAAQ;AAAA,IAC5B,yBAAyB;AAAA,MAAI,CAAC,SAC5B,kBAAkB,MAAM,cAAc;AAAA,IACxC;AAAA,EACF;AAGA,UAAQ,QAAQ,CAAC,WAAW;AAC1B,QAAI,OAAO,KAAK;AACd,aAAO,KAAK,OAAO,KAAK,OAAO,IAAI,sBAAsB,CAAC;AAAA,IAC5D;AAAA,EACF,CAAC;AAED,QAAM,kBAAkB,QAAQ,KAAK,CAAC,EAAE,YAAY,MAAM,WAAW;AAErE,SAAO;AAAA,IACL,IAAI,CAAC;AAAA,IACL,SAAS;AAAA,IACT,aAAa,QAAQ;AAAA,MAAQ,CAAC,EAAE,aAAa,UAAU,IAAI,MACzD,eAAe,MACX;AAAA,QACE;AAAA,UACE,MAAM;AAAA,UACN,aAAS,kBAAAC,SAAU,GAAG;AAAA,QACxB;AAAA,MACF,IACA,CAAC;AAAA,IACP;AAAA,EACF;AACF;AAEO,MAAM,wBAAwB,OACnC,MACA,WACgC;AAChC,MAAI;AACF,WAAO,MAAM,mBAAmB,MAAM,MAAM;AAAA,EAC9C,SAAS,KAAK;AACZ,WAAO,KAAK,iCAAiC;AAC7C,WAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa,CAAC;AAAA,IAChB;AAAA,EACF;AACF;",
   "names": ["path", "packageManager", "stripAnsi"]
 }

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

@@ -1,6 +1,4 @@
-import type readPkgUp from 'read-pkg-up';
 import type { Logger } from '../../../../utils/logging';
-import { type PackageManagerConfig } from '../../../../utils/packageManager';
 import type { InternalLintResult } from '../../internal';
 export type Patches = Patch[];
 export type Patch = {
@@ -13,11 +11,5 @@ export type PatchReturnType = {
     result: 'skip';
     reason?: string;
 };
-export type PatchConfig = {
-    mode: 'format' | 'lint';
-    manifest: readPkgUp.NormalizedReadResult;
-    packageManager: PackageManagerConfig;
-    dir?: string;
-};
-export type PatchFunction = (config: PatchConfig) => Promise<PatchReturnType>;
+export type PatchFunction = (mode: 'format' | 'lint') => Promise<PatchReturnType>;
 export declare const upgradeSkuba: (mode: 'lint' | 'format', logger: Logger) => Promise<InternalLintResult>;

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

@@ -64,10 +64,9 @@ const resolvePatches = async (version) => {
   throw new Error(`Could not resolve patches for ${version}`);
 };
 const upgradeSkuba = async (mode, logger) => {
-  const [currentVersion, manifest, packageManager] = await Promise.all([
+  const [currentVersion, manifest] = await Promise.all([
     (0, import_version.getSkubaVersion)(),
-    (0, import_manifest.getConsumerManifest)(),
-    (0, import_packageManager.detectPackageManager)()
+    (0, import_manifest.getConsumerManifest)()
   ]);
   if (!manifest) {
     throw new Error("Could not find a package json for this project");
@@ -83,17 +82,12 @@ const upgradeSkuba = async (mode, logger) => {
   }
   if (mode === "lint") {
     const results = await Promise.all(
-      patches.map(
-        async ({ apply }) => await apply({
-          mode,
-          manifest,
-          packageManager
-        })
-      )
+      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,
@@ -116,11 +110,7 @@ const upgradeSkuba = async (mode, logger) => {
   }
   logger.plain("Updating skuba...");
   for (const { apply, description } of patches) {
-    const result = await apply({
-      mode,
-      manifest,
-      packageManager
-    });
+    const result = await apply(mode);
     logger.newline();
     if (result.result === "skip") {
       logger.plain(

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lint/internalLints/upgrade/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport { readdir, writeFile } from 'fs-extra';\nimport type readPkgUp from 'read-pkg-up';\nimport { gte, sort } from 'semver';\n\nimport type { Logger } from '../../../../utils/logging';\nimport { getConsumerManifest } from '../../../../utils/manifest';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../../utils/packageManager';\nimport { getSkubaVersion } from '../../../../utils/version';\nimport { formatPackage } from '../../../configure/processing/package';\nimport type { SkubaPackageJson } from '../../../init/writePackageJson';\nimport type { InternalLintResult } from '../../internal';\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 };\n\nexport type PatchConfig = {\n  mode: 'format' | 'lint';\n  manifest: readPkgUp.NormalizedReadResult;\n  packageManager: PackageManagerConfig;\n  dir?: string;\n};\n\nexport type PatchFunction = (config: PatchConfig) => Promise<PatchReturnType>;\n\nconst getPatches = async (manifestVersion: string): Promise<Patches> => {\n  const patches = await readdir(path.join(__dirname, 'patches'), {\n    withFileTypes: true,\n  });\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.flatMap((patch) =>\n      // Is a directory rather than a JavaScript source file\n      patch.isDirectory() &&\n      // Has been added since the last patch run on the project\n      gte(patch.name, manifestVersion)\n        ? patch.name\n        : [],\n    ),\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, packageManager] = await Promise.all([\n    getSkubaVersion(),\n    getConsumerManifest(),\n    detectPackageManager(),\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(\n        async ({ apply }) =>\n          await apply({\n            mode,\n            manifest,\n            packageManager,\n          }),\n      ),\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    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({\n      mode,\n      manifest,\n      packageManager,\n    });\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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",
+  "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 { formatPackage } from '../../../configure/processing/package';\nimport type { SkubaPackageJson } from '../../../init/writePackageJson';\nimport type { InternalLintResult } from '../../internal';\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    withFileTypes: true,\n  });\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.flatMap((patch) =>\n      // Is a directory rather than a JavaScript source file\n      patch.isDirectory() &&\n      // Has been added since the last patch run on the project\n      gte(patch.name, manifestVersion)\n        ? patch.name\n        : [],\n    ),\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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAmC;AACnC,oBAA0B;AAG1B,sBAAoC;AACpC,4BAAqC;AACrC,qBAAgC;AAChC,qBAA8B;AAgB9B,MAAM,aAAa,OAAO,oBAA8C;AACtE,QAAM,UAAU,UAAM,yBAAQ,YAAAA,QAAK,KAAK,WAAW,SAAS,GAAG;AAAA,IAC7D,eAAe;AAAA,EACjB,CAAC;AAID,QAAM,wBAAoB;AAAA,IACxB,QAAQ;AAAA,MAAQ,CAAC;AAAA;AAAA,QAEf,MAAM,YAAY;AAAA,YAElB,mBAAI,MAAM,MAAM,eAAe,IAC3B,MAAM,OACN,CAAC;AAAA;AAAA,IACP;AAAA,EACF;AAEA,UAAQ,MAAM,QAAQ,IAAI,kBAAkB,IAAI,cAAc,CAAC,GAAG,KAAK;AACzE;AAEA,MAAM,iBAAiB,CAAC,MAAM,IAAI;AAIlC,MAAM,iBAAiB,OAAO,YAAsC;AAClE,aAAW,aAAa,gBAAgB;AACtC,QAAI;AAEF,cAAQ,MAAM,OAAO,aAAa,OAAO,UAAU,SAAS,KAAK;AAAA,IACnE,QAAQ;AAAA,IAER;AAAA,EACF;AACA,QAAM,IAAI,MAAM,iCAAiC,OAAO,EAAE;AAC5D;AAEO,MAAM,eAAe,OAC1B,MACA,WACgC;AAChC,QAAM,CAAC,gBAAgB,QAAQ,IAAI,MAAM,QAAQ,IAAI;AAAA,QACnD,gCAAgB;AAAA,QAChB,qCAAoB;AAAA,EACtB,CAAC;AAED,MAAI,CAAC,UAAU;AACb,UAAM,IAAI,MAAM,gDAAgD;AAAA,EAClE;AAEA,WAAS,YAAY,UAAU,EAAE,SAAS,QAAQ;AAElD,QAAM,kBAAmB,SAAS,YAAY,MAC3C;AAGH,UAAI,mBAAI,iBAAiB,cAAc,GAAG;AACxC,WAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,EACpC;AAEA,QAAM,UAAU,MAAM,WAAW,eAAe;AAEhD,MAAI,QAAQ,WAAW,GAAG;AACxB,WAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,EACpC;AAEA,MAAI,SAAS,QAAQ;AACnB,UAAM,UAAU,MAAM,QAAQ;AAAA,MAC5B,QAAQ,IAAI,OAAO,EAAE,MAAM,MAAM,MAAM,MAAM,IAAI,CAAC;AAAA,IACpD;AAGA,QAAI,QAAQ,MAAM,CAAC,EAAE,OAAO,MAAM,WAAW,MAAM,GAAG;AACpD,aAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,IACpC;AAEA,UAAM,iBAAiB,UAAM,4CAAqB;AAElD,WAAO;AAAA,MACL,mCAAmC,OAAO;AAAA,QACxC,eAAe;AAAA,QACf;AAAA,QACA;AAAA,MACF,CAAC,iBAAiB,OAAO,IAAI,eAAe,CAAC;AAAA,IAC/C;AAEA,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa;AAAA,QACX;AAAA;AAAA;AAAA,UAGE,MAAM,SAAS;AAAA,UACf,SAAS,mCAAmC,eAAe,IAAI;AAAA,QACjE;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO,MAAM,mBAAmB;AAGhC,aAAW,EAAE,OAAO,YAAY,KAAK,SAAS;AAC5C,UAAM,SAAS,MAAM,MAAM,IAAI;AAC/B,WAAO,QAAQ;AACf,QAAI,OAAO,WAAW,QAAQ;AAC5B,aAAO;AAAA,QACL,kBAAkB,WAAW,GAC3B,OAAO,SAAS,MAAM,OAAO,MAAM,KAAK,EAC1C;AAAA,MACF;AAAA,IACF,OAAO;AACL,aAAO,MAAM,kBAAkB,WAAW,EAAE;AAAA,IAC9C;AAAA,EACF;AAEA,EAAC,SAAS,YAAY,MAA2B,UAAU;AAE3D,QAAM,qBAAqB,UAAM,8BAAc,SAAS,WAAW;AAEnE,YAAM,2BAAU,SAAS,MAAM,kBAAkB;AACjD,SAAO,QAAQ;AACf,SAAO,MAAM,wBAAwB;AACrC,SAAO,QAAQ;AAEf,SAAO;AAAA,IACL,IAAI;AAAA,IACJ,SAAS;AAAA,EACX;AACF;",
   "names": ["path"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/addEmptyExports.js

@@ -64,7 +64,7 @@ const addEmptyExports = async (mode) => {
   const results = await Promise.all(JEST_SETUP_FILES.map(addEmptyExport));
   return results.every((result) => result === "skip") ? "skip" : "apply";
 };
-const tryAddEmptyExports = async ({ mode }) => {
+const tryAddEmptyExports = async (mode) => {
   try {
     return { result: await addEmptyExports(mode) };
   } catch (err) {

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/addEmptyExports.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/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 '../../../../../configure/analysis/package';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\nimport { formatPrettier } from '../../../../../configure/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 ({ mode }) => {\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,OAAO,EAAE,KAAK,MAAM;AACnE,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;",
+  "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 '../../../../../configure/analysis/package';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\nimport { formatPrettier } from '../../../../../configure/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/lint/internalLints/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.d.ts

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

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.js

@@ -79,7 +79,7 @@ const moveNpmrcOutOfIgnoreManagedSection = async (mode, dir, fileName) => {
   await import_fs_extra.default.promises.writeFile(import_path.default.join(dir, fileName), newIgnoreFile);
   return { result: "apply" };
 };
-const tryMoveNpmrcOutOfIgnoreManagedSection = (type) => async ({ mode, dir = process.cwd() }) => {
+const tryMoveNpmrcOutOfIgnoreManagedSection = (type) => async (mode, dir = process.cwd()) => {
   try {
     return await moveNpmrcOutOfIgnoreManagedSection(mode, dir, type);
   } catch (err) {

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.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 { NPMRC_LINES } from '../../../../../../utils/npmrc';\nimport { createDestinationFileReader } from '../../../../../configure/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 moveNpmrcOutOfIgnoreManagedSection = async (\n  mode: 'format' | 'lint',\n  dir: string,\n  fileName: '.gitignore' | '.dockerignore',\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const ignoreFile = await readFile(fileName);\n\n  if (!ignoreFile) {\n    return { result: 'skip', reason: `no ${fileName} file found` };\n  }\n\n  let isIgnored: { inManaged: boolean } | undefined;\n  let currentlyInManagedSection = false;\n\n  for (const line of ignoreFile.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 newIgnoreFile =\n    ignoreFile\n      .split('\\n')\n      .filter((line) => !NPMRC_LINES.includes(line.trim()))\n      .join('\\n')\n      .trim() + NPMRC_IGNORE_SECTION;\n\n  await fs.promises.writeFile(path.join(dir, fileName), newIgnoreFile);\n\n  return { result: 'apply' };\n};\n\nexport const tryMoveNpmrcOutOfIgnoreManagedSection = (\n  type: '.gitignore' | '.dockerignore',\n) =>\n  (async ({ mode, dir = process.cwd() }) => {\n    try {\n      return await moveNpmrcOutOfIgnoreManagedSection(mode, dir, type);\n    } catch (err) {\n      log.warn(`Failed to move .npmrc out of ${type} managed sections.`);\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,mBAA4B;AAC5B,qBAA4C;AAE5C,MAAM,uBAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAS7B,MAAM,qCAAqC,OACzC,MACA,KACA,aAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,aAAa,MAAM,SAAS,QAAQ;AAE1C,MAAI,CAAC,YAAY;AACf,WAAO,EAAE,QAAQ,QAAQ,QAAQ,MAAM,QAAQ,cAAc;AAAA,EAC/D;AAEA,MAAI;AACJ,MAAI,4BAA4B;AAEhC,aAAW,QAAQ,WAAW,MAAM,IAAI,GAAG;AACzC,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,gBACJ,WACG,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,CAAC,yBAAY,SAAS,KAAK,KAAK,CAAC,CAAC,EACnD,KAAK,IAAI,EACT,KAAK,IAAI;AAEd,QAAM,gBAAAA,QAAG,SAAS,UAAU,YAAAC,QAAK,KAAK,KAAK,QAAQ,GAAG,aAAa;AAEnE,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,wCAAwC,CACnD,SAEC,OAAO,EAAE,MAAM,MAAM,QAAQ,IAAI,EAAE,MAAM;AACxC,MAAI;AACF,WAAO,MAAM,mCAAmC,MAAM,KAAK,IAAI;AAAA,EACjE,SAAS,KAAK;AACZ,uBAAI,KAAK,gCAAgC,IAAI,oBAAoB;AACjE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "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 { NPMRC_LINES } from '../../../../../../utils/npmrc';\nimport { createDestinationFileReader } from '../../../../../configure/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 moveNpmrcOutOfIgnoreManagedSection = async (\n  mode: 'format' | 'lint',\n  dir: string,\n  fileName: '.gitignore' | '.dockerignore',\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const ignoreFile = await readFile(fileName);\n\n  if (!ignoreFile) {\n    return { result: 'skip', reason: `no ${fileName} file found` };\n  }\n\n  let isIgnored: { inManaged: boolean } | undefined;\n  let currentlyInManagedSection = false;\n\n  for (const line of ignoreFile.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 newIgnoreFile =\n    ignoreFile\n      .split('\\n')\n      .filter((line) => !NPMRC_LINES.includes(line.trim()))\n      .join('\\n')\n      .trim() + NPMRC_IGNORE_SECTION;\n\n  await fs.promises.writeFile(path.join(dir, fileName), newIgnoreFile);\n\n  return { result: 'apply' };\n};\n\nexport const tryMoveNpmrcOutOfIgnoreManagedSection = (\n  type: '.gitignore' | '.dockerignore',\n) =>\n  (async (mode: 'format' | 'lint', dir = process.cwd()) => {\n    try {\n      return await moveNpmrcOutOfIgnoreManagedSection(mode, dir, type);\n    } catch (err) {\n      log.warn(`Failed to move .npmrc out of ${type} managed sections.`);\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,mBAA4B;AAC5B,qBAA4C;AAE5C,MAAM,uBAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAS7B,MAAM,qCAAqC,OACzC,MACA,KACA,aAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,aAAa,MAAM,SAAS,QAAQ;AAE1C,MAAI,CAAC,YAAY;AACf,WAAO,EAAE,QAAQ,QAAQ,QAAQ,MAAM,QAAQ,cAAc;AAAA,EAC/D;AAEA,MAAI;AACJ,MAAI,4BAA4B;AAEhC,aAAW,QAAQ,WAAW,MAAM,IAAI,GAAG;AACzC,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,gBACJ,WACG,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,CAAC,yBAAY,SAAS,KAAK,KAAK,CAAC,CAAC,EACnD,KAAK,IAAI,EACT,KAAK,IAAI;AAEd,QAAM,gBAAAA,QAAG,SAAS,UAAU,YAAAC,QAAK,KAAK,KAAK,QAAQ,GAAG,aAAa;AAEnE,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,wCAAwC,CACnD,SAEC,OAAO,MAAyB,MAAM,QAAQ,IAAI,MAAM;AACvD,MAAI;AACF,WAAO,MAAM,mCAAmC,MAAM,KAAK,IAAI;AAAA,EACjE,SAAS,KAAK;AACZ,uBAAI,KAAK,gCAAgC,IAAI,oBAAoB;AACjE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fs", "path"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/patchDockerfile.js

@@ -55,10 +55,7 @@ const patchDockerfile = async (mode, dir) => {
   await import_fs_extra.default.promises.writeFile(DOCKERFILE_FILENAME, patched);
   return { result: "apply" };
 };
-const tryPatchDockerfile = async ({
-  mode,
-  dir = process.cwd()
-}) => {
+const tryPatchDockerfile = async (mode, dir = process.cwd()) => {
   try {
     return await patchDockerfile(mode, dir);
   } catch (err) {

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/patchDockerfile.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/7.3.1/patchDockerfile.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\n\nconst DOCKERFILE_FILENAME = 'Dockerfile';\n\nconst NON_DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs:(18|20)/g;\nconst DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs(18|20)-debian11/g;\nconst VERSION_DEBIAN_REPLACE = 'gcr.io/distroless/nodejs$1-debian12';\n\nconst patchDockerfile = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const maybeDockerfile = await readFile(DOCKERFILE_FILENAME);\n\n  if (!maybeDockerfile) {\n    return { result: 'skip', reason: 'no Dockerfile found' };\n  }\n\n  const patched = maybeDockerfile\n    .replaceAll(NON_DEBIAN_REGEX, VERSION_DEBIAN_REPLACE)\n    .replaceAll(DEBIAN_REGEX, VERSION_DEBIAN_REPLACE);\n\n  if (patched === maybeDockerfile) {\n    return { result: 'skip' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await fs.promises.writeFile(DOCKERFILE_FILENAME, patched);\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchDockerfile: PatchFunction = async ({\n  mode,\n  dir = process.cwd(),\n}) => {\n  try {\n    return await patchDockerfile(mode, dir);\n  } catch (err) {\n    log.warn('Failed to patch Dockerfile.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,qBAA4C;AAE5C,MAAM,sBAAsB;AAE5B,MAAM,mBAAmB;AACzB,MAAM,eAAe;AACrB,MAAM,yBAAyB;AAE/B,MAAM,kBAAkB,OACtB,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,kBAAkB,MAAM,SAAS,mBAAmB;AAE1D,MAAI,CAAC,iBAAiB;AACpB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,sBAAsB;AAAA,EACzD;AAEA,QAAM,UAAU,gBACb,WAAW,kBAAkB,sBAAsB,EACnD,WAAW,cAAc,sBAAsB;AAElD,MAAI,YAAY,iBAAiB;AAC/B,WAAO,EAAE,QAAQ,OAAO;AAAA,EAC1B;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,gBAAAA,QAAG,SAAS,UAAU,qBAAqB,OAAO;AAExD,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,qBAAoC,OAAO;AAAA,EACtD;AAAA,EACA,MAAM,QAAQ,IAAI;AACpB,MAAM;AACJ,MAAI;AACF,WAAO,MAAM,gBAAgB,MAAM,GAAG;AAAA,EACxC,SAAS,KAAK;AACZ,uBAAI,KAAK,6BAA6B;AACtC,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\n\nconst DOCKERFILE_FILENAME = 'Dockerfile';\n\nconst NON_DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs:(18|20)/g;\nconst DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs(18|20)-debian11/g;\nconst VERSION_DEBIAN_REPLACE = 'gcr.io/distroless/nodejs$1-debian12';\n\nconst patchDockerfile = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const maybeDockerfile = await readFile(DOCKERFILE_FILENAME);\n\n  if (!maybeDockerfile) {\n    return { result: 'skip', reason: 'no Dockerfile found' };\n  }\n\n  const patched = maybeDockerfile\n    .replaceAll(NON_DEBIAN_REGEX, VERSION_DEBIAN_REPLACE)\n    .replaceAll(DEBIAN_REGEX, VERSION_DEBIAN_REPLACE);\n\n  if (patched === maybeDockerfile) {\n    return { result: 'skip' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await fs.promises.writeFile(DOCKERFILE_FILENAME, patched);\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchDockerfile: PatchFunction = async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    return await patchDockerfile(mode, dir);\n  } catch (err) {\n    log.warn('Failed to patch Dockerfile.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,qBAA4C;AAE5C,MAAM,sBAAsB;AAE5B,MAAM,mBAAmB;AACzB,MAAM,eAAe;AACrB,MAAM,yBAAyB;AAE/B,MAAM,kBAAkB,OACtB,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,kBAAkB,MAAM,SAAS,mBAAmB;AAE1D,MAAI,CAAC,iBAAiB;AACpB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,sBAAsB;AAAA,EACzD;AAEA,QAAM,UAAU,gBACb,WAAW,kBAAkB,sBAAsB,EACnD,WAAW,cAAc,sBAAsB;AAElD,MAAI,YAAY,iBAAiB;AAC/B,WAAO,EAAE,QAAQ,OAAO;AAAA,EAC1B;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,gBAAAA,QAAG,SAAS,UAAU,qBAAqB,OAAO;AAExD,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,qBAAoC,OAC/C,MACA,MAAM,QAAQ,IAAI,MACf;AACH,MAAI;AACF,WAAO,MAAM,gBAAgB,MAAM,GAAG;AAAA,EACxC,SAAS,KAAK;AACZ,uBAAI,KAAK,6BAA6B;AACtC,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fs"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/patchServerListener.js

@@ -75,10 +75,7 @@ const patchServerListener = async (mode, dir) => {
   );
   return { result: "apply" };
 };
-const tryPatchServerListener = async ({
-  mode,
-  dir = process.cwd()
-}) => {
+const tryPatchServerListener = async (mode, dir = process.cwd()) => {
   try {
     return await patchServerListener(mode, dir);
   } catch (err) {