skuba 14.0.0-migrate-to-inquirer-20251031055743 → 14.0.0-replace-global-vars-20251117052457

package/lib/cli/configure/modules/jest.js

@@ -1,86 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var jest_exports = {};
-__export(jest_exports, {
-  jestModule: () => jestModule
-});
-module.exports = __toCommonJS(jest_exports);
-var import_template = require("../../../utils/template.js");
-var import_deleteFiles = require("../processing/deleteFiles.js");
-var import_package = require("../processing/package.js");
-var import_typescript = require("../processing/typescript.js");
-const OUTDATED_ISOLATED_MODULES_CONFIG_SNIPPETS = [
-  `
-  globals: {
-    'ts-jest': {
-      // seek-oss/skuba#626
-      isolatedModules: true,
-    },
-  },`,
-  `
-  globals: {
-    'ts-jest': {
-      isolatedModules: true,
-    },
-  },`
-];
-const filterProps = (0, import_typescript.createPropFilter)([
-  "collectCoverageFrom",
-  "coverageThreshold",
-  "globalSetup",
-  "globalTeardown",
-  "setupFiles",
-  "setupFilesAfterEnv"
-]);
-const jestModule = async () => {
-  const [configFile, setupFile] = await Promise.all([
-    (0, import_template.readBaseTemplateFile)("jest.config.ts"),
-    (0, import_template.readBaseTemplateFile)("jest.setup.ts")
-  ]);
-  return {
-    ...(0, import_deleteFiles.deleteFiles)("jest.config.js", "jest.setup.js"),
-    "jest.config.ts": async (tsFile, currentFiles, initialFiles) => {
-      if (tsFile?.includes("skuba")) {
-        return OUTDATED_ISOLATED_MODULES_CONFIG_SNIPPETS.reduce(
-          (acc, snippet) => acc.replace(snippet, ""),
-          tsFile
-        );
-      }
-      const jsFile = initialFiles["jest.config.js"];
-      if (jsFile?.includes("skuba")) {
-        return (0, import_typescript.transformModuleImportsAndExports)(jsFile, (_, p) => p);
-      }
-      currentFiles["jest.setup.ts"] ??= initialFiles["jest.setup.js"] ?? setupFile;
-      const inputFile = tsFile ?? jsFile;
-      const props = inputFile === void 0 ? void 0 : await (0, import_typescript.readModuleExports)(inputFile);
-      if (props === void 0) {
-        return configFile;
-      }
-      const filteredProps = filterProps(null, props);
-      const appendProps = (0, import_typescript.createPropAppender)(filteredProps);
-      return (0, import_typescript.transformModuleImportsAndExports)(configFile, appendProps);
-    },
-    "package.json": (0, import_package.withPackage)(({ jest, ...data }) => data)
-  };
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  jestModule
-});
-//# sourceMappingURL=jest.js.map

