skuba 5.2.0-beta.0 → 6.0.0

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/build/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/build/index.ts"],
-  "sourcesContent": ["import chalk from 'chalk';\n\nimport { hasDebugFlag } from '../../utils/args';\nimport { log } from '../../utils/logging';\nimport { getStringPropFromConsumerManifest } from '../../utils/manifest';\nimport { tryAddEmptyExports } from '../configure/addEmptyExports';\n\nimport { esbuild } from './esbuild';\nimport { tsc } from './tsc';\n\nexport const build = async (args = process.argv.slice(2)) => {\n  await tryAddEmptyExports();\n\n  // TODO: define a unified `package.json#/skuba` schema and parser so we don't\n  // need all these messy lookups.\n  const tool = await getStringPropFromConsumerManifest('build');\n\n  switch (tool) {\n    case 'esbuild': {\n      const debug = hasDebugFlag(args);\n\n      log.plain(chalk.yellow('esbuild'));\n      await esbuild({ debug }, args);\n      return;\n    }\n\n    // TODO: flip the default case over to `esbuild` in skuba v5.\n    case undefined:\n    case 'tsc': {\n      log.plain(chalk.blue('tsc'));\n      await tsc(args);\n      return;\n    }\n\n    default: {\n      log.err(\n        'We don\u2019t support the build tool specified in your',\n        log.bold('package.json'),\n        'yet:',\n      );\n      log.err(log.subtle(JSON.stringify({ skuba: { build: tool } }, null, 2)));\n      process.exitCode = 1;\n      return;\n    }\n  }\n};\n"],
+  "sourcesContent": ["import chalk from 'chalk';\n\nimport { hasDebugFlag } from '../../utils/args';\nimport { log } from '../../utils/logging';\nimport { getStringPropFromConsumerManifest } from '../../utils/manifest';\nimport { tryAddEmptyExports } from '../configure/addEmptyExports';\n\nimport { esbuild } from './esbuild';\nimport { tsc } from './tsc';\n\nexport const build = async (args = process.argv.slice(2)) => {\n  await tryAddEmptyExports();\n\n  // TODO: define a unified `package.json#/skuba` schema and parser so we don't\n  // need all these messy lookups.\n  const tool = await getStringPropFromConsumerManifest('build');\n\n  switch (tool) {\n    case 'esbuild': {\n      const debug = hasDebugFlag(args);\n\n      log.plain(chalk.yellow('esbuild'));\n      await esbuild({ debug }, args);\n      return;\n    }\n\n    // TODO: flip the default case over to `esbuild` in skuba vNext.\n    case undefined:\n    case 'tsc': {\n      log.plain(chalk.blue('tsc'));\n      await tsc(args);\n      return;\n    }\n\n    default: {\n      log.err(\n        'We don\u2019t support the build tool specified in your',\n        log.bold('package.json'),\n        'yet:',\n      );\n      log.err(log.subtle(JSON.stringify({ skuba: { build: tool } }, null, 2)));\n      process.exitCode = 1;\n      return;\n    }\n  }\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,kBAA6B;AAC7B,qBAAoB;AACpB,sBAAkD;AAClD,6BAAmC;AAEnC,qBAAwB;AACxB,iBAAoB;AAEb,MAAM,QAAQ,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AAC3D,YAAM,2CAAmB;AAIzB,QAAM,OAAO,UAAM,mDAAkC,OAAO;AAE5D,UAAQ,MAAM;AAAA,IACZ,KAAK,WAAW;AACd,YAAM,YAAQ,0BAAa,IAAI;AAE/B,yBAAI,MAAM,aAAAA,QAAM,OAAO,SAAS,CAAC;AACjC,gBAAM,wBAAQ,EAAE,MAAM,GAAG,IAAI;AAC7B;AAAA,IACF;AAAA,IAGA,KAAK;AAAA,IACL,KAAK,OAAO;AACV,yBAAI,MAAM,aAAAA,QAAM,KAAK,KAAK,CAAC;AAC3B,gBAAM,gBAAI,IAAI;AACd;AAAA,IACF;AAAA,IAEA,SAAS;AACP,yBAAI;AAAA,QACF;AAAA,QACA,mBAAI,KAAK,cAAc;AAAA,QACvB;AAAA,MACF;AACA,yBAAI,IAAI,mBAAI,OAAO,KAAK,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;AACvE,cAAQ,WAAW;AACnB;AAAA,IACF;AAAA,EACF;AACF;",
   "names": ["chalk"]
 }

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/renovate.d.ts

@@ -1,2 +1,3 @@
 import type { Module, Options } from '../types';
+export declare const RENOVATE_CONFIG_FILENAMES: string[];
 export declare const renovateModule: ({ type }: Options) => Promise<Module>;

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

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var renovate_exports = {};
 __export(renovate_exports, {
+  RENOVATE_CONFIG_FILENAMES: () => RENOVATE_CONFIG_FILENAMES,
   renovateModule: () => renovateModule
 });
 module.exports = __toCommonJS(renovate_exports);
@@ -33,6 +34,10 @@ const OTHER_CONFIG_FILENAMES = [
   "renovate.json",
   "renovate.json5"
 ];
+const RENOVATE_CONFIG_FILENAMES = [
+  ".github/renovate.json5",
+  ...OTHER_CONFIG_FILENAMES
+];
 const renovateModule = async ({ type }) => {
   const configFile = await (0, import_template.readBaseTemplateFile)(".github/renovate.json5");
   return {
@@ -58,6 +63,7 @@ const renovateModule = async ({ type }) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  RENOVATE_CONFIG_FILENAMES,
   renovateModule
 });
 //# sourceMappingURL=renovate.js.map

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/modules/renovate.ts"],
-  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { withPackage } from '../processing/package';\nimport { formatPrettier } from '../processing/prettier';\nimport { getFirstDefined } from '../processing/record';\nimport type { Module, Options } from '../types';\n\nconst OTHER_CONFIG_FILENAMES = [\n  '.github/renovate.json',\n  '.renovaterc',\n  '.renovaterc.json',\n  'renovate.json',\n  'renovate.json5',\n];\n\nexport const renovateModule = async ({ type }: Options): Promise<Module> => {\n  const configFile = await readBaseTemplateFile('.github/renovate.json5');\n\n  return {\n    ...deleteFiles(...OTHER_CONFIG_FILENAMES),\n\n    '.github/renovate.json5': (_inputFile, _files, initialFiles) => {\n      // allow migration from other Renovate config files\n      const inputFile = getFirstDefined(initialFiles, [\n        '.github/renovate.json5',\n        ...OTHER_CONFIG_FILENAMES,\n      ]);\n\n      // allow customised Renovate configs that extend a SEEK configuration\n      return inputFile?.includes('seek')\n        ? formatPrettier(inputFile, { parser: 'json5' })\n        : configFile;\n    },\n\n    /**\n     * Ensure Renovate correctly detects the project as an application/library.\n     *\n     * @see {@link https://docs.renovatebot.com/configuration-options/#rangestrategy }\n     * @see {@link https://github.com/renovatebot/renovate/blob/8c361082842bb157d85ca39ecf4f6075730e74bb/lib/manager/npm/extract/type.ts#L3 }\n     */\n    'package.json': withPackage(({ private: _, renovate, ...data }) => ({\n      ...data,\n      private: type !== 'package',\n    })),\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,yBAA4B;AAC5B,qBAA4B;AAC5B,sBAA+B;AAC/B,oBAAgC;AAGhC,MAAM,yBAAyB;AAAA,EAC7B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,iBAAiB,OAAO,EAAE,KAAK,MAAgC;AAC1E,QAAM,aAAa,UAAM,sCAAqB,wBAAwB;AAEtE,SAAO;AAAA,IACL,OAAG,gCAAY,GAAG,sBAAsB;AAAA,IAExC,0BAA0B,CAAC,YAAY,QAAQ,iBAAiB;AAE9D,YAAM,gBAAY,+BAAgB,cAAc;AAAA,QAC9C;AAAA,QACA,GAAG;AAAA,MACL,CAAC;AAGD,aAAO,WAAW,SAAS,MAAM,QAC7B,gCAAe,WAAW,EAAE,QAAQ,QAAQ,CAAC,IAC7C;AAAA,IACN;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAQA,oBAAgB,4BAAY,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,KAAK,OAAO;AAAA,MAClE,GAAG;AAAA,MACH,SAAS,SAAS;AAAA,IACpB,EAAE;AAAA,EACJ;AACF;",
+  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { withPackage } from '../processing/package';\nimport { formatPrettier } from '../processing/prettier';\nimport { getFirstDefined } from '../processing/record';\nimport type { Module, Options } from '../types';\n\nconst OTHER_CONFIG_FILENAMES = [\n  '.github/renovate.json',\n  '.renovaterc',\n  '.renovaterc.json',\n  'renovate.json',\n  'renovate.json5',\n];\n\nexport const RENOVATE_CONFIG_FILENAMES = [\n  '.github/renovate.json5',\n  ...OTHER_CONFIG_FILENAMES,\n];\n\nexport const renovateModule = async ({ type }: Options): Promise<Module> => {\n  const configFile = await readBaseTemplateFile('.github/renovate.json5');\n\n  return {\n    ...deleteFiles(...OTHER_CONFIG_FILENAMES),\n\n    '.github/renovate.json5': (_inputFile, _files, initialFiles) => {\n      // allow migration from other Renovate config files\n      const inputFile = getFirstDefined(initialFiles, [\n        '.github/renovate.json5',\n        ...OTHER_CONFIG_FILENAMES,\n      ]);\n\n      // allow customised Renovate configs that extend a SEEK configuration\n      return inputFile?.includes('seek')\n        ? formatPrettier(inputFile, { parser: 'json5' })\n        : configFile;\n    },\n\n    /**\n     * Ensure Renovate correctly detects the project as an application/library.\n     *\n     * @see {@link https://docs.renovatebot.com/configuration-options/#rangestrategy }\n     * @see {@link https://github.com/renovatebot/renovate/blob/8c361082842bb157d85ca39ecf4f6075730e74bb/lib/manager/npm/extract/type.ts#L3 }\n     */\n    'package.json': withPackage(({ private: _, renovate, ...data }) => ({\n      ...data,\n      private: type !== 'package',\n    })),\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,yBAA4B;AAC5B,qBAA4B;AAC5B,sBAA+B;AAC/B,oBAAgC;AAGhC,MAAM,yBAAyB;AAAA,EAC7B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAEO,MAAM,4BAA4B;AAAA,EACvC;AAAA,EACA,GAAG;AACL;AAEO,MAAM,iBAAiB,OAAO,EAAE,KAAK,MAAgC;AAC1E,QAAM,aAAa,UAAM,sCAAqB,wBAAwB;AAEtE,SAAO;AAAA,IACL,OAAG,gCAAY,GAAG,sBAAsB;AAAA,IAExC,0BAA0B,CAAC,YAAY,QAAQ,iBAAiB;AAE9D,YAAM,gBAAY,+BAAgB,cAAc;AAAA,QAC9C;AAAA,QACA,GAAG;AAAA,MACL,CAAC;AAGD,aAAO,WAAW,SAAS,MAAM,QAC7B,gCAAe,WAAW,EAAE,QAAQ,QAAQ,CAAC,IAC7C;AAAA,IACN;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAQA,oBAAgB,4BAAY,CAAC,EAAE,SAAS,GAAG,UAAU,GAAG,KAAK,OAAO;AAAA,MAClE,GAAG;AAAA,MACH,SAAS,SAAS;AAAA,IACpB,EAAE;AAAA,EACJ;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/patchRenovateConfig.d.ts

@@ -0,0 +1 @@
+export declare const tryPatchRenovateConfig: (dir?: string) => Promise<void>;

package/lib/cli/configure/patchRenovateConfig.js

@@ -0,0 +1,132 @@
+"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 patchRenovateConfig_exports = {};
+__export(patchRenovateConfig_exports, {
+  tryPatchRenovateConfig: () => tryPatchRenovateConfig
+});
+module.exports = __toCommonJS(patchRenovateConfig_exports);
+var import_util = require("util");
+var import_fs_extra = __toESM(require("fs-extra"));
+var fleece = __toESM(require("golden-fleece"));
+var t = __toESM(require("runtypes"));
+var Git = __toESM(require("../../api/git"));
+var import_logging = require("../../utils/logging");
+var import_project = require("./analysis/project");
+var import_renovate = require("./modules/renovate");
+var import_prettier = require("./processing/prettier");
+const RENOVATE_PRESETS = [
+  "local>seekasia/renovate-config",
+  "local>seek-jobs/renovate-config"
+];
+const RenovateConfig = t.Record({
+  extends: t.Array(t.String)
+});
+const ownerToRenovatePreset = (owner) => {
+  const lowercaseOwner = owner.toLowerCase();
+  switch (lowercaseOwner) {
+    case "seekasia":
+      return "local>seekasia/renovate-config";
+    case "seek-jobs":
+      return "local>seek-jobs/renovate-config";
+    default:
+      return;
+  }
+};
+const patchJson = async ({ filepath, input, presetToAdd }) => {
+  const config = JSON.parse(input);
+  if (!RenovateConfig.guard(config)) {
+    return;
+  }
+  config.extends.unshift(presetToAdd);
+  await import_fs_extra.default.promises.writeFile(
+    filepath,
+    (0, import_prettier.formatPrettier)(JSON.stringify(config), { parser: "json" })
+  );
+  return;
+};
+const patchJson5 = async ({ filepath, input, presetToAdd }) => {
+  const config = fleece.evaluate(input);
+  if (!RenovateConfig.guard(config)) {
+    return;
+  }
+  config.extends.unshift(presetToAdd);
+  await import_fs_extra.default.promises.writeFile(
+    filepath,
+    (0, import_prettier.formatPrettier)(fleece.patch(input, config), { parser: "json5" })
+  );
+  return;
+};
+const patchByFiletype = {
+  json: patchJson,
+  json5: patchJson5
+};
+const patchRenovateConfig = async (dir) => {
+  const readFile = (0, import_project.createDestinationFileReader)(dir);
+  const { owner } = await Git.getOwnerAndRepo({ dir });
+  const presetToAdd = ownerToRenovatePreset(owner);
+  if (!presetToAdd) {
+    return;
+  }
+  const maybeConfigs = await Promise.all(
+    import_renovate.RENOVATE_CONFIG_FILENAMES.map(async (filepath) => ({
+      input: await readFile(filepath),
+      filepath
+    }))
+  );
+  const config = maybeConfigs.find((maybeConfig) => Boolean(maybeConfig.input));
+  if (
+    // No file was found.
+    !config?.input || // The file appears to mention the baseline preset for the configured Git
+    // owner. This is a very naive check that we don't want to overcomplicate
+    // because it is invoked before each skuba format and lint.
+    config.input.includes(presetToAdd)
+  ) {
+    return;
+  }
+  const filetype = config.filepath.toLowerCase().endsWith(".json5") ? "json5" : "json";
+  const patchFile = patchByFiletype[filetype];
+  await patchFile({
+    filepath: config.filepath,
+    input: config.input,
+    presetToAdd
+  });
+};
+const tryPatchRenovateConfig = async (dir = process.cwd()) => {
+  try {
+    await patchRenovateConfig(dir);
+  } catch (err) {
+    import_logging.log.warn("Failed to patch Renovate config.");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  tryPatchRenovateConfig
+});
+//# sourceMappingURL=patchRenovateConfig.js.map

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/cli/configure/patchRenovateConfig.ts"],
+  "sourcesContent": ["/* eslint-disable new-cap */\n\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\nimport * as fleece from 'golden-fleece';\nimport * as t from 'runtypes';\n\nimport * as Git from '../../api/git';\nimport { log } from '../../utils/logging';\n\nimport { createDestinationFileReader } from './analysis/project';\nimport { RENOVATE_CONFIG_FILENAMES } from './modules/renovate';\nimport { formatPrettier } from './processing/prettier';\n\nconst RENOVATE_PRESETS = [\n  'local>seekasia/renovate-config',\n  'local>seek-jobs/renovate-config',\n] as const;\n\ntype RenovateFiletype = 'json' | 'json5';\n\ntype RenovatePreset = (typeof RENOVATE_PRESETS)[number];\n\nconst RenovateConfig = t.Record({\n  extends: t.Array(t.String),\n});\n\nconst ownerToRenovatePreset = (owner: string): RenovatePreset | undefined => {\n  const lowercaseOwner = owner.toLowerCase();\n\n  switch (lowercaseOwner) {\n    case 'seekasia':\n      return 'local>seekasia/renovate-config';\n\n    case 'seek-jobs':\n      return 'local>seek-jobs/renovate-config';\n\n    default:\n      return;\n  }\n};\n\ntype PatchFile = (props: {\n  filepath: string;\n  input: string;\n  presetToAdd: RenovatePreset;\n}) => Promise<void>;\n\nconst patchJson: PatchFile = async ({ filepath, input, presetToAdd }) => {\n  const config: unknown = JSON.parse(input);\n\n  if (!RenovateConfig.guard(config)) {\n    return;\n  }\n\n  config.extends.unshift(presetToAdd);\n\n  await fs.promises.writeFile(\n    filepath,\n    formatPrettier(JSON.stringify(config), { parser: 'json' }),\n  );\n\n  return;\n};\n\nconst patchJson5: PatchFile = async ({ filepath, input, presetToAdd }) => {\n  const config: unknown = fleece.evaluate(input);\n\n  if (!RenovateConfig.guard(config)) {\n    return;\n  }\n\n  config.extends.unshift(presetToAdd);\n\n  await fs.promises.writeFile(\n    filepath,\n    formatPrettier(fleece.patch(input, config), { parser: 'json5' }),\n  );\n\n  return;\n};\n\nconst patchByFiletype: Record<RenovateFiletype, PatchFile> = {\n  json: patchJson,\n  json5: patchJson5,\n};\n\nconst patchRenovateConfig = async (dir: string) => {\n  const readFile = createDestinationFileReader(dir);\n\n  const { owner } = await Git.getOwnerAndRepo({ dir });\n\n  const presetToAdd = ownerToRenovatePreset(owner);\n\n  if (!presetToAdd) {\n    // No baseline preset needs to be added for the configured Git owner.\n    return;\n  }\n\n  const maybeConfigs = await Promise.all(\n    RENOVATE_CONFIG_FILENAMES.map(async (filepath) => ({\n      input: await readFile(filepath),\n      filepath,\n    })),\n  );\n\n  const config = maybeConfigs.find((maybeConfig) => Boolean(maybeConfig.input));\n\n  if (\n    // No file was found.\n    !config?.input ||\n    // The file appears to mention the baseline preset for the configured Git\n    // owner. This is a very naive check that we don't want to overcomplicate\n    // because it is invoked before each skuba format and lint.\n    config.input.includes(presetToAdd)\n  ) {\n    return;\n  }\n\n  const filetype: RenovateFiletype = config.filepath\n    .toLowerCase()\n    .endsWith('.json5')\n    ? 'json5'\n    : 'json';\n\n  const patchFile = patchByFiletype[filetype];\n\n  await patchFile({\n    filepath: config.filepath,\n    input: config.input,\n    presetToAdd,\n  });\n};\n\nexport const tryPatchRenovateConfig = async (dir = process.cwd()) => {\n  try {\n    await patchRenovateConfig(dir);\n  } catch (err) {\n    log.warn('Failed to patch Renovate config.');\n    log.subtle(inspect(err));\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,kBAAwB;AAExB,sBAAe;AACf,aAAwB;AACxB,QAAmB;AAEnB,UAAqB;AACrB,qBAAoB;AAEpB,qBAA4C;AAC5C,sBAA0C;AAC1C,sBAA+B;AAE/B,MAAM,mBAAmB;AAAA,EACvB;AAAA,EACA;AACF;AAMA,MAAM,iBAAiB,EAAE,OAAO;AAAA,EAC9B,SAAS,EAAE,MAAM,EAAE,MAAM;AAC3B,CAAC;AAED,MAAM,wBAAwB,CAAC,UAA8C;AAC3E,QAAM,iBAAiB,MAAM,YAAY;AAEzC,UAAQ,gBAAgB;AAAA,IACtB,KAAK;AACH,aAAO;AAAA,IAET,KAAK;AACH,aAAO;AAAA,IAET;AACE;AAAA,EACJ;AACF;AAQA,MAAM,YAAuB,OAAO,EAAE,UAAU,OAAO,YAAY,MAAM;AACvE,QAAM,SAAkB,KAAK,MAAM,KAAK;AAExC,MAAI,CAAC,eAAe,MAAM,MAAM,GAAG;AACjC;AAAA,EACF;AAEA,SAAO,QAAQ,QAAQ,WAAW;AAElC,QAAM,gBAAAA,QAAG,SAAS;AAAA,IAChB;AAAA,QACA,gCAAe,KAAK,UAAU,MAAM,GAAG,EAAE,QAAQ,OAAO,CAAC;AAAA,EAC3D;AAEA;AACF;AAEA,MAAM,aAAwB,OAAO,EAAE,UAAU,OAAO,YAAY,MAAM;AACxE,QAAM,SAAkB,OAAO,SAAS,KAAK;AAE7C,MAAI,CAAC,eAAe,MAAM,MAAM,GAAG;AACjC;AAAA,EACF;AAEA,SAAO,QAAQ,QAAQ,WAAW;AAElC,QAAM,gBAAAA,QAAG,SAAS;AAAA,IAChB;AAAA,QACA,gCAAe,OAAO,MAAM,OAAO,MAAM,GAAG,EAAE,QAAQ,QAAQ,CAAC;AAAA,EACjE;AAEA;AACF;AAEA,MAAM,kBAAuD;AAAA,EAC3D,MAAM;AAAA,EACN,OAAO;AACT;AAEA,MAAM,sBAAsB,OAAO,QAAgB;AACjD,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,EAAE,MAAM,IAAI,MAAM,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAEnD,QAAM,cAAc,sBAAsB,KAAK;AAE/C,MAAI,CAAC,aAAa;AAEhB;AAAA,EACF;AAEA,QAAM,eAAe,MAAM,QAAQ;AAAA,IACjC,0CAA0B,IAAI,OAAO,cAAc;AAAA,MACjD,OAAO,MAAM,SAAS,QAAQ;AAAA,MAC9B;AAAA,IACF,EAAE;AAAA,EACJ;AAEA,QAAM,SAAS,aAAa,KAAK,CAAC,gBAAgB,QAAQ,YAAY,KAAK,CAAC;AAE5E;AAAA;AAAA,IAEE,CAAC,QAAQ;AAAA;AAAA;AAAA,IAIT,OAAO,MAAM,SAAS,WAAW;AAAA,IACjC;AACA;AAAA,EACF;AAEA,QAAM,WAA6B,OAAO,SACvC,YAAY,EACZ,SAAS,QAAQ,IAChB,UACA;AAEJ,QAAM,YAAY,gBAAgB,QAAQ;AAE1C,QAAM,UAAU;AAAA,IACd,UAAU,OAAO;AAAA,IACjB,OAAO,OAAO;AAAA,IACd;AAAA,EACF,CAAC;AACH;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/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

@@ -37,9 +37,16 @@ var import_logging = require("../utils/logging");
 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_refreshIgnoreFiles.tryRefreshIgnoreFiles)()]);
+  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);
   const logger = (0, import_logging.createLogger)(debug);
   import_logging.log.plain(import_chalk.default.magenta("ESLint"));

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 { tryRefreshIgnoreFiles } from './configure/refreshIgnoreFiles';\n\nexport const format = async (args = process.argv.slice(2)): Promise<void> => {\n  await Promise.all([tryAddEmptyExports(), tryRefreshIgnoreFiles()]);\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,gCAAsC;AAE/B,MAAM,SAAS,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAqB;AAC3E,QAAM,QAAQ,IAAI,KAAC,2CAAmB,OAAG,iDAAsB,CAAC,CAAC;AAEjE,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"]
 }