skuba 7.3.1 → 7.4.0-horrible-hacks-20240206023615

package/README.md

@@ -37,17 +37,17 @@ usage may look something like this:
 
 ```shell
 # Install project dependencies.
-yarn
+pnpm install
 
 # Run the skuba CLI.
-yarn skuba help
+pnpm exec skuba help
 ```
 
 Global installations are also supported to speed up local development:
 
 ```shell
 # Install skuba globally.
-yarn global add skuba
+pnpm add --global skuba
 
 # Look, no `npx`!
 skuba help

package/jest/transform.test.ts

@@ -3,7 +3,9 @@ import { transform } from './transform';
 test('transform', () =>
   expect(transform).toStrictEqual({
     '^.+\\.tsx?$': [
-      expect.stringMatching(/\/skuba\/node_modules\/ts-jest\/dist\/index\.js$/),
+      expect.stringMatching(
+        /\/skuba\/node_modules\/.*\/?ts-jest\/dist\/index\.js$/,
+      ),
       {
         isolatedModules: true,
       },

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

@@ -1,4 +1,5 @@
 import type { Config } from '@jest/types';
+export type { Config } from '@jest/types';
 /**
  * Set of Jest options that are recommended and supported for customisation.
  *
@@ -144,4 +145,3 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
     workerIdleMemoryLimit: string | number;
     workerThreads: boolean;
 }>, DefaultOptions | AdditionalOptions>) => Config.InitialOptions;
-export {};

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/api/jest/index.ts"],
-  "sourcesContent": ["import type { Config } from '@jest/types';\n\nimport jestPreset from '../../../jest-preset';\nimport { mergeRaw } from '../../cli/configure/processing/record';\n\n/**\n * Set of Jest options that are recommended and supported for customisation.\n *\n * While we technically accept anything compatible with `Config.InitialOptions`,\n * these are tacitly endorsed for our use cases and receive IntelliSense.\n */\ntype DefaultOptions =\n  | 'collectCoverage'\n  | 'collectCoverageFrom'\n  | 'coveragePathIgnorePatterns'\n  | 'coverageThreshold'\n  | 'displayName'\n  | 'globals'\n  | 'globalSetup'\n  | 'globalTeardown'\n  | 'projects'\n  | 'setupFiles'\n  | 'setupFilesAfterEnv'\n  | 'snapshotSerializers'\n  | 'testEnvironment'\n  | 'testPathIgnorePatterns'\n  | 'testTimeout'\n  | 'watchPathIgnorePatterns';\n\n/**\n * Merge additional Jest options into the **skuba** preset.\n *\n * This concatenates array options like `testPathIgnorePatterns`.\n */\nexport const mergePreset = <\n  AdditionalOptions extends keyof Config.InitialOptions,\n>({\n  projects,\n  ...options\n}: Pick<\n  Config.InitialOptions,\n  AdditionalOptions | DefaultOptions\n>): Config.InitialOptions => {\n  const root = mergeRaw(jestPreset, options);\n\n  return {\n    ...root,\n\n    projects: projects?.map((project) => {\n      if (typeof project === 'string') {\n        return project;\n      }\n\n      return {\n        moduleNameMapper: root.moduleNameMapper,\n        transform: root.transform,\n        ...project,\n      };\n    }),\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAAuB;AACvB,oBAAyB;AA+BlB,MAAM,cAAc,CAEzB;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAG6B;AAC3B,QAAM,WAAO,wBAAS,mBAAAA,SAAY,OAAO;AAEzC,SAAO;AAAA,IACL,GAAG;AAAA,IAEH,UAAU,UAAU,IAAI,CAAC,YAAY;AACnC,UAAI,OAAO,YAAY,UAAU;AAC/B,eAAO;AAAA,MACT;AAEA,aAAO;AAAA,QACL,kBAAkB,KAAK;AAAA,QACvB,WAAW,KAAK;AAAA,QAChB,GAAG;AAAA,MACL;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
+  "sourcesContent": ["import type { Config } from '@jest/types';\n\nimport jestPreset from '../../../jest-preset';\nimport { mergeRaw } from '../../cli/configure/processing/record';\n\n// Avoid TS4082 in Jest configuration files:\n// Default export of the module has or is using private name `ConfigGlobals`.\nexport type { Config } from '@jest/types';\n\n/**\n * Set of Jest options that are recommended and supported for customisation.\n *\n * While we technically accept anything compatible with `Config.InitialOptions`,\n * these are tacitly endorsed for our use cases and receive IntelliSense.\n */\ntype DefaultOptions =\n  | 'collectCoverage'\n  | 'collectCoverageFrom'\n  | 'coveragePathIgnorePatterns'\n  | 'coverageThreshold'\n  | 'displayName'\n  | 'globals'\n  | 'globalSetup'\n  | 'globalTeardown'\n  | 'projects'\n  | 'setupFiles'\n  | 'setupFilesAfterEnv'\n  | 'snapshotSerializers'\n  | 'testEnvironment'\n  | 'testPathIgnorePatterns'\n  | 'testTimeout'\n  | 'watchPathIgnorePatterns';\n\n/**\n * Merge additional Jest options into the **skuba** preset.\n *\n * This concatenates array options like `testPathIgnorePatterns`.\n */\nexport const mergePreset = <\n  AdditionalOptions extends keyof Config.InitialOptions,\n>({\n  projects,\n  ...options\n}: Pick<\n  Config.InitialOptions,\n  AdditionalOptions | DefaultOptions\n>): Config.InitialOptions => {\n  const root = mergeRaw(jestPreset, options);\n\n  return {\n    ...root,\n\n    projects: projects?.map((project) => {\n      if (typeof project === 'string') {\n        return project;\n      }\n\n      return {\n        moduleNameMapper: root.moduleNameMapper,\n        transform: root.transform,\n        ...project,\n      };\n    }),\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAAuB;AACvB,oBAAyB;AAmClB,MAAM,cAAc,CAEzB;AAAA,EACA;AAAA,EACA,GAAG;AACL,MAG6B;AAC3B,QAAM,WAAO,wBAAS,mBAAAA,SAAY,OAAO;AAEzC,SAAO;AAAA,IACL,GAAG;AAAA,IAEH,UAAU,UAAU,IAAI,CAAC,YAAY;AACnC,UAAI,OAAO,YAAY,UAAU;AAC/B,eAAO;AAAA,MACT;AAEA,aAAO;AAAA,QACL,kBAAkB,KAAK;AAAA,QACvB,WAAW,KAAK;AAAA,QAChB,GAAG;AAAA,MACL;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
   "names": ["jestPreset"]
 }

package/lib/cli/adapter/prettier.d.ts

@@ -48,5 +48,5 @@ export interface PrettierOutput {
  * On the other hand, this affords more flexibility in how we track and report
  * on progress and results.
  */
-export declare const runPrettier: (mode: 'format' | 'lint', logger: Logger) => Promise<PrettierOutput>;
+export declare const runPrettier: (mode: 'format' | 'lint', logger: Logger, cwd?: string) => Promise<PrettierOutput>;
 export {};

package/lib/cli/adapter/prettier.js

@@ -99,32 +99,33 @@ const formatOrLintFile = async ({ data, filepath, options }, mode, result) => {
   result?.touched.push(filepath);
   return formatted;
 };
-const runPrettier = async (mode, logger) => {
+const runPrettier = async (mode, logger, cwd = process.cwd()) => {
   logger.debug("Initialising Prettier...");
   const start = process.hrtime.bigint();
-  let directory = process.cwd();
-  const manifest = await (0, import_manifest.getConsumerManifest)();
-  if (manifest) {
-    directory = import_path.default.dirname(manifest.path);
-  }
+  const manifest = await (0, import_manifest.getConsumerManifest)(cwd);
+  const directory = manifest ? import_path.default.dirname(manifest.path) : cwd;
   logger.debug(
     manifest ? "Detected project root:" : "Detected working directory:",
     directory
   );
   logger.debug("Discovering files...");
-  const filepaths = await (0, import_dir.crawlDirectory)(directory, [
+  const relativeFilepaths = await (0, import_dir.crawlDirectory)(directory, [
     ".gitignore",
     ".prettierignore"
   ]);
-  logger.debug(`Discovered ${(0, import_logging.pluralise)(filepaths.length, "file")}.`);
+  logger.debug(`Discovered ${(0, import_logging.pluralise)(relativeFilepaths.length, "file")}.`);
   const result = {
-    count: filepaths.length,
+    count: relativeFilepaths.length,
     errored: [],
     touched: [],
     unparsed: []
   };
   logger.debug(mode === "format" ? "Formatting" : "Linting", "files...");
-  for (const filepath of filepaths) {
+  for (const relativeFilepath of relativeFilepaths) {
+    const filepath = import_path.default.relative(
+      process.cwd(),
+      import_path.default.join(directory, relativeFilepath)
+    );
     const parser = await inferParser(filepath);
     logger.debug(filepath);
     logger.debug("  parser:", parser ?? "-");

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/adapter/prettier.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport {\n  type Options,\n  type SupportLanguage,\n  check,\n  format,\n  getSupportInfo,\n  resolveConfig,\n} from 'prettier';\n\nimport { crawlDirectory } from '../../utils/dir';\nimport { type Logger, 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 = async (\n  filepath: string,\n): Promise<string | undefined> => {\n  const filename = path.basename(filepath).toLowerCase();\n\n  languages ??= (await getSupportInfo()).languages;\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 = async ({\n  data,\n  filepath,\n}: {\n  data: string;\n  filepath: string;\n}): Promise<boolean> => {\n  if (path.basename(filepath) !== 'package.json') {\n    return true;\n  }\n\n  try {\n    const packageJson = parsePackage(data);\n\n    return !packageJson || (await 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\nexport const formatOrLintFile = async (\n  { data, filepath, options }: File,\n  mode: 'format' | 'lint',\n  result: Result | null,\n): Promise<string | undefined> => {\n  if (mode === 'lint') {\n    let ok: boolean;\n    try {\n      ok =\n        (await check(data, options)) &&\n        (await 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 = await 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 = await 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 respecting `.gitignore`.\n  // This avoids exhibiting different behaviour than a Prettier IDE integration,\n  // though it may present headaches if `.gitignore` and `.prettierignore` rules\n  // conflict.\n  const filepaths = await crawlDirectory(directory, [\n    '.gitignore',\n    '.prettierignore',\n  ]);\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 = await 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 = await 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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",
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport {\n  type Options,\n  type SupportLanguage,\n  check,\n  format,\n  getSupportInfo,\n  resolveConfig,\n} from 'prettier';\n\nimport { crawlDirectory } from '../../utils/dir';\nimport { type Logger, 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 = async (\n  filepath: string,\n): Promise<string | undefined> => {\n  const filename = path.basename(filepath).toLowerCase();\n\n  languages ??= (await getSupportInfo()).languages;\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 = async ({\n  data,\n  filepath,\n}: {\n  data: string;\n  filepath: string;\n}): Promise<boolean> => {\n  if (path.basename(filepath) !== 'package.json') {\n    return true;\n  }\n\n  try {\n    const packageJson = parsePackage(data);\n\n    return !packageJson || (await 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\nexport const formatOrLintFile = async (\n  { data, filepath, options }: File,\n  mode: 'format' | 'lint',\n  result: Result | null,\n): Promise<string | undefined> => {\n  if (mode === 'lint') {\n    let ok: boolean;\n    try {\n      ok =\n        (await check(data, options)) &&\n        (await 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 = await 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 = await 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  cwd = process.cwd(),\n): Promise<PrettierOutput> => {\n  logger.debug('Initialising Prettier...');\n\n  const start = process.hrtime.bigint();\n\n  const manifest = await getConsumerManifest(cwd);\n\n  const directory = manifest ? path.dirname(manifest.path) : cwd;\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 respecting `.gitignore`.\n  // This avoids exhibiting different behaviour than a Prettier IDE integration,\n  // though it may present headaches if `.gitignore` and `.prettierignore` rules\n  // conflict.\n  const relativeFilepaths = await crawlDirectory(directory, [\n    '.gitignore',\n    '.prettierignore',\n  ]);\n\n  logger.debug(`Discovered ${pluralise(relativeFilepaths.length, 'file')}.`);\n\n  const result: Result = {\n    count: relativeFilepaths.length,\n    errored: [],\n    touched: [],\n    unparsed: [],\n  };\n\n  logger.debug(mode === 'format' ? 'Formatting' : 'Linting', 'files...');\n\n  for (const relativeFilepath of relativeFilepaths) {\n    // Use relative paths to keep log output cleaner, particularly in the common\n    // case where we are executing against the current working directory.\n    const filepath = path.relative(\n      process.cwd(),\n      path.join(directory, relativeFilepath),\n    );\n\n    // Infer parser upfront so we can skip unsupported files.\n    const parser = await 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 = await 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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",
   "names": ["path", "fs"]
 }

package/lib/cli/build/index.js

@@ -35,12 +35,10 @@ var import_chalk = __toESM(require("chalk"));
 var import_args = require("../../utils/args");
 var import_logging = require("../../utils/logging");
 var import_manifest = require("../../utils/manifest");
-var import_addEmptyExports = require("../configure/addEmptyExports");
 var import_assets = require("./assets");
 var import_esbuild = require("./esbuild");
 var import_tsc = require("./tsc");
 const build = async (args = process.argv.slice(2)) => {
-  await (0, import_addEmptyExports.tryAddEmptyExports)();
   const tool = await (0, import_manifest.getStringPropFromConsumerManifest)("build");
   switch (tool) {
     case "esbuild": {

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 { copyAssets } from './assets';\nimport { esbuild } from './esbuild';\nimport { readTsconfig, 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      break;\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      break;\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  const parsedCommandLine = readTsconfig(args, log);\n\n  if (!parsedCommandLine || process.exitCode) {\n    return;\n  }\n\n  const { options: compilerOptions } = parsedCommandLine;\n\n  if (!compilerOptions.outDir) {\n    return;\n  }\n\n  await copyAssets(compilerOptions.outDir);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,kBAA6B;AAC7B,qBAAoB;AACpB,sBAAkD;AAClD,6BAAmC;AAEnC,oBAA2B;AAC3B,qBAAwB;AACxB,iBAAkC;AAE3B,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;AAEA,QAAM,wBAAoB,yBAAa,MAAM,kBAAG;AAEhD,MAAI,CAAC,qBAAqB,QAAQ,UAAU;AAC1C;AAAA,EACF;AAEA,QAAM,EAAE,SAAS,gBAAgB,IAAI;AAErC,MAAI,CAAC,gBAAgB,QAAQ;AAC3B;AAAA,EACF;AAEA,YAAM,0BAAW,gBAAgB,MAAM;AACzC;",
+  "sourcesContent": ["import chalk from 'chalk';\n\nimport { hasDebugFlag } from '../../utils/args';\nimport { log } from '../../utils/logging';\nimport { getStringPropFromConsumerManifest } from '../../utils/manifest';\n\nimport { copyAssets } from './assets';\nimport { esbuild } from './esbuild';\nimport { readTsconfig, tsc } from './tsc';\n\nexport const build = async (args = process.argv.slice(2)) => {\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      break;\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      break;\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  const parsedCommandLine = readTsconfig(args, log);\n\n  if (!parsedCommandLine || process.exitCode) {\n    return;\n  }\n\n  const { options: compilerOptions } = parsedCommandLine;\n\n  if (!compilerOptions.outDir) {\n    return;\n  }\n\n  await copyAssets(compilerOptions.outDir);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAkB;AAElB,kBAA6B;AAC7B,qBAAoB;AACpB,sBAAkD;AAElD,oBAA2B;AAC3B,qBAAwB;AACxB,iBAAkC;AAE3B,MAAM,QAAQ,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AAG3D,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;AAEA,QAAM,wBAAoB,yBAAa,MAAM,kBAAG;AAEhD,MAAI,CAAC,qBAAqB,QAAQ,UAAU;AAC1C;AAAA,EACF;AAEA,QAAM,EAAE,SAAS,gBAAgB,IAAI;AAErC,MAAI,CAAC,gBAAgB,QAAQ;AAC3B;AAAA,EACF;AAEA,YAAM,0BAAW,gBAAgB,MAAM;AACzC;",
   "names": ["chalk"]
 }

package/lib/cli/buildPackage.js

@@ -24,9 +24,7 @@ module.exports = __toCommonJS(buildPackage_exports);
 var import_args = require("../utils/args");
 var import_exec = require("../utils/exec");
 var import_assets = require("./build/assets");
-var import_addEmptyExports = require("./configure/addEmptyExports");
 const buildPackage = async (args = process.argv.slice(2)) => {
-  await (0, import_addEmptyExports.tryAddEmptyExports)();
   await (0, import_exec.execConcurrently)(
     [
       {

package/lib/cli/buildPackage.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/cli/buildPackage.ts"],
-  "sourcesContent": ["import { hasSerialFlag } from '../utils/args';\nimport { execConcurrently } from '../utils/exec';\n\nimport { copyAssetsConcurrently } from './build/assets';\nimport { tryAddEmptyExports } from './configure/addEmptyExports';\n\nexport const buildPackage = async (args = process.argv.slice(2)) => {\n  await tryAddEmptyExports();\n\n  await execConcurrently(\n    [\n      {\n        command:\n          'tsc --module CommonJS --outDir lib-commonjs --project tsconfig.build.json',\n        name: 'commonjs',\n        prefixColor: 'green',\n      },\n      {\n        command:\n          'tsc --module ES2015 --outDir lib-es2015 --project tsconfig.build.json',\n        name: 'es2015',\n        prefixColor: 'yellow',\n      },\n      {\n        command:\n          'tsc --allowJS false --declaration --emitDeclarationOnly --outDir lib-types --project tsconfig.build.json',\n        name: 'types',\n        prefixColor: 'blue',\n      },\n    ],\n    {\n      maxProcesses: hasSerialFlag(args) ? 1 : undefined,\n    },\n  );\n\n  await copyAssetsConcurrently([\n    {\n      outDir: 'lib-commonjs',\n      name: 'commonjs',\n      prefixColor: 'green',\n    },\n    {\n      outDir: 'lib-es2015',\n      name: 'es2015',\n      prefixColor: 'yellow',\n    },\n  ]);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA8B;AAC9B,kBAAiC;AAEjC,oBAAuC;AACvC,6BAAmC;AAE5B,MAAM,eAAe,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AAClE,YAAM,2CAAmB;AAEzB,YAAM;AAAA,IACJ;AAAA,MACE;AAAA,QACE,SACE;AAAA,QACF,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA;AAAA,QACE,SACE;AAAA,QACF,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA;AAAA,QACE,SACE;AAAA,QACF,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,IACF;AAAA,IACA;AAAA,MACE,kBAAc,2BAAc,IAAI,IAAI,IAAI;AAAA,IAC1C;AAAA,EACF;AAEA,YAAM,sCAAuB;AAAA,IAC3B;AAAA,MACE,QAAQ;AAAA,MACR,MAAM;AAAA,MACN,aAAa;AAAA,IACf;AAAA,IACA;AAAA,MACE,QAAQ;AAAA,MACR,MAAM;AAAA,MACN,aAAa;AAAA,IACf;AAAA,EACF,CAAC;AACH;",
+  "sourcesContent": ["import { hasSerialFlag } from '../utils/args';\nimport { execConcurrently } from '../utils/exec';\n\nimport { copyAssetsConcurrently } from './build/assets';\n\nexport const buildPackage = async (args = process.argv.slice(2)) => {\n  await execConcurrently(\n    [\n      {\n        command:\n          'tsc --module CommonJS --outDir lib-commonjs --project tsconfig.build.json',\n        name: 'commonjs',\n        prefixColor: 'green',\n      },\n      {\n        command:\n          'tsc --module ES2015 --outDir lib-es2015 --project tsconfig.build.json',\n        name: 'es2015',\n        prefixColor: 'yellow',\n      },\n      {\n        command:\n          'tsc --allowJS false --declaration --emitDeclarationOnly --outDir lib-types --project tsconfig.build.json',\n        name: 'types',\n        prefixColor: 'blue',\n      },\n    ],\n    {\n      maxProcesses: hasSerialFlag(args) ? 1 : undefined,\n    },\n  );\n\n  await copyAssetsConcurrently([\n    {\n      outDir: 'lib-commonjs',\n      name: 'commonjs',\n      prefixColor: 'green',\n    },\n    {\n      outDir: 'lib-es2015',\n      name: 'es2015',\n      prefixColor: 'yellow',\n    },\n  ]);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAA8B;AAC9B,kBAAiC;AAEjC,oBAAuC;AAEhC,MAAM,eAAe,OAAO,OAAO,QAAQ,KAAK,MAAM,CAAC,MAAM;AAClE,YAAM;AAAA,IACJ;AAAA,MACE;AAAA,QACE,SACE;AAAA,QACF,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA;AAAA,QACE,SACE;AAAA,QACF,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,MACA;AAAA,QACE,SACE;AAAA,QACF,MAAM;AAAA,QACN,aAAa;AAAA,MACf;AAAA,IACF;AAAA,IACA;AAAA,MACE,kBAAc,2BAAc,IAAI,IAAI,IAAI;AAAA,IAC1C;AAAA,EACF;AAEA,YAAM,sCAAuB;AAAA,IAC3B;AAAA,MACE,QAAQ;AAAA,MACR,MAAM;AAAA,MACN,aAAa;AAAA,IACf;AAAA,IACA;AAAA,MACE,QAAQ;AAAA,MACR,MAAM;AAAA,MACN,aAAa;AAAA,IACf;AAAA,EACF,CAAC;AACH;",
   "names": []
 }

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

@@ -1,8 +1,10 @@
 import type { ProjectType } from '../../utils/manifest';
+import type { PackageManagerConfig } from '../../utils/packageManager';
 interface Props {
     destinationRoot: string;
     entryPoint: string;
     firstRun: boolean;
+    packageManager: PackageManagerConfig;
     type: ProjectType;
 }
 export declare const analyseConfiguration: (props: Props) => Promise<undefined | (() => Promise<void>)>;

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/analyseConfiguration.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\n\nimport { log } from '../../utils/logging';\nimport type { ProjectType } from '../../utils/manifest';\n\nimport { diffFiles } from './analysis/project';\n\ninterface Props {\n  destinationRoot: string;\n  entryPoint: string;\n  firstRun: boolean;\n  type: ProjectType;\n}\n\nexport const analyseConfiguration = async (\n  props: Props,\n): Promise<undefined | (() => Promise<void>)> => {\n  log.newline();\n  log.plain(log.bold('Config:'));\n\n  const files = await diffFiles(props);\n\n  if (Object.keys(files).length === 0) {\n    log.newline();\n    log.ok('\u2714 No changes');\n    return;\n  }\n\n  log.newline();\n  Object.entries(files)\n    .sort(([filenameA], [filenameB]) => filenameA.localeCompare(filenameB))\n    .forEach(([filename, { operation }]) => log.plain(operation, filename));\n\n  return async () => {\n    const dirnames = [\n      ...new Set(Object.keys(files).map((filename) => path.dirname(filename))),\n    ];\n\n    await Promise.all(\n      dirnames.map((dirname) =>\n        fs.promises.mkdir(dirname, { recursive: true }),\n      ),\n    );\n\n    await Promise.all(\n      Object.entries(files).map(([filename, { data }]) =>\n        data === undefined\n          ? fs.promises.rm(filename)\n          : fs.promises.writeFile(filename, data),\n      ),\n    );\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AAEf,qBAAoB;AAGpB,qBAA0B;AASnB,MAAM,uBAAuB,OAClC,UAC+C;AAC/C,qBAAI,QAAQ;AACZ,qBAAI,MAAM,mBAAI,KAAK,SAAS,CAAC;AAE7B,QAAM,QAAQ,UAAM,0BAAU,KAAK;AAEnC,MAAI,OAAO,KAAK,KAAK,EAAE,WAAW,GAAG;AACnC,uBAAI,QAAQ;AACZ,uBAAI,GAAG,mBAAc;AACrB;AAAA,EACF;AAEA,qBAAI,QAAQ;AACZ,SAAO,QAAQ,KAAK,EACjB,KAAK,CAAC,CAAC,SAAS,GAAG,CAAC,SAAS,MAAM,UAAU,cAAc,SAAS,CAAC,EACrE,QAAQ,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,mBAAI,MAAM,WAAW,QAAQ,CAAC;AAExE,SAAO,YAAY;AACjB,UAAM,WAAW;AAAA,MACf,GAAG,IAAI,IAAI,OAAO,KAAK,KAAK,EAAE,IAAI,CAAC,aAAa,YAAAA,QAAK,QAAQ,QAAQ,CAAC,CAAC;AAAA,IACzE;AAEA,UAAM,QAAQ;AAAA,MACZ,SAAS;AAAA,QAAI,CAAC,YACZ,gBAAAC,QAAG,SAAS,MAAM,SAAS,EAAE,WAAW,KAAK,CAAC;AAAA,MAChD;AAAA,IACF;AAEA,UAAM,QAAQ;AAAA,MACZ,OAAO,QAAQ,KAAK,EAAE;AAAA,QAAI,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,MAC5C,SAAS,SACL,gBAAAA,QAAG,SAAS,GAAG,QAAQ,IACvB,gBAAAA,QAAG,SAAS,UAAU,UAAU,IAAI;AAAA,MAC1C;AAAA,IACF;AAAA,EACF;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\n\nimport { log } from '../../utils/logging';\nimport type { ProjectType } from '../../utils/manifest';\nimport type { PackageManagerConfig } from '../../utils/packageManager';\n\nimport { diffFiles } from './analysis/project';\n\ninterface Props {\n  destinationRoot: string;\n  entryPoint: string;\n  firstRun: boolean;\n  packageManager: PackageManagerConfig;\n  type: ProjectType;\n}\n\nexport const analyseConfiguration = async (\n  props: Props,\n): Promise<undefined | (() => Promise<void>)> => {\n  log.newline();\n  log.plain(log.bold('Config:'));\n\n  const files = await diffFiles(props);\n\n  if (Object.keys(files).length === 0) {\n    log.newline();\n    log.ok('\u2714 No changes');\n    return;\n  }\n\n  log.newline();\n  Object.entries(files)\n    .sort(([filenameA], [filenameB]) => filenameA.localeCompare(filenameB))\n    .forEach(([filename, { operation }]) => log.plain(operation, filename));\n\n  return async () => {\n    const dirnames = [\n      ...new Set(Object.keys(files).map((filename) => path.dirname(filename))),\n    ];\n\n    await Promise.all(\n      dirnames.map((dirname) =>\n        fs.promises.mkdir(dirname, { recursive: true }),\n      ),\n    );\n\n    await Promise.all(\n      Object.entries(files).map(([filename, { data }]) =>\n        data === undefined\n          ? fs.promises.rm(filename)\n          : fs.promises.writeFile(filename, data),\n      ),\n    );\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AAEf,qBAAoB;AAIpB,qBAA0B;AAUnB,MAAM,uBAAuB,OAClC,UAC+C;AAC/C,qBAAI,QAAQ;AACZ,qBAAI,MAAM,mBAAI,KAAK,SAAS,CAAC;AAE7B,QAAM,QAAQ,UAAM,0BAAU,KAAK;AAEnC,MAAI,OAAO,KAAK,KAAK,EAAE,WAAW,GAAG;AACnC,uBAAI,QAAQ;AACZ,uBAAI,GAAG,mBAAc;AACrB;AAAA,EACF;AAEA,qBAAI,QAAQ;AACZ,SAAO,QAAQ,KAAK,EACjB,KAAK,CAAC,CAAC,SAAS,GAAG,CAAC,SAAS,MAAM,UAAU,cAAc,SAAS,CAAC,EACrE,QAAQ,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,mBAAI,MAAM,WAAW,QAAQ,CAAC;AAExE,SAAO,YAAY;AACjB,UAAM,WAAW;AAAA,MACf,GAAG,IAAI,IAAI,OAAO,KAAK,KAAK,EAAE,IAAI,CAAC,aAAa,YAAAA,QAAK,QAAQ,QAAQ,CAAC,CAAC;AAAA,IACzE;AAEA,UAAM,QAAQ;AAAA,MACZ,SAAS;AAAA,QAAI,CAAC,YACZ,gBAAAC,QAAG,SAAS,MAAM,SAAS,EAAE,WAAW,KAAK,CAAC;AAAA,MAChD;AAAA,IACF;AAEA,UAAM,QAAQ;AAAA,MACZ,OAAO,QAAQ,KAAK,EAAE;AAAA,QAAI,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,MAC5C,SAAS,SACL,gBAAAA,QAAG,SAAS,GAAG,QAAQ,IACvB,gBAAAA,QAAG,SAAS,UAAU,UAAU,IAAI;AAAA,MAC1C;AAAA,IACF;AAAA,EACF;AACF;",
   "names": ["path", "fs"]
 }

package/lib/cli/configure/getEntryPoint.js

@@ -33,10 +33,10 @@ __export(getEntryPoint_exports, {
 module.exports = __toCommonJS(getEntryPoint_exports);
 var import_path = __toESM(require("path"));
 var import_chalk = __toESM(require("chalk"));
+var import_enquirer = require("enquirer");
 var import_logging = require("../../utils/logging");
 var import_validation = require("../../utils/validation");
 var import_files = require("./analysis/files");
-var import_enquirer = require("enquirer");
 const getEntryPoint = ({
   destinationRoot,
   manifest,

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/getEntryPoint.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport type { NormalizedReadResult } from 'read-pkg-up';\n\nimport { log } from '../../utils/logging';\nimport type { ProjectType } from '../../utils/manifest';\nimport type { TemplateConfig } from '../../utils/template';\nimport { hasStringProp } from '../../utils/validation';\n\nimport { tsFileExists } from './analysis/files';\n\nimport { Input } from 'enquirer';\n\ninterface Props {\n  destinationRoot: string;\n  manifest: NormalizedReadResult;\n  templateConfig: TemplateConfig;\n  type: ProjectType;\n}\nexport const getEntryPoint = ({\n  destinationRoot,\n  manifest,\n  templateConfig,\n  type,\n}: Props) => {\n  if (hasStringProp(manifest.packageJson.skuba, 'entryPoint')) {\n    return manifest.packageJson.skuba.entryPoint;\n  }\n\n  if (templateConfig.entryPoint !== undefined) {\n    return templateConfig.entryPoint;\n  }\n\n  log.newline();\n  const entryPointPrompt = new Input({\n    initial: type === 'package' ? 'src/index.ts' : 'src/app.ts',\n    message: 'Entry point:',\n    name: 'entryPoint',\n    result: (value) => (value.endsWith('.ts') ? value : `${value}.ts`),\n    validate: async (value) => {\n      // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n      const [modulePath] = value.split('#', 2);\n\n      if (!modulePath) {\n        return `${chalk.bold(value)} is an invalid module path`;\n      }\n\n      const exists = await tsFileExists(path.join(destinationRoot, modulePath));\n\n      return exists || `${chalk.bold(value)} is not a TypeScript file.`;\n    },\n  });\n\n  return entryPointPrompt.run();\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAGlB,qBAAoB;AAGpB,wBAA8B;AAE9B,mBAA6B;AAE7B,sBAAsB;AAQf,MAAM,gBAAgB,CAAC;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAa;AACX,UAAI,iCAAc,SAAS,YAAY,OAAO,YAAY,GAAG;AAC3D,WAAO,SAAS,YAAY,MAAM;AAAA,EACpC;AAEA,MAAI,eAAe,eAAe,QAAW;AAC3C,WAAO,eAAe;AAAA,EACxB;AAEA,qBAAI,QAAQ;AACZ,QAAM,mBAAmB,IAAI,sBAAM;AAAA,IACjC,SAAS,SAAS,YAAY,iBAAiB;AAAA,IAC/C,SAAS;AAAA,IACT,MAAM;AAAA,IACN,QAAQ,CAAC,UAAW,MAAM,SAAS,KAAK,IAAI,QAAQ,GAAG,KAAK;AAAA,IAC5D,UAAU,OAAO,UAAU;AAEzB,YAAM,CAAC,UAAU,IAAI,MAAM,MAAM,KAAK,CAAC;AAEvC,UAAI,CAAC,YAAY;AACf,eAAO,GAAG,aAAAA,QAAM,KAAK,KAAK,CAAC;AAAA,MAC7B;AAEA,YAAM,SAAS,UAAM,2BAAa,YAAAC,QAAK,KAAK,iBAAiB,UAAU,CAAC;AAExE,aAAO,UAAU,GAAG,aAAAD,QAAM,KAAK,KAAK,CAAC;AAAA,IACvC;AAAA,EACF,CAAC;AAED,SAAO,iBAAiB,IAAI;AAC9B;",
+  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { Input } from 'enquirer';\nimport type { NormalizedReadResult } from 'read-pkg-up';\n\nimport { log } from '../../utils/logging';\nimport type { ProjectType } from '../../utils/manifest';\nimport type { TemplateConfig } from '../../utils/template';\nimport { hasStringProp } from '../../utils/validation';\n\nimport { tsFileExists } from './analysis/files';\n\ninterface Props {\n  destinationRoot: string;\n  manifest: NormalizedReadResult;\n  templateConfig: TemplateConfig;\n  type: ProjectType;\n}\nexport const getEntryPoint = ({\n  destinationRoot,\n  manifest,\n  templateConfig,\n  type,\n}: Props) => {\n  if (hasStringProp(manifest.packageJson.skuba, 'entryPoint')) {\n    return manifest.packageJson.skuba.entryPoint;\n  }\n\n  if (templateConfig.entryPoint !== undefined) {\n    return templateConfig.entryPoint;\n  }\n\n  log.newline();\n  const entryPointPrompt = new Input({\n    initial: type === 'package' ? 'src/index.ts' : 'src/app.ts',\n    message: 'Entry point:',\n    name: 'entryPoint',\n    result: (value) => (value.endsWith('.ts') ? value : `${value}.ts`),\n    validate: async (value) => {\n      // Support exported function targeting, e.g. `src/module.ts#callMeMaybe`\n      const [modulePath] = value.split('#', 2);\n\n      if (!modulePath) {\n        return `${chalk.bold(value)} is an invalid module path`;\n      }\n\n      const exists = await tsFileExists(path.join(destinationRoot, modulePath));\n\n      return exists || `${chalk.bold(value)} is not a TypeScript file.`;\n    },\n  });\n\n  return entryPointPrompt.run();\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAsB;AAGtB,qBAAoB;AAGpB,wBAA8B;AAE9B,mBAA6B;AAQtB,MAAM,gBAAgB,CAAC;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAAa;AACX,UAAI,iCAAc,SAAS,YAAY,OAAO,YAAY,GAAG;AAC3D,WAAO,SAAS,YAAY,MAAM;AAAA,EACpC;AAEA,MAAI,eAAe,eAAe,QAAW;AAC3C,WAAO,eAAe;AAAA,EACxB;AAEA,qBAAI,QAAQ;AACZ,QAAM,mBAAmB,IAAI,sBAAM;AAAA,IACjC,SAAS,SAAS,YAAY,iBAAiB;AAAA,IAC/C,SAAS;AAAA,IACT,MAAM;AAAA,IACN,QAAQ,CAAC,UAAW,MAAM,SAAS,KAAK,IAAI,QAAQ,GAAG,KAAK;AAAA,IAC5D,UAAU,OAAO,UAAU;AAEzB,YAAM,CAAC,UAAU,IAAI,MAAM,MAAM,KAAK,CAAC;AAEvC,UAAI,CAAC,YAAY;AACf,eAAO,GAAG,aAAAA,QAAM,KAAK,KAAK,CAAC;AAAA,MAC7B;AAEA,YAAM,SAAS,UAAM,2BAAa,YAAAC,QAAK,KAAK,iBAAiB,UAAU,CAAC;AAExE,aAAO,UAAU,GAAG,aAAAD,QAAM,KAAK,KAAK,CAAC;AAAA,IACvC;AAAA,EACF,CAAC;AAED,SAAO,iBAAiB,IAAI;AAC9B;",
   "names": ["chalk", "path"]
 }

package/lib/cli/configure/getProjectType.js

@@ -21,10 +21,10 @@ __export(getProjectType_exports, {
   getProjectType: () => getProjectType
 });
 module.exports = __toCommonJS(getProjectType_exports);
+var import_enquirer = require("enquirer");
 var import_logging = require("../../utils/logging");
 var import_manifest = require("../../utils/manifest");
 var import_validation = require("../../utils/validation");
-var import_enquirer = require("enquirer");
 const getProjectType = async ({
   manifest,
   templateConfig

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/getProjectType.ts"],
-  "sourcesContent": ["import type { NormalizedReadResult } from 'read-pkg-up';\n\nimport { log } from '../../utils/logging';\nimport {\n  PROJECT_TYPES,\n  type ProjectType,\n  projectTypeSchema,\n} from '../../utils/manifest';\nimport type { TemplateConfig } from '../../utils/template';\nimport { hasProp } from '../../utils/validation';\n\nimport { Select } from 'enquirer';\n\ninterface Props {\n  manifest: NormalizedReadResult;\n  templateConfig: TemplateConfig;\n}\n\nexport const getProjectType = async ({\n  manifest,\n  templateConfig,\n}: Props): Promise<ProjectType> => {\n  const projectType = projectTypeSchema.safeParse(\n    hasProp(manifest.packageJson.skuba, 'type')\n      ? manifest.packageJson.skuba.type\n      : null,\n  );\n\n  if (projectType.success) {\n    return projectType.data;\n  }\n\n  if (templateConfig.type !== undefined) {\n    return templateConfig.type;\n  }\n\n  const initial: ProjectType =\n    manifest.packageJson.devDependencies?.['@seek/seek-module-toolkit'] ||\n    manifest.packageJson.files\n      ? 'package'\n      : 'application';\n\n  log.newline();\n  const projectTypePrompt = new Select({\n    choices: PROJECT_TYPES,\n    message: 'Project type:',\n    name: 'projectType',\n    initial,\n  });\n\n  return projectTypePrompt.run();\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,qBAAoB;AACpB,sBAIO;AAEP,wBAAwB;AAExB,sBAAuB;AAOhB,MAAM,iBAAiB,OAAO;AAAA,EACnC;AAAA,EACA;AACF,MAAmC;AACjC,QAAM,cAAc,kCAAkB;AAAA,QACpC,2BAAQ,SAAS,YAAY,OAAO,MAAM,IACtC,SAAS,YAAY,MAAM,OAC3B;AAAA,EACN;AAEA,MAAI,YAAY,SAAS;AACvB,WAAO,YAAY;AAAA,EACrB;AAEA,MAAI,eAAe,SAAS,QAAW;AACrC,WAAO,eAAe;AAAA,EACxB;AAEA,QAAM,UACJ,SAAS,YAAY,kBAAkB,2BAA2B,KAClE,SAAS,YAAY,QACjB,YACA;AAEN,qBAAI,QAAQ;AACZ,QAAM,oBAAoB,IAAI,uBAAO;AAAA,IACnC,SAAS;AAAA,IACT,SAAS;AAAA,IACT,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AAED,SAAO,kBAAkB,IAAI;AAC/B;",
+  "sourcesContent": ["import { Select } from 'enquirer';\nimport type { NormalizedReadResult } from 'read-pkg-up';\n\nimport { log } from '../../utils/logging';\nimport {\n  PROJECT_TYPES,\n  type ProjectType,\n  projectTypeSchema,\n} from '../../utils/manifest';\nimport type { TemplateConfig } from '../../utils/template';\nimport { hasProp } from '../../utils/validation';\n\ninterface Props {\n  manifest: NormalizedReadResult;\n  templateConfig: TemplateConfig;\n}\n\nexport const getProjectType = async ({\n  manifest,\n  templateConfig,\n}: Props): Promise<ProjectType> => {\n  const projectType = projectTypeSchema.safeParse(\n    hasProp(manifest.packageJson.skuba, 'type')\n      ? manifest.packageJson.skuba.type\n      : null,\n  );\n\n  if (projectType.success) {\n    return projectType.data;\n  }\n\n  if (templateConfig.type !== undefined) {\n    return templateConfig.type;\n  }\n\n  const initial: ProjectType =\n    manifest.packageJson.devDependencies?.['@seek/seek-module-toolkit'] ||\n    manifest.packageJson.files\n      ? 'package'\n      : 'application';\n\n  log.newline();\n  const projectTypePrompt = new Select({\n    choices: PROJECT_TYPES,\n    message: 'Project type:',\n    name: 'projectType',\n    initial,\n  });\n\n  return projectTypePrompt.run();\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAuB;AAGvB,qBAAoB;AACpB,sBAIO;AAEP,wBAAwB;AAOjB,MAAM,iBAAiB,OAAO;AAAA,EACnC;AAAA,EACA;AACF,MAAmC;AACjC,QAAM,cAAc,kCAAkB;AAAA,QACpC,2BAAQ,SAAS,YAAY,OAAO,MAAM,IACtC,SAAS,YAAY,MAAM,OAC3B;AAAA,EACN;AAEA,MAAI,YAAY,SAAS;AACvB,WAAO,YAAY;AAAA,EACrB;AAEA,MAAI,eAAe,SAAS,QAAW;AACrC,WAAO,eAAe;AAAA,EACxB;AAEA,QAAM,UACJ,SAAS,YAAY,kBAAkB,2BAA2B,KAClE,SAAS,YAAY,QACjB,YACA;AAEN,qBAAI,QAAQ;AACZ,QAAM,oBAAoB,IAAI,uBAAO;AAAA,IACnC,SAAS;AAAA,IACT,SAAS;AAAA,IACT,MAAM;AAAA,IACN;AAAA,EACF,CAAC;AAED,SAAO,kBAAkB,IAAI;AAC/B;",
   "names": []
 }

package/lib/cli/configure/index.js

@@ -32,10 +32,12 @@ __export(configure_exports, {
 });
 module.exports = __toCommonJS(configure_exports);
 var import_path = __toESM(require("path"));
+var import_enquirer = require("enquirer");
 var import_dir = require("../../utils/dir");
 var import_exec = require("../../utils/exec");
 var import_logging = require("../../utils/logging");
 var import_logo = require("../../utils/logo");
+var import_packageManager = require("../../utils/packageManager");
 var import_template = require("../../utils/template");
 var import_validation = require("../../utils/validation");
 var import_analyseConfiguration = require("./analyseConfiguration");
@@ -45,7 +47,6 @@ var import_package = require("./analysis/package");
 var import_ensureTemplateCompletion = require("./ensureTemplateCompletion");
 var import_getEntryPoint = require("./getEntryPoint");
 var import_getProjectType = require("./getProjectType");
-var import_enquirer = require("enquirer");
 const shouldApply = async (name) => {
   const prompt = new import_enquirer.Select({
     choices: ["yes", "no"],
@@ -57,10 +58,11 @@ const shouldApply = async (name) => {
 };
 const configure = async () => {
   await (0, import_logo.showLogoAndVersionInfo)();
-  const [manifest] = await Promise.all([
+  const [manifest, packageManager] = await Promise.all([
     (0, import_package.getDestinationManifest)(),
-    (0, import_exec.ensureCommands)("yarn")
+    (0, import_packageManager.detectPackageManager)()
   ]);
+  await (0, import_exec.ensureCommands)(packageManager.command);
   const destinationRoot = import_path.default.dirname(manifest.path);
   import_logging.log.plain("Detected project root:", import_logging.log.bold(destinationRoot));
   const [include] = await Promise.all([
@@ -102,6 +104,7 @@ const configure = async () => {
     destinationRoot,
     entryPoint,
     firstRun,
+    packageManager,
     type
   });
   if (fixConfiguration) {
@@ -113,17 +116,17 @@ const configure = async () => {
   if (fixDependencies) {
     const exec = (0, import_exec.createExec)({
       stdio: "pipe",
-      streamStdio: "yarn"
+      streamStdio: packageManager.command
     });
     import_logging.log.newline();
     try {
-      await exec("yarn", "install");
+      await exec(packageManager.install);
     } catch {
       import_logging.log.newline();
       import_logging.log.warn(import_logging.log.bold("\u2717 Failed to install dependencies. Resume with:"));
       import_logging.log.newline();
-      import_logging.log.plain(import_logging.log.bold("yarn install"));
-      import_logging.log.plain(import_logging.log.bold("yarn format"));
+      import_logging.log.plain(import_logging.log.bold(packageManager, "install"));
+      import_logging.log.plain(import_logging.log.bold(packageManager, "run", "format"));
       import_logging.log.newline();
       process.exitCode = 1;
       return;
@@ -133,7 +136,7 @@ const configure = async () => {
     import_logging.log.newline();
     import_logging.log.ok(import_logging.log.bold("\u2714 All done! Try running:"));
     import_logging.log.newline();
-    import_logging.log.plain(import_logging.log.bold("yarn format"));
+    import_logging.log.plain(import_logging.log.bold(packageManager, "run", "format"));
   }
   import_logging.log.newline();
 };

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport { createInclusionFilter } from '../../utils/dir';\nimport { createExec, ensureCommands } from '../../utils/exec';\nimport { log } from '../../utils/logging';\nimport { showLogoAndVersionInfo } from '../../utils/logo';\nimport { BASE_TEMPLATE_DIR } from '../../utils/template';\nimport { hasProp } from '../../utils/validation';\n\nimport { analyseConfiguration } from './analyseConfiguration';\nimport { analyseDependencies } from './analyseDependencies';\nimport { auditWorkingTree } from './analysis/git';\nimport { getDestinationManifest } from './analysis/package';\nimport { ensureTemplateCompletion } from './ensureTemplateCompletion';\nimport { getEntryPoint } from './getEntryPoint';\nimport { getProjectType } from './getProjectType';\n\nimport { Select } from 'enquirer';\n\nconst shouldApply = async (name: string) => {\n  const prompt = new Select({\n    choices: ['yes', 'no'] as const,\n    message: 'Apply changes?',\n    name,\n  });\n\n  const result = await prompt.run();\n\n  return result === 'yes';\n};\n\nexport const configure = async () => {\n  await showLogoAndVersionInfo();\n\n  const [manifest] = await Promise.all([\n    getDestinationManifest(),\n    ensureCommands('yarn'),\n  ]);\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  log.plain('Detected project root:', log.bold(destinationRoot));\n\n  const [include] = await Promise.all([\n    createInclusionFilter([\n      path.join(destinationRoot, '.gitignore'),\n      path.join(BASE_TEMPLATE_DIR, '_.gitignore'),\n    ]),\n\n    auditWorkingTree(destinationRoot),\n  ]);\n\n  const templateConfig = await ensureTemplateCompletion({\n    destinationRoot,\n    include,\n    manifest,\n  });\n\n  const type = await getProjectType({\n    manifest,\n    templateConfig,\n  });\n\n  const entryPoint = await getEntryPoint({\n    destinationRoot,\n    manifest,\n    templateConfig,\n    type,\n  });\n\n  const fixDependencies = await analyseDependencies({\n    destinationRoot,\n    include,\n    manifest,\n    type,\n  });\n\n  if (fixDependencies) {\n    log.newline();\n\n    if (await shouldApply('fixDependencies')) {\n      await fixDependencies();\n    }\n  }\n\n  const firstRun = hasProp(manifest.packageJson, 'skuba');\n\n  const fixConfiguration = await analyseConfiguration({\n    destinationRoot,\n    entryPoint,\n    firstRun,\n    type,\n  });\n\n  if (fixConfiguration) {\n    log.newline();\n\n    if (await shouldApply('fixConfiguration')) {\n      await fixConfiguration();\n    }\n  }\n\n  if (fixDependencies) {\n    const exec = createExec({\n      stdio: 'pipe',\n      streamStdio: 'yarn',\n    });\n\n    log.newline();\n    try {\n      await exec('yarn', 'install');\n    } catch {\n      log.newline();\n      log.warn(log.bold('\u2717 Failed to install dependencies. Resume with:'));\n\n      log.newline();\n      log.plain(log.bold('yarn install'));\n      log.plain(log.bold('yarn format'));\n\n      log.newline();\n      process.exitCode = 1;\n      return;\n    }\n  }\n\n  if (fixConfiguration ?? fixDependencies) {\n    log.newline();\n    log.ok(log.bold('\u2714 All done! Try running:'));\n\n    log.newline();\n    log.plain(log.bold('yarn format'));\n  }\n\n  log.newline();\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,iBAAsC;AACtC,kBAA2C;AAC3C,qBAAoB;AACpB,kBAAuC;AACvC,sBAAkC;AAClC,wBAAwB;AAExB,kCAAqC;AACrC,iCAAoC;AACpC,iBAAiC;AACjC,qBAAuC;AACvC,sCAAyC;AACzC,2BAA8B;AAC9B,4BAA+B;AAE/B,sBAAuB;AAEvB,MAAM,cAAc,OAAO,SAAiB;AAC1C,QAAM,SAAS,IAAI,uBAAO;AAAA,IACxB,SAAS,CAAC,OAAO,IAAI;AAAA,IACrB,SAAS;AAAA,IACT;AAAA,EACF,CAAC;AAED,QAAM,SAAS,MAAM,OAAO,IAAI;AAEhC,SAAO,WAAW;AACpB;AAEO,MAAM,YAAY,YAAY;AACnC,YAAM,oCAAuB;AAE7B,QAAM,CAAC,QAAQ,IAAI,MAAM,QAAQ,IAAI;AAAA,QACnC,uCAAuB;AAAA,QACvB,4BAAe,MAAM;AAAA,EACvB,CAAC;AAED,QAAM,kBAAkB,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAElD,qBAAI,MAAM,0BAA0B,mBAAI,KAAK,eAAe,CAAC;AAE7D,QAAM,CAAC,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,QAClC,kCAAsB;AAAA,MACpB,YAAAA,QAAK,KAAK,iBAAiB,YAAY;AAAA,MACvC,YAAAA,QAAK,KAAK,mCAAmB,aAAa;AAAA,IAC5C,CAAC;AAAA,QAED,6BAAiB,eAAe;AAAA,EAClC,CAAC;AAED,QAAM,iBAAiB,UAAM,0DAAyB;AAAA,IACpD;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,OAAO,UAAM,sCAAe;AAAA,IAChC;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,aAAa,UAAM,oCAAc;AAAA,IACrC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,kBAAkB,UAAM,gDAAoB;AAAA,IAChD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAED,MAAI,iBAAiB;AACnB,uBAAI,QAAQ;AAEZ,QAAI,MAAM,YAAY,iBAAiB,GAAG;AACxC,YAAM,gBAAgB;AAAA,IACxB;AAAA,EACF;AAEA,QAAM,eAAW,2BAAQ,SAAS,aAAa,OAAO;AAEtD,QAAM,mBAAmB,UAAM,kDAAqB;AAAA,IAClD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AAED,MAAI,kBAAkB;AACpB,uBAAI,QAAQ;AAEZ,QAAI,MAAM,YAAY,kBAAkB,GAAG;AACzC,YAAM,iBAAiB;AAAA,IACzB;AAAA,EACF;AAEA,MAAI,iBAAiB;AACnB,UAAM,WAAO,wBAAW;AAAA,MACtB,OAAO;AAAA,MACP,aAAa;AAAA,IACf,CAAC;AAED,uBAAI,QAAQ;AACZ,QAAI;AACF,YAAM,KAAK,QAAQ,SAAS;AAAA,IAC9B,QAAQ;AACN,yBAAI,QAAQ;AACZ,yBAAI,KAAK,mBAAI,KAAK,qDAAgD,CAAC;AAEnE,yBAAI,QAAQ;AACZ,yBAAI,MAAM,mBAAI,KAAK,cAAc,CAAC;AAClC,yBAAI,MAAM,mBAAI,KAAK,aAAa,CAAC;AAEjC,yBAAI,QAAQ;AACZ,cAAQ,WAAW;AACnB;AAAA,IACF;AAAA,EACF;AAEA,MAAI,oBAAoB,iBAAiB;AACvC,uBAAI,QAAQ;AACZ,uBAAI,GAAG,mBAAI,KAAK,+BAA0B,CAAC;AAE3C,uBAAI,QAAQ;AACZ,uBAAI,MAAM,mBAAI,KAAK,aAAa,CAAC;AAAA,EACnC;AAEA,qBAAI,QAAQ;AACd;",
+  "sourcesContent": ["import path from 'path';\n\nimport { Select } from 'enquirer';\n\nimport { createInclusionFilter } from '../../utils/dir';\nimport { createExec, ensureCommands } from '../../utils/exec';\nimport { log } from '../../utils/logging';\nimport { showLogoAndVersionInfo } from '../../utils/logo';\nimport { detectPackageManager } from '../../utils/packageManager';\nimport { BASE_TEMPLATE_DIR } from '../../utils/template';\nimport { hasProp } from '../../utils/validation';\n\nimport { analyseConfiguration } from './analyseConfiguration';\nimport { analyseDependencies } from './analyseDependencies';\nimport { auditWorkingTree } from './analysis/git';\nimport { getDestinationManifest } from './analysis/package';\nimport { ensureTemplateCompletion } from './ensureTemplateCompletion';\nimport { getEntryPoint } from './getEntryPoint';\nimport { getProjectType } from './getProjectType';\n\nconst shouldApply = async (name: string) => {\n  const prompt = new Select({\n    choices: ['yes', 'no'] as const,\n    message: 'Apply changes?',\n    name,\n  });\n\n  const result = await prompt.run();\n\n  return result === 'yes';\n};\n\nexport const configure = async () => {\n  await showLogoAndVersionInfo();\n\n  const [manifest, packageManager] = await Promise.all([\n    getDestinationManifest(),\n    detectPackageManager(),\n  ]);\n\n  await ensureCommands(packageManager.command);\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  log.plain('Detected project root:', log.bold(destinationRoot));\n\n  const [include] = await Promise.all([\n    createInclusionFilter([\n      path.join(destinationRoot, '.gitignore'),\n      path.join(BASE_TEMPLATE_DIR, '_.gitignore'),\n    ]),\n\n    auditWorkingTree(destinationRoot),\n  ]);\n\n  const templateConfig = await ensureTemplateCompletion({\n    destinationRoot,\n    include,\n    manifest,\n  });\n\n  const type = await getProjectType({\n    manifest,\n    templateConfig,\n  });\n\n  const entryPoint = await getEntryPoint({\n    destinationRoot,\n    manifest,\n    templateConfig,\n    type,\n  });\n\n  const fixDependencies = await analyseDependencies({\n    destinationRoot,\n    include,\n    manifest,\n    type,\n  });\n\n  if (fixDependencies) {\n    log.newline();\n\n    if (await shouldApply('fixDependencies')) {\n      await fixDependencies();\n    }\n  }\n\n  const firstRun = hasProp(manifest.packageJson, 'skuba');\n\n  const fixConfiguration = await analyseConfiguration({\n    destinationRoot,\n    entryPoint,\n    firstRun,\n    packageManager,\n    type,\n  });\n\n  if (fixConfiguration) {\n    log.newline();\n\n    if (await shouldApply('fixConfiguration')) {\n      await fixConfiguration();\n    }\n  }\n\n  if (fixDependencies) {\n    const exec = createExec({\n      stdio: 'pipe',\n      streamStdio: packageManager.command,\n    });\n\n    log.newline();\n    try {\n      await exec(packageManager.install);\n    } catch {\n      log.newline();\n      log.warn(log.bold('\u2717 Failed to install dependencies. Resume with:'));\n\n      log.newline();\n      log.plain(log.bold(packageManager, 'install'));\n      log.plain(log.bold(packageManager, 'run', 'format'));\n\n      log.newline();\n      process.exitCode = 1;\n      return;\n    }\n  }\n\n  if (fixConfiguration ?? fixDependencies) {\n    log.newline();\n    log.ok(log.bold('\u2714 All done! Try running:'));\n\n    log.newline();\n    log.plain(log.bold(packageManager, 'run', 'format'));\n  }\n\n  log.newline();\n};\n"],
+  "mappings": "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",
   "names": ["path"]
 }

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

@@ -30,7 +30,6 @@ var import_prettier = require("./prettier");
 var import_renovate = require("./renovate");
 var import_serverless = require("./serverless");
 var import_skubaDive = require("./skubaDive");
-var import_tsconfig = require("./tsconfig");
 var import_tslint = require("./tslint");
 const loadModules = (opts) => Promise.all(
   [
@@ -43,7 +42,6 @@ const loadModules = (opts) => Promise.all(
     import_renovate.renovateModule,
     import_serverless.serverlessModule,
     import_skubaDive.skubaDiveModule,
-    import_tsconfig.tsconfigModule,
     import_tslint.tslintModule
   ].map((createModule) => createModule(opts))
 );

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/configure/modules/index.ts"],
-  "sourcesContent": ["import type { Module, Options } from '../types';\n\nimport { eslintModule } from './eslint';\nimport { ignoreModule } from './ignore';\nimport { jestModule } from './jest';\nimport { nodemonModule } from './nodemon';\nimport { packageModule } from './package';\nimport { prettierModule } from './prettier';\nimport { renovateModule } from './renovate';\nimport { serverlessModule } from './serverless';\nimport { skubaDiveModule } from './skubaDive';\nimport { tsconfigModule } from './tsconfig';\nimport { tslintModule } from './tslint';\n\nexport const loadModules = (opts: Options): Promise<Module[]> =>\n  Promise.all(\n    [\n      eslintModule,\n      ignoreModule,\n      jestModule,\n      nodemonModule,\n      packageModule,\n      prettierModule,\n      renovateModule,\n      serverlessModule,\n      skubaDiveModule,\n      tsconfigModule,\n      tslintModule,\n    ].map((createModule) => createModule(opts)),\n  );\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,oBAA6B;AAC7B,oBAA6B;AAC7B,kBAA2B;AAC3B,qBAA8B;AAC9B,qBAA8B;AAC9B,sBAA+B;AAC/B,sBAA+B;AAC/B,wBAAiC;AACjC,uBAAgC;AAChC,sBAA+B;AAC/B,oBAA6B;AAEtB,MAAM,cAAc,CAAC,SAC1B,QAAQ;AAAA,EACN;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,EAAE,IAAI,CAAC,iBAAiB,aAAa,IAAI,CAAC;AAC5C;",
+  "sourcesContent": ["import type { Module, Options } from '../types';\n\nimport { eslintModule } from './eslint';\nimport { ignoreModule } from './ignore';\nimport { jestModule } from './jest';\nimport { nodemonModule } from './nodemon';\nimport { packageModule } from './package';\nimport { prettierModule } from './prettier';\nimport { renovateModule } from './renovate';\nimport { serverlessModule } from './serverless';\nimport { skubaDiveModule } from './skubaDive';\nimport { tslintModule } from './tslint';\n\nexport const loadModules = (opts: Options): Promise<Module[]> =>\n  Promise.all(\n    [\n      eslintModule,\n      ignoreModule,\n      jestModule,\n      nodemonModule,\n      packageModule,\n      prettierModule,\n      renovateModule,\n      serverlessModule,\n      skubaDiveModule,\n      tslintModule,\n    ].map((createModule) => createModule(opts)),\n  );\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,oBAA6B;AAC7B,oBAA6B;AAC7B,kBAA2B;AAC3B,qBAA8B;AAC9B,qBAA8B;AAC9B,sBAA+B;AAC/B,sBAA+B;AAC/B,wBAAiC;AACjC,uBAAgC;AAChC,oBAA6B;AAEtB,MAAM,cAAc,CAAC,SAC1B,QAAQ;AAAA,EACN;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,EAAE,IAAI,CAAC,iBAAiB,aAAa,IAAI,CAAC;AAC5C;",
   "names": []
 }

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

@@ -1,2 +1,2 @@
 import type { Module, Options } from '../types';
-export declare const packageModule: ({ entryPoint, type, }: Options) => Promise<Module>;
+export declare const packageModule: ({ entryPoint, packageManager, type, }: Options) => Promise<Module>;

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

@@ -33,6 +33,7 @@ const DEFAULT_PACKAGE_FILES = [
 ];
 const packageModule = async ({
   entryPoint,
+  packageManager,
   type
 }) => {
   const version = await (0, import_version.getSkubaVersion)();
@@ -92,7 +93,7 @@ const packageModule = async ({
           outputData.scripts.prerelease,
           outputData.scripts.release ?? "skuba release"
         ].filter((script) => typeof script === "string").map(
-          (script) => script.replace(/^smt build$/, "yarn build").replace(/^smt /, "skuba ").trim()
+          (script) => script.replace(/^smt build$/, `${packageManager.runSilent} build`).replace(/^smt /, "skuba ").trim()
         ).filter(Boolean).join(" && ");
         if (outputData.scripts.build === "skuba build-package") {
           outputData.main = "./lib-commonjs/index.js";

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

@@ -1,7 +1,7 @@
 {
   "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,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;",
+  "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  packageManager,\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$/, `${packageManager.runSilent} 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;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,GAAG,eAAe,SAAS,QAAQ,EAC1D,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/patchRenovateConfig.d.ts

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