skuba 0.0.0-master-20230318044948 → 0.0.0-master-20230319220011

package/README.md

@@ -4,7 +4,7 @@
 
 [![GitHub Release](https://github.com/seek-oss/skuba/workflows/Release/badge.svg?branch=master)](https://github.com/seek-oss/skuba/actions?query=workflow%3ARelease)
 [![GitHub Validate](https://github.com/seek-oss/skuba/workflows/Validate/badge.svg?branch=master)](https://github.com/seek-oss/skuba/actions?query=workflow%3AValidate)
-[![Node.js version](https://img.shields.io/badge/node-%3E%3D%2014.18-brightgreen)](https://nodejs.org/en/)
+[![Node.js version](https://img.shields.io/badge/node-%3E%3D%2016.11-brightgreen)](https://nodejs.org/en/)
 [![npm package](https://img.shields.io/npm/v/skuba)](https://www.npmjs.com/package/skuba)
 
 ---

package/lib/cli/adapter/eslint.js

@@ -45,7 +45,18 @@ const runESLint = async (mode, logger) => {
   logger.debug("Initialising ESLint...");
   const engine = new import_eslint.ESLint({
     cache: true,
-    extensions: ["js", "ts", "tsx", "yaml", "yml"],
+    extensions: [
+      "cjs",
+      "cts",
+      "js",
+      "jsx",
+      "mjs",
+      "mts",
+      "ts",
+      "tsx",
+      "yaml",
+      "yml"
+    ],
     fix: mode === "format",
     reportUnusedDisableDirectives: "error"
   });

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 { Linter } from 'eslint';\nimport { ESLint } from 'eslint';\n\nimport type { Logger } from '../../utils/logging';\nimport { 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): Promise<ESLintOutput> => {\n  logger.debug('Initialising ESLint...');\n\n  const engine = new ESLint({\n    cache: true,\n    extensions: ['js', 'ts', 'tsx', 'yaml', 'yml'],\n    fix: mode === 'format',\n    reportUnusedDisableDirectives: 'error',\n  });\n\n  const cwd = process.cwd();\n\n  logger.debug('Processing files...');\n\n  const start = process.hrtime.bigint();\n\n  /* eslint-disable no-console */\n  const ogConsoleError = console.error;\n  console.error = (...args: unknown[]) => {\n    if (\n      args[0] !==\n      // `eslint-plugin-react` prints this annoying error on non-React repos.\n      // We still want to support React linting for repos that have React code,\n      // so we have to manually suppress it.\n      //\n      // https://github.com/yannickcr/eslint-plugin-react/blob/7484acaca8351a8568fa99344bc811c5cd8396bd/lib/util/version.js#L61-L65\n      'Warning: React version was set to \"detect\" in eslint-plugin-react settings, but the \"react\" package is not installed. Assuming latest React version for linting.'\n    ) {\n      ogConsoleError(...args);\n    }\n  };\n\n  const [formatter, results] = await Promise.all([\n    engine.loadFormatter(),\n    engine.lintFiles('.'),\n  ]);\n\n  console.error = ogConsoleError;\n  /* eslint-enable no-console */\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\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;AAElB,oBAAuB;AAGvB,qBAA0B;AAE1B,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,WAC0B;AAC1B,SAAO,MAAM,wBAAwB;AAErC,QAAM,SAAS,IAAI,qBAAO;AAAA,IACxB,OAAO;AAAA,IACP,YAAY,CAAC,MAAM,MAAM,OAAO,QAAQ,KAAK;AAAA,IAC7C,KAAK,SAAS;AAAA,IACd,+BAA+B;AAAA,EACjC,CAAC;AAED,QAAM,MAAM,QAAQ,IAAI;AAExB,SAAO,MAAM,qBAAqB;AAElC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AAGpC,QAAM,iBAAiB,QAAQ;AAC/B,UAAQ,QAAQ,IAAI,SAAoB;AACtC,QACE,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA,IAMN,oKACA;AACA,qBAAe,GAAG,IAAI;AAAA,IACxB;AAAA,EACF;AAEA,QAAM,CAAC,WAAW,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC7C,OAAO,cAAc;AAAA,IACrB,OAAO,UAAU,GAAG;AAAA,EACtB,CAAC;AAED,UAAQ,QAAQ;AAGhB,QAAM,MAAM,QAAQ,OAAO,OAAO;AAElC,SAAO;AAAA,IACL,iBAAa,0BAAU,QAAQ,QAAQ,MAAM,QAAQ,OAAO;AAAA,MAC1D;AAAA,MACA;AAAA,IACF;AAAA,EACF;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,qBAAO,YAAY,OAAO;AAEhC,QAAM,SAAS,MAAM,UAAU,OAAO,OAAO;AAE7C,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 { Linter } from 'eslint';\nimport { ESLint } from 'eslint';\n\nimport type { Logger } from '../../utils/logging';\nimport { 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): Promise<ESLintOutput> => {\n  logger.debug('Initialising ESLint...');\n\n  const engine = new ESLint({\n    cache: true,\n    extensions: [\n      'cjs',\n      'cts',\n      'js',\n      'jsx',\n      'mjs',\n      'mts',\n      'ts',\n      'tsx',\n      'yaml',\n      'yml',\n    ],\n    fix: mode === 'format',\n    reportUnusedDisableDirectives: 'error',\n  });\n\n  const cwd = process.cwd();\n\n  logger.debug('Processing files...');\n\n  const start = process.hrtime.bigint();\n\n  /* eslint-disable no-console */\n  const ogConsoleError = console.error;\n  console.error = (...args: unknown[]) => {\n    if (\n      args[0] !==\n      // `eslint-plugin-react` prints this annoying error on non-React repos.\n      // We still want to support React linting for repos that have React code,\n      // so we have to manually suppress it.\n      //\n      // https://github.com/yannickcr/eslint-plugin-react/blob/7484acaca8351a8568fa99344bc811c5cd8396bd/lib/util/version.js#L61-L65\n      'Warning: React version was set to \"detect\" in eslint-plugin-react settings, but the \"react\" package is not installed. Assuming latest React version for linting.'\n    ) {\n      ogConsoleError(...args);\n    }\n  };\n\n  const [formatter, results] = await Promise.all([\n    engine.loadFormatter(),\n    engine.lintFiles('.'),\n  ]);\n\n  console.error = ogConsoleError;\n  /* eslint-enable no-console */\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\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;AAElB,oBAAuB;AAGvB,qBAA0B;AAE1B,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,WAC0B;AAC1B,SAAO,MAAM,wBAAwB;AAErC,QAAM,SAAS,IAAI,qBAAO;AAAA,IACxB,OAAO;AAAA,IACP,YAAY;AAAA,MACV;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IACA,KAAK,SAAS;AAAA,IACd,+BAA+B;AAAA,EACjC,CAAC;AAED,QAAM,MAAM,QAAQ,IAAI;AAExB,SAAO,MAAM,qBAAqB;AAElC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AAGpC,QAAM,iBAAiB,QAAQ;AAC/B,UAAQ,QAAQ,IAAI,SAAoB;AACtC,QACE,KAAK,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA,IAMN,oKACA;AACA,qBAAe,GAAG,IAAI;AAAA,IACxB;AAAA,EACF;AAEA,QAAM,CAAC,WAAW,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC7C,OAAO,cAAc;AAAA,IACrB,OAAO,UAAU,GAAG;AAAA,EACtB,CAAC;AAED,UAAQ,QAAQ;AAGhB,QAAM,MAAM,QAAQ,OAAO,OAAO;AAElC,SAAO;AAAA,IACL,iBAAa,0BAAU,QAAQ,QAAQ,MAAM,QAAQ,OAAO;AAAA,MAC1D;AAAA,MACA;AAAA,IACF;AAAA,EACF;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,qBAAO,YAAY,OAAO;AAEhC,QAAM,SAAS,MAAM,UAAU,OAAO,OAAO;AAE7C,MAAI,QAAQ;AACV,WAAO,MAAM,MAAM;AAAA,EACrB;AAEA,SAAO,EAAE,QAAQ,SAAS,IAAI,QAAQ,SAAS;AACjD;",
   "names": ["chalk", "path"]
 }

package/lib/cli/adapter/prettier.js

@@ -42,7 +42,7 @@ var import_package = require("../configure/processing/package");
 let languages;
 const inferParser = (filepath) => {
   const filename = import_path.default.basename(filepath).toLowerCase();
-  languages ?? (languages = (0, import_prettier.getSupportInfo)().languages.filter((language) => language.since));
+  languages ??= (0, import_prettier.getSupportInfo)().languages.filter((language) => language.since);
   const firstLanguage = languages.find(
     (language) => language.extensions?.some((extension) => filename.endsWith(extension)) || language.filenames?.some((name) => name.toLowerCase() === filename)
   );

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/cli/adapter/prettier.ts"],
   "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport type { Options, SupportLanguage } from 'prettier';\nimport { check, format, getSupportInfo, resolveConfig } from 'prettier';\n\nimport { crawlDirectory } from '../../utils/dir';\nimport type { Logger } from '../../utils/logging';\nimport { pluralise } from '../../utils/logging';\nimport { getConsumerManifest } from '../../utils/manifest';\nimport { formatPackage, parsePackage } from '../configure/processing/package';\n\nlet languages: SupportLanguage[] | undefined;\n\n/**\n * Infers a parser for the specified filepath.\n *\n * This is a cut-down version of Prettier's built-in function of the same name;\n * ours operates purely on the `filepath` string and does not perform file I/O.\n * Prettier's internal `getInterpreter` function can open a file to read the\n * shebang, and its file descriptor usage can throw warnings on worker threads:\n *\n * ```console\n * Warning: File descriptor 123 closed but not opened in unmanaged mode\n *     at Object.closeSync (node:fs:530:11)\n *     at Object.closeSync (node_modules/graceful-fs/graceful-fs.js:74:20)\n *     ...\n * ```\n *\n * References:\n *\n * - https://github.com/prettier/prettier/blob/2.4.1/src/main/options.js#L167\n * - seek-oss/skuba#659\n */\nexport const inferParser = (filepath: string): string | undefined => {\n  const filename = path.basename(filepath).toLowerCase();\n\n  languages ??= getSupportInfo().languages.filter((language) => language.since);\n\n  const firstLanguage = languages.find(\n    (language) =>\n      language.extensions?.some((extension) => filename.endsWith(extension)) ||\n      language.filenames?.some((name) => name.toLowerCase() === filename),\n  );\n\n  return firstLanguage?.parsers[0];\n};\n\nconst isPackageJsonOk = ({\n  data,\n  filepath,\n}: {\n  data: string;\n  filepath: string;\n}): boolean => {\n  if (path.basename(filepath) !== 'package.json') {\n    return true;\n  }\n\n  try {\n    const packageJson = parsePackage(data);\n\n    return !packageJson || formatPackage(packageJson) === data;\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  return true;\n};\n\ninterface File {\n  data: string;\n  options: Options;\n  filepath: string;\n}\n\ninterface Result {\n  count: number;\n  errored: Array<{ err?: unknown; filepath: string }>;\n  touched: string[];\n  unparsed: string[];\n}\n\nconst formatOrLintFile = (\n  { data, filepath, options }: File,\n  mode: 'format' | 'lint',\n  result: Result,\n): string | undefined => {\n  if (mode === 'lint') {\n    let ok: boolean;\n    try {\n      ok = check(data, options) && isPackageJsonOk({ data, filepath });\n    } catch (err) {\n      result.errored.push({ err, filepath });\n      return;\n    }\n\n    if (!ok) {\n      result.errored.push({ filepath });\n    }\n\n    return;\n  }\n\n  let formatted: string;\n  try {\n    formatted = format(data, options);\n  } catch (err) {\n    result.errored.push({ err, filepath });\n    return;\n  }\n\n  // Perform additional formatting (i.e. sorting) on a `package.json` manifest.\n  try {\n    if (path.basename(filepath) === 'package.json') {\n      const packageJson = parsePackage(formatted);\n      if (packageJson) {\n        formatted = formatPackage(packageJson);\n      }\n    }\n  } catch {\n    // Be more lenient about our custom formatting and don't throw if it errors.\n  }\n\n  if (formatted === data) {\n    return;\n  }\n\n  result.touched.push(filepath);\n  return formatted;\n};\n\nexport interface PrettierOutput {\n  ok: boolean;\n  result: Result;\n}\n\n/**\n * Formats/lints files with Prettier.\n *\n * Prettier doesn't provide a higher-level Node.js API that replicates the\n * behaviour of its CLI, so we have to plumb together its lower-level functions.\n * On the other hand, this affords more flexibility in how we track and report\n * on progress and results.\n */\nexport const runPrettier = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<PrettierOutput> => {\n  logger.debug('Initialising Prettier...');\n\n  const start = process.hrtime.bigint();\n\n  let directory = process.cwd();\n\n  const manifest = await getConsumerManifest();\n  if (manifest) {\n    directory = path.dirname(manifest.path);\n  }\n\n  logger.debug(\n    manifest ? 'Detected project root:' : 'Detected working directory:',\n    directory,\n  );\n\n  logger.debug('Discovering files...');\n\n  // Match Prettier's opinion of not respecting `.gitignore`.\n  // This avoids exhibiting different behaviour than a Prettier IDE integration,\n  // and the headache of conflicting `.gitignore` and `.prettierignore` rules.\n  const filepaths = await crawlDirectory(directory, '.prettierignore');\n\n  logger.debug(`Discovered ${pluralise(filepaths.length, 'file')}.`);\n\n  const result: Result = {\n    count: filepaths.length,\n    errored: [],\n    touched: [],\n    unparsed: [],\n  };\n\n  logger.debug(mode === 'format' ? 'Formatting' : 'Linting', 'files...');\n\n  for (const filepath of filepaths) {\n    // Infer parser upfront so we can skip unsupported files.\n    const parser = inferParser(filepath);\n\n    logger.debug(filepath);\n    logger.debug('  parser:', parser ?? '-');\n\n    if (!parser) {\n      result.unparsed.push(filepath);\n      continue;\n    }\n\n    const [config, data] = await Promise.all([\n      resolveConfig(filepath),\n      fs.promises.readFile(filepath, 'utf-8'),\n    ]);\n\n    const file: File = {\n      data,\n      filepath,\n      options: { ...config, filepath },\n    };\n\n    const formatted = formatOrLintFile(file, mode, result);\n\n    if (typeof formatted === 'string') {\n      await fs.promises.writeFile(filepath, formatted);\n    }\n  }\n\n  const end = process.hrtime.bigint();\n\n  logger.plain(\n    `Processed ${pluralise(\n      result.count - result.unparsed.length,\n      'file',\n    )} in ${logger.timing(start, end)}.`,\n  );\n\n  if (result.touched.length) {\n    logger.plain(`Formatted ${pluralise(result.touched.length, 'file')}:`);\n    for (const filepath of result.touched) {\n      logger.warn(filepath);\n    }\n  }\n\n  if (result.errored.length) {\n    logger.plain(`Flagged ${pluralise(result.errored.length, 'file')}:`);\n    for (const { err, filepath } of result.errored) {\n      logger.warn(filepath, ...(err ? [String(err)] : []));\n    }\n  }\n\n  return { ok: result.errored.length === 0, result };\n};\n"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["path", "fs"]
 }

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

@@ -66,7 +66,7 @@ const jestModule = async () => {
       if (jsFile?.includes("skuba")) {
         return (0, import_typescript.transformModuleImportsAndExports)(jsFile, (_, p) => p);
       }
-      currentFiles["jest.setup.ts"] ?? (currentFiles["jest.setup.ts"] = initialFiles["jest.setup.js"] ?? setupFile);
+      currentFiles["jest.setup.ts"] ??= initialFiles["jest.setup.js"] ?? setupFile;
       const inputFile = tsFile ?? jsFile;
       const props = inputFile === void 0 ? void 0 : (0, import_typescript.readModuleExports)(inputFile);
       if (props === void 0) {

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../src/cli/configure/modules/jest.ts"],
   "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { withPackage } from '../processing/package';\nimport {\n  createPropAppender,\n  createPropFilter,\n  readModuleExports,\n  transformModuleImportsAndExports,\n} from '../processing/typescript';\nimport type { Module } from '../types';\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': (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 ? undefined : 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,CAAC,QAAQ,cAAc,iBAAiB;AAExD,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,wEACE,aAAa,eAAe,KAAK;AAEnC,YAAM,YAAY,UAAU;AAE5B,YAAM,QACJ,cAAc,SAAY,aAAY,qCAAkB,SAAS;AAEnE,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;",
+  "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,CAAC,QAAQ,cAAc,iBAAiB;AAExD,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,SAAY,aAAY,qCAAkB,SAAS;AAEnE,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/configure/modules/package.js

@@ -67,8 +67,8 @@ const packageModule = async ({
         inputData,
         "skuba" in inputData ? recurringData : initialData
       );
-      outputData.license ?? (outputData.license = "UNLICENSED");
-      outputData.scripts ?? (outputData.scripts = {});
+      outputData.license ??= "UNLICENSED";
+      outputData.scripts ??= {};
       if (outputData.workspaces && !outputData.private) {
         outputData.private = true;
       }
@@ -86,7 +86,7 @@ const packageModule = async ({
         outputData.files = (outputData.files ?? DEFAULT_PACKAGE_FILES).flatMap(
           (filePattern) => filePattern === "lib" ? DEFAULT_PACKAGE_FILES : [filePattern]
         );
-        outputData.version ?? (outputData.version = "0.0.0-semantically-released");
+        outputData.version ??= "0.0.0-semantically-released";
         outputData.scripts.release = [
           outputData.scripts.prepublish,
           outputData.scripts.prerelease,

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../src/cli/configure/modules/package.ts"],
   "sourcesContent": ["import { getSkubaVersion } from '../../../utils/version';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { withPackage } from '../processing/package';\nimport { merge } from '../processing/record';\nimport type { Module, Options } from '../types';\n\nconst DEFAULT_PACKAGE_FILES = [\n  'lib*/**/*.d.ts',\n  'lib*/**/*.js',\n  'lib*/**/*.js.map',\n  'lib*/**/*.json',\n];\n\nexport const packageModule = async ({\n  entryPoint,\n  type,\n}: Options): Promise<Module> => {\n  const version = await getSkubaVersion();\n\n  const initialData = {\n    private: type !== 'package',\n\n    scripts: {\n      build: type === 'package' ? 'skuba build-package' : 'skuba build',\n      format: 'skuba format',\n      lint: 'skuba lint',\n      ...(type === 'package' ? {} : { start: 'skuba start' }),\n      test: 'skuba test --coverage',\n      'test:watch': 'skuba test --watch',\n    },\n    skuba: {\n      entryPoint,\n      template: null,\n      type,\n      version,\n    },\n  };\n\n  const recurringData = {\n    skuba: {\n      entryPoint,\n      type,\n      version,\n    },\n  };\n\n  return {\n    ...deleteFiles('.npmignore', 'package-lock.json'),\n\n    'package.json': (inputFile) =>\n      withPackage((inputData) => {\n        const outputData = merge(\n          inputData,\n          'skuba' in inputData ? recurringData : initialData,\n        );\n\n        outputData.license ??= 'UNLICENSED';\n        outputData.scripts ??= {};\n\n        // Workspaces can only be enabled in private projects\n        if (outputData.workspaces && !outputData.private) {\n          outputData.private = true;\n        }\n\n        delete outputData.scripts.commit;\n        delete outputData.scripts['format:check'];\n        delete outputData.scripts['lint:build'];\n        delete outputData.scripts['lint:compile'];\n        delete outputData.scripts['lint:eslint'];\n        delete outputData.scripts['lint:prettier'];\n        delete outputData.scripts['lint:tslint'];\n        delete outputData.scripts['test:build'];\n        delete outputData.scripts['test:jest'];\n        delete outputData.typings;\n\n        if (type === 'package') {\n          outputData.files = (\n            outputData.files ?? DEFAULT_PACKAGE_FILES\n          ).flatMap((filePattern) =>\n            filePattern === 'lib' ? DEFAULT_PACKAGE_FILES : [filePattern],\n          );\n\n          outputData.version ??= '0.0.0-semantically-released';\n\n          // User-defined pre- and post-scripts are confusing and dropped by e.g.\n          // Yarn 2.\n          outputData.scripts.release = [\n            outputData.scripts.prepublish,\n            outputData.scripts.prerelease,\n            outputData.scripts.release ?? 'skuba release',\n          ]\n            .filter((script): script is string => typeof script === 'string')\n            .map((script) =>\n              script\n                .replace(/^smt build$/, 'yarn build')\n                .replace(/^smt /, 'skuba ')\n                .trim(),\n            )\n            .filter(Boolean)\n            .join(' && ');\n\n          // Align with the required syntax for package.json#/paths\n          if (outputData.scripts.build === 'skuba build-package') {\n            outputData.main = './lib-commonjs/index.js';\n            outputData.module = './lib-es2015/index.js';\n            outputData.types = './lib-types/index.d.ts';\n          } else {\n            outputData.main = './lib/index.js';\n            outputData.module = './lib/index.js';\n            outputData.types = './lib/index.d.ts';\n          }\n\n          delete outputData.scripts.prepublish;\n          delete outputData.scripts.prerelease;\n        }\n\n        return outputData;\n      })(inputFile),\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAgC;AAChC,yBAA4B;AAC5B,qBAA4B;AAC5B,oBAAsB;AAGtB,MAAM,wBAAwB;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,gBAAgB,OAAO;AAAA,EAClC;AAAA,EACA;AACF,MAAgC;AAC9B,QAAM,UAAU,UAAM,gCAAgB;AAEtC,QAAM,cAAc;AAAA,IAClB,SAAS,SAAS;AAAA,IAElB,SAAS;AAAA,MACP,OAAO,SAAS,YAAY,wBAAwB;AAAA,MACpD,QAAQ;AAAA,MACR,MAAM;AAAA,MACN,GAAI,SAAS,YAAY,CAAC,IAAI,EAAE,OAAO,cAAc;AAAA,MACrD,MAAM;AAAA,MACN,cAAc;AAAA,IAChB;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA,UAAU;AAAA,MACV;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,QAAM,gBAAgB;AAAA,IACpB,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,OAAG,gCAAY,cAAc,mBAAmB;AAAA,IAEhD,gBAAgB,CAAC,kBACf,4BAAY,CAAC,cAAc;AACzB,YAAM,iBAAa;AAAA,QACjB;AAAA,QACA,WAAW,YAAY,gBAAgB;AAAA,MACzC;AAEA,iBAAW,YAAX,WAAW,UAAY;AACvB,iBAAW,YAAX,WAAW,UAAY,CAAC;AAGxB,UAAI,WAAW,cAAc,CAAC,WAAW,SAAS;AAChD,mBAAW,UAAU;AAAA,MACvB;AAEA,aAAO,WAAW,QAAQ;AAC1B,aAAO,WAAW,QAAQ,cAAc;AACxC,aAAO,WAAW,QAAQ,YAAY;AACtC,aAAO,WAAW,QAAQ,cAAc;AACxC,aAAO,WAAW,QAAQ,aAAa;AACvC,aAAO,WAAW,QAAQ,eAAe;AACzC,aAAO,WAAW,QAAQ,aAAa;AACvC,aAAO,WAAW,QAAQ,YAAY;AACtC,aAAO,WAAW,QAAQ,WAAW;AACrC,aAAO,WAAW;AAElB,UAAI,SAAS,WAAW;AACtB,mBAAW,SACT,WAAW,SAAS,uBACpB;AAAA,UAAQ,CAAC,gBACT,gBAAgB,QAAQ,wBAAwB,CAAC,WAAW;AAAA,QAC9D;AAEA,mBAAW,YAAX,WAAW,UAAY;AAIvB,mBAAW,QAAQ,UAAU;AAAA,UAC3B,WAAW,QAAQ;AAAA,UACnB,WAAW,QAAQ;AAAA,UACnB,WAAW,QAAQ,WAAW;AAAA,QAChC,EACG,OAAO,CAAC,WAA6B,OAAO,WAAW,QAAQ,EAC/D;AAAA,UAAI,CAAC,WACJ,OACG,QAAQ,eAAe,YAAY,EACnC,QAAQ,SAAS,QAAQ,EACzB,KAAK;AAAA,QACV,EACC,OAAO,OAAO,EACd,KAAK,MAAM;AAGd,YAAI,WAAW,QAAQ,UAAU,uBAAuB;AACtD,qBAAW,OAAO;AAClB,qBAAW,SAAS;AACpB,qBAAW,QAAQ;AAAA,QACrB,OAAO;AACL,qBAAW,OAAO;AAClB,qBAAW,SAAS;AACpB,qBAAW,QAAQ;AAAA,QACrB;AAEA,eAAO,WAAW,QAAQ;AAC1B,eAAO,WAAW,QAAQ;AAAA,MAC5B;AAEA,aAAO;AAAA,IACT,CAAC,EAAE,SAAS;AAAA,EAChB;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAgC;AAChC,yBAA4B;AAC5B,qBAA4B;AAC5B,oBAAsB;AAGtB,MAAM,wBAAwB;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,gBAAgB,OAAO;AAAA,EAClC;AAAA,EACA;AACF,MAAgC;AAC9B,QAAM,UAAU,UAAM,gCAAgB;AAEtC,QAAM,cAAc;AAAA,IAClB,SAAS,SAAS;AAAA,IAElB,SAAS;AAAA,MACP,OAAO,SAAS,YAAY,wBAAwB;AAAA,MACpD,QAAQ;AAAA,MACR,MAAM;AAAA,MACN,GAAI,SAAS,YAAY,CAAC,IAAI,EAAE,OAAO,cAAc;AAAA,MACrD,MAAM;AAAA,MACN,cAAc;AAAA,IAChB;AAAA,IACA,OAAO;AAAA,MACL;AAAA,MACA,UAAU;AAAA,MACV;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,QAAM,gBAAgB;AAAA,IACpB,OAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,OAAG,gCAAY,cAAc,mBAAmB;AAAA,IAEhD,gBAAgB,CAAC,kBACf,4BAAY,CAAC,cAAc;AACzB,YAAM,iBAAa;AAAA,QACjB;AAAA,QACA,WAAW,YAAY,gBAAgB;AAAA,MACzC;AAEA,iBAAW,YAAY;AACvB,iBAAW,YAAY,CAAC;AAGxB,UAAI,WAAW,cAAc,CAAC,WAAW,SAAS;AAChD,mBAAW,UAAU;AAAA,MACvB;AAEA,aAAO,WAAW,QAAQ;AAC1B,aAAO,WAAW,QAAQ,cAAc;AACxC,aAAO,WAAW,QAAQ,YAAY;AACtC,aAAO,WAAW,QAAQ,cAAc;AACxC,aAAO,WAAW,QAAQ,aAAa;AACvC,aAAO,WAAW,QAAQ,eAAe;AACzC,aAAO,WAAW,QAAQ,aAAa;AACvC,aAAO,WAAW,QAAQ,YAAY;AACtC,aAAO,WAAW,QAAQ,WAAW;AACrC,aAAO,WAAW;AAElB,UAAI,SAAS,WAAW;AACtB,mBAAW,SACT,WAAW,SAAS,uBACpB;AAAA,UAAQ,CAAC,gBACT,gBAAgB,QAAQ,wBAAwB,CAAC,WAAW;AAAA,QAC9D;AAEA,mBAAW,YAAY;AAIvB,mBAAW,QAAQ,UAAU;AAAA,UAC3B,WAAW,QAAQ;AAAA,UACnB,WAAW,QAAQ;AAAA,UACnB,WAAW,QAAQ,WAAW;AAAA,QAChC,EACG,OAAO,CAAC,WAA6B,OAAO,WAAW,QAAQ,EAC/D;AAAA,UAAI,CAAC,WACJ,OACG,QAAQ,eAAe,YAAY,EACnC,QAAQ,SAAS,QAAQ,EACzB,KAAK;AAAA,QACV,EACC,OAAO,OAAO,EACd,KAAK,MAAM;AAGd,YAAI,WAAW,QAAQ,UAAU,uBAAuB;AACtD,qBAAW,OAAO;AAClB,qBAAW,SAAS;AACpB,qBAAW,QAAQ;AAAA,QACrB,OAAO;AACL,qBAAW,OAAO;AAClB,qBAAW,SAAS;AACpB,qBAAW,QAAQ;AAAA,QACrB;AAEA,eAAO,WAAW,QAAQ;AAC1B,eAAO,WAAW,QAAQ;AAAA,MAC5B;AAEA,aAAO;AAAA,IACT,CAAC,EAAE,SAAS;AAAA,EAChB;AACF;",
   "names": []
 }

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

@@ -73,7 +73,7 @@ const tsconfigModule = async ({
       if ((0, import_validation.hasProp)(outputData, "include") && !initialFiles["tsconfig.json"]?.includes("skuba/config/tsconfig.json")) {
         delete outputData.include;
       }
-      if (firstRun && type === "package" && (0, import_validation.isObject)(outputData.compilerOptions) && !outputData.compilerOptions.removeComments) {
+      if (firstRun && type === "package" && (0, import_validation.hasProp)(outputData, "compilerOptions") && (0, import_validation.isObject)(outputData.compilerOptions) && !outputData.compilerOptions.removeComments) {
         outputData.compilerOptions.removeComments = false;
       }
       return (0, import_json.formatObject)(outputData);

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/modules/tsconfig.ts"],
-  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { hasProp, hasStringProp, isObject } from '../../../utils/validation';\nimport { formatObject, parseObject } from '../processing/json';\nimport { loadFiles } from '../processing/loadFiles';\nimport { merge } from '../processing/record';\nimport type { Module, Options } from '../types';\n\nexport const tsconfigModule = async ({\n  firstRun,\n  type,\n}: Options): Promise<Module> => {\n  const [buildFile, baseFile] = await Promise.all([\n    readBaseTemplateFile('tsconfig.build.json'),\n    readBaseTemplateFile('tsconfig.json'),\n  ]);\n\n  const baseData = parseObject(baseFile);\n\n  // packages should not use module aliases\n  if (\n    type === 'package' &&\n    hasProp(baseData, 'compilerOptions') &&\n    isObject(baseData.compilerOptions)\n  ) {\n    delete baseData.compilerOptions.baseUrl;\n    delete baseData.compilerOptions.paths;\n  }\n\n  return {\n    ...loadFiles('Dockerfile'),\n\n    'tsconfig.build.json': (inputFile) => inputFile ?? buildFile,\n\n    'tsconfig.json': (inputFile, files, initialFiles) => {\n      const inputData = parseObject(inputFile);\n\n      let outDir: string | undefined;\n\n      if (\n        hasProp(inputData, 'compilerOptions') &&\n        hasStringProp(inputData.compilerOptions, 'outDir')\n      ) {\n        outDir = inputData.compilerOptions.outDir.replace(/\\/$/, '');\n      }\n\n      // optimistically rewire Dockerfile for new output directory\n      if (outDir !== undefined && outDir !== 'lib') {\n        files.Dockerfile = files.Dockerfile?.replace(\n          new RegExp(`([^\\\\w])${outDir}([^\\\\w])`, 'g'),\n          '$1lib$2',\n        );\n      }\n\n      // existing project may target earlier Node.js versions than skuba\n      if (hasProp(baseData, 'compilerOptions')) {\n        if (\n          hasProp(baseData.compilerOptions, 'lib') &&\n          hasProp(inputData?.compilerOptions, 'lib')\n        ) {\n          delete baseData.compilerOptions.lib;\n        }\n\n        if (\n          hasProp(baseData.compilerOptions, 'target') &&\n          hasProp(inputData?.compilerOptions, 'target')\n        ) {\n          delete baseData.compilerOptions.target;\n        }\n      }\n\n      const outputData = merge(inputData ?? {}, baseData);\n\n      // Remove `lib/**/*` and `lib`, which duplicate `lib*/**/*`\n      if (hasProp(outputData, 'exclude') && Array.isArray(outputData.exclude)) {\n        const { exclude } = outputData;\n\n        const hasLibStar = exclude.includes('lib*/**/*');\n\n        outputData.exclude = exclude.filter(\n          (pattern: unknown) =>\n            !(hasLibStar && new Set<unknown>(['lib', 'lib/**/*']).has(pattern)),\n        );\n      }\n\n      // for optimal ESLinting, base config should compile all files and leave\n      // exclusions to .eslintignore and tsconfig.build.json\n      if (\n        hasProp(outputData, 'include') &&\n        !initialFiles['tsconfig.json']?.includes('skuba/config/tsconfig.json')\n      ) {\n        delete outputData.include;\n      }\n\n      // Retain comments for package documentation\n      if (\n        firstRun &&\n        type === 'package' &&\n        isObject(outputData.compilerOptions) &&\n        !outputData.compilerOptions.removeComments\n      ) {\n        outputData.compilerOptions.removeComments = false;\n      }\n\n      return formatObject(outputData);\n    },\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,wBAAiD;AACjD,kBAA0C;AAC1C,uBAA0B;AAC1B,oBAAsB;AAGf,MAAM,iBAAiB,OAAO;AAAA,EACnC;AAAA,EACA;AACF,MAAgC;AAC9B,QAAM,CAAC,WAAW,QAAQ,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,sCAAqB,qBAAqB;AAAA,QAC1C,sCAAqB,eAAe;AAAA,EACtC,CAAC;AAED,QAAM,eAAW,yBAAY,QAAQ;AAGrC,MACE,SAAS,iBACT,2BAAQ,UAAU,iBAAiB,SACnC,4BAAS,SAAS,eAAe,GACjC;AACA,WAAO,SAAS,gBAAgB;AAChC,WAAO,SAAS,gBAAgB;AAAA,EAClC;AAEA,SAAO;AAAA,IACL,OAAG,4BAAU,YAAY;AAAA,IAEzB,uBAAuB,CAAC,cAAc,aAAa;AAAA,IAEnD,iBAAiB,CAAC,WAAW,OAAO,iBAAiB;AACnD,YAAM,gBAAY,yBAAY,SAAS;AAEvC,UAAI;AAEJ,cACE,2BAAQ,WAAW,iBAAiB,SACpC,iCAAc,UAAU,iBAAiB,QAAQ,GACjD;AACA,iBAAS,UAAU,gBAAgB,OAAO,QAAQ,OAAO,EAAE;AAAA,MAC7D;AAGA,UAAI,WAAW,UAAa,WAAW,OAAO;AAC5C,cAAM,aAAa,MAAM,YAAY;AAAA,UACnC,IAAI,OAAO,WAAW,kBAAkB,GAAG;AAAA,UAC3C;AAAA,QACF;AAAA,MACF;AAGA,cAAI,2BAAQ,UAAU,iBAAiB,GAAG;AACxC,gBACE,2BAAQ,SAAS,iBAAiB,KAAK,SACvC,2BAAQ,WAAW,iBAAiB,KAAK,GACzC;AACA,iBAAO,SAAS,gBAAgB;AAAA,QAClC;AAEA,gBACE,2BAAQ,SAAS,iBAAiB,QAAQ,SAC1C,2BAAQ,WAAW,iBAAiB,QAAQ,GAC5C;AACA,iBAAO,SAAS,gBAAgB;AAAA,QAClC;AAAA,MACF;AAEA,YAAM,iBAAa,qBAAM,aAAa,CAAC,GAAG,QAAQ;AAGlD,cAAI,2BAAQ,YAAY,SAAS,KAAK,MAAM,QAAQ,WAAW,OAAO,GAAG;AACvE,cAAM,EAAE,QAAQ,IAAI;AAEpB,cAAM,aAAa,QAAQ,SAAS,WAAW;AAE/C,mBAAW,UAAU,QAAQ;AAAA,UAC3B,CAAC,YACC,EAAE,eAAc,oBAAI,IAAa,CAAC,OAAO,UAAU,CAAC,GAAE,IAAI,OAAO;AAAA,QACrE;AAAA,MACF;AAIA,cACE,2BAAQ,YAAY,SAAS,KAC7B,CAAC,aAAa,eAAe,GAAG,SAAS,4BAA4B,GACrE;AACA,eAAO,WAAW;AAAA,MACpB;AAGA,UACE,YACA,SAAS,iBACT,4BAAS,WAAW,eAAe,KACnC,CAAC,WAAW,gBAAgB,gBAC5B;AACA,mBAAW,gBAAgB,iBAAiB;AAAA,MAC9C;AAEA,iBAAO,0BAAa,UAAU;AAAA,IAChC;AAAA,EACF;AACF;",
+  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { hasProp, hasStringProp, isObject } from '../../../utils/validation';\nimport { formatObject, parseObject } from '../processing/json';\nimport { loadFiles } from '../processing/loadFiles';\nimport { merge } from '../processing/record';\nimport type { Module, Options } from '../types';\n\nexport const tsconfigModule = async ({\n  firstRun,\n  type,\n}: Options): Promise<Module> => {\n  const [buildFile, baseFile] = await Promise.all([\n    readBaseTemplateFile('tsconfig.build.json'),\n    readBaseTemplateFile('tsconfig.json'),\n  ]);\n\n  const baseData = parseObject(baseFile);\n\n  // packages should not use module aliases\n  if (\n    type === 'package' &&\n    hasProp(baseData, 'compilerOptions') &&\n    isObject(baseData.compilerOptions)\n  ) {\n    delete baseData.compilerOptions.baseUrl;\n    delete baseData.compilerOptions.paths;\n  }\n\n  return {\n    ...loadFiles('Dockerfile'),\n\n    'tsconfig.build.json': (inputFile) => inputFile ?? buildFile,\n\n    'tsconfig.json': (inputFile, files, initialFiles) => {\n      const inputData = parseObject(inputFile);\n\n      let outDir: string | undefined;\n\n      if (\n        hasProp(inputData, 'compilerOptions') &&\n        hasStringProp(inputData.compilerOptions, 'outDir')\n      ) {\n        outDir = inputData.compilerOptions.outDir.replace(/\\/$/, '');\n      }\n\n      // optimistically rewire Dockerfile for new output directory\n      if (outDir !== undefined && outDir !== 'lib') {\n        files.Dockerfile = files.Dockerfile?.replace(\n          new RegExp(`([^\\\\w])${outDir}([^\\\\w])`, 'g'),\n          '$1lib$2',\n        );\n      }\n\n      // existing project may target earlier Node.js versions than skuba\n      if (hasProp(baseData, 'compilerOptions')) {\n        if (\n          hasProp(baseData.compilerOptions, 'lib') &&\n          hasProp(inputData?.compilerOptions, 'lib')\n        ) {\n          delete baseData.compilerOptions.lib;\n        }\n\n        if (\n          hasProp(baseData.compilerOptions, 'target') &&\n          hasProp(inputData?.compilerOptions, 'target')\n        ) {\n          delete baseData.compilerOptions.target;\n        }\n      }\n\n      const outputData = merge(inputData ?? {}, baseData);\n\n      // Remove `lib/**/*` and `lib`, which duplicate `lib*/**/*`\n      if (hasProp(outputData, 'exclude') && Array.isArray(outputData.exclude)) {\n        const { exclude } = outputData;\n\n        const hasLibStar = exclude.includes('lib*/**/*');\n\n        outputData.exclude = exclude.filter(\n          (pattern: unknown) =>\n            !(hasLibStar && new Set<unknown>(['lib', 'lib/**/*']).has(pattern)),\n        );\n      }\n\n      // for optimal ESLinting, base config should compile all files and leave\n      // exclusions to .eslintignore and tsconfig.build.json\n      if (\n        hasProp(outputData, 'include') &&\n        !initialFiles['tsconfig.json']?.includes('skuba/config/tsconfig.json')\n      ) {\n        delete outputData.include;\n      }\n\n      // Retain comments for package documentation\n      if (\n        firstRun &&\n        type === 'package' &&\n        hasProp(outputData, 'compilerOptions') &&\n        isObject(outputData.compilerOptions) &&\n        !outputData.compilerOptions.removeComments\n      ) {\n        outputData.compilerOptions.removeComments = false;\n      }\n\n      return formatObject(outputData);\n    },\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,wBAAiD;AACjD,kBAA0C;AAC1C,uBAA0B;AAC1B,oBAAsB;AAGf,MAAM,iBAAiB,OAAO;AAAA,EACnC;AAAA,EACA;AACF,MAAgC;AAC9B,QAAM,CAAC,WAAW,QAAQ,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,sCAAqB,qBAAqB;AAAA,QAC1C,sCAAqB,eAAe;AAAA,EACtC,CAAC;AAED,QAAM,eAAW,yBAAY,QAAQ;AAGrC,MACE,SAAS,iBACT,2BAAQ,UAAU,iBAAiB,SACnC,4BAAS,SAAS,eAAe,GACjC;AACA,WAAO,SAAS,gBAAgB;AAChC,WAAO,SAAS,gBAAgB;AAAA,EAClC;AAEA,SAAO;AAAA,IACL,OAAG,4BAAU,YAAY;AAAA,IAEzB,uBAAuB,CAAC,cAAc,aAAa;AAAA,IAEnD,iBAAiB,CAAC,WAAW,OAAO,iBAAiB;AACnD,YAAM,gBAAY,yBAAY,SAAS;AAEvC,UAAI;AAEJ,cACE,2BAAQ,WAAW,iBAAiB,SACpC,iCAAc,UAAU,iBAAiB,QAAQ,GACjD;AACA,iBAAS,UAAU,gBAAgB,OAAO,QAAQ,OAAO,EAAE;AAAA,MAC7D;AAGA,UAAI,WAAW,UAAa,WAAW,OAAO;AAC5C,cAAM,aAAa,MAAM,YAAY;AAAA,UACnC,IAAI,OAAO,WAAW,kBAAkB,GAAG;AAAA,UAC3C;AAAA,QACF;AAAA,MACF;AAGA,cAAI,2BAAQ,UAAU,iBAAiB,GAAG;AACxC,gBACE,2BAAQ,SAAS,iBAAiB,KAAK,SACvC,2BAAQ,WAAW,iBAAiB,KAAK,GACzC;AACA,iBAAO,SAAS,gBAAgB;AAAA,QAClC;AAEA,gBACE,2BAAQ,SAAS,iBAAiB,QAAQ,SAC1C,2BAAQ,WAAW,iBAAiB,QAAQ,GAC5C;AACA,iBAAO,SAAS,gBAAgB;AAAA,QAClC;AAAA,MACF;AAEA,YAAM,iBAAa,qBAAM,aAAa,CAAC,GAAG,QAAQ;AAGlD,cAAI,2BAAQ,YAAY,SAAS,KAAK,MAAM,QAAQ,WAAW,OAAO,GAAG;AACvE,cAAM,EAAE,QAAQ,IAAI;AAEpB,cAAM,aAAa,QAAQ,SAAS,WAAW;AAE/C,mBAAW,UAAU,QAAQ;AAAA,UAC3B,CAAC,YACC,EAAE,eAAc,oBAAI,IAAa,CAAC,OAAO,UAAU,CAAC,GAAE,IAAI,OAAO;AAAA,QACrE;AAAA,MACF;AAIA,cACE,2BAAQ,YAAY,SAAS,KAC7B,CAAC,aAAa,eAAe,GAAG,SAAS,4BAA4B,GACrE;AACA,eAAO,WAAW;AAAA,MACpB;AAGA,UACE,YACA,SAAS,iBACT,2BAAQ,YAAY,iBAAiB,SACrC,4BAAS,WAAW,eAAe,KACnC,CAAC,WAAW,gBAAgB,gBAC5B;AACA,mBAAW,gBAAgB,iBAAiB;AAAA,MAC9C;AAEA,iBAAO,0BAAa,UAAU;AAAA,IAChC;AAAA,EACF;AACF;",
   "names": []
 }

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

@@ -0,0 +1,3 @@
+export declare const KEEP_ALIVE_CODE = "\n// Gantry ALB default idle timeout is 30 seconds\n// https://nodejs.org/docs/latest-v18.x/api/http.html#serverkeepalivetimeout\n// Node default is 5 seconds\n// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/application-load-balancers.html#connection-idle-timeout\n// AWS recommends setting an application timeout larger than the load balancer\nlistener.keepAliveTimeout = 31000;\n";
+export declare const SERVER_LISTENER_FILENAME = "src/listen.ts";
+export declare const tryPatchServerListener: (dir?: string) => Promise<void>;

package/lib/cli/configure/patchServerListener.js

@@ -0,0 +1,87 @@
+"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 patchServerListener_exports = {};
+__export(patchServerListener_exports, {
+  KEEP_ALIVE_CODE: () => KEEP_ALIVE_CODE,
+  SERVER_LISTENER_FILENAME: () => SERVER_LISTENER_FILENAME,
+  tryPatchServerListener: () => tryPatchServerListener
+});
+module.exports = __toCommonJS(patchServerListener_exports);
+var import_util = require("util");
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_logging = require("../../utils/logging");
+var import_project = require("./analysis/project");
+var import_prettier = require("./processing/prettier");
+const KEEP_ALIVE_CODE = `
+// Gantry ALB default idle timeout is 30 seconds
+// https://nodejs.org/docs/latest-v18.x/api/http.html#serverkeepalivetimeout
+// Node default is 5 seconds
+// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/application-load-balancers.html#connection-idle-timeout
+// AWS recommends setting an application timeout larger than the load balancer
+listener.keepAliveTimeout = 31000;
+`;
+const SERVER_LISTENER_FILENAME = "src/listen.ts";
+const patchServerListener = async (dir) => {
+  const readFile = (0, import_project.createDestinationFileReader)(dir);
+  let listener = await readFile(SERVER_LISTENER_FILENAME);
+  if (!listener || listener.includes("keepAliveTimeout")) {
+    return;
+  }
+  if (listener.includes("\napp.listen(")) {
+    listener = listener.replace(
+      "\napp.listen(",
+      "\nconst listener = app.listen("
+    );
+  }
+  if (!listener.includes("\nconst listener = app.listen(")) {
+    return;
+  }
+  listener = `${listener}${KEEP_ALIVE_CODE}`;
+  await import_fs_extra.default.promises.writeFile(
+    SERVER_LISTENER_FILENAME,
+    (0, import_prettier.formatPrettier)(listener, {
+      parser: "typescript"
+    })
+  );
+};
+const tryPatchServerListener = async (dir = process.cwd()) => {
+  try {
+    await patchServerListener(dir);
+  } catch (err) {
+    import_logging.log.warn("Failed to patch server listener.");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  KEEP_ALIVE_CODE,
+  SERVER_LISTENER_FILENAME,
+  tryPatchServerListener
+});
+//# sourceMappingURL=patchServerListener.js.map

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/cli/configure/patchServerListener.ts"],
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport { log } from '../../utils/logging';\n\nimport { createDestinationFileReader } from './analysis/project';\nimport { formatPrettier } from './processing/prettier';\n\nexport const KEEP_ALIVE_CODE = `\n// Gantry ALB default idle timeout is 30 seconds\n// https://nodejs.org/docs/latest-v18.x/api/http.html#serverkeepalivetimeout\n// Node default is 5 seconds\n// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/application-load-balancers.html#connection-idle-timeout\n// AWS recommends setting an application timeout larger than the load balancer\nlistener.keepAliveTimeout = 31000;\n`;\n\nexport const SERVER_LISTENER_FILENAME = 'src/listen.ts';\n\nconst patchServerListener = async (dir: string) => {\n  const readFile = createDestinationFileReader(dir);\n\n  let listener = await readFile(SERVER_LISTENER_FILENAME);\n\n  if (!listener || listener.includes('keepAliveTimeout')) {\n    return;\n  }\n\n  if (listener.includes('\\napp.listen(')) {\n    listener = listener.replace(\n      '\\napp.listen(',\n      '\\nconst listener = app.listen(',\n    );\n  }\n\n  if (!listener.includes('\\nconst listener = app.listen(')) {\n    return;\n  }\n\n  listener = `${listener}${KEEP_ALIVE_CODE}`;\n\n  await fs.promises.writeFile(\n    SERVER_LISTENER_FILENAME,\n    formatPrettier(listener, {\n      parser: 'typescript',\n    }),\n  );\n};\n\nexport const tryPatchServerListener = async (dir = process.cwd()) => {\n  try {\n    await patchServerListener(dir);\n  } catch (err) {\n    log.warn('Failed to patch server listener.');\n    log.subtle(inspect(err));\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,sBAAe;AAEf,qBAAoB;AAEpB,qBAA4C;AAC5C,sBAA+B;AAExB,MAAM,kBAAkB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASxB,MAAM,2BAA2B;AAExC,MAAM,sBAAsB,OAAO,QAAgB;AACjD,QAAM,eAAW,4CAA4B,GAAG;AAEhD,MAAI,WAAW,MAAM,SAAS,wBAAwB;AAEtD,MAAI,CAAC,YAAY,SAAS,SAAS,kBAAkB,GAAG;AACtD;AAAA,EACF;AAEA,MAAI,SAAS,SAAS,eAAe,GAAG;AACtC,eAAW,SAAS;AAAA,MAClB;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,MAAI,CAAC,SAAS,SAAS,gCAAgC,GAAG;AACxD;AAAA,EACF;AAEA,aAAW,GAAG,WAAW;AAEzB,QAAM,gBAAAA,QAAG,SAAS;AAAA,IAChB;AAAA,QACA,gCAAe,UAAU;AAAA,MACvB,QAAQ;AAAA,IACV,CAAC;AAAA,EACH;AACF;AAEO,MAAM,yBAAyB,OAAO,MAAM,QAAQ,IAAI,MAAM;AACnE,MAAI;AACF,UAAM,oBAAoB,GAAG;AAAA,EAC/B,SAAS,KAAP;AACA,uBAAI,KAAK,kCAAkC;AAC3C,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AAAA,EACzB;AACF;",
+  "names": ["fs"]
+}

package/lib/cli/format.js

@@ -38,11 +38,13 @@ var import_eslint = require("./adapter/eslint");
 var import_prettier = require("./adapter/prettier");
 var import_addEmptyExports = require("./configure/addEmptyExports");
 var import_patchRenovateConfig = require("./configure/patchRenovateConfig");
+var import_patchServerListener = require("./configure/patchServerListener");
 var import_refreshIgnoreFiles = require("./configure/refreshIgnoreFiles");
 const format = async (args = process.argv.slice(2)) => {
   await Promise.all([
     (0, import_addEmptyExports.tryAddEmptyExports)(),
     (0, import_patchRenovateConfig.tryPatchRenovateConfig)(),
+    (0, import_patchServerListener.tryPatchServerListener)(),
     (0, import_refreshIgnoreFiles.tryRefreshIgnoreFiles)()
   ]);
   const debug = (0, import_args.hasDebugFlag)(args);

package/lib/cli/format.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/cli/format.ts"],
-  "sourcesContent": ["import chalk from 'chalk';\n\nimport { hasDebugFlag } from '../utils/args';\nimport { createLogger, log } from '../utils/logging';\n\nimport { runESLint } from './adapter/eslint';\nimport { runPrettier } from './adapter/prettier';\nimport { tryAddEmptyExports } from './configure/addEmptyExports';\nimport { tryPatchRenovateConfig } from './configure/patchRenovateConfig';\nimport { tryRefreshIgnoreFiles } from './configure/refreshIgnoreFiles';\n\nexport const format = async (args = process.argv.slice(2)): Promise<void> => {\n  await Promise.all([\n    tryAddEmptyExports(),\n    tryPatchRenovateConfig(),\n    tryRefreshIgnoreFiles(),\n  ]);\n\n  const debug = hasDebugFlag(args);\n  const logger = createLogger(debug);\n\n  log.plain(chalk.magenta('ESLint'));\n\n  const eslint = await runESLint('format', logger);\n\n  log.newline();\n  log.plain(chalk.cyan('Prettier'));\n\n  const prettier = await runPrettier('format', logger);\n\n  if (eslint.ok && prettier.ok) {\n    return;\n  }\n\n  const tools = [\n    ...(eslint.ok ? [] : ['ESLint']),\n    ...(prettier.ok ? [] : ['Prettier']),\n  ];\n\n  log.newline();\n  log.err(tools.join(', '), 'found issues that require triage.');\n\n  process.exitCode = 1;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,kBAA6B;AAC7B,qBAAkC;AAElC,oBAA0B;AAC1B,sBAA4B;AAC5B,6BAAmC;AACnC,iCAAuC;AACvC,gCAAsC;AAE/B,MAAM,SAAS,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAqB;AAC3E,QAAM,QAAQ,IAAI;AAAA,QAChB,2CAAmB;AAAA,QACnB,mDAAuB;AAAA,QACvB,iDAAsB;AAAA,EACxB,CAAC;AAED,QAAM,YAAQ,0BAAa,IAAI;AAC/B,QAAM,aAAS,6BAAa,KAAK;AAEjC,qBAAI,MAAM,aAAAA,QAAM,QAAQ,QAAQ,CAAC;AAEjC,QAAM,SAAS,UAAM,yBAAU,UAAU,MAAM;AAE/C,qBAAI,QAAQ;AACZ,qBAAI,MAAM,aAAAA,QAAM,KAAK,UAAU,CAAC;AAEhC,QAAM,WAAW,UAAM,6BAAY,UAAU,MAAM;AAEnD,MAAI,OAAO,MAAM,SAAS,IAAI;AAC5B;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ;AAAA,IAC9B,GAAI,SAAS,KAAK,CAAC,IAAI,CAAC,UAAU;AAAA,EACpC;AAEA,qBAAI,QAAQ;AACZ,qBAAI,IAAI,MAAM,KAAK,IAAI,GAAG,mCAAmC;AAE7D,UAAQ,WAAW;AACrB;",
+  "sourcesContent": ["import chalk from 'chalk';\n\nimport { hasDebugFlag } from '../utils/args';\nimport { createLogger, log } from '../utils/logging';\n\nimport { runESLint } from './adapter/eslint';\nimport { runPrettier } from './adapter/prettier';\nimport { tryAddEmptyExports } from './configure/addEmptyExports';\nimport { tryPatchRenovateConfig } from './configure/patchRenovateConfig';\nimport { tryPatchServerListener } from './configure/patchServerListener';\nimport { tryRefreshIgnoreFiles } from './configure/refreshIgnoreFiles';\n\nexport const format = async (args = process.argv.slice(2)): Promise<void> => {\n  await Promise.all([\n    tryAddEmptyExports(),\n    tryPatchRenovateConfig(),\n    tryPatchServerListener(),\n    tryRefreshIgnoreFiles(),\n  ]);\n\n  const debug = hasDebugFlag(args);\n  const logger = createLogger(debug);\n\n  log.plain(chalk.magenta('ESLint'));\n\n  const eslint = await runESLint('format', logger);\n\n  log.newline();\n  log.plain(chalk.cyan('Prettier'));\n\n  const prettier = await runPrettier('format', logger);\n\n  if (eslint.ok && prettier.ok) {\n    return;\n  }\n\n  const tools = [\n    ...(eslint.ok ? [] : ['ESLint']),\n    ...(prettier.ok ? [] : ['Prettier']),\n  ];\n\n  log.newline();\n  log.err(tools.join(', '), 'found issues that require triage.');\n\n  process.exitCode = 1;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,kBAA6B;AAC7B,qBAAkC;AAElC,oBAA0B;AAC1B,sBAA4B;AAC5B,6BAAmC;AACnC,iCAAuC;AACvC,iCAAuC;AACvC,gCAAsC;AAE/B,MAAM,SAAS,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAqB;AAC3E,QAAM,QAAQ,IAAI;AAAA,QAChB,2CAAmB;AAAA,QACnB,mDAAuB;AAAA,QACvB,mDAAuB;AAAA,QACvB,iDAAsB;AAAA,EACxB,CAAC;AAED,QAAM,YAAQ,0BAAa,IAAI;AAC/B,QAAM,aAAS,6BAAa,KAAK;AAEjC,qBAAI,MAAM,aAAAA,QAAM,QAAQ,QAAQ,CAAC;AAEjC,QAAM,SAAS,UAAM,yBAAU,UAAU,MAAM;AAE/C,qBAAI,QAAQ;AACZ,qBAAI,MAAM,aAAAA,QAAM,KAAK,UAAU,CAAC;AAEhC,QAAM,WAAW,UAAM,6BAAY,UAAU,MAAM;AAEnD,MAAI,OAAO,MAAM,SAAS,IAAI;AAC5B;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ;AAAA,IAC9B,GAAI,SAAS,KAAK,CAAC,IAAI,CAAC,UAAU;AAAA,EACpC;AAEA,qBAAI,QAAQ;AACZ,qBAAI,IAAI,MAAM,KAAK,IAAI,GAAG,mCAAmC;AAE7D,UAAQ,WAAW;AACrB;",
   "names": ["chalk"]
 }

package/lib/cli/lint/autofix.js

@@ -44,6 +44,8 @@ var import_wait = require("../../utils/wait");
 var import_eslint = require("../adapter/eslint");
 var import_prettier = require("../adapter/prettier");
 var import_addEmptyExports = require("../configure/addEmptyExports");
+var import_renovate = require("../configure/modules/renovate");
+var import_patchServerListener = require("../configure/patchServerListener");
 var import_refreshIgnoreFiles = require("../configure/refreshIgnoreFiles");
 const AUTOFIX_COMMIT_MESSAGE = "Run `skuba format`";
 const AUTOFIX_DELETE_FILES = [
@@ -54,7 +56,9 @@ const AUTOFIX_DELETE_FILES = [
 const AUTOFIX_CODEGEN_FILES = /* @__PURE__ */ new Set([
   ...AUTOFIX_DELETE_FILES,
   ...import_addEmptyExports.JEST_SETUP_FILES,
-  ...import_refreshIgnoreFiles.REFRESHABLE_IGNORE_FILES
+  ...import_refreshIgnoreFiles.REFRESHABLE_IGNORE_FILES,
+  ...import_renovate.RENOVATE_CONFIG_FILENAMES,
+  import_patchServerListener.SERVER_LISTENER_FILENAME
 ]);
 const AUTOFIX_IGNORE_FILES = [
   {

package/lib/cli/lint/autofix.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/autofix.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport simpleGit from 'simple-git';\n\nimport * as Git from '../../api/git';\nimport * as GitHub from '../../api/github';\nimport { isCiEnv } from '../../utils/env';\nimport { createLogger, log } from '../../utils/logging';\nimport { throwOnTimeout } from '../../utils/wait';\nimport { runESLint } from '../adapter/eslint';\nimport { runPrettier } from '../adapter/prettier';\nimport { JEST_SETUP_FILES } from '../configure/addEmptyExports';\nimport { REFRESHABLE_IGNORE_FILES } from '../configure/refreshIgnoreFiles';\n\nimport type { Input } from './types';\n\nconst AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';\n\nconst AUTOFIX_DELETE_FILES = [\n  // Try to delete this SEEK-Jobs/gutenberg automation file that may have been\n  // accidentally committed in a prior autofix.\n  'Dockerfile-incunabulum',\n];\n\nconst AUTOFIX_CODEGEN_FILES = new Set<string>([\n  ...AUTOFIX_DELETE_FILES,\n  ...JEST_SETUP_FILES,\n  ...REFRESHABLE_IGNORE_FILES,\n]);\n\nexport const AUTOFIX_IGNORE_FILES: Git.ChangedFile[] = [\n  {\n    path: '.npmrc',\n    state: 'added',\n  },\n  {\n    path: 'Dockerfile-incunabulum',\n    state: 'added',\n  },\n];\n\nconst shouldPush = async ({\n  currentBranch,\n  dir,\n}: {\n  currentBranch?: string;\n  dir: string;\n}) => {\n  if (!isCiEnv()) {\n    // We're not running in a CI environment so we don't need to push autofixes.\n    // Ideally we'd drive this off of repository write permissions, but that is\n    // non-trivial to infer without attempting an actual write.\n    return false;\n  }\n\n  const isDefaultBuildkiteBranch =\n    currentBranch &&\n    [process.env.BUILDKITE_PIPELINE_DEFAULT_BRANCH, 'master', 'main'].includes(\n      currentBranch,\n    );\n\n  const isProtectedGitHubBranch = process.env.GITHUB_REF_PROTECTED === 'true';\n\n  if (isDefaultBuildkiteBranch || isProtectedGitHubBranch) {\n    // The current branch is a protected branch.\n    // We respect GitHub Flow; avoid pushing directly to the default branch.\n    return false;\n  }\n\n  let headCommitMessage;\n  try {\n    headCommitMessage = await Git.getHeadCommitMessage({ dir });\n  } catch {}\n\n  if (headCommitMessage === AUTOFIX_COMMIT_MESSAGE) {\n    // Short circuit when the head commit appears to be one of our autofixes.\n    // Repeating the same operation is unlikely to correct outstanding issues.\n    return false;\n  }\n\n  // Allow the push attempt to go ahead if our guards have been cleared.\n  return true;\n};\n\ninterface AutofixParameters {\n  debug: Input['debug'];\n\n  eslint: boolean;\n  prettier: boolean;\n}\n\n/**\n * @returns Whether skuba codegenned a file change which should be included in\n * an autofix commit.\n */\nconst tryCodegen = async (dir: string): Promise<boolean> => {\n  try {\n    // Try to forcibly remove `AUTOFIX_DELETE_FILES` from source control.\n    // These may include outdated configuration files or internal files that\n    // were accidentally committed by an autofix.\n    await Promise.all(\n      AUTOFIX_DELETE_FILES.map((filename) =>\n        fs.promises.rm(path.join(dir, filename), { force: true }),\n      ),\n    );\n\n    // Search codegenned file changes in the local Git working directory.\n    // These may include the `AUTOFIX_DELETE_FILES` deleted above or fixups to\n    // ignore files and module exports that were run at the start of the\n    // `skuba lint` command.\n    const changedFiles = await Git.getChangedFiles({\n      dir,\n\n      ignore: AUTOFIX_IGNORE_FILES,\n    });\n\n    // Determine if a meaningful codegen change\n    return changedFiles.some((changedFile) =>\n      AUTOFIX_CODEGEN_FILES.has(changedFile.path),\n    );\n  } catch (err) {\n    log.warn(log.bold('Failed to evaluate codegen changes.'));\n    log.subtle(inspect(err));\n\n    return false;\n  }\n};\n\nexport const autofix = async (params: AutofixParameters): Promise<void> => {\n  const dir = process.cwd();\n\n  const codegen = await tryCodegen(dir);\n\n  if (!params.eslint && !params.prettier && !codegen) {\n    return;\n  }\n\n  let currentBranch;\n  try {\n    currentBranch = await Git.currentBranch({ dir });\n  } catch {}\n\n  if (!(await shouldPush({ currentBranch, dir }))) {\n    return;\n  }\n\n  try {\n    log.newline();\n    if (!params.eslint && !params.prettier) {\n      log.warn('Trying to push codegen updates...');\n    } else {\n      log.warn(\n        `Trying to autofix with ${\n          params.eslint ? 'ESLint and ' : ''\n        }Prettier...`,\n      );\n\n      const logger = createLogger(params.debug);\n\n      if (params.eslint) {\n        await runESLint('format', logger);\n      }\n      // Unconditionally re-run Prettier; reaching here means we have pre-existing\n      // format violations or may have created new ones through ESLint fixes.\n      await runPrettier('format', logger);\n    }\n\n    if (process.env.GITHUB_ACTIONS) {\n      // GitHub runners have Git installed locally\n      const ref = await Git.commitAllChanges({\n        dir,\n        message: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: AUTOFIX_IGNORE_FILES,\n      });\n\n      if (!ref) {\n        return log.warn('No autofixes detected.');\n      }\n\n      await throwOnTimeout(simpleGit().push(), { s: 30 });\n      log.warn(`Pushed fix commit ${ref}.`);\n      return;\n    }\n\n    // Other CI Environments, use GitHub API\n    if (!currentBranch) {\n      log.warn('Could not determine the current branch.');\n      log.warn(\n        'Please propagate BUILDKITE_BRANCH, GITHUB_HEAD_REF, GITHUB_REF_NAME, or the .git directory to your container.',\n      );\n      return;\n    }\n\n    const ref = await throwOnTimeout(\n      GitHub.uploadAllFileChanges({\n        branch: currentBranch,\n        dir,\n        messageHeadline: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: AUTOFIX_IGNORE_FILES,\n      }),\n      { s: 30 },\n    );\n\n    if (!ref) {\n      return log.warn('No autofixes detected.');\n    }\n\n    log.warn(`Pushed fix commit ${ref}.`);\n  } catch (err) {\n    log.warn(log.bold('Failed to push fix commit.'));\n    log.warn(\n      log.bold(\n        'Does your CI environment have write access to your Git repository?',\n      ),\n    );\n    log.subtle(inspect(err));\n  }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport simpleGit from 'simple-git';\n\nimport * as Git from '../../api/git';\nimport * as GitHub from '../../api/github';\nimport { isCiEnv } from '../../utils/env';\nimport { createLogger, log } from '../../utils/logging';\nimport { throwOnTimeout } from '../../utils/wait';\nimport { runESLint } from '../adapter/eslint';\nimport { runPrettier } from '../adapter/prettier';\nimport { JEST_SETUP_FILES } from '../configure/addEmptyExports';\nimport { RENOVATE_CONFIG_FILENAMES } from '../configure/modules/renovate';\nimport { SERVER_LISTENER_FILENAME } from '../configure/patchServerListener';\nimport { REFRESHABLE_IGNORE_FILES } from '../configure/refreshIgnoreFiles';\n\nimport type { Input } from './types';\n\nconst AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';\n\nconst AUTOFIX_DELETE_FILES = [\n  // Try to delete this SEEK-Jobs/gutenberg automation file that may have been\n  // accidentally committed in a prior autofix.\n  'Dockerfile-incunabulum',\n];\n\nconst AUTOFIX_CODEGEN_FILES = new Set<string>([\n  ...AUTOFIX_DELETE_FILES,\n  ...JEST_SETUP_FILES,\n  ...REFRESHABLE_IGNORE_FILES,\n  ...RENOVATE_CONFIG_FILENAMES,\n  SERVER_LISTENER_FILENAME,\n]);\n\nexport const AUTOFIX_IGNORE_FILES: Git.ChangedFile[] = [\n  {\n    path: '.npmrc',\n    state: 'added',\n  },\n  {\n    path: 'Dockerfile-incunabulum',\n    state: 'added',\n  },\n];\n\nconst shouldPush = async ({\n  currentBranch,\n  dir,\n}: {\n  currentBranch?: string;\n  dir: string;\n}) => {\n  if (!isCiEnv()) {\n    // We're not running in a CI environment so we don't need to push autofixes.\n    // Ideally we'd drive this off of repository write permissions, but that is\n    // non-trivial to infer without attempting an actual write.\n    return false;\n  }\n\n  const isDefaultBuildkiteBranch =\n    currentBranch &&\n    [process.env.BUILDKITE_PIPELINE_DEFAULT_BRANCH, 'master', 'main'].includes(\n      currentBranch,\n    );\n\n  const isProtectedGitHubBranch = process.env.GITHUB_REF_PROTECTED === 'true';\n\n  if (isDefaultBuildkiteBranch || isProtectedGitHubBranch) {\n    // The current branch is a protected branch.\n    // We respect GitHub Flow; avoid pushing directly to the default branch.\n    return false;\n  }\n\n  let headCommitMessage;\n  try {\n    headCommitMessage = await Git.getHeadCommitMessage({ dir });\n  } catch {}\n\n  if (headCommitMessage === AUTOFIX_COMMIT_MESSAGE) {\n    // Short circuit when the head commit appears to be one of our autofixes.\n    // Repeating the same operation is unlikely to correct outstanding issues.\n    return false;\n  }\n\n  // Allow the push attempt to go ahead if our guards have been cleared.\n  return true;\n};\n\ninterface AutofixParameters {\n  debug: Input['debug'];\n\n  eslint: boolean;\n  prettier: boolean;\n}\n\n/**\n * @returns Whether skuba codegenned a file change which should be included in\n * an autofix commit.\n */\nconst tryCodegen = async (dir: string): Promise<boolean> => {\n  try {\n    // Try to forcibly remove `AUTOFIX_DELETE_FILES` from source control.\n    // These may include outdated configuration files or internal files that\n    // were accidentally committed by an autofix.\n    await Promise.all(\n      AUTOFIX_DELETE_FILES.map((filename) =>\n        fs.promises.rm(path.join(dir, filename), { force: true }),\n      ),\n    );\n\n    // Search codegenned file changes in the local Git working directory.\n    // These may include the `AUTOFIX_DELETE_FILES` deleted above or fixups to\n    // ignore files and module exports that were run at the start of the\n    // `skuba lint` command.\n    const changedFiles = await Git.getChangedFiles({\n      dir,\n\n      ignore: AUTOFIX_IGNORE_FILES,\n    });\n\n    // Determine if a meaningful codegen change\n    return changedFiles.some((changedFile) =>\n      AUTOFIX_CODEGEN_FILES.has(changedFile.path),\n    );\n  } catch (err) {\n    log.warn(log.bold('Failed to evaluate codegen changes.'));\n    log.subtle(inspect(err));\n\n    return false;\n  }\n};\n\nexport const autofix = async (params: AutofixParameters): Promise<void> => {\n  const dir = process.cwd();\n\n  const codegen = await tryCodegen(dir);\n\n  if (!params.eslint && !params.prettier && !codegen) {\n    return;\n  }\n\n  let currentBranch;\n  try {\n    currentBranch = await Git.currentBranch({ dir });\n  } catch {}\n\n  if (!(await shouldPush({ currentBranch, dir }))) {\n    return;\n  }\n\n  try {\n    log.newline();\n    if (!params.eslint && !params.prettier) {\n      log.warn('Trying to push codegen updates...');\n    } else {\n      log.warn(\n        `Trying to autofix with ${\n          params.eslint ? 'ESLint and ' : ''\n        }Prettier...`,\n      );\n\n      const logger = createLogger(params.debug);\n\n      if (params.eslint) {\n        await runESLint('format', logger);\n      }\n      // Unconditionally re-run Prettier; reaching here means we have pre-existing\n      // format violations or may have created new ones through ESLint fixes.\n      await runPrettier('format', logger);\n    }\n\n    if (process.env.GITHUB_ACTIONS) {\n      // GitHub runners have Git installed locally\n      const ref = await Git.commitAllChanges({\n        dir,\n        message: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: AUTOFIX_IGNORE_FILES,\n      });\n\n      if (!ref) {\n        return log.warn('No autofixes detected.');\n      }\n\n      await throwOnTimeout(simpleGit().push(), { s: 30 });\n      log.warn(`Pushed fix commit ${ref}.`);\n      return;\n    }\n\n    // Other CI Environments, use GitHub API\n    if (!currentBranch) {\n      log.warn('Could not determine the current branch.');\n      log.warn(\n        'Please propagate BUILDKITE_BRANCH, GITHUB_HEAD_REF, GITHUB_REF_NAME, or the .git directory to your container.',\n      );\n      return;\n    }\n\n    const ref = await throwOnTimeout(\n      GitHub.uploadAllFileChanges({\n        branch: currentBranch,\n        dir,\n        messageHeadline: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: AUTOFIX_IGNORE_FILES,\n      }),\n      { s: 30 },\n    );\n\n    if (!ref) {\n      return log.warn('No autofixes detected.');\n    }\n\n    log.warn(`Pushed fix commit ${ref}.`);\n  } catch (err) {\n    log.warn(log.bold('Failed to push fix commit.'));\n    log.warn(\n      log.bold(\n        'Does your CI environment have write access to your Git repository?',\n      ),\n    );\n    log.subtle(inspect(err));\n  }\n};\n"],
+  "mappings": "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",
   "names": ["fs", "path", "ref", "simpleGit"]
 }

package/lib/cli/lint/external.js

@@ -43,10 +43,7 @@ var import_prettier = require("./prettier");
 var import_tsc = require("./tsc");
 const tscPrefixRegex = /^(.*?tsc\s+│.*?\s)/gm;
 class StreamInterceptor extends import_stream.default.Transform {
-  constructor() {
-    super(...arguments);
-    this.chunks = [];
-  }
+  chunks = [];
   output() {
     return Buffer.concat(this.chunks).toString().replace(tscPrefixRegex, "");
   }

package/lib/cli/lint/external.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/cli/lint/external.ts"],
   "sourcesContent": ["import stream from 'stream';\nimport { inspect } from 'util';\n\nimport { log } from '../../utils/logging';\nimport { throwOnTimeout } from '../../utils/wait';\n\nimport { createAnnotations } from './annotate';\nimport { autofix } from './autofix';\nimport { runESLintInCurrentThread, runESLintInWorkerThread } from './eslint';\nimport {\n  runPrettierInCurrentThread,\n  runPrettierInWorkerThread,\n} from './prettier';\nimport { runTscInNewProcess } from './tsc';\nimport type { Input } from './types';\n\nconst tscPrefixRegex = /^(.*?tsc\\s+\u2502.*?\\s)/gm;\n\nexport class StreamInterceptor extends stream.Transform {\n  private chunks: Uint8Array[] = [];\n\n  public output() {\n    return Buffer.concat(this.chunks).toString().replace(tscPrefixRegex, '');\n  }\n\n  _transform(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: stream.TransformCallback,\n  ) {\n    this.chunks.push(chunk);\n\n    callback(null, chunk);\n  }\n}\n\nconst lintConcurrently = async ({ tscOutputStream, ...input }: Input) => {\n  const [eslint, prettier, tscOk] = await Promise.all([\n    runESLintInWorkerThread(input),\n    runPrettierInWorkerThread(input),\n    runTscInNewProcess({ ...input, tscOutputStream }),\n  ]);\n\n  return { eslint, prettier, tscOk };\n};\n\n/**\n * Run linting tools `--serial`ly for resource-constrained environments.\n *\n * Note that we still run ESLint and Prettier in worker threads as a\n * counterintuitive optimisation. Memory can be more readily freed on worker\n * thread exit, which isn't as easy with a monolithic main thread.\n */\nconst lintSerially = async ({ tscOutputStream, ...input }: Input) => {\n  const eslint = await runESLintInWorkerThread(input);\n  const prettier = await runPrettierInWorkerThread(input);\n  const tscOk = await runTscInNewProcess({ ...input, tscOutputStream });\n\n  return { eslint, prettier, tscOk };\n};\n\nconst lintSeriallyWithoutWorkerThreads = async (input: Input) => {\n  const eslint = await runESLintInCurrentThread(input);\n  const prettier = await runPrettierInCurrentThread(input);\n  const tscOk = await runTscInNewProcess(input);\n\n  return { eslint, prettier, tscOk };\n};\n\nconst selectLintFunction = (input: Input) => {\n  if (!input.workerThreads) {\n    return lintSeriallyWithoutWorkerThreads;\n  }\n\n  // `--debug` implies `--serial`.\n  const isSerial = input.debug || input.serial;\n\n  return isSerial ? lintSerially : lintConcurrently;\n};\n\nexport const externalLint = async (input: Input) => {\n  const lint = selectLintFunction(input);\n\n  const tscOutputStream = new StreamInterceptor();\n  tscOutputStream.pipe(input.tscOutputStream ?? process.stdout);\n\n  const { eslint, prettier, tscOk } = await lint({ ...input, tscOutputStream });\n\n  try {\n    await throwOnTimeout(\n      createAnnotations(eslint, prettier, tscOk, tscOutputStream),\n      { s: 30 },\n    );\n  } catch (err) {\n    log.warn('Failed to annotate lint results.');\n    log.subtle(inspect(err));\n  }\n\n  if (!eslint.ok || !prettier.ok || !tscOk) {\n    const tools = [\n      ...(eslint.ok ? [] : ['ESLint']),\n      ...(prettier.ok ? [] : ['Prettier']),\n      ...(tscOk ? [] : ['tsc']),\n    ];\n\n    log.newline();\n    log.err(`${tools.join(', ')} found issues that require triage.`);\n\n    process.exitCode = 1;\n  }\n\n  await autofix({\n    debug: input.debug,\n    eslint: eslint.fixable,\n    prettier: !prettier.ok,\n  });\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAmB;AACnB,kBAAwB;AAExB,qBAAoB;AACpB,kBAA+B;AAE/B,sBAAkC;AAClC,qBAAwB;AACxB,oBAAkE;AAClE,sBAGO;AACP,iBAAmC;AAGnC,MAAM,iBAAiB;AAEhB,MAAM,0BAA0B,cAAAA,QAAO,UAAU;AAAA,EAAjD;AAAA;AACL,SAAQ,SAAuB,CAAC;AAAA;AAAA,EAEzB,SAAS;AACd,WAAO,OAAO,OAAO,KAAK,MAAM,EAAE,SAAS,EAAE,QAAQ,gBAAgB,EAAE;AAAA,EACzE;AAAA,EAEA,WACE,OACA,WACA,UACA;AACA,SAAK,OAAO,KAAK,KAAK;AAEtB,aAAS,MAAM,KAAK;AAAA,EACtB;AACF;AAEA,MAAM,mBAAmB,OAAO,EAAE,iBAAiB,GAAG,MAAM,MAAa;AACvE,QAAM,CAAC,QAAQ,UAAU,KAAK,IAAI,MAAM,QAAQ,IAAI;AAAA,QAClD,uCAAwB,KAAK;AAAA,QAC7B,2CAA0B,KAAK;AAAA,QAC/B,+BAAmB,EAAE,GAAG,OAAO,gBAAgB,CAAC;AAAA,EAClD,CAAC;AAED,SAAO,EAAE,QAAQ,UAAU,MAAM;AACnC;AASA,MAAM,eAAe,OAAO,EAAE,iBAAiB,GAAG,MAAM,MAAa;AACnE,QAAM,SAAS,UAAM,uCAAwB,KAAK;AAClD,QAAM,WAAW,UAAM,2CAA0B,KAAK;AACtD,QAAM,QAAQ,UAAM,+BAAmB,EAAE,GAAG,OAAO,gBAAgB,CAAC;AAEpE,SAAO,EAAE,QAAQ,UAAU,MAAM;AACnC;AAEA,MAAM,mCAAmC,OAAO,UAAiB;AAC/D,QAAM,SAAS,UAAM,wCAAyB,KAAK;AACnD,QAAM,WAAW,UAAM,4CAA2B,KAAK;AACvD,QAAM,QAAQ,UAAM,+BAAmB,KAAK;AAE5C,SAAO,EAAE,QAAQ,UAAU,MAAM;AACnC;AAEA,MAAM,qBAAqB,CAAC,UAAiB;AAC3C,MAAI,CAAC,MAAM,eAAe;AACxB,WAAO;AAAA,EACT;AAGA,QAAM,WAAW,MAAM,SAAS,MAAM;AAEtC,SAAO,WAAW,eAAe;AACnC;AAEO,MAAM,eAAe,OAAO,UAAiB;AAClD,QAAM,OAAO,mBAAmB,KAAK;AAErC,QAAM,kBAAkB,IAAI,kBAAkB;AAC9C,kBAAgB,KAAK,MAAM,mBAAmB,QAAQ,MAAM;AAE5D,QAAM,EAAE,QAAQ,UAAU,MAAM,IAAI,MAAM,KAAK,EAAE,GAAG,OAAO,gBAAgB,CAAC;AAE5E,MAAI;AACF,cAAM;AAAA,UACJ,mCAAkB,QAAQ,UAAU,OAAO,eAAe;AAAA,MAC1D,EAAE,GAAG,GAAG;AAAA,IACV;AAAA,EACF,SAAS,KAAP;AACA,uBAAI,KAAK,kCAAkC;AAC3C,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AAAA,EACzB;AAEA,MAAI,CAAC,OAAO,MAAM,CAAC,SAAS,MAAM,CAAC,OAAO;AACxC,UAAM,QAAQ;AAAA,MACZ,GAAI,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ;AAAA,MAC9B,GAAI,SAAS,KAAK,CAAC,IAAI,CAAC,UAAU;AAAA,MAClC,GAAI,QAAQ,CAAC,IAAI,CAAC,KAAK;AAAA,IACzB;AAEA,uBAAI,QAAQ;AACZ,uBAAI,IAAI,GAAG,MAAM,KAAK,IAAI,qCAAqC;AAE/D,YAAQ,WAAW;AAAA,EACrB;AAEA,YAAM,wBAAQ;AAAA,IACZ,OAAO,MAAM;AAAA,IACb,QAAQ,OAAO;AAAA,IACf,UAAU,CAAC,SAAS;AAAA,EACtB,CAAC;AACH;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAmB;AACnB,kBAAwB;AAExB,qBAAoB;AACpB,kBAA+B;AAE/B,sBAAkC;AAClC,qBAAwB;AACxB,oBAAkE;AAClE,sBAGO;AACP,iBAAmC;AAGnC,MAAM,iBAAiB;AAEhB,MAAM,0BAA0B,cAAAA,QAAO,UAAU;AAAA,EAC9C,SAAuB,CAAC;AAAA,EAEzB,SAAS;AACd,WAAO,OAAO,OAAO,KAAK,MAAM,EAAE,SAAS,EAAE,QAAQ,gBAAgB,EAAE;AAAA,EACzE;AAAA,EAEA,WACE,OACA,WACA,UACA;AACA,SAAK,OAAO,KAAK,KAAK;AAEtB,aAAS,MAAM,KAAK;AAAA,EACtB;AACF;AAEA,MAAM,mBAAmB,OAAO,EAAE,iBAAiB,GAAG,MAAM,MAAa;AACvE,QAAM,CAAC,QAAQ,UAAU,KAAK,IAAI,MAAM,QAAQ,IAAI;AAAA,QAClD,uCAAwB,KAAK;AAAA,QAC7B,2CAA0B,KAAK;AAAA,QAC/B,+BAAmB,EAAE,GAAG,OAAO,gBAAgB,CAAC;AAAA,EAClD,CAAC;AAED,SAAO,EAAE,QAAQ,UAAU,MAAM;AACnC;AASA,MAAM,eAAe,OAAO,EAAE,iBAAiB,GAAG,MAAM,MAAa;AACnE,QAAM,SAAS,UAAM,uCAAwB,KAAK;AAClD,QAAM,WAAW,UAAM,2CAA0B,KAAK;AACtD,QAAM,QAAQ,UAAM,+BAAmB,EAAE,GAAG,OAAO,gBAAgB,CAAC;AAEpE,SAAO,EAAE,QAAQ,UAAU,MAAM;AACnC;AAEA,MAAM,mCAAmC,OAAO,UAAiB;AAC/D,QAAM,SAAS,UAAM,wCAAyB,KAAK;AACnD,QAAM,WAAW,UAAM,4CAA2B,KAAK;AACvD,QAAM,QAAQ,UAAM,+BAAmB,KAAK;AAE5C,SAAO,EAAE,QAAQ,UAAU,MAAM;AACnC;AAEA,MAAM,qBAAqB,CAAC,UAAiB;AAC3C,MAAI,CAAC,MAAM,eAAe;AACxB,WAAO;AAAA,EACT;AAGA,QAAM,WAAW,MAAM,SAAS,MAAM;AAEtC,SAAO,WAAW,eAAe;AACnC;AAEO,MAAM,eAAe,OAAO,UAAiB;AAClD,QAAM,OAAO,mBAAmB,KAAK;AAErC,QAAM,kBAAkB,IAAI,kBAAkB;AAC9C,kBAAgB,KAAK,MAAM,mBAAmB,QAAQ,MAAM;AAE5D,QAAM,EAAE,QAAQ,UAAU,MAAM,IAAI,MAAM,KAAK,EAAE,GAAG,OAAO,gBAAgB,CAAC;AAE5E,MAAI;AACF,cAAM;AAAA,UACJ,mCAAkB,QAAQ,UAAU,OAAO,eAAe;AAAA,MAC1D,EAAE,GAAG,GAAG;AAAA,IACV;AAAA,EACF,SAAS,KAAP;AACA,uBAAI,KAAK,kCAAkC;AAC3C,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AAAA,EACzB;AAEA,MAAI,CAAC,OAAO,MAAM,CAAC,SAAS,MAAM,CAAC,OAAO;AACxC,UAAM,QAAQ;AAAA,MACZ,GAAI,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ;AAAA,MAC9B,GAAI,SAAS,KAAK,CAAC,IAAI,CAAC,UAAU;AAAA,MAClC,GAAI,QAAQ,CAAC,IAAI,CAAC,KAAK;AAAA,IACzB;AAEA,uBAAI,QAAQ;AACZ,uBAAI,IAAI,GAAG,MAAM,KAAK,IAAI,qCAAqC;AAE/D,YAAQ,WAAW;AAAA,EACrB;AAEA,YAAM,wBAAQ;AAAA,IACZ,OAAO,MAAM;AAAA,IACb,QAAQ,OAAO;AAAA,IACf,UAAU,CAAC,SAAS;AAAA,EACtB,CAAC;AACH;",
   "names": ["stream"]
 }

package/lib/cli/lint/index.js

@@ -24,6 +24,7 @@ module.exports = __toCommonJS(lint_exports);
 var import_args = require("../../utils/args");
 var import_addEmptyExports = require("../configure/addEmptyExports");
 var import_patchRenovateConfig = require("../configure/patchRenovateConfig");
+var import_patchServerListener = require("../configure/patchServerListener");
 var import_refreshIgnoreFiles = require("../configure/refreshIgnoreFiles");
 var import_external = require("./external");
 var import_internal = require("./internal");
@@ -31,6 +32,7 @@ const lint = async (args = process.argv.slice(2), tscOutputStream = void 0, work
   await Promise.all([
     (0, import_addEmptyExports.tryAddEmptyExports)(),
     (0, import_patchRenovateConfig.tryPatchRenovateConfig)(),
+    (0, import_patchServerListener.tryPatchServerListener)(),
     (0, import_refreshIgnoreFiles.tryRefreshIgnoreFiles)()
   ]);
   const opts = {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/index.ts"],
-  "sourcesContent": ["import type { Writable } from 'stream';\n\nimport { hasDebugFlag, hasSerialFlag } from '../../utils/args';\nimport { tryAddEmptyExports } from '../configure/addEmptyExports';\nimport { tryPatchRenovateConfig } from '../configure/patchRenovateConfig';\nimport { tryRefreshIgnoreFiles } from '../configure/refreshIgnoreFiles';\n\nimport { externalLint } from './external';\nimport { internalLint } from './internal';\nimport type { Input } from './types';\n\nexport const lint = async (\n  args = process.argv.slice(2),\n  tscOutputStream: Writable | undefined = undefined,\n  workerThreads = true,\n) => {\n  await Promise.all([\n    tryAddEmptyExports(),\n    tryPatchRenovateConfig(),\n    tryRefreshIgnoreFiles(),\n  ]);\n\n  const opts: Input = {\n    debug: hasDebugFlag(args),\n    serial: hasSerialFlag(args),\n    tscOutputStream,\n    workerThreads,\n  };\n\n  await externalLint(opts);\n\n  await internalLint();\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,kBAA4C;AAC5C,6BAAmC;AACnC,iCAAuC;AACvC,gCAAsC;AAEtC,sBAA6B;AAC7B,sBAA6B;AAGtB,MAAM,OAAO,OAClB,OAAO,QAAQ,KAAK,MAAM,CAAC,GAC3B,kBAAwC,QACxC,gBAAgB,SACb;AACH,QAAM,QAAQ,IAAI;AAAA,QAChB,2CAAmB;AAAA,QACnB,mDAAuB;AAAA,QACvB,iDAAsB;AAAA,EACxB,CAAC;AAED,QAAM,OAAc;AAAA,IAClB,WAAO,0BAAa,IAAI;AAAA,IACxB,YAAQ,2BAAc,IAAI;AAAA,IAC1B;AAAA,IACA;AAAA,EACF;AAEA,YAAM,8BAAa,IAAI;AAEvB,YAAM,8BAAa;AACrB;",
+  "sourcesContent": ["import type { Writable } from 'stream';\n\nimport { hasDebugFlag, hasSerialFlag } from '../../utils/args';\nimport { tryAddEmptyExports } from '../configure/addEmptyExports';\nimport { tryPatchRenovateConfig } from '../configure/patchRenovateConfig';\nimport { tryPatchServerListener } from '../configure/patchServerListener';\nimport { tryRefreshIgnoreFiles } from '../configure/refreshIgnoreFiles';\n\nimport { externalLint } from './external';\nimport { internalLint } from './internal';\nimport type { Input } from './types';\n\nexport const lint = async (\n  args = process.argv.slice(2),\n  tscOutputStream: Writable | undefined = undefined,\n  workerThreads = true,\n) => {\n  await Promise.all([\n    tryAddEmptyExports(),\n    tryPatchRenovateConfig(),\n    tryPatchServerListener(),\n    tryRefreshIgnoreFiles(),\n  ]);\n\n  const opts: Input = {\n    debug: hasDebugFlag(args),\n    serial: hasSerialFlag(args),\n    tscOutputStream,\n    workerThreads,\n  };\n\n  await externalLint(opts);\n\n  await internalLint();\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,kBAA4C;AAC5C,6BAAmC;AACnC,iCAAuC;AACvC,iCAAuC;AACvC,gCAAsC;AAEtC,sBAA6B;AAC7B,sBAA6B;AAGtB,MAAM,OAAO,OAClB,OAAO,QAAQ,KAAK,MAAM,CAAC,GAC3B,kBAAwC,QACxC,gBAAgB,SACb;AACH,QAAM,QAAQ,IAAI;AAAA,QAChB,2CAAmB;AAAA,QACnB,mDAAuB;AAAA,QACvB,mDAAuB;AAAA,QACvB,iDAAsB;AAAA,EACxB,CAAC;AAED,QAAM,OAAc;AAAA,IAClB,WAAO,0BAAa,IAAI;AAAA,IACxB,YAAQ,2BAAc,IAAI;AAAA,IAC1B;AAAA,IACA;AAAA,EACF;AAEA,YAAM,8BAAa,IAAI;AAEvB,YAAM,8BAAa;AACrB;",
   "names": []
 }

package/lib/cli/start.js

@@ -42,7 +42,7 @@ const start = async () => {
     (0, import_args.parseRunArgs)(process.argv.slice(2)),
     (0, import_get_port.default)()
   ]);
-  args.entryPoint ?? (args.entryPoint = await (0, import_manifest.getEntryPointFromManifest)());
+  args.entryPoint ??= await (0, import_manifest.getEntryPointFromManifest)();
   const execProcess = (0, import_exec.createExec)({
     env: {
       __SKUBA_ENTRY_POINT: args.entryPoint,

package/lib/cli/start.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/cli/start.ts"],
   "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../utils/args';\nimport { createExec } from '../utils/exec';\nimport { getEntryPointFromManifest } from '../utils/manifest';\nimport { isIpPort } from '../utils/validation';\n\nexport const start = async () => {\n  const [args, availablePort] = await Promise.all([\n    parseRunArgs(process.argv.slice(2)),\n    getPort(),\n  ]);\n\n  args.entryPoint ??= await getEntryPointFromManifest();\n\n  const execProcess = createExec({\n    env: {\n      __SKUBA_ENTRY_POINT: args.entryPoint,\n      __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n    },\n  });\n\n  return execProcess(\n    'ts-node-dev',\n    ...args.node,\n    '--require',\n    'dotenv/config',\n    '--require',\n    'tsconfig-paths/register',\n    '--respawn',\n    '--transpile-only',\n    path.join(__dirname, '..', 'wrapper'),\n    ...args.script,\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,sBAA0C;AAC1C,wBAAyB;AAElB,MAAM,QAAQ,YAAY;AAC/B,QAAM,CAAC,MAAM,aAAa,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,QAClC,gBAAAA,SAAQ;AAAA,EACV,CAAC;AAED,OAAK,eAAL,KAAK,aAAe,UAAM,2CAA0B;AAEpD,QAAM,kBAAc,wBAAW;AAAA,IAC7B,KAAK;AAAA,MACH,qBAAqB,KAAK;AAAA,MAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,IACtE;AAAA,EACF,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAAC,QAAK,KAAK,WAAW,MAAM,SAAS;AAAA,IACpC,GAAG,KAAK;AAAA,EACV;AACF;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,sBAA0C;AAC1C,wBAAyB;AAElB,MAAM,QAAQ,YAAY;AAC/B,QAAM,CAAC,MAAM,aAAa,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,QAClC,gBAAAA,SAAQ;AAAA,EACV,CAAC;AAED,OAAK,eAAe,UAAM,2CAA0B;AAEpD,QAAM,kBAAc,wBAAW;AAAA,IAC7B,KAAK;AAAA,MACH,qBAAqB,KAAK;AAAA,MAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,IACtE;AAAA,EACF,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAAC,QAAK,KAAK,WAAW,MAAM,SAAS;AAAA,IACpC,GAAG,KAAK;AAAA,EACV;AACF;",
   "names": ["getPort", "path"]
 }

package/lib/cli/test/index.js

@@ -24,9 +24,8 @@ module.exports = __toCommonJS(test_exports);
 var import_jest = require("jest");
 var import_addEmptyExports = require("../configure/addEmptyExports");
 const test = async () => {
-  var _a;
   await (0, import_addEmptyExports.tryAddEmptyExports)();
-  (_a = process.env).NODE_ENV ?? (_a.NODE_ENV = "test");
+  process.env.NODE_ENV ??= "test";
   const argv = process.argv.slice(2);
   return (0, import_jest.run)(argv);
 };

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/cli/test/index.ts"],
   "sourcesContent": ["import { run } from 'jest';\n\nimport { tryAddEmptyExports } from '../configure/addEmptyExports';\n\nexport const test = async () => {\n  await tryAddEmptyExports();\n\n  // This is usually set in `jest-cli`'s binary wrapper\n  process.env.NODE_ENV ??= 'test';\n\n  const argv = process.argv.slice(2);\n\n  return run(argv);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAoB;AAEpB,6BAAmC;AAE5B,MAAM,OAAO,YAAY;AAJhC;AAKE,YAAM,2CAAmB;AAGzB,gBAAQ,KAAI,aAAZ,GAAY,WAAa;AAEzB,QAAM,OAAO,QAAQ,KAAK,MAAM,CAAC;AAEjC,aAAO,iBAAI,IAAI;AACjB;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAoB;AAEpB,6BAAmC;AAE5B,MAAM,OAAO,YAAY;AAC9B,YAAM,2CAAmB;AAGzB,UAAQ,IAAI,aAAa;AAEzB,QAAM,OAAO,QAAQ,KAAK,MAAM,CAAC;AAEjC,aAAO,iBAAI,IAAI;AACjB;",
   "names": []
 }

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

@@ -79,7 +79,7 @@ const generateAnnotationEntries = (testResults) => {
   const resultsByDisplayName = testResults.reduce(
     (acc, result) => {
       const displayName = result.displayName?.name ?? DEFAULT_DISPLAY_NAME;
-      (acc[displayName] ?? (acc[displayName] = [])).push(result);
+      (acc[displayName] ??= []).push(result);
       return acc;
     },
     {}

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

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../../../src/cli/test/reporters/github/annotations.ts"],
   "sourcesContent": ["import path from 'path';\n\nimport type { TestResult } from '@jest/test-result';\nimport stripAnsi from 'strip-ansi';\nimport dedent from 'ts-dedent';\n\nimport type * as GitHub from '../../../../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) {\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;AAGjB,wBAAsB;AACtB,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,kBAAAC;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,GAAG;AACvB,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,kBAAAC,SAAU,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,wCAAqB,CAAC,IAAG,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;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAGjB,wBAAsB;AACtB,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,kBAAAC;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,GAAG;AACvB,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,kBAAAC,SAAU,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/utils/exec.js

@@ -45,10 +45,7 @@ var import_npm_which = __toESM(require("npm-which"));
 var import_error = require("./error");
 var import_logging = require("./logging");
 class YarnSpamFilter extends import_stream.default.Transform {
-  constructor() {
-    super(...arguments);
-    this.silenced = false;
-  }
+  silenced = false;
   _transform(chunk, _encoding, callback) {
     const str = Buffer.from(chunk).toString();
     if (str.startsWith("info Direct dependencies")) {

package/lib/utils/exec.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/utils/exec.ts"],
   "sourcesContent": ["import { cpus } from 'os';\nimport stream from 'stream';\nimport util from 'util';\n\nimport type { Color } from 'chalk';\nimport concurrently from 'concurrently';\nimport type { ExecaChildProcess } from 'execa';\nimport execa from 'execa';\nimport npmRunPath from 'npm-run-path';\nimport npmWhich from 'npm-which';\n\nimport { ConcurrentlyErrors, isErrorWithCode } from './error';\nimport { log } from './logging';\n\nclass YarnSpamFilter extends stream.Transform {\n  silenced = false;\n\n  _transform(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: stream.TransformCallback,\n  ) {\n    const str = Buffer.from(chunk).toString();\n\n    // Yarn spews the entire installed dependency tree after this message\n    if (str.startsWith('info Direct dependencies')) {\n      this.silenced = true;\n    }\n\n    if (\n      !this.silenced &&\n      // This isn't very useful given the command generates a lockfile\n      !str.startsWith('info No lockfile found')\n    ) {\n      this.push(chunk);\n    }\n\n    callback();\n  }\n}\n\nclass YarnWarningFilter extends stream.Transform {\n  _transform(\n    chunk: Uint8Array,\n    _encoding: BufferEncoding,\n    callback: stream.TransformCallback,\n  ) {\n    const str = Buffer.from(chunk).toString();\n\n    // Filter out annoying deprecation warnings that users can do little about\n    if (!str.startsWith('warning skuba >')) {\n      this.push(chunk);\n    }\n\n    callback();\n  }\n}\n\nexport type Exec = (\n  command: string,\n  ...args: string[]\n) => ExecaChildProcess<string>;\n\ninterface ExecConcurrentlyCommand {\n  command: string;\n  name: string;\n  prefixColor?: typeof Color;\n}\n\ninterface ExecConcurrentlyOptions {\n  /**\n   * The maximum number of processes that can execute concurrently.\n   *\n   * Defaults to the CPU core count.\n   */\n  maxProcesses?: number;\n\n  /**\n   * A set length to pad names to.\n   *\n   * Defaults to the length of the longest command name.\n   */\n  nameLength?: number;\n\n  /**\n   * The stream that logging output will be written to.\n   *\n   * Defaults to `process.stdout`.\n   */\n  outputStream?: stream.Writable;\n}\n\ntype ExecOptions = execa.Options & { streamStdio?: true | 'yarn' };\n\nconst envWithPath = {\n  PATH: npmRunPath({ cwd: __dirname }),\n};\n\nconst runCommand = (command: string, args: string[], opts?: ExecOptions) => {\n  const subprocess = execa(command, args, {\n    localDir: __dirname,\n    preferLocal: true,\n    stdio: 'inherit',\n    ...opts,\n  });\n\n  switch (opts?.streamStdio) {\n    case 'yarn':\n      const stderrFilter = new YarnWarningFilter();\n      const stdoutFilter = new YarnSpamFilter();\n\n      subprocess.stderr?.pipe(stderrFilter).pipe(process.stderr);\n      subprocess.stdout?.pipe(stdoutFilter).pipe(process.stdout);\n\n      break;\n\n    case true:\n      subprocess.stderr?.pipe(process.stderr);\n      subprocess.stdout?.pipe(process.stdout);\n\n      break;\n  }\n\n  return subprocess;\n};\n\nconst whichCallback = npmWhich(__dirname);\n\nconst which = util.promisify<string, string>(whichCallback);\n\nexport const createExec =\n  (opts: ExecOptions): Exec =>\n  (command, ...args) =>\n    runCommand(command, args, opts);\n\nexport const exec: Exec = (command, ...args) => runCommand(command, args);\n\nexport const execConcurrently = async (\n  commands: ExecConcurrentlyCommand[],\n  { maxProcesses, nameLength, outputStream }: ExecConcurrentlyOptions = {},\n) => {\n  const maxNameLength =\n    nameLength ??\n    commands.reduce(\n      (length, command) => Math.max(length, command.name.length),\n      0,\n    );\n\n  try {\n    await concurrently(\n      commands.map(({ command, name, prefixColor }) => ({\n        command,\n        env: envWithPath,\n        name: name.padEnd(maxNameLength),\n        prefixColor,\n      })),\n      {\n        maxProcesses: maxProcesses ?? cpus().length,\n\n        outputStream,\n\n        // Use a minimalist logging prefix.\n        prefix: '{name} \u2502',\n      },\n    ).result;\n  } catch (err) {\n    const result = ConcurrentlyErrors.validate(err);\n\n    if (!result.success) {\n      throw err;\n    }\n\n    const failed = result.value\n      .filter(({ exitCode }) => exitCode !== 0)\n      .sort(({ index: indexA }, { index: indexB }) => indexA - indexB)\n      .map((subprocess) => subprocess.command.name);\n\n    throw Error(\n      `${failed.join(', ')} subprocess${\n        failed.length === 1 ? '' : 'es'\n      } failed.`,\n    );\n  }\n};\n\nexport const ensureCommands = async (...names: string[]) => {\n  let success = true;\n\n  await Promise.all(\n    names.map(async (name) => {\n      const result = await hasCommand(name);\n\n      if (!result) {\n        success = false;\n\n        log.err(log.bold(name), 'needs to be installed.');\n      }\n    }),\n  );\n\n  if (!success) {\n    process.exit(1);\n  }\n};\n\nexport const hasCommand = async (name: string) => {\n  try {\n    await which(name);\n\n    return true;\n  } catch (err) {\n    if (isErrorWithCode(err, 'ENOENT')) {\n      return false;\n    }\n\n    throw err;\n  }\n};\n"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["stream", "npmRunPath", "execa", "npmWhich", "util", "concurrently"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "0.0.0-master-20230318044948",
+  "version": "0.0.0-master-20230319220011",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -65,7 +65,7 @@
     ]
   },
   "resolutions": {
-    "**/@types/node": ">=14.18"
+    "**/@types/node": ">=16.11"
   },
   "dependencies": {
     "@esbuild-plugins/tsconfig-paths": "^0.1.0",
@@ -75,7 +75,7 @@
     "@octokit/rest": "^19.0.0",
     "@octokit/types": "^9.0.0",
     "@types/jest": "^29.0.0",
-    "@types/node": ">=14.18",
+    "@types/node": ">=16.11",
     "chalk": "^4.1.0",
     "concurrently": "^7.0.0",
     "dotenv": "^16.0.0",
@@ -83,7 +83,7 @@
     "enquirer": "^2.3.6",
     "esbuild": "~0.17.0",
     "eslint": "^8.11.0",
-    "eslint-config-skuba": "1.3.0",
+    "eslint-config-skuba": "1.4.1",
     "execa": "^5.0.0",
     "fdir": "^6.0.0",
     "fs-extra": "^11.0.0",
@@ -116,7 +116,7 @@
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "1.0.2",
-    "typescript": "~4.9.0",
+    "typescript": "~5.0.0",
     "validate-npm-package-name": "^5.0.0"
   },
   "devDependencies": {
@@ -155,7 +155,7 @@
     }
   },
   "engines": {
-    "node": ">=14.18"
+    "node": ">=16.11"
   },
   "skuba": {
     "build": "esbuild",

package/template/koa-rest-api/package.json

@@ -14,10 +14,10 @@
   "dependencies": {
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/exporter-collector-grpc": "^0.25.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.36.0",
     "@opentelemetry/instrumentation-aws-sdk": "^0.34.0",
     "@opentelemetry/instrumentation-http": "^0.36.0",
-    "@opentelemetry/sdk-node": "^0.35.0",
+    "@opentelemetry/sdk-node": "^0.36.0",
     "@seek/logger": "^5.0.1",
     "aws-sdk": "^2.1039.0",
     "hot-shots": "^10.0.0",

package/template/koa-rest-api/src/tracing.ts

@@ -6,7 +6,7 @@
 
 import { propagation } from '@opentelemetry/api';
 import { CompositePropagator } from '@opentelemetry/core';
-import { CollectorTraceExporter } from '@opentelemetry/exporter-collector-grpc';
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
 import { AwsInstrumentation } from '@opentelemetry/instrumentation-aws-sdk';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 import { B3InjectEncoding, B3Propagator } from '@opentelemetry/propagator-b3';
@@ -31,17 +31,12 @@ const main = () => {
   );
 
   const sdk = new NodeSDK({
-    traceExporter: new CollectorTraceExporter(),
+    traceExporter: new OTLPTraceExporter(),
     autoDetectResources: false,
     instrumentations: [new HttpInstrumentation(), new AwsInstrumentation()],
   });
 
-  sdk
-    .start()
-    .then(() => log('info', 'OpenTelemetry initialised'))
-    .catch((err: Error) =>
-      log('error', 'OpenTelemetry not initialised', { err }),
-    );
+  sdk.start();
 
   process.on('SIGTERM', () => {
     sdk

package/template/koa-rest-api/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "lib": [
+      // open-telemetry/opentelemetry-js#3580
+      "DOM",
+
+      "ES2022"
+    ],
+    "outDir": "lib",
+    "paths": {
+      "src": ["src"]
+    },
+    "target": "ES2022"
+  },
+  "exclude": ["lib*/**/*"],
+  "extends": "skuba/config/tsconfig.json"
+}

package/template/oss-npm-package/_package.json

@@ -1,25 +1,22 @@
 {
-  "dependencies": {},
+  "name": "<%- moduleName %>",
+  "version": "0.0.0-semantically-released",
   "description": "<%- description %>",
-  "devDependencies": {
-    "@types/node": "^16.18.3",
-    "commitizen": "^4.2.4",
-    "skuba": "*"
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/<%- orgName %>/<%- repoName %>.git"
   },
+  "license": "MIT",
+  "sideEffects": false,
+  "main": "./lib-commonjs/index.js",
+  "module": "./lib-es2015/index.js",
+  "types": "./lib-types/index.d.ts",
   "files": [
     "lib*/**/*.d.ts",
     "lib*/**/*.js",
     "lib*/**/*.js.map",
     "lib*/**/*.json"
   ],
-  "license": "MIT",
-  "main": "./lib-commonjs/index.js",
-  "module": "./lib-es2015/index.js",
-  "name": "<%- moduleName %>",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/<%- orgName %>/<%- repoName %>.git"
-  },
   "scripts": {
     "build": "skuba build-package",
     "commit": "cz",
@@ -35,7 +32,13 @@
       "path": "cz-conventional-changelog"
     }
   },
-  "sideEffects": false,
-  "types": "./lib-types/index.d.ts",
-  "version": "0.0.0-semantically-released"
+  "dependencies": {},
+  "devDependencies": {
+    "@types/node": "^16.18.3",
+    "commitizen": "^4.2.4",
+    "skuba": "*"
+  },
+  "engines": {
+    "node": ">=16.11"
+  }
 }

package/template/oss-npm-package/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "lib": ["ES2020"],
+    "lib": ["ES2022"],
     "outDir": "lib",
     "removeComments": false,
-    "target": "ES2020"
+    "target": "ES2022"
   },
   "exclude": ["lib*/**/*"],
   "extends": "skuba/config/tsconfig.json"

package/template/private-npm-package/_package.json

@@ -1,25 +1,22 @@
 {
-  "dependencies": {},
+  "name": "<%- moduleName %>",
+  "version": "0.0.0-semantically-released",
   "description": "<%- description %>",
-  "devDependencies": {
-    "@types/node": "^16.18.3",
-    "commitizen": "^4.2.4",
-    "skuba": "*"
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/<%- orgName %>/<%- repoName %>.git"
   },
+  "license": "UNLICENSED",
+  "sideEffects": false,
+  "main": "./lib-commonjs/index.js",
+  "module": "./lib-es2015/index.js",
+  "types": "./lib-types/index.d.ts",
   "files": [
     "lib*/**/*.d.ts",
     "lib*/**/*.js",
     "lib*/**/*.js.map",
     "lib*/**/*.json"
   ],
-  "license": "UNLICENSED",
-  "main": "./lib-commonjs/index.js",
-  "module": "./lib-es2015/index.js",
-  "name": "<%- moduleName %>",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/<%- orgName %>/<%- repoName %>.git"
-  },
   "scripts": {
     "build": "skuba build-package",
     "commit": "cz",
@@ -35,7 +32,13 @@
       "path": "cz-conventional-changelog"
     }
   },
-  "sideEffects": false,
-  "types": "./lib-types/index.d.ts",
-  "version": "0.0.0-semantically-released"
+  "dependencies": {},
+  "devDependencies": {
+    "@types/node": "^16.18.3",
+    "commitizen": "^4.2.4",
+    "skuba": "*"
+  },
+  "engines": {
+    "node": ">=16.11"
+  }
 }

package/template/private-npm-package/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "lib": ["ES2020"],
+    "lib": ["ES2022"],
     "outDir": "lib",
     "removeComments": false,
-    "target": "ES2020"
+    "target": "ES2022"
   },
   "exclude": ["lib*/**/*"],
   "extends": "skuba/config/tsconfig.json"