skuba 9.0.0-renovate-eslint-9.x-20240811012135 → 9.0.0-renovate-eslint-9.x-20240811034714

package/lib/cli/adapter/eslint.js

@@ -57,10 +57,21 @@ const runESLint = async (mode, logger, overrideConfigFile) => {
   });
   logger.debug("Processing files...");
   const start = process.hrtime.bigint();
-  const [formatter, results] = await Promise.all([
+  const [formatter, { type, results }] = await Promise.all([
     engine.loadFormatter(),
-    engine.lintFiles([])
+    engine.lintFiles([]).then((r) => ({ type: "results", results: r })).catch((error) => {
+      if (error instanceof Error && error.message === "Could not find config file.") {
+        return { type: "no-config", results: void 0 };
+      }
+      throw error;
+    })
   ]);
+  if (type === "no-config") {
+    logger.plain(
+      "skuba could not find an eslint config file. Do you need to run format or configure?"
+    );
+    return { ok: false, fixable: false, errors: [], warnings: [], output: "" };
+  }
   const end = process.hrtime.bigint();
   logger.plain(
     `Processed ${(0, import_logging.pluralise)(results.length, "file")} in ${logger.timing(

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/adapter/eslint.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { type ESLint, type Linter, loadESLint } from 'eslint';\n\nimport { type Logger, pluralise } from '../../utils/logging';\n\nconst symbolForResult = (result: ESLint.LintResult) => {\n  if (result.errorCount) {\n    return chalk.red('\u25CB');\n  }\n\n  return result.warningCount ? chalk.yellow('\u25CD') : chalk.green('\u25CB');\n};\n\nexport interface ESLintResult {\n  messages: Linter.LintMessage[];\n  filePath: string;\n}\n\nexport interface ESLintOutput {\n  errors: ESLintResult[];\n  fixable: boolean;\n  ok: boolean;\n  output: string;\n  warnings: ESLintResult[];\n}\n\nexport const runESLint = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  overrideConfigFile?: string,\n): Promise<ESLintOutput> => {\n  logger.debug('Initialising ESLint...');\n\n  const cwd = process.cwd();\n\n  const ESLint = await loadESLint({ useFlatConfig: true });\n  const engine = new ESLint({\n    cache: true,\n    fix: mode === 'format',\n    overrideConfigFile,\n    overrideConfig: {\n      linterOptions: {\n        reportUnusedDisableDirectives: true,\n      },\n    },\n  });\n\n  logger.debug('Processing files...');\n\n  const start = process.hrtime.bigint();\n\n  const [formatter, results] = await Promise.all([\n    engine.loadFormatter(),\n    engine.lintFiles([]),\n  ]);\n\n  const end = process.hrtime.bigint();\n\n  logger.plain(\n    `Processed ${pluralise(results.length, 'file')} in ${logger.timing(\n      start,\n      end,\n    )}.`,\n  );\n\n  const errors: ESLintResult[] = [];\n  const warnings: ESLintResult[] = [];\n  let fixable = false;\n\n  for (const result of results) {\n    const relativePath = path.relative(cwd, result.filePath);\n    if (result.fixableErrorCount + result.fixableWarningCount) {\n      fixable = true;\n    }\n\n    if (result.errorCount) {\n      errors.push({\n        filePath: relativePath,\n        messages: result.messages,\n      });\n    }\n\n    if (result.warningCount) {\n      warnings.push({\n        filePath: relativePath,\n        messages: result.messages,\n      });\n    }\n\n    logger.debug(symbolForResult(result), relativePath);\n  }\n\n  const ok = errors.length === 0;\n\n  await ESLint.outputFixes(results);\n\n  const output = await formatter.format(results, {\n    cwd,\n    rulesMeta: engine.getRulesMetaForResults(results),\n  });\n\n  if (output) {\n    logger.plain(output);\n  }\n\n  return { errors, fixable, ok, output, warnings };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,oBAAqD;AAErD,qBAAuC;AAEvC,MAAM,kBAAkB,CAAC,WAA8B;AACrD,MAAI,OAAO,YAAY;AACrB,WAAO,aAAAA,QAAM,IAAI,QAAG;AAAA,EACtB;AAEA,SAAO,OAAO,eAAe,aAAAA,QAAM,OAAO,QAAG,IAAI,aAAAA,QAAM,MAAM,QAAG;AAClE;AAeO,MAAM,YAAY,OACvB,MACA,QACA,uBAC0B;AAC1B,SAAO,MAAM,wBAAwB;AAErC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,SAAS,UAAM,0BAAW,EAAE,eAAe,KAAK,CAAC;AACvD,QAAM,SAAS,IAAI,OAAO;AAAA,IACxB,OAAO;AAAA,IACP,KAAK,SAAS;AAAA,IACd;AAAA,IACA,gBAAgB;AAAA,MACd,eAAe;AAAA,QACb,+BAA+B;AAAA,MACjC;AAAA,IACF;AAAA,EACF,CAAC;AAED,SAAO,MAAM,qBAAqB;AAElC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AAEpC,QAAM,CAAC,WAAW,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC7C,OAAO,cAAc;AAAA,IACrB,OAAO,UAAU,CAAC,CAAC;AAAA,EACrB,CAAC;AAED,QAAM,MAAM,QAAQ,OAAO,OAAO;AAElC,SAAO;AAAA,IACL,iBAAa,0BAAU,QAAQ,QAAQ,MAAM,CAAC,OAAO,OAAO;AAAA,MAC1D;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,SAAyB,CAAC;AAChC,QAAM,WAA2B,CAAC;AAClC,MAAI,UAAU;AAEd,aAAW,UAAU,SAAS;AAC5B,UAAM,eAAe,YAAAC,QAAK,SAAS,KAAK,OAAO,QAAQ;AACvD,QAAI,OAAO,oBAAoB,OAAO,qBAAqB;AACzD,gBAAU;AAAA,IACZ;AAEA,QAAI,OAAO,YAAY;AACrB,aAAO,KAAK;AAAA,QACV,UAAU;AAAA,QACV,UAAU,OAAO;AAAA,MACnB,CAAC;AAAA,IACH;AAEA,QAAI,OAAO,cAAc;AACvB,eAAS,KAAK;AAAA,QACZ,UAAU;AAAA,QACV,UAAU,OAAO;AAAA,MACnB,CAAC;AAAA,IACH;AAEA,WAAO,MAAM,gBAAgB,MAAM,GAAG,YAAY;AAAA,EACpD;AAEA,QAAM,KAAK,OAAO,WAAW;AAE7B,QAAM,OAAO,YAAY,OAAO;AAEhC,QAAM,SAAS,MAAM,UAAU,OAAO,SAAS;AAAA,IAC7C;AAAA,IACA,WAAW,OAAO,uBAAuB,OAAO;AAAA,EAClD,CAAC;AAED,MAAI,QAAQ;AACV,WAAO,MAAM,MAAM;AAAA,EACrB;AAEA,SAAO,EAAE,QAAQ,SAAS,IAAI,QAAQ,SAAS;AACjD;",
+  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { type ESLint, type Linter, loadESLint } from 'eslint';\n\nimport { type Logger, pluralise } from '../../utils/logging';\n\nconst symbolForResult = (result: ESLint.LintResult) => {\n  if (result.errorCount) {\n    return chalk.red('\u25CB');\n  }\n\n  return result.warningCount ? chalk.yellow('\u25CD') : chalk.green('\u25CB');\n};\n\nexport interface ESLintResult {\n  messages: Linter.LintMessage[];\n  filePath: string;\n}\n\nexport interface ESLintOutput {\n  errors: ESLintResult[];\n  fixable: boolean;\n  ok: boolean;\n  output: string;\n  warnings: ESLintResult[];\n}\n\nexport const runESLint = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  overrideConfigFile?: string,\n): Promise<ESLintOutput> => {\n  logger.debug('Initialising ESLint...');\n\n  const cwd = process.cwd();\n\n  const ESLint = await loadESLint({ useFlatConfig: true });\n  const engine = new ESLint({\n    cache: true,\n    fix: mode === 'format',\n    overrideConfigFile,\n    overrideConfig: {\n      linterOptions: {\n        reportUnusedDisableDirectives: true,\n      },\n    },\n  });\n\n  logger.debug('Processing files...');\n\n  const start = process.hrtime.bigint();\n\n  const [formatter, { type, results }] = await Promise.all([\n    engine.loadFormatter(),\n    engine\n      .lintFiles([])\n      .then((r) => ({ type: 'results', results: r }) as const)\n      .catch((error) => {\n        if (\n          error instanceof Error &&\n          error.message === 'Could not find config file.'\n        ) {\n          return { type: 'no-config', results: undefined } as const;\n        }\n        throw error;\n      }),\n  ]);\n\n  if (type === 'no-config') {\n    logger.plain(\n      'skuba could not find an eslint config file. Do you need to run format or configure?',\n    );\n    return { ok: false, fixable: false, errors: [], warnings: [], output: '' };\n  }\n\n  const end = process.hrtime.bigint();\n\n  logger.plain(\n    `Processed ${pluralise(results.length, 'file')} in ${logger.timing(\n      start,\n      end,\n    )}.`,\n  );\n\n  const errors: ESLintResult[] = [];\n  const warnings: ESLintResult[] = [];\n  let fixable = false;\n\n  for (const result of results) {\n    const relativePath = path.relative(cwd, result.filePath);\n    if (result.fixableErrorCount + result.fixableWarningCount) {\n      fixable = true;\n    }\n\n    if (result.errorCount) {\n      errors.push({\n        filePath: relativePath,\n        messages: result.messages,\n      });\n    }\n\n    if (result.warningCount) {\n      warnings.push({\n        filePath: relativePath,\n        messages: result.messages,\n      });\n    }\n\n    logger.debug(symbolForResult(result), relativePath);\n  }\n\n  const ok = errors.length === 0;\n\n  await ESLint.outputFixes(results);\n\n  const output = await formatter.format(results, {\n    cwd,\n    rulesMeta: engine.getRulesMetaForResults(results),\n  });\n\n  if (output) {\n    logger.plain(output);\n  }\n\n  return { errors, fixable, ok, output, warnings };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,oBAAqD;AAErD,qBAAuC;AAEvC,MAAM,kBAAkB,CAAC,WAA8B;AACrD,MAAI,OAAO,YAAY;AACrB,WAAO,aAAAA,QAAM,IAAI,QAAG;AAAA,EACtB;AAEA,SAAO,OAAO,eAAe,aAAAA,QAAM,OAAO,QAAG,IAAI,aAAAA,QAAM,MAAM,QAAG;AAClE;AAeO,MAAM,YAAY,OACvB,MACA,QACA,uBAC0B;AAC1B,SAAO,MAAM,wBAAwB;AAErC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,SAAS,UAAM,0BAAW,EAAE,eAAe,KAAK,CAAC;AACvD,QAAM,SAAS,IAAI,OAAO;AAAA,IACxB,OAAO;AAAA,IACP,KAAK,SAAS;AAAA,IACd;AAAA,IACA,gBAAgB;AAAA,MACd,eAAe;AAAA,QACb,+BAA+B;AAAA,MACjC;AAAA,IACF;AAAA,EACF,CAAC;AAED,SAAO,MAAM,qBAAqB;AAElC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AAEpC,QAAM,CAAC,WAAW,EAAE,MAAM,QAAQ,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,IACvD,OAAO,cAAc;AAAA,IACrB,OACG,UAAU,CAAC,CAAC,EACZ,KAAK,CAAC,OAAO,EAAE,MAAM,WAAW,SAAS,EAAE,EAAW,EACtD,MAAM,CAAC,UAAU;AAChB,UACE,iBAAiB,SACjB,MAAM,YAAY,+BAClB;AACA,eAAO,EAAE,MAAM,aAAa,SAAS,OAAU;AAAA,MACjD;AACA,YAAM;AAAA,IACR,CAAC;AAAA,EACL,CAAC;AAED,MAAI,SAAS,aAAa;AACxB,WAAO;AAAA,MACL;AAAA,IACF;AACA,WAAO,EAAE,IAAI,OAAO,SAAS,OAAO,QAAQ,CAAC,GAAG,UAAU,CAAC,GAAG,QAAQ,GAAG;AAAA,EAC3E;AAEA,QAAM,MAAM,QAAQ,OAAO,OAAO;AAElC,SAAO;AAAA,IACL,iBAAa,0BAAU,QAAQ,QAAQ,MAAM,CAAC,OAAO,OAAO;AAAA,MAC1D;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,SAAyB,CAAC;AAChC,QAAM,WAA2B,CAAC;AAClC,MAAI,UAAU;AAEd,aAAW,UAAU,SAAS;AAC5B,UAAM,eAAe,YAAAC,QAAK,SAAS,KAAK,OAAO,QAAQ;AACvD,QAAI,OAAO,oBAAoB,OAAO,qBAAqB;AACzD,gBAAU;AAAA,IACZ;AAEA,QAAI,OAAO,YAAY;AACrB,aAAO,KAAK;AAAA,QACV,UAAU;AAAA,QACV,UAAU,OAAO;AAAA,MACnB,CAAC;AAAA,IACH;AAEA,QAAI,OAAO,cAAc;AACvB,eAAS,KAAK;AAAA,QACZ,UAAU;AAAA,QACV,UAAU,OAAO;AAAA,MACnB,CAAC;AAAA,IACH;AAEA,WAAO,MAAM,gBAAgB,MAAM,GAAG,YAAY;AAAA,EACpD;AAEA,QAAM,KAAK,OAAO,WAAW;AAE7B,QAAM,OAAO,YAAY,OAAO;AAEhC,QAAM,SAAS,MAAM,UAAU,OAAO,SAAS;AAAA,IAC7C;AAAA,IACA,WAAW,OAAO,uBAAuB,OAAO;AAAA,EAClD,CAAC;AAED,MAAI,QAAQ;AACV,WAAO,MAAM,MAAM;AAAA,EACrB;AAEA,SAAO,EAAE,QAAQ,SAAS,IAAI,QAAQ,SAAS;AACjD;",
   "names": ["chalk", "path"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.d.ts

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

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.js

@@ -0,0 +1,95 @@
+"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 collapseDuplicateMergeKeys_exports = {};
+__export(collapseDuplicateMergeKeys_exports, {
+  tryCollapseDuplicateMergeKeys: () => tryCollapseDuplicateMergeKeys
+});
+module.exports = __toCommonJS(collapseDuplicateMergeKeys_exports);
+var import_util = require("util");
+var import_fast_glob = __toESM(require("fast-glob"));
+var import_fs_extra = require("fs-extra");
+var import_logging = require("../../../../../../utils/logging");
+const collapseDuplicateMergeKeys = async ({
+  mode
+}) => {
+  const buildkiteFiles = await (0, import_fast_glob.default)([".buildkite/**/*"], { onlyFiles: true });
+  if (buildkiteFiles.length === 0) {
+    return { result: "skip", reason: "no Buildkite files found" };
+  }
+  const input = await Promise.all(
+    buildkiteFiles.map((name) => (0, import_fs_extra.readFile)(name, "utf-8"))
+  );
+  const replaced = await Promise.all(
+    input.map(collapseDuplicateMergeKeysInFile)
+  );
+  if (replaced.every((r, i) => r === input[i])) {
+    return { result: "skip" };
+  }
+  if (mode === "lint") {
+    return { result: "apply" };
+  }
+  await Promise.all(
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    buildkiteFiles.map((name, i) => (0, import_fs_extra.writeFile)(name, replaced[i]))
+  );
+  return { result: "apply" };
+};
+const collapseDuplicateMergeKeysInFile = (input) => replaceAllUntilStable(
+  input,
+  /^([ \-]*)<<: \[?(\*[^\n\]]+)\]?$\n^( *)<<: \[?(\*[^\n\]]+)\]?$/gm,
+  (match, a, b, c, d) => {
+    if (a.length === c.length) {
+      return `${a}<<: [${b}, ${d}]`;
+    }
+    return match;
+  }
+);
+const replaceAllUntilStable = (input, searchValue, replacer) => {
+  let output = input;
+  let previousOutput;
+  do {
+    previousOutput = output;
+    output = output.replace(searchValue, replacer);
+  } while (output !== previousOutput);
+  return output;
+};
+const tryCollapseDuplicateMergeKeys = async (config) => {
+  try {
+    return await collapseDuplicateMergeKeys(config);
+  } catch (err) {
+    import_logging.log.warn("Failed to collapse duplicate merge keys.");
+    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 = {
+  tryCollapseDuplicateMergeKeys
+});
+//# sourceMappingURL=collapseDuplicateMergeKeys.js.map

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.ts"],
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport { readFile, writeFile } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst collapseDuplicateMergeKeys: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const buildkiteFiles = await fg(['.buildkite/**/*'], { onlyFiles: true });\n\n  if (buildkiteFiles.length === 0) {\n    return { result: 'skip', reason: 'no Buildkite files found' };\n  }\n\n  const input = await Promise.all(\n    buildkiteFiles.map((name) => readFile(name, 'utf-8')),\n  );\n\n  const replaced = await Promise.all(\n    input.map(collapseDuplicateMergeKeysInFile),\n  );\n\n  if (replaced.every((r, i) => r === input[i])) {\n    return { result: 'skip' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await Promise.all(\n    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n    buildkiteFiles.map((name, i) => writeFile(name, replaced[i]!)),\n  );\n\n  return { result: 'apply' };\n};\n\nconst collapseDuplicateMergeKeysInFile = (input: string) =>\n  replaceAllUntilStable(\n    input,\n    /^([ \\-]*)<<: \\[?(\\*[^\\n\\]]+)\\]?$\\n^( *)<<: \\[?(\\*[^\\n\\]]+)\\]?$/gm,\n    (match, a, b, c, d) => {\n      if (a.length === c.length) {\n        return `${a}<<: [${b}, ${d}]`;\n      }\n      return match;\n    },\n  );\n\nconst replaceAllUntilStable = (\n  input: string,\n  searchValue: RegExp,\n  replacer: (substring: string, ...args: string[]) => string,\n): string => {\n  let output = input;\n  let previousOutput;\n\n  do {\n    previousOutput = output;\n    output = output.replace(searchValue, replacer);\n  } while (output !== previousOutput);\n\n  return output;\n};\n\nexport const tryCollapseDuplicateMergeKeys: PatchFunction = async (config) => {\n  try {\n    return await collapseDuplicateMergeKeys(config);\n  } catch (err) {\n    log.warn('Failed to collapse duplicate merge keys.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n\n// TODO: write some tests\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAe;AACf,sBAAoC;AAGpC,qBAAoB;AAEpB,MAAM,6BAA4C,OAAO;AAAA,EACvD;AACF,MAAgC;AAC9B,QAAM,iBAAiB,UAAM,iBAAAA,SAAG,CAAC,iBAAiB,GAAG,EAAE,WAAW,KAAK,CAAC;AAExE,MAAI,eAAe,WAAW,GAAG;AAC/B,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,QAAM,QAAQ,MAAM,QAAQ;AAAA,IAC1B,eAAe,IAAI,CAAC,aAAS,0BAAS,MAAM,OAAO,CAAC;AAAA,EACtD;AAEA,QAAM,WAAW,MAAM,QAAQ;AAAA,IAC7B,MAAM,IAAI,gCAAgC;AAAA,EAC5C;AAEA,MAAI,SAAS,MAAM,CAAC,GAAG,MAAM,MAAM,MAAM,CAAC,CAAC,GAAG;AAC5C,WAAO,EAAE,QAAQ,OAAO;AAAA,EAC1B;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,QAAQ;AAAA;AAAA,IAEZ,eAAe,IAAI,CAAC,MAAM,UAAM,2BAAU,MAAM,SAAS,CAAC,CAAE,CAAC;AAAA,EAC/D;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEA,MAAM,mCAAmC,CAAC,UACxC;AAAA,EACE;AAAA,EACA;AAAA,EACA,CAAC,OAAO,GAAG,GAAG,GAAG,MAAM;AACrB,QAAI,EAAE,WAAW,EAAE,QAAQ;AACzB,aAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;AAAA,IAC5B;AACA,WAAO;AAAA,EACT;AACF;AAEF,MAAM,wBAAwB,CAC5B,OACA,aACA,aACW;AACX,MAAI,SAAS;AACb,MAAI;AAEJ,KAAG;AACD,qBAAiB;AACjB,aAAS,OAAO,QAAQ,aAAa,QAAQ;AAAA,EAC/C,SAAS,WAAW;AAEpB,SAAO;AACT;AAEO,MAAM,gCAA+C,OAAO,WAAW;AAC5E,MAAI;AACF,WAAO,MAAM,2BAA2B,MAAM;AAAA,EAChD,SAAS,KAAK;AACZ,uBAAI,KAAK,0CAA0C;AACnD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "names": ["fg"]
+}

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

@@ -21,8 +21,13 @@ __export(__exports, {
   patches: () => patches
 });
 module.exports = __toCommonJS(__exports);
+var import_collapseDuplicateMergeKeys = require("./collapseDuplicateMergeKeys");
 var import_upgradeESLint = require("./upgradeESLint");
 const patches = [
+  {
+    apply: import_collapseDuplicateMergeKeys.tryCollapseDuplicateMergeKeys,
+    description: "Collapse duplicate merge keys in .buildkite files"
+  },
   {
     apply: import_upgradeESLint.tryUpgradeESLint,
     description: "Upgrade to ESLint flat config"

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/index.ts"],
-  "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryUpgradeESLint } from './upgradeESLint';\n\nexport const patches: Patches = [\n  {\n    apply: tryUpgradeESLint,\n    description: 'Upgrade to ESLint flat config',\n  },\n];\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,2BAAiC;AAE1B,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
+  "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryCollapseDuplicateMergeKeys } from './collapseDuplicateMergeKeys';\nimport { tryUpgradeESLint } from './upgradeESLint';\n\nexport const patches: Patches = [\n  {\n    apply: tryCollapseDuplicateMergeKeys,\n    description: 'Collapse duplicate merge keys in .buildkite files',\n  },\n  {\n    apply: tryUpgradeESLint,\n    description: 'Upgrade to ESLint flat config',\n  },\n];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,wCAA8C;AAC9C,2BAAiC;AAE1B,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
   "names": []
 }

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/upgradeESLint.js

@@ -25,40 +25,61 @@ var import_util = require("util");
 var import_fs_extra = require("fs-extra");
 var import_exec = require("../../../../../../utils/exec");
 var import_logging = require("../../../../../../utils/logging");
+var import_project = require("../../../../../configure/analysis/project");
 var import_configFile = require("../../../../../configure/processing/configFile");
 const upgradeESLint = async ({
-  mode
+  mode,
+  dir = process.cwd()
 }) => {
-  let originalIgnoreContents;
-  try {
-    originalIgnoreContents = await (0, import_fs_extra.readFile)(".eslintignore", "utf8");
-  } catch (err) {
-    if (typeof err === "object" && err !== null && "code" in err && err.code === "ENOENT") {
-      return { result: "skip", reason: "already migrated" };
-    }
-    throw err;
+  const readFile = (0, import_project.createDestinationFileReader)(dir);
+  const originalIgnoreContents = await readFile(".eslintignore");
+  if (originalIgnoreContents === null) {
+    return { result: "skip", reason: "already migrated" };
   }
   if (mode === "lint") {
     return { result: "apply" };
   }
-  await (0, import_fs_extra.writeFile)(
-    ".eslintignore",
-    (0, import_configFile.mergeWithConfigFile)("", "ignore")(originalIgnoreContents)
-  );
+  const merged = (0, import_configFile.mergeWithConfigFile)("", "ignore")(originalIgnoreContents);
+  let deletedIgnoreFile = false;
+  if (merged.trim().length === 0) {
+    await (0, import_fs_extra.rm)(".eslintignore");
+    deletedIgnoreFile = true;
+  } else {
+    await (0, import_fs_extra.writeFile)(".eslintignore", merged);
+  }
   const exec = (0, import_exec.createExec)({
     cwd: process.cwd(),
     stdio: "ignore"
   });
   await exec("eslint-migrate-config", ".eslintrc.js", "--commonjs");
-  const output = await (0, import_fs_extra.readFile)("eslint.config.cjs", "utf8");
+  const output = fiddleWithOutput(await readFile("eslint.config.cjs") ?? "");
   await (0, import_fs_extra.writeFile)("eslint.config.js", output);
   await Promise.all([
-    (0, import_fs_extra.rm)(".eslintignore"),
+    deletedIgnoreFile ? Promise.resolve() : (0, import_fs_extra.rm)(".eslintignore"),
     (0, import_fs_extra.rm)("eslint.config.cjs"),
     (0, import_fs_extra.rm)(".eslintrc.js")
   ]);
   return { result: "apply" };
 };
+const fiddleWithOutput = (input) => {
+  let output = input.replace(/compat.extends\(["']skuba["']\)/, "skuba");
+  if (!output.includes("eslint-config-skuba")) {
+    output = `const skuba = require('eslint-config-skuba');
+
+${output}`;
+  }
+  if (!output.includes("compat.")) {
+    output = output.replace(/const compat = new FlatCompat\(\{[^}]+\}\);/m, "");
+    output = output.replace(
+      /const \{\s*FlatCompat,?\s*\}\s*=\s*require\(["']@eslint\/eslintrc["']\);/m,
+      ""
+    );
+  }
+  if (!output.includes("js.")) {
+    output = output.replace(/const js = require\(['"]@eslint\/js['"]\);/, "");
+  }
+  return output;
+};
 const tryUpgradeESLint = async (config) => {
   try {
     return await upgradeESLint(config);

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/upgradeESLint.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/upgradeESLint.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport { readFile, rm, writeFile } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { createExec } from '../../../../../../utils/exec';\nimport { log } from '../../../../../../utils/logging';\nimport { mergeWithConfigFile } from '../../../../../configure/processing/configFile';\n\nconst upgradeESLint: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  let originalIgnoreContents;\n\n  try {\n    originalIgnoreContents = await readFile('.eslintignore', 'utf8');\n  } catch (err) {\n    if (\n      typeof err === 'object' &&\n      err !== null &&\n      'code' in err &&\n      err.code === 'ENOENT'\n    ) {\n      return { result: 'skip', reason: 'already migrated' };\n    }\n\n    throw err;\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  // Remove managed section of .eslintignore\n  await writeFile(\n    '.eslintignore',\n    mergeWithConfigFile('', 'ignore')(originalIgnoreContents),\n  );\n\n  const exec = createExec({\n    cwd: process.cwd(),\n    stdio: 'ignore',\n  });\n\n  await exec('eslint-migrate-config', '.eslintrc.js', '--commonjs');\n\n  const output = await readFile('eslint.config.cjs', 'utf8');\n  await writeFile('eslint.config.js', output);\n\n  await Promise.all([\n    rm('.eslintignore'),\n    rm('eslint.config.cjs'),\n    rm('.eslintrc.js'),\n  ]);\n\n  return { result: 'apply' };\n};\n\nexport const tryUpgradeESLint: PatchFunction = async (config) => {\n  try {\n    return await upgradeESLint(config);\n  } catch (err) {\n    log.warn('Failed to upgrade ESLint to flag config.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n\n// TODO: write some tests\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,sBAAwC;AAGxC,kBAA2B;AAC3B,qBAAoB;AACpB,wBAAoC;AAEpC,MAAM,gBAA+B,OAAO;AAAA,EAC1C;AACF,MAAgC;AAC9B,MAAI;AAEJ,MAAI;AACF,6BAAyB,UAAM,0BAAS,iBAAiB,MAAM;AAAA,EACjE,SAAS,KAAK;AACZ,QACE,OAAO,QAAQ,YACf,QAAQ,QACR,UAAU,OACV,IAAI,SAAS,UACb;AACA,aAAO,EAAE,QAAQ,QAAQ,QAAQ,mBAAmB;AAAA,IACtD;AAEA,UAAM;AAAA,EACR;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAGA,YAAM;AAAA,IACJ;AAAA,QACA,uCAAoB,IAAI,QAAQ,EAAE,sBAAsB;AAAA,EAC1D;AAEA,QAAM,WAAO,wBAAW;AAAA,IACtB,KAAK,QAAQ,IAAI;AAAA,IACjB,OAAO;AAAA,EACT,CAAC;AAED,QAAM,KAAK,yBAAyB,gBAAgB,YAAY;AAEhE,QAAM,SAAS,UAAM,0BAAS,qBAAqB,MAAM;AACzD,YAAM,2BAAU,oBAAoB,MAAM;AAE1C,QAAM,QAAQ,IAAI;AAAA,QAChB,oBAAG,eAAe;AAAA,QAClB,oBAAG,mBAAmB;AAAA,QACtB,oBAAG,cAAc;AAAA,EACnB,CAAC;AAED,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,mBAAkC,OAAO,WAAW;AAC/D,MAAI;AACF,WAAO,MAAM,cAAc,MAAM;AAAA,EACnC,SAAS,KAAK;AACZ,uBAAI,KAAK,0CAA0C;AACnD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { rm, writeFile } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { createExec } from '../../../../../../utils/exec';\nimport { log } from '../../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\nimport { mergeWithConfigFile } from '../../../../../configure/processing/configFile';\n\nconst upgradeESLint: PatchFunction = async ({\n  mode,\n  dir = process.cwd(),\n}): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n  const originalIgnoreContents = await readFile('.eslintignore');\n\n  if (originalIgnoreContents === null) {\n    return { result: 'skip', reason: 'already migrated' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  // Remove managed section of .eslintignore\n  const merged = mergeWithConfigFile('', 'ignore')(originalIgnoreContents);\n  let deletedIgnoreFile = false;\n  if (merged.trim().length === 0) {\n    await rm('.eslintignore');\n    deletedIgnoreFile = true;\n  } else {\n    await writeFile('.eslintignore', merged);\n  }\n\n  const exec = createExec({\n    cwd: process.cwd(),\n    stdio: 'ignore',\n  });\n\n  await exec('eslint-migrate-config', '.eslintrc.js', '--commonjs');\n\n  const output = fiddleWithOutput((await readFile('eslint.config.cjs')) ?? '');\n  await writeFile('eslint.config.js', output);\n\n  await Promise.all([\n    deletedIgnoreFile ? Promise.resolve() : rm('.eslintignore'),\n    rm('eslint.config.cjs'),\n    rm('.eslintrc.js'),\n  ]);\n\n  return { result: 'apply' };\n};\n\nconst fiddleWithOutput = (input: string) => {\n  let output = input.replace(/compat.extends\\([\"']skuba[\"']\\)/, 'skuba');\n\n  if (!output.includes('eslint-config-skuba')) {\n    output = `const skuba = require('eslint-config-skuba');\\n\\n${output}`;\n  }\n\n  if (!output.includes('compat.')) {\n    output = output.replace(/const compat = new FlatCompat\\(\\{[^}]+\\}\\);/m, '');\n    output = output.replace(\n      /const \\{\\s*FlatCompat,?\\s*\\}\\s*=\\s*require\\([\"']@eslint\\/eslintrc[\"']\\);/m,\n      '',\n    );\n  }\n\n  if (!output.includes('js.')) {\n    output = output.replace(/const js = require\\(['\"]@eslint\\/js['\"]\\);/, '');\n  }\n\n  return output;\n};\n\nexport const tryUpgradeESLint: PatchFunction = async (config) => {\n  try {\n    return await upgradeESLint(config);\n  } catch (err) {\n    log.warn('Failed to upgrade ESLint to flag config.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n\n// TODO: write some tests\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,sBAA8B;AAG9B,kBAA2B;AAC3B,qBAAoB;AACpB,qBAA4C;AAC5C,wBAAoC;AAEpC,MAAM,gBAA+B,OAAO;AAAA,EAC1C;AAAA,EACA,MAAM,QAAQ,IAAI;AACpB,MAAgC;AAC9B,QAAM,eAAW,4CAA4B,GAAG;AAChD,QAAM,yBAAyB,MAAM,SAAS,eAAe;AAE7D,MAAI,2BAA2B,MAAM;AACnC,WAAO,EAAE,QAAQ,QAAQ,QAAQ,mBAAmB;AAAA,EACtD;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAGA,QAAM,aAAS,uCAAoB,IAAI,QAAQ,EAAE,sBAAsB;AACvE,MAAI,oBAAoB;AACxB,MAAI,OAAO,KAAK,EAAE,WAAW,GAAG;AAC9B,cAAM,oBAAG,eAAe;AACxB,wBAAoB;AAAA,EACtB,OAAO;AACL,cAAM,2BAAU,iBAAiB,MAAM;AAAA,EACzC;AAEA,QAAM,WAAO,wBAAW;AAAA,IACtB,KAAK,QAAQ,IAAI;AAAA,IACjB,OAAO;AAAA,EACT,CAAC;AAED,QAAM,KAAK,yBAAyB,gBAAgB,YAAY;AAEhE,QAAM,SAAS,iBAAkB,MAAM,SAAS,mBAAmB,KAAM,EAAE;AAC3E,YAAM,2BAAU,oBAAoB,MAAM;AAE1C,QAAM,QAAQ,IAAI;AAAA,IAChB,oBAAoB,QAAQ,QAAQ,QAAI,oBAAG,eAAe;AAAA,QAC1D,oBAAG,mBAAmB;AAAA,QACtB,oBAAG,cAAc;AAAA,EACnB,CAAC;AAED,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEA,MAAM,mBAAmB,CAAC,UAAkB;AAC1C,MAAI,SAAS,MAAM,QAAQ,mCAAmC,OAAO;AAErE,MAAI,CAAC,OAAO,SAAS,qBAAqB,GAAG;AAC3C,aAAS;AAAA;AAAA,EAAoD,MAAM;AAAA,EACrE;AAEA,MAAI,CAAC,OAAO,SAAS,SAAS,GAAG;AAC/B,aAAS,OAAO,QAAQ,gDAAgD,EAAE;AAC1E,aAAS,OAAO;AAAA,MACd;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,MAAI,CAAC,OAAO,SAAS,KAAK,GAAG;AAC3B,aAAS,OAAO,QAAQ,8CAA8C,EAAE;AAAA,EAC1E;AAEA,SAAO;AACT;AAEO,MAAM,mBAAkC,OAAO,WAAW;AAC/D,MAAI;AACF,WAAO,MAAM,cAAc,MAAM;AAAA,EACnC,SAAS,KAAK;AACZ,uBAAI,KAAK,0CAA0C;AACnD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "9.0.0-renovate-eslint-9.x-20240811012135",
+  "version": "9.0.0-renovate-eslint-9.x-20240811034714",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -101,7 +101,7 @@
     "typescript": "~5.5.4",
     "validate-npm-package-name": "^5.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.0.0-renovate-eslint-9.x-20240811012135"
+    "eslint-config-skuba": "5.0.0-renovate-eslint-9.x-20240811034714"
   },
   "devDependencies": {
     "@changesets/cli": "2.27.7",

package/template/greeter/package.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "skuba": "9.0.0-renovate-eslint-9.x-20240811012135"
+    "skuba": "9.0.0-renovate-eslint-9.x-20240811034714"
   },
   "packageManager": "pnpm@9.6.0",
   "engines": {

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

@@ -27,7 +27,7 @@
     "aws-cdk-lib": "^2.109.0",
     "constructs": "^10.0.17",
     "pino-pretty": "^11.0.0",
-    "skuba": "9.0.0-renovate-eslint-9.x-20240811012135"
+    "skuba": "9.0.0-renovate-eslint-9.x-20240811034714"
   },
   "packageManager": "pnpm@9.6.0",
   "engines": {