package/lib/cli/configure/modules/jest.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/cli/configure/modules/jest.ts"],
-  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template.js';\nimport { deleteFiles } from '../processing/deleteFiles.js';\nimport { withPackage } from '../processing/package.js';\nimport {\n  createPropAppender,\n  createPropFilter,\n  readModuleExports,\n  transformModuleImportsAndExports,\n} from '../processing/typescript.js';\nimport type { Module } from '../types.js';\n\nconst OUTDATED_ISOLATED_MODULES_CONFIG_SNIPPETS = [\n  `\n  globals: {\n    'ts-jest': {\n      // seek-oss/skuba#626\n      isolatedModules: true,\n    },\n  },`,\n  `\n  globals: {\n    'ts-jest': {\n      isolatedModules: true,\n    },\n  },`,\n];\n\n// Jest options to preserve during migration\nconst filterProps = createPropFilter([\n  'collectCoverageFrom',\n  'coverageThreshold',\n  'globalSetup',\n  'globalTeardown',\n  'setupFiles',\n  'setupFilesAfterEnv',\n]);\n\nexport const jestModule = async (): Promise<Module> => {\n  const [configFile, setupFile] = await Promise.all([\n    readBaseTemplateFile('jest.config.ts'),\n    readBaseTemplateFile('jest.setup.ts'),\n  ]);\n\n  return {\n    ...deleteFiles('jest.config.js', 'jest.setup.js'),\n\n    'jest.config.ts': async (tsFile, currentFiles, initialFiles) => {\n      // Allow customised TS Jest config that extends skuba\n      if (tsFile?.includes('skuba')) {\n        return OUTDATED_ISOLATED_MODULES_CONFIG_SNIPPETS.reduce(\n          (acc, snippet) => acc.replace(snippet, ''),\n          tsFile,\n        );\n      }\n\n      const jsFile = initialFiles['jest.config.js'];\n\n      // Migrate a JS config that extends skuba, retaining all existing props\n      if (jsFile?.includes('skuba')) {\n        return transformModuleImportsAndExports(jsFile, (_, p) => p);\n      }\n\n      currentFiles['jest.setup.ts'] ??=\n        initialFiles['jest.setup.js'] ?? setupFile;\n\n      const inputFile = tsFile ?? jsFile;\n\n      const props =\n        inputFile === undefined\n          ? undefined\n          : await readModuleExports(inputFile);\n\n      if (props === undefined) {\n        return configFile;\n      }\n\n      const filteredProps = filterProps(null, props);\n\n      const appendProps = createPropAppender(filteredProps);\n\n      // Append a subset of custom props to our base `jest.config.ts`\n      return transformModuleImportsAndExports(configFile, appendProps);\n    },\n\n    'package.json': withPackage(({ jest, ...data }) => data),\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,yBAA4B;AAC5B,qBAA4B;AAC5B,wBAKO;AAGP,MAAM,4CAA4C;AAAA,EAChD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMF;AAGA,MAAM,kBAAc,oCAAiB;AAAA,EACnC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAEM,MAAM,aAAa,YAA6B;AACrD,QAAM,CAAC,YAAY,SAAS,IAAI,MAAM,QAAQ,IAAI;AAAA,QAChD,sCAAqB,gBAAgB;AAAA,QACrC,sCAAqB,eAAe;AAAA,EACtC,CAAC;AAED,SAAO;AAAA,IACL,OAAG,gCAAY,kBAAkB,eAAe;AAAA,IAEhD,kBAAkB,OAAO,QAAQ,cAAc,iBAAiB;AAE9D,UAAI,QAAQ,SAAS,OAAO,GAAG;AAC7B,eAAO,0CAA0C;AAAA,UAC/C,CAAC,KAAK,YAAY,IAAI,QAAQ,SAAS,EAAE;AAAA,UACzC;AAAA,QACF;AAAA,MACF;AAEA,YAAM,SAAS,aAAa,gBAAgB;AAG5C,UAAI,QAAQ,SAAS,OAAO,GAAG;AAC7B,mBAAO,oDAAiC,QAAQ,CAAC,GAAG,MAAM,CAAC;AAAA,MAC7D;AAEA,mBAAa,eAAe,MAC1B,aAAa,eAAe,KAAK;AAEnC,YAAM,YAAY,UAAU;AAE5B,YAAM,QACJ,cAAc,SACV,SACA,UAAM,qCAAkB,SAAS;AAEvC,UAAI,UAAU,QAAW;AACvB,eAAO;AAAA,MACT;AAEA,YAAM,gBAAgB,YAAY,MAAM,KAAK;AAE7C,YAAM,kBAAc,sCAAmB,aAAa;AAGpD,iBAAO,oDAAiC,YAAY,WAAW;AAAA,IACjE;AAAA,IAEA,oBAAgB,4BAAY,CAAC,EAAE,MAAM,GAAG,KAAK,MAAM,IAAI;AAAA,EACzD;AACF;",
-  "names": []
-}

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

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

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

@@ -1,144 +0,0 @@
-"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 upgradeESLint_exports = {};
-__export(upgradeESLint_exports, {
-  tryUpgradeESLint: () => tryUpgradeESLint
-});
-module.exports = __toCommonJS(upgradeESLint_exports);
-var fsp = __toESM(require("fs/promises"));
-var import_path = __toESM(require("path"));
-var import_util = require("util");
-var import_fs_extra = __toESM(require("fs-extra"));
-var import_exec = require("../../../../../../utils/exec.js");
-var import_logging = require("../../../../../../utils/logging.js");
-var import_project = require("../../../../../configure/analysis/project.js");
-var import_configFile = require("../../../../../configure/processing/configFile.js");
-var import_prettier = require("../../../../../configure/processing/prettier.js");
-const IGNORE_FILE = ".eslintignore";
-const OLD_CONFIG_FILE = ".eslintrc.js";
-const NEW_CONFIG_FILE_CJS = "eslint.config.cjs";
-const NEW_CONFIG_FILE_JS = "eslint.config.js";
-const upgradeESLint = async ({
-  mode,
-  dir: cwd = process.cwd()
-}) => {
-  const readFile = (0, import_project.createDestinationFileReader)(cwd);
-  const [ignoreFileContents, oldConfig] = await Promise.all([
-    readFile(IGNORE_FILE),
-    readFile(OLD_CONFIG_FILE)
-  ]);
-  if (oldConfig === void 0) {
-    return {
-      result: "skip",
-      reason: `no ${OLD_CONFIG_FILE} - have you already migrated?`
-    };
-  }
-  if (mode === "lint") {
-    return { result: "apply" };
-  }
-  const ignoreContentsWithoutSkubaManaged = (0, import_configFile.mergeWithConfigFile)(
-    "",
-    "ignore"
-  )(ignoreFileContents);
-  const exec = (0, import_exec.createExec)({
-    cwd: process.cwd(),
-    stdio: "ignore"
-  });
-  const dir = await writeTemporaryFiles({
-    [OLD_CONFIG_FILE]: oldConfig,
-    ...ignoreContentsWithoutSkubaManaged.trim().length > 0 ? { [IGNORE_FILE]: ignoreContentsWithoutSkubaManaged } : {}
-  });
-  try {
-    await exec(
-      "eslint-migrate-config",
-      import_path.default.join(dir, OLD_CONFIG_FILE),
-      "--commonjs"
-    );
-    const output = fiddleWithOutput(
-      await fsp.readFile(import_path.default.join(dir, NEW_CONFIG_FILE_CJS), "utf-8")
-    );
-    await import_fs_extra.default.promises.writeFile(
-      NEW_CONFIG_FILE_JS,
-      await (0, import_prettier.formatPrettier)(output, { filepath: NEW_CONFIG_FILE_JS })
-    );
-    await Promise.all([
-      ignoreFileContents === void 0 ? Promise.resolve() : import_fs_extra.default.promises.rm(IGNORE_FILE),
-      import_fs_extra.default.promises.rm(OLD_CONFIG_FILE)
-    ]);
-    return { result: "apply" };
-  } finally {
-    await fsp.rm(dir, { recursive: true });
-  }
-};
-const writeTemporaryFiles = async (contents) => {
-  const dir = await fsp.mkdtemp("eslint-migrate-config");
-  await Promise.all(
-    Object.entries(contents).map(
-      async ([file, content]) => fsp.writeFile(import_path.default.join(dir, file), content)
-    )
-  );
-  return dir;
-};
-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['"]\);/, "");
-  }
-  output = output.replace(
-    /^const skuba = require\('eslint-config-skuba'\);\s*module.exports = \[...skuba\];$/m,
-    "module.exports = require('eslint-config-skuba');"
-  );
-  return output;
-};
-const tryUpgradeESLint = async (config) => {
-  try {
-    return await upgradeESLint(config);
-  } catch (err) {
-    import_logging.log.warn("Failed to upgrade ESLint to flat config.");
-    import_logging.log.subtle((0, import_util.inspect)(err));
-    return { result: "skip", reason: "due to an error" };
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  tryUpgradeESLint
-});
-//# sourceMappingURL=upgradeESLint.js.map

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

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/upgradeESLint.ts"],
-  "sourcesContent": ["// eslint-disable-next-line no-restricted-imports -- fs-extra is mocked\nimport * as fsp from 'fs/promises';\nimport path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport { createExec } from '../../../../../../utils/exec.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project.js';\nimport { mergeWithConfigFile } from '../../../../../configure/processing/configFile.js';\nimport { formatPrettier } from '../../../../../configure/processing/prettier.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst IGNORE_FILE = '.eslintignore';\nconst OLD_CONFIG_FILE = '.eslintrc.js';\nconst NEW_CONFIG_FILE_CJS = 'eslint.config.cjs';\nconst NEW_CONFIG_FILE_JS = 'eslint.config.js';\n\nconst upgradeESLint: PatchFunction = async ({\n  mode,\n  dir: cwd = process.cwd(),\n}): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(cwd);\n  const [ignoreFileContents, oldConfig] = await Promise.all([\n    readFile(IGNORE_FILE),\n    readFile(OLD_CONFIG_FILE),\n  ]);\n\n  if (oldConfig === undefined) {\n    return {\n      result: 'skip',\n      reason: `no ${OLD_CONFIG_FILE} - have you already migrated?`,\n    };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  const ignoreContentsWithoutSkubaManaged = mergeWithConfigFile(\n    '',\n    'ignore',\n  )(ignoreFileContents);\n\n  const exec = createExec({\n    cwd: process.cwd(),\n    stdio: 'ignore',\n  });\n\n  // eslint-migrate-config require()s the file, so for testability, put it in a temporary location\n  const dir = await writeTemporaryFiles({\n    [OLD_CONFIG_FILE]: oldConfig,\n    ...(ignoreContentsWithoutSkubaManaged.trim().length > 0\n      ? { [IGNORE_FILE]: ignoreContentsWithoutSkubaManaged }\n      : {}),\n  });\n  try {\n    await exec(\n      'eslint-migrate-config',\n      path.join(dir, OLD_CONFIG_FILE),\n      '--commonjs',\n    );\n\n    const output = fiddleWithOutput(\n      await fsp.readFile(path.join(dir, NEW_CONFIG_FILE_CJS), 'utf-8'),\n    );\n    await fs.promises.writeFile(\n      NEW_CONFIG_FILE_JS,\n      await formatPrettier(output, { filepath: NEW_CONFIG_FILE_JS }),\n    );\n\n    await Promise.all([\n      ignoreFileContents === undefined\n        ? Promise.resolve()\n        : fs.promises.rm(IGNORE_FILE),\n      fs.promises.rm(OLD_CONFIG_FILE),\n    ]);\n\n    return { result: 'apply' };\n  } finally {\n    await fsp.rm(dir, { recursive: true });\n  }\n};\n\nconst writeTemporaryFiles = async (contents: Record<string, string>) => {\n  const dir = await fsp.mkdtemp('eslint-migrate-config');\n\n  await Promise.all(\n    Object.entries(contents).map(async ([file, content]) =>\n      fsp.writeFile(path.join(dir, file), content),\n    ),\n  );\n\n  return dir;\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  output = output.replace(\n    /^const skuba = require\\('eslint-config-skuba'\\);\\s*module.exports = \\[...skuba\\];$/m,\n    \"module.exports = require('eslint-config-skuba');\",\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 flat config.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": "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",
-  "names": ["path", "fs"]
-}

package/lib/cli/test/reporters/github/annotations.d.ts

@@ -1,9 +0,0 @@
-import type { TestResult } from '@jest/test-result';
-import type * as GitHub from '@skuba-lib/api/github';
-export declare const createAnnotations: (testResults: TestResult[]) => GitHub.Annotation[];
-interface AnnotationEntry {
-    annotations: GitHub.Annotation[];
-    displayName: string | undefined;
-}
-export declare const generateAnnotationEntries: (testResults: TestResult[]) => AnnotationEntry[];
-export {};

package/lib/cli/test/reporters/github/annotations.js

@@ -1,102 +0,0 @@
-"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 annotations_exports = {};
-__export(annotations_exports, {
-  createAnnotations: () => createAnnotations,
-  generateAnnotationEntries: () => generateAnnotationEntries
-});
-module.exports = __toCommonJS(annotations_exports);
-var import_path = __toESM(require("path"));
-var import_util = require("util");
-var import_ts_dedent = __toESM(require("ts-dedent"));
-const JEST_LOCATION_REGEX = /\n +at (.+\()?(.+?):(\d+):(\d+)/;
-const createAnnotations = (testResults) => {
-  const cwd = process.cwd();
-  return testResults.flatMap((testResult) => {
-    if (testResult.testExecError) {
-      return {
-        annotation_level: "failure",
-        path: import_path.default.relative(cwd, testResult.testFilePath),
-        start_line: 1,
-        end_line: 1,
-        message: (0, import_util.stripVTControlCharacters)(
-          testResult.failureMessage ? (0, import_ts_dedent.default)(testResult.failureMessage) : testResult.testExecError.message
-        ),
-        title: "Jest"
-      };
-    }
-    if (testResult.numFailingTests > 0) {
-      return testResult.testResults.flatMap(
-        (assertionResult) => assertionResult.failureMessages.flatMap((failureMessage) => {
-          const match = JEST_LOCATION_REGEX.exec(failureMessage);
-          if (match?.length === 5 && match[2]) {
-            return {
-              annotation_level: "failure",
-              path: import_path.default.relative(cwd, match[2]),
-              start_line: Number(match[3]),
-              end_line: Number(match[3]),
-              start_column: Number(match[4]),
-              end_column: Number(match[4]),
-              message: (0, import_util.stripVTControlCharacters)(failureMessage),
-              title: "Jest"
-            };
-          }
-          return [];
-        })
-      );
-    }
-    return [];
-  });
-};
-const DEFAULT_DISPLAY_NAME = Symbol("DEFAULT_DISPLAY_NAME");
-const generateAnnotationEntries = (testResults) => {
-  const resultsByDisplayName = testResults.reduce(
-    (acc, result) => {
-      const displayName = result.displayName?.name ?? DEFAULT_DISPLAY_NAME;
-      (acc[displayName] ??= []).push(result);
-      return acc;
-    },
-    {}
-  );
-  const defaultResults = resultsByDisplayName[DEFAULT_DISPLAY_NAME];
-  const entries = [
-    ...defaultResults?.length ? [[void 0, defaultResults]] : [],
-    ...Object.entries(resultsByDisplayName)
-  ];
-  return entries.map(([displayName, results]) => ({
-    annotations: createAnnotations(results),
-    displayName
-  }));
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createAnnotations,
-  generateAnnotationEntries
-});
-//# sourceMappingURL=annotations.js.map

package/lib/cli/test/reporters/github/annotations.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../src/cli/test/reporters/github/annotations.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { stripVTControlCharacters as stripAnsi } from 'util';\n\nimport type { TestResult } from '@jest/test-result';\nimport dedent from 'ts-dedent';\n\nimport type * as GitHub from '@skuba-lib/api/github';\n\n/**\n * Matches the first stack trace location in a Jest failure message.\n *\n * For example, given the following input message:\n *\n * ```console\n * Error: expect(received).toBe(expected) // Object.is equality\n *\n * Expected: \"a\"\n * Received: \"b\"\n *     at Object.<anonymous> (/workdir/skuba/src/test.test.ts:2:15)\n *     at Promise.then.completed (/workdir/skuba/node_modules/jest-circus/build/utils.js:390:28)\n *     ...\n * ```\n *\n * or:\n *\n * ```console\n * Error: expect(received).toBe(expected) // Object.is equality\n *\n * Expected: \"a\"\n * Received: \"b\"\n *     at /workdir/skuba/src/test.test.ts:2:15\n *     at Promise.then.completed (/workdir/skuba/node_modules/jest-circus/build/utils.js:390:28)\n *     ...\n * ```\n *\n * This pattern will produce the following matches:\n *\n * 1. /workdir/skuba/src/test.test.ts\n * 2. 2\n * 2. 15\n */\nconst JEST_LOCATION_REGEX = /\\n +at (.+\\()?(.+?):(\\d+):(\\d+)/;\n\nexport const createAnnotations = (\n  testResults: TestResult[],\n): GitHub.Annotation[] => {\n  const cwd = process.cwd();\n\n  return testResults.flatMap((testResult) => {\n    if (testResult.testExecError) {\n      return {\n        annotation_level: 'failure',\n        path: path.relative(cwd, testResult.testFilePath),\n        start_line: 1,\n        end_line: 1,\n        message: stripAnsi(\n          testResult.failureMessage\n            ? dedent(testResult.failureMessage)\n            : testResult.testExecError.message,\n        ),\n        title: 'Jest',\n      };\n    }\n\n    if (testResult.numFailingTests > 0) {\n      return testResult.testResults.flatMap((assertionResult) =>\n        assertionResult.failureMessages.flatMap((failureMessage) => {\n          const match = JEST_LOCATION_REGEX.exec(failureMessage);\n          if (match?.length === 5 && match[2]) {\n            return {\n              annotation_level: 'failure',\n              path: path.relative(cwd, match[2]),\n              start_line: Number(match[3]),\n              end_line: Number(match[3]),\n              start_column: Number(match[4]),\n              end_column: Number(match[4]),\n              message: stripAnsi(failureMessage),\n              title: 'Jest',\n            };\n          }\n\n          return [];\n        }),\n      );\n    }\n\n    return [];\n  });\n};\n\nconst DEFAULT_DISPLAY_NAME = Symbol('DEFAULT_DISPLAY_NAME');\n\ninterface AnnotationEntry {\n  annotations: GitHub.Annotation[];\n  displayName: string | undefined;\n}\n\nexport const generateAnnotationEntries = (\n  testResults: TestResult[],\n): AnnotationEntry[] => {\n  type ResultsByDisplayName = Record<string | symbol, TestResult[]>;\n\n  // Group test results by display name.\n  const resultsByDisplayName = testResults.reduce<ResultsByDisplayName>(\n    (acc, result) => {\n      const displayName = result.displayName?.name ?? DEFAULT_DISPLAY_NAME;\n\n      (acc[displayName] ??= []).push(result);\n\n      return acc;\n    },\n    {},\n  );\n\n  const defaultResults = resultsByDisplayName[DEFAULT_DISPLAY_NAME];\n\n  const entries = [\n    ...(defaultResults?.length ? ([[undefined, defaultResults]] as const) : []),\n    ...Object.entries(resultsByDisplayName),\n  ];\n\n  // Create annotations for each display name.\n  return entries.map<AnnotationEntry>(([displayName, results]) => ({\n    annotations: createAnnotations(results),\n    displayName,\n  }));\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAsD;AAGtD,uBAAmB;AAqCnB,MAAM,sBAAsB;AAErB,MAAM,oBAAoB,CAC/B,gBACwB;AACxB,QAAM,MAAM,QAAQ,IAAI;AAExB,SAAO,YAAY,QAAQ,CAAC,eAAe;AACzC,QAAI,WAAW,eAAe;AAC5B,aAAO;AAAA,QACL,kBAAkB;AAAA,QAClB,MAAM,YAAAA,QAAK,SAAS,KAAK,WAAW,YAAY;AAAA,QAChD,YAAY;AAAA,QACZ,UAAU;AAAA,QACV,aAAS,YAAAC;AAAA,UACP,WAAW,qBACP,iBAAAC,SAAO,WAAW,cAAc,IAChC,WAAW,cAAc;AAAA,QAC/B;AAAA,QACA,OAAO;AAAA,MACT;AAAA,IACF;AAEA,QAAI,WAAW,kBAAkB,GAAG;AAClC,aAAO,WAAW,YAAY;AAAA,QAAQ,CAAC,oBACrC,gBAAgB,gBAAgB,QAAQ,CAAC,mBAAmB;AAC1D,gBAAM,QAAQ,oBAAoB,KAAK,cAAc;AACrD,cAAI,OAAO,WAAW,KAAK,MAAM,CAAC,GAAG;AACnC,mBAAO;AAAA,cACL,kBAAkB;AAAA,cAClB,MAAM,YAAAF,QAAK,SAAS,KAAK,MAAM,CAAC,CAAC;AAAA,cACjC,YAAY,OAAO,MAAM,CAAC,CAAC;AAAA,cAC3B,UAAU,OAAO,MAAM,CAAC,CAAC;AAAA,cACzB,cAAc,OAAO,MAAM,CAAC,CAAC;AAAA,cAC7B,YAAY,OAAO,MAAM,CAAC,CAAC;AAAA,cAC3B,aAAS,YAAAC,0BAAU,cAAc;AAAA,cACjC,OAAO;AAAA,YACT;AAAA,UACF;AAEA,iBAAO,CAAC;AAAA,QACV,CAAC;AAAA,MACH;AAAA,IACF;AAEA,WAAO,CAAC;AAAA,EACV,CAAC;AACH;AAEA,MAAM,uBAAuB,OAAO,sBAAsB;AAOnD,MAAM,4BAA4B,CACvC,gBACsB;AAItB,QAAM,uBAAuB,YAAY;AAAA,IACvC,CAAC,KAAK,WAAW;AACf,YAAM,cAAc,OAAO,aAAa,QAAQ;AAEhD,OAAC,IAAI,WAAW,MAAM,CAAC,GAAG,KAAK,MAAM;AAErC,aAAO;AAAA,IACT;AAAA,IACA,CAAC;AAAA,EACH;AAEA,QAAM,iBAAiB,qBAAqB,oBAAoB;AAEhE,QAAM,UAAU;AAAA,IACd,GAAI,gBAAgB,SAAU,CAAC,CAAC,QAAW,cAAc,CAAC,IAAc,CAAC;AAAA,IACzE,GAAG,OAAO,QAAQ,oBAAoB;AAAA,EACxC;AAGA,SAAO,QAAQ,IAAqB,CAAC,CAAC,aAAa,OAAO,OAAO;AAAA,IAC/D,aAAa,kBAAkB,OAAO;AAAA,IACtC;AAAA,EACF,EAAE;AACJ;",
-  "names": ["path", "stripAnsi", "dedent"]
-}

package/lib/cli/test/reporters/github/index.d.ts

@@ -1,5 +0,0 @@
-import type { Reporter, TestContext } from '@jest/reporters';
-import type { AggregatedResult } from '@jest/test-result';
-export default class GitHubReporter implements Pick<Reporter, 'onRunComplete'> {
-    onRunComplete(_contexts: Set<TestContext>, { testResults }: AggregatedResult): Promise<void>;
-}

package/lib/cli/test/reporters/github/index.js

@@ -1,74 +0,0 @@
-"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 github_exports = {};
-__export(github_exports, {
-  default: () => GitHubReporter
-});
-module.exports = __toCommonJS(github_exports);
-var import_util = require("util");
-var import_logging = require("../../../../utils/logging.js");
-var import_wait = require("../../../../utils/wait.js");
-var import_annotations = require("./annotations.js");
-var GitHub = __toESM(require("@skuba-lib/api/github"));
-class GitHubReporter {
-  async onRunComplete(_contexts, { testResults }) {
-    if (!GitHub.enabledFromEnvironment()) {
-      return;
-    }
-    let lastCheckRun;
-    try {
-      const entries = (0, import_annotations.generateAnnotationEntries)(testResults);
-      const build = GitHub.buildNameFromEnvironment();
-      for (const { displayName, annotations } of entries) {
-        const name = `skuba/test${displayName ? ` (${displayName})` : ""}`;
-        const isOk = !annotations.length;
-        const summary = isOk ? "`skuba test` passed." : "`skuba test` found issues that require triage.";
-        const checkRun = {
-          name,
-          annotations,
-          conclusion: isOk ? "success" : "failure",
-          summary,
-          title: `${build} ${isOk ? "passed" : "failed"}`
-        };
-        lastCheckRun = checkRun;
-        await (0, import_wait.throwOnTimeout)(GitHub.createCheckRun(checkRun), {
-          s: 30
-        });
-      }
-    } catch (err) {
-      import_logging.log.warn("Failed to report test results to GitHub.");
-      import_logging.log.subtle((0, import_util.inspect)(err));
-      if (lastCheckRun) {
-        import_logging.log.subtle("Last request:");
-        import_logging.log.subtle(JSON.stringify(lastCheckRun));
-      }
-    }
-  }
-}
-//# sourceMappingURL=index.js.map

package/lib/cli/test/reporters/github/index.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../../src/cli/test/reporters/github/index.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport type { Reporter, TestContext } from '@jest/reporters';\nimport type { AggregatedResult } from '@jest/test-result';\n\nimport { log } from '../../../../utils/logging.js';\nimport { throwOnTimeout } from '../../../../utils/wait.js';\n\nimport { generateAnnotationEntries } from './annotations.js';\n\nimport * as GitHub from '@skuba-lib/api/github';\n\nexport default class GitHubReporter implements Pick<Reporter, 'onRunComplete'> {\n  async onRunComplete(\n    _contexts: Set<TestContext>,\n    { testResults }: AggregatedResult,\n  ): Promise<void> {\n    if (!GitHub.enabledFromEnvironment()) {\n      return;\n    }\n\n    type CheckRun = Parameters<typeof GitHub.createCheckRun>[0];\n\n    let lastCheckRun: CheckRun | undefined;\n\n    try {\n      const entries = generateAnnotationEntries(testResults);\n\n      const build = GitHub.buildNameFromEnvironment();\n\n      // Create a check run per display name.\n      // Run in series to reduce the likelihood of exceeding GitHub rate limits.\n      for (const { displayName, annotations } of entries) {\n        const name = `skuba/test${displayName ? ` (${displayName})` : ''}`;\n\n        const isOk = !annotations.length;\n\n        const summary = isOk\n          ? '`skuba test` passed.'\n          : '`skuba test` found issues that require triage.';\n\n        const checkRun: CheckRun = {\n          name,\n          annotations,\n          conclusion: isOk ? 'success' : 'failure',\n          summary,\n          title: `${build} ${isOk ? 'passed' : 'failed'}`,\n        };\n\n        lastCheckRun = checkRun;\n\n        await throwOnTimeout(GitHub.createCheckRun(checkRun), {\n          s: 30,\n        });\n      }\n    } catch (err) {\n      log.warn('Failed to report test results to GitHub.');\n      log.subtle(inspect(err));\n\n      if (lastCheckRun) {\n        log.subtle('Last request:');\n        log.subtle(JSON.stringify(lastCheckRun));\n      }\n    }\n  }\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAKxB,qBAAoB;AACpB,kBAA+B;AAE/B,yBAA0C;AAE1C,aAAwB;AAExB,MAAO,eAAwE;AAAA,EAC7E,MAAM,cACJ,WACA,EAAE,YAAY,GACC;AACf,QAAI,CAAC,OAAO,uBAAuB,GAAG;AACpC;AAAA,IACF;AAIA,QAAI;AAEJ,QAAI;AACF,YAAM,cAAU,8CAA0B,WAAW;AAErD,YAAM,QAAQ,OAAO,yBAAyB;AAI9C,iBAAW,EAAE,aAAa,YAAY,KAAK,SAAS;AAClD,cAAM,OAAO,aAAa,cAAc,KAAK,WAAW,MAAM,EAAE;AAEhE,cAAM,OAAO,CAAC,YAAY;AAE1B,cAAM,UAAU,OACZ,yBACA;AAEJ,cAAM,WAAqB;AAAA,UACzB;AAAA,UACA;AAAA,UACA,YAAY,OAAO,YAAY;AAAA,UAC/B;AAAA,UACA,OAAO,GAAG,KAAK,IAAI,OAAO,WAAW,QAAQ;AAAA,QAC/C;AAEA,uBAAe;AAEf,kBAAM,4BAAe,OAAO,eAAe,QAAQ,GAAG;AAAA,UACpD,GAAG;AAAA,QACL,CAAC;AAAA,MACH;AAAA,IACF,SAAS,KAAK;AACZ,yBAAI,KAAK,0CAA0C;AACnD,yBAAI,WAAO,qBAAQ,GAAG,CAAC;AAEvB,UAAI,cAAc;AAChB,2BAAI,OAAO,eAAe;AAC1B,2BAAI,OAAO,KAAK,UAAU,YAAY,CAAC;AAAA,MACzC;AAAA,IACF;AAAA,EACF;AACF;",
-  "names": []
-}

package/template/base/jest.config.ts

@@ -1,19 +0,0 @@
-import { Jest } from 'skuba';
-
-export default Jest.mergePreset({
-  coveragePathIgnorePatterns: ['src/testing'],
-  coverageThreshold: {
-    global: {
-      branches: 0,
-      functions: 0,
-      lines: 0,
-      statements: 0,
-    },
-  },
-  setupFiles: ['<rootDir>/jest.setup.ts'],
-  testPathIgnorePatterns: ['/test\\.ts'],
-  moduleNameMapper: {
-    '^#src/(.*)\\.js$': ['<rootDir>/src/$1'],
-    '^#src/(.*)$': ['<rootDir>/src/$1'],
-  },
-});

package/template/base/jest.setup.ts

@@ -1,3 +0,0 @@
-process.env.DEPLOYMENT = 'test';
-
-export {};