skuba 13.0.3 → 13.1.1

package/lib/cli/init/prompts.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/init/prompts.ts"],
-  "sourcesContent": ["import { type FormChoice, Input, Select } from 'enquirer';\nimport fs from 'fs-extra';\n\nimport { TEMPLATE_NAMES_WITH_BYO } from '../../utils/template.js';\n\nimport {\n  PLATFORM_OPTIONS,\n  type Platform,\n  isGitHubOrg,\n  isGitHubRepo,\n  isGitHubTeam,\n  isPlatform,\n} from './validation.js';\n\nexport type Choice = FormChoice & {\n  /**\n   * Whether the user is allowed to skip field entry and use the initial value.\n   *\n   * Defaults to `false`.\n   */\n  allowInitial?: boolean;\n};\n\nexport type BaseFields = Record<\n  (typeof BASE_CHOICES)[number]['name'],\n  string\n> & {\n  platformName: Platform;\n};\n\nconst BASE_CHOICES = [\n  {\n    name: 'ownerName',\n    message: 'Owner',\n    initial: 'SEEK-Jobs/my-team',\n    validate: (value: unknown) => {\n      if (typeof value !== 'string') {\n        return 'required';\n      }\n\n      const [org, team] = value.split('/');\n\n      if (!org || !isGitHubOrg(org)) {\n        return 'fails GitHub validation';\n      }\n\n      return (\n        team === undefined || isGitHubTeam(team) || 'fails GitHub validation'\n      );\n    },\n  },\n  {\n    name: 'repoName',\n    message: 'Repo',\n    initial: 'my-repo',\n    validate: async (value: unknown) => {\n      if (typeof value !== 'string') {\n        return 'required';\n      }\n\n      if (!isGitHubRepo(value)) {\n        return 'fails GitHub validation';\n      }\n\n      const exists = await fs.pathExists(value);\n\n      return !exists || `'${value}' is an existing directory`;\n    },\n  },\n  {\n    name: 'platformName',\n    message: 'Platform',\n    initial: 'arm64',\n    allowInitial: true,\n    validate: (value: unknown) =>\n      isPlatform(value) || `must be ${PLATFORM_OPTIONS}`,\n  },\n  {\n    name: 'defaultBranch',\n    message: 'Default Branch',\n    initial: 'main',\n    allowInitial: true,\n    validate: (value: unknown) =>\n      typeof value === 'string' && value.length > 0 ? true : 'required',\n  },\n] as const;\n\nexport const BASE_PROMPT_PROPS = {\n  choices: BASE_CHOICES,\n  message: 'For starters, some project details:',\n  name: 'baseAnswers',\n};\n\nexport const SHOULD_CONTINUE_PROMPT = new Select({\n  choices: ['yes', 'no'] as const,\n  message: 'Fill this in now?',\n  name: 'shouldContinue',\n});\n\nexport const GIT_PATH_PROMPT = new Input({\n  message: 'Git path',\n  name: 'gitPath',\n  initial: 'seek-oss/skuba',\n  validate: (value) => /[^/]+\\/[^/]+/.test(value) || 'Path is not valid',\n});\n\nexport const TEMPLATE_PROMPT = new Select({\n  choices: TEMPLATE_NAMES_WITH_BYO,\n  message: 'Select a template:',\n  name: 'templateName',\n});\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAA+C;AAC/C,sBAAe;AAEf,sBAAwC;AAExC,wBAOO;AAkBP,MAAM,eAAe;AAAA,EACnB;AAAA,IACE,MAAM;AAAA,IACN,SAAS;AAAA,IACT,SAAS;AAAA,IACT,UAAU,CAAC,UAAmB;AAC5B,UAAI,OAAO,UAAU,UAAU;AAC7B,eAAO;AAAA,MACT;AAEA,YAAM,CAAC,KAAK,IAAI,IAAI,MAAM,MAAM,GAAG;AAEnC,UAAI,CAAC,OAAO,KAAC,+BAAY,GAAG,GAAG;AAC7B,eAAO;AAAA,MACT;AAEA,aACE,SAAS,cAAa,gCAAa,IAAI,KAAK;AAAA,IAEhD;AAAA,EACF;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,SAAS;AAAA,IACT,SAAS;AAAA,IACT,UAAU,OAAO,UAAmB;AAClC,UAAI,OAAO,UAAU,UAAU;AAC7B,eAAO;AAAA,MACT;AAEA,UAAI,KAAC,gCAAa,KAAK,GAAG;AACxB,eAAO;AAAA,MACT;AAEA,YAAM,SAAS,MAAM,gBAAAA,QAAG,WAAW,KAAK;AAExC,aAAO,CAAC,UAAU,IAAI,KAAK;AAAA,IAC7B;AAAA,EACF;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,SAAS;AAAA,IACT,SAAS;AAAA,IACT,cAAc;AAAA,IACd,UAAU,CAAC,cACT,8BAAW,KAAK,KAAK,WAAW,kCAAgB;AAAA,EACpD;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,SAAS;AAAA,IACT,SAAS;AAAA,IACT,cAAc;AAAA,IACd,UAAU,CAAC,UACT,OAAO,UAAU,YAAY,MAAM,SAAS,IAAI,OAAO;AAAA,EAC3D;AACF;AAEO,MAAM,oBAAoB;AAAA,EAC/B,SAAS;AAAA,EACT,SAAS;AAAA,EACT,MAAM;AACR;AAEO,MAAM,yBAAyB,IAAI,uBAAO;AAAA,EAC/C,SAAS,CAAC,OAAO,IAAI;AAAA,EACrB,SAAS;AAAA,EACT,MAAM;AACR,CAAC;AAEM,MAAM,kBAAkB,IAAI,sBAAM;AAAA,EACvC,SAAS;AAAA,EACT,MAAM;AAAA,EACN,SAAS;AAAA,EACT,UAAU,CAAC,UAAU,eAAe,KAAK,KAAK,KAAK;AACrD,CAAC;AAEM,MAAM,kBAAkB,IAAI,uBAAO;AAAA,EACxC,SAAS;AAAA,EACT,SAAS;AAAA,EACT,MAAM;AACR,CAAC;",
-  "names": ["fs"]
+  "sourcesContent": ["import { input, select } from '@inquirer/prompts';\n\nimport { pathExists } from '../../utils/fs.js';\nimport { TEMPLATE_NAMES_WITH_BYO } from '../../utils/template.js';\n\nimport {\n  PLATFORM_OPTIONS,\n  type Platform,\n  isGitHubOrg,\n  isGitHubRepo,\n  isGitHubTeam,\n  isPlatform,\n} from './validation.js';\n\nexport interface Choice {\n  name: string;\n  message: string;\n  initial?: string;\n  validate?: (value: string) => boolean | string | Promise<boolean | string>;\n  /**\n   * Whether the user is allowed to skip field entry and use the initial value.\n   *\n   * Defaults to `false`.\n   */\n  allowInitial?: boolean;\n}\n\nexport type BaseFields = Record<\n  (typeof BASE_CHOICES)[number]['name'],\n  string\n> & {\n  platformName: Platform;\n};\n\nconst BASE_CHOICES = [\n  {\n    name: 'ownerName',\n    message: 'Owner',\n    initial: 'SEEK-Jobs/my-team',\n    validate: (value: unknown) => {\n      if (typeof value !== 'string') {\n        return 'Required';\n      }\n\n      const [org, team] = value.split('/');\n\n      if (!org || !isGitHubOrg(org)) {\n        return 'Must contain a valid GitHub org name';\n      }\n\n      return (\n        team === undefined ||\n        isGitHubTeam(team) ||\n        'Must contain a valid GitHub team name'\n      );\n    },\n  },\n  {\n    name: 'repoName',\n    message: 'Repo',\n    initial: 'my-repo',\n    validate: async (value: unknown) => {\n      if (typeof value !== 'string') {\n        return 'Required';\n      }\n\n      if (!isGitHubRepo(value)) {\n        return 'Must be a valid GitHub repo name';\n      }\n\n      const exists = await pathExists(value);\n\n      return !exists || `'${value}' is an existing directory`;\n    },\n  },\n  {\n    name: 'platformName',\n    message: 'Platform',\n    initial: 'arm64',\n    allowInitial: true,\n    validate: (value: unknown) =>\n      isPlatform(value) || `Must be ${PLATFORM_OPTIONS}`,\n  },\n  {\n    name: 'defaultBranch',\n    message: 'Default Branch',\n    initial: 'main',\n    allowInitial: true,\n    validate: (value: unknown) =>\n      typeof value === 'string' && value.length > 0 ? true : 'Required',\n  },\n] as const;\n\nexport const BASE_PROMPT_PROPS = {\n  choices: BASE_CHOICES,\n  message: 'For starters, some project details:',\n  name: 'baseAnswers',\n};\n\nexport const shouldContinue = async () =>\n  select({\n    message: 'Fill this in now?',\n    choices: [\n      { name: 'Yes', value: 'yes' },\n      { name: 'No', value: 'no' },\n    ],\n  });\n\nexport const getGitPath = async () =>\n  input({\n    message: 'Git path',\n    default: 'seek-oss/skuba',\n    validate: (value: string) =>\n      /[^/]+\\/[^/]+/.test(value) || 'Must be a valid path',\n  });\n\nexport const getTemplateName = async () =>\n  select({\n    message: 'Select a template:',\n    choices: TEMPLATE_NAMES_WITH_BYO.map((name) => ({ name, value: name })),\n  });\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA8B;AAE9B,gBAA2B;AAC3B,sBAAwC;AAExC,wBAOO;AAsBP,MAAM,eAAe;AAAA,EACnB;AAAA,IACE,MAAM;AAAA,IACN,SAAS;AAAA,IACT,SAAS;AAAA,IACT,UAAU,CAAC,UAAmB;AAC5B,UAAI,OAAO,UAAU,UAAU;AAC7B,eAAO;AAAA,MACT;AAEA,YAAM,CAAC,KAAK,IAAI,IAAI,MAAM,MAAM,GAAG;AAEnC,UAAI,CAAC,OAAO,KAAC,+BAAY,GAAG,GAAG;AAC7B,eAAO;AAAA,MACT;AAEA,aACE,SAAS,cACT,gCAAa,IAAI,KACjB;AAAA,IAEJ;AAAA,EACF;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,SAAS;AAAA,IACT,SAAS;AAAA,IACT,UAAU,OAAO,UAAmB;AAClC,UAAI,OAAO,UAAU,UAAU;AAC7B,eAAO;AAAA,MACT;AAEA,UAAI,KAAC,gCAAa,KAAK,GAAG;AACxB,eAAO;AAAA,MACT;AAEA,YAAM,SAAS,UAAM,sBAAW,KAAK;AAErC,aAAO,CAAC,UAAU,IAAI,KAAK;AAAA,IAC7B;AAAA,EACF;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,SAAS;AAAA,IACT,SAAS;AAAA,IACT,cAAc;AAAA,IACd,UAAU,CAAC,cACT,8BAAW,KAAK,KAAK,WAAW,kCAAgB;AAAA,EACpD;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,SAAS;AAAA,IACT,SAAS;AAAA,IACT,cAAc;AAAA,IACd,UAAU,CAAC,UACT,OAAO,UAAU,YAAY,MAAM,SAAS,IAAI,OAAO;AAAA,EAC3D;AACF;AAEO,MAAM,oBAAoB;AAAA,EAC/B,SAAS;AAAA,EACT,SAAS;AAAA,EACT,MAAM;AACR;AAEO,MAAM,iBAAiB,gBAC5B,uBAAO;AAAA,EACL,SAAS;AAAA,EACT,SAAS;AAAA,IACP,EAAE,MAAM,OAAO,OAAO,MAAM;AAAA,IAC5B,EAAE,MAAM,MAAM,OAAO,KAAK;AAAA,EAC5B;AACF,CAAC;AAEI,MAAM,aAAa,gBACxB,sBAAM;AAAA,EACJ,SAAS;AAAA,EACT,SAAS;AAAA,EACT,UAAU,CAAC,UACT,eAAe,KAAK,KAAK,KAAK;AAClC,CAAC;AAEI,MAAM,kBAAkB,gBAC7B,uBAAO;AAAA,EACL,SAAS;AAAA,EACT,SAAS,wCAAwB,IAAI,CAAC,UAAU,EAAE,MAAM,OAAO,KAAK,EAAE;AACxE,CAAC;",
+  "names": []
 }

package/lib/cli/init/types.d.ts

@@ -21,9 +21,9 @@ export declare const initConfigInputSchema: z.ZodObject<{
 }, z.core.$strip>;
 export type InitConfig = z.infer<typeof initConfigSchema>;
 declare const initConfigSchema: z.ZodObject<{
-    templateName: z.ZodString;
     destinationDir: z.ZodString;
     templateComplete: z.ZodBoolean;
+    templateName: z.ZodString;
     templateData: z.ZodObject<{
         ownerName: z.ZodString;
         repoName: z.ZodString;

package/lib/cli/lint/autofix.js

@@ -34,7 +34,7 @@ __export(autofix_exports, {
 });
 module.exports = __toCommonJS(autofix_exports);
 var import_util = require("util");
-var import_simple_git = __toESM(require("simple-git"));
+var import_simple_git = require("simple-git");
 var import_env = require("../../utils/env.js");
 var import_logging = require("../../utils/logging.js");
 var import_npmrc = require("../../utils/npmrc.js");
@@ -148,7 +148,7 @@ const autofix = async (params) => {
       if (!ref2) {
         return import_logging.log.warn("No autofixes detected.");
       }
-      await (0, import_wait.throwOnTimeout)((0, import_simple_git.default)().push(), { s: 30 });
+      await (0, import_wait.throwOnTimeout)((0, import_simple_git.simpleGit)().push(), { s: 30 });
       import_logging.log.warn(`Pushed fix commit ${ref2}.`);
       return;
     }

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/autofix.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport simpleGit from 'simple-git';\n\nimport { isCiEnv } from '../../utils/env.js';\nimport { createLogger, log } from '../../utils/logging.js';\nimport { hasNpmrcSecret } from '../../utils/npmrc.js';\nimport { throwOnTimeout } from '../../utils/wait.js';\nimport { runESLint } from '../adapter/eslint.js';\nimport { runPrettier } from '../adapter/prettier.js';\nimport { createDestinationFileReader } from '../configure/analysis/project.js';\n\nimport { internalLint } from './internal.js';\nimport type { Input } from './types.js';\n\nimport * as Buildkite from '@skuba-lib/api/buildkite';\nimport * as Git from '@skuba-lib/api/git';\nimport * as GitHub from '@skuba-lib/api/github';\n\nconst RENOVATE_DEFAULT_PREFIX = 'renovate';\n\nconst AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';\n\nexport const AUTOFIX_IGNORE_FILES_BASE: Git.ChangedFile[] = [\n  {\n    path: 'Dockerfile-incunabulum',\n    state: 'added',\n  },\n];\n\nexport const AUTOFIX_IGNORE_FILES_NPMRC: Git.ChangedFile[] = [\n  {\n    path: '.npmrc',\n    state: 'added',\n  },\n  {\n    path: '.npmrc',\n    state: 'modified',\n  },\n];\n\nconst shouldPush = async ({\n  currentBranch,\n  dir,\n}: {\n  currentBranch?: string;\n  dir: string;\n}) => {\n  if (!isCiEnv()) {\n    // We're not running in a CI environment so we don't need to push autofixes.\n    // Ideally we'd drive this off of repository write permissions, but that is\n    // non-trivial to infer without attempting an actual write.\n    return false;\n  }\n\n  const isDefaultBuildkiteBranch =\n    currentBranch &&\n    [process.env.BUILDKITE_PIPELINE_DEFAULT_BRANCH, 'master', 'main'].includes(\n      currentBranch,\n    );\n\n  const isProtectedGitHubBranch = process.env.GITHUB_REF_PROTECTED === 'true';\n\n  if (isDefaultBuildkiteBranch || isProtectedGitHubBranch) {\n    // The current branch is a protected branch.\n    // We respect GitHub Flow; avoid pushing directly to the default branch.\n    return false;\n  }\n\n  if (currentBranch?.startsWith(RENOVATE_DEFAULT_PREFIX)) {\n    try {\n      await GitHub.getPullRequestNumber();\n    } catch {\n      const warning =\n        'An autofix is available, but it was not pushed because an open pull request for this Renovate branch could not be found. If a pull request has since been created, retry the lint step to push the fix.';\n      log.warn(warning);\n      try {\n        await Buildkite.annotate(Buildkite.md.terminal(warning));\n      } catch {}\n\n      return false;\n    }\n  }\n\n  let headCommitMessage;\n  try {\n    headCommitMessage = await Git.getHeadCommitMessage({ dir });\n  } catch {}\n\n  if (headCommitMessage?.startsWith(AUTOFIX_COMMIT_MESSAGE)) {\n    // Short circuit when the head commit appears to be one of our autofixes.\n    // Repeating the same operation is unlikely to correct outstanding issues.\n    return false;\n  }\n\n  // Allow the push attempt to go ahead if our guards have been cleared.\n  return true;\n};\n\nconst getIgnores = async (dir: string): Promise<Git.ChangedFile[]> => {\n  const contents = await createDestinationFileReader(dir)('.npmrc');\n\n  // If an .npmrc has secrets, we need to ignore it\n  if (hasNpmrcSecret(contents ?? '')) {\n    return [...AUTOFIX_IGNORE_FILES_BASE, ...AUTOFIX_IGNORE_FILES_NPMRC];\n  }\n\n  return AUTOFIX_IGNORE_FILES_BASE;\n};\n\ninterface AutofixParameters {\n  debug: Input['debug'];\n\n  eslint: boolean;\n  prettier: boolean;\n  internal: boolean;\n\n  eslintConfigFile?: string;\n}\n\nexport const autofix = async (params: AutofixParameters): Promise<void> => {\n  const dir = process.cwd();\n\n  if (!params.eslint && !params.prettier && !params.internal) {\n    return;\n  }\n\n  let currentBranch;\n  try {\n    currentBranch = await Git.currentBranch({ dir });\n  } catch {}\n\n  if (!(await shouldPush({ currentBranch, dir }))) {\n    return;\n  }\n\n  try {\n    log.newline();\n\n    log.warn(\n      `Attempting to autofix issues (${[\n        params.internal ? 'skuba' : undefined,\n        params.internal || params.eslint ? 'ESLint' : undefined,\n        'Prettier', // Prettier is always run\n      ]\n        .filter((s) => s !== undefined)\n        .join(', ')})...`,\n    );\n\n    const logger = createLogger({ debug: params.debug });\n\n    if (params.internal) {\n      await internalLint('format');\n    }\n\n    if (params.internal || params.eslint) {\n      await runESLint('format', logger, params.eslintConfigFile);\n    }\n\n    // Unconditionally re-run Prettier; reaching here means we have pre-existing\n    // format violations or may have created new ones through ESLint/internal fixes.\n    await runPrettier('format', logger);\n\n    if (process.env.GITHUB_ACTIONS) {\n      // GitHub runners have Git installed locally\n      const ref = await Git.commitAllChanges({\n        dir,\n        message: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: await getIgnores(dir),\n      });\n\n      if (!ref) {\n        return log.warn('No autofixes detected.');\n      }\n\n      await throwOnTimeout(simpleGit().push(), { s: 30 });\n      log.warn(`Pushed fix commit ${ref}.`);\n      return;\n    }\n\n    // Other CI Environments, use GitHub API\n    if (!currentBranch) {\n      log.warn('Could not determine the current branch.');\n      log.warn(\n        'Please propagate BUILDKITE_BRANCH, GITHUB_HEAD_REF, GITHUB_REF_NAME, or the .git directory to your container.',\n      );\n      return;\n    }\n\n    const ref = await throwOnTimeout(\n      GitHub.uploadAllFileChanges({\n        branch: currentBranch,\n        dir,\n        messageHeadline: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: await getIgnores(dir),\n      }),\n      { s: 30 },\n    );\n\n    if (!ref) {\n      return log.warn('No autofixes detected.');\n    }\n\n    log.warn(`Pushed fix commit ${ref}.`);\n  } catch (err) {\n    log.warn(log.bold('Failed to push fix commit.'));\n    log.warn(\n      log.bold(\n        'Does your CI environment have write access to your Git repository?',\n      ),\n    );\n    log.subtle(inspect(err));\n  }\n};\n"],
-  "mappings": "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",
-  "names": ["ref", "simpleGit"]
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { simpleGit } from 'simple-git';\n\nimport { isCiEnv } from '../../utils/env.js';\nimport { createLogger, log } from '../../utils/logging.js';\nimport { hasNpmrcSecret } from '../../utils/npmrc.js';\nimport { throwOnTimeout } from '../../utils/wait.js';\nimport { runESLint } from '../adapter/eslint.js';\nimport { runPrettier } from '../adapter/prettier.js';\nimport { createDestinationFileReader } from '../configure/analysis/project.js';\n\nimport { internalLint } from './internal.js';\nimport type { Input } from './types.js';\n\nimport * as Buildkite from '@skuba-lib/api/buildkite';\nimport * as Git from '@skuba-lib/api/git';\nimport * as GitHub from '@skuba-lib/api/github';\n\nconst RENOVATE_DEFAULT_PREFIX = 'renovate';\n\nconst AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';\n\nexport const AUTOFIX_IGNORE_FILES_BASE: Git.ChangedFile[] = [\n  {\n    path: 'Dockerfile-incunabulum',\n    state: 'added',\n  },\n];\n\nexport const AUTOFIX_IGNORE_FILES_NPMRC: Git.ChangedFile[] = [\n  {\n    path: '.npmrc',\n    state: 'added',\n  },\n  {\n    path: '.npmrc',\n    state: 'modified',\n  },\n];\n\nconst shouldPush = async ({\n  currentBranch,\n  dir,\n}: {\n  currentBranch?: string;\n  dir: string;\n}) => {\n  if (!isCiEnv()) {\n    // We're not running in a CI environment so we don't need to push autofixes.\n    // Ideally we'd drive this off of repository write permissions, but that is\n    // non-trivial to infer without attempting an actual write.\n    return false;\n  }\n\n  const isDefaultBuildkiteBranch =\n    currentBranch &&\n    [process.env.BUILDKITE_PIPELINE_DEFAULT_BRANCH, 'master', 'main'].includes(\n      currentBranch,\n    );\n\n  const isProtectedGitHubBranch = process.env.GITHUB_REF_PROTECTED === 'true';\n\n  if (isDefaultBuildkiteBranch || isProtectedGitHubBranch) {\n    // The current branch is a protected branch.\n    // We respect GitHub Flow; avoid pushing directly to the default branch.\n    return false;\n  }\n\n  if (currentBranch?.startsWith(RENOVATE_DEFAULT_PREFIX)) {\n    try {\n      await GitHub.getPullRequestNumber();\n    } catch {\n      const warning =\n        'An autofix is available, but it was not pushed because an open pull request for this Renovate branch could not be found. If a pull request has since been created, retry the lint step to push the fix.';\n      log.warn(warning);\n      try {\n        await Buildkite.annotate(Buildkite.md.terminal(warning));\n      } catch {}\n\n      return false;\n    }\n  }\n\n  let headCommitMessage;\n  try {\n    headCommitMessage = await Git.getHeadCommitMessage({ dir });\n  } catch {}\n\n  if (headCommitMessage?.startsWith(AUTOFIX_COMMIT_MESSAGE)) {\n    // Short circuit when the head commit appears to be one of our autofixes.\n    // Repeating the same operation is unlikely to correct outstanding issues.\n    return false;\n  }\n\n  // Allow the push attempt to go ahead if our guards have been cleared.\n  return true;\n};\n\nconst getIgnores = async (dir: string): Promise<Git.ChangedFile[]> => {\n  const contents = await createDestinationFileReader(dir)('.npmrc');\n\n  // If an .npmrc has secrets, we need to ignore it\n  if (hasNpmrcSecret(contents ?? '')) {\n    return [...AUTOFIX_IGNORE_FILES_BASE, ...AUTOFIX_IGNORE_FILES_NPMRC];\n  }\n\n  return AUTOFIX_IGNORE_FILES_BASE;\n};\n\ninterface AutofixParameters {\n  debug: Input['debug'];\n\n  eslint: boolean;\n  prettier: boolean;\n  internal: boolean;\n\n  eslintConfigFile?: string;\n}\n\nexport const autofix = async (params: AutofixParameters): Promise<void> => {\n  const dir = process.cwd();\n\n  if (!params.eslint && !params.prettier && !params.internal) {\n    return;\n  }\n\n  let currentBranch;\n  try {\n    currentBranch = await Git.currentBranch({ dir });\n  } catch {}\n\n  if (!(await shouldPush({ currentBranch, dir }))) {\n    return;\n  }\n\n  try {\n    log.newline();\n\n    log.warn(\n      `Attempting to autofix issues (${[\n        params.internal ? 'skuba' : undefined,\n        params.internal || params.eslint ? 'ESLint' : undefined,\n        'Prettier', // Prettier is always run\n      ]\n        .filter((s) => s !== undefined)\n        .join(', ')})...`,\n    );\n\n    const logger = createLogger({ debug: params.debug });\n\n    if (params.internal) {\n      await internalLint('format');\n    }\n\n    if (params.internal || params.eslint) {\n      await runESLint('format', logger, params.eslintConfigFile);\n    }\n\n    // Unconditionally re-run Prettier; reaching here means we have pre-existing\n    // format violations or may have created new ones through ESLint/internal fixes.\n    await runPrettier('format', logger);\n\n    if (process.env.GITHUB_ACTIONS) {\n      // GitHub runners have Git installed locally\n      const ref = await Git.commitAllChanges({\n        dir,\n        message: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: await getIgnores(dir),\n      });\n\n      if (!ref) {\n        return log.warn('No autofixes detected.');\n      }\n\n      await throwOnTimeout(simpleGit().push(), { s: 30 });\n      log.warn(`Pushed fix commit ${ref}.`);\n      return;\n    }\n\n    // Other CI Environments, use GitHub API\n    if (!currentBranch) {\n      log.warn('Could not determine the current branch.');\n      log.warn(\n        'Please propagate BUILDKITE_BRANCH, GITHUB_HEAD_REF, GITHUB_REF_NAME, or the .git directory to your container.',\n      );\n      return;\n    }\n\n    const ref = await throwOnTimeout(\n      GitHub.uploadAllFileChanges({\n        branch: currentBranch,\n        dir,\n        messageHeadline: AUTOFIX_COMMIT_MESSAGE,\n\n        ignore: await getIgnores(dir),\n      }),\n      { s: 30 },\n    );\n\n    if (!ref) {\n      return log.warn('No autofixes detected.');\n    }\n\n    log.warn(`Pushed fix commit ${ref}.`);\n  } catch (err) {\n    log.warn(log.bold('Failed to push fix commit.'));\n    log.warn(\n      log.bold(\n        'Does your CI environment have write access to your Git repository?',\n      ),\n    );\n    log.subtle(inspect(err));\n  }\n};\n"],
+  "mappings": "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",
+  "names": ["ref"]
 }

package/lib/cli/lint/eslint.js

@@ -32,13 +32,13 @@ __export(eslint_exports, {
   runESLintInWorkerThread: () => runESLintInWorkerThread
 });
 module.exports = __toCommonJS(eslint_exports);
+var import_node_util = require("node:util");
 var import_path = __toESM(require("path"));
 var import_worker_threads = require("worker_threads");
-var import_chalk = __toESM(require("chalk"));
 var import_logging = require("../../utils/logging.js");
 var import_worker = require("../../utils/worker.js");
 var import_eslint = require("../adapter/eslint.js");
-const LOG_PREFIX = import_chalk.default.magenta("ESLint   \u2502");
+const LOG_PREFIX = (0, import_node_util.styleText)("magenta", "ESLint   \u2502");
 const runESLintInCurrentThread = ({ debug, eslintConfigFile }) => (0, import_eslint.runESLint)(
   "lint",
   (0, import_logging.createLogger)({ debug, prefixes: [LOG_PREFIX] }),

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/eslint.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { isMainThread } from 'worker_threads';\n\nimport chalk from 'chalk';\n\nimport { createLogger } from '../../utils/logging.js';\nimport { execWorkerThread, postWorkerOutput } from '../../utils/worker.js';\nimport { type ESLintOutput, runESLint } from '../adapter/eslint.js';\n\nimport type { Input } from './types.js';\n\nconst LOG_PREFIX = chalk.magenta('ESLint   \u2502');\n\nexport const runESLintInCurrentThread = ({ debug, eslintConfigFile }: Input) =>\n  runESLint(\n    'lint',\n    createLogger({ debug, prefixes: [LOG_PREFIX] }),\n    eslintConfigFile,\n  );\n\nexport const runESLintInWorkerThread = (input: Input) =>\n  execWorkerThread<Input, ESLintOutput>(\n    path.posix.join(__dirname, 'eslint.js'),\n    input,\n  );\n\nif (!isMainThread) {\n  postWorkerOutput(\n    runESLintInCurrentThread,\n    createLogger({ debug: false, prefixes: [LOG_PREFIX] }),\n  );\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,4BAA6B;AAE7B,mBAAkB;AAElB,qBAA6B;AAC7B,oBAAmD;AACnD,oBAA6C;AAI7C,MAAM,aAAa,aAAAA,QAAM,QAAQ,iBAAY;AAEtC,MAAM,2BAA2B,CAAC,EAAE,OAAO,iBAAiB,UACjE;AAAA,EACE;AAAA,MACA,6BAAa,EAAE,OAAO,UAAU,CAAC,UAAU,EAAE,CAAC;AAAA,EAC9C;AACF;AAEK,MAAM,0BAA0B,CAAC,cACtC;AAAA,EACE,YAAAC,QAAK,MAAM,KAAK,WAAW,WAAW;AAAA,EACtC;AACF;AAEF,IAAI,CAAC,oCAAc;AACjB;AAAA,IACE;AAAA,QACA,6BAAa,EAAE,OAAO,OAAO,UAAU,CAAC,UAAU,EAAE,CAAC;AAAA,EACvD;AACF;",
-  "names": ["chalk", "path"]
+  "sourcesContent": ["import { styleText } from 'node:util';\nimport path from 'path';\nimport { isMainThread } from 'worker_threads';\n\nimport { createLogger } from '../../utils/logging.js';\nimport { execWorkerThread, postWorkerOutput } from '../../utils/worker.js';\nimport { type ESLintOutput, runESLint } from '../adapter/eslint.js';\n\nimport type { Input } from './types.js';\n\nconst LOG_PREFIX = styleText('magenta', 'ESLint   \u2502');\n\nexport const runESLintInCurrentThread = ({ debug, eslintConfigFile }: Input) =>\n  runESLint(\n    'lint',\n    createLogger({ debug, prefixes: [LOG_PREFIX] }),\n    eslintConfigFile,\n  );\n\nexport const runESLintInWorkerThread = (input: Input) =>\n  execWorkerThread<Input, ESLintOutput>(\n    path.posix.join(__dirname, 'eslint.js'),\n    input,\n  );\n\nif (!isMainThread) {\n  postWorkerOutput(\n    runESLintInCurrentThread,\n    createLogger({ debug: false, prefixes: [LOG_PREFIX] }),\n  );\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0B;AAC1B,kBAAiB;AACjB,4BAA6B;AAE7B,qBAA6B;AAC7B,oBAAmD;AACnD,oBAA6C;AAI7C,MAAM,iBAAa,4BAAU,WAAW,iBAAY;AAE7C,MAAM,2BAA2B,CAAC,EAAE,OAAO,iBAAiB,UACjE;AAAA,EACE;AAAA,MACA,6BAAa,EAAE,OAAO,UAAU,CAAC,UAAU,EAAE,CAAC;AAAA,EAC9C;AACF;AAEK,MAAM,0BAA0B,CAAC,cACtC;AAAA,EACE,YAAAA,QAAK,MAAM,KAAK,WAAW,WAAW;AAAA,EACtC;AACF;AAEF,IAAI,CAAC,oCAAc;AACjB;AAAA,IACE;AAAA,QACA,6BAAa,EAAE,OAAO,OAAO,UAAU,CAAC,UAAU,EAAE,CAAC;AAAA,EACvD;AACF;",
+  "names": ["path"]
 }

package/lib/cli/lint/index.js

@@ -62,9 +62,7 @@ const lint = async (args = process.argv.slice(2), tscWriteable = void 0, workerT
       import_logging.log.newline();
       import_logging.log.warn(
         `Try running ${import_logging.log.bold(
-          packageManager.print.exec,
-          "skuba",
-          "format"
+          `${packageManager.print.exec} skuba format`
         )} to fix them.`
       );
     }

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/index.ts"],
-  "sourcesContent": ["import type { Writable } from 'stream';\nimport { inspect } from 'util';\n\nimport { hasDebugFlag, hasSerialFlag } from '../../utils/args.js';\nimport { log } from '../../utils/logging.js';\nimport { detectPackageManager } from '../../utils/packageManager.js';\nimport { throwOnTimeout } from '../../utils/wait.js';\n\nimport { createAnnotations } from './annotate/index.js';\nimport { autofix } from './autofix.js';\nimport { externalLint } from './external.js';\nimport { internalLint } from './internal.js';\nimport type { Input } from './types.js';\n\nexport const lint = async (\n  args = process.argv.slice(2),\n  tscWriteable: Writable | undefined = undefined,\n  workerThreads = true,\n) => {\n  const opts: Input = {\n    debug: hasDebugFlag(args),\n    serial: hasSerialFlag(args),\n    tscOutputStream: tscWriteable,\n    workerThreads,\n  };\n\n  const { eslint, prettier, tscOk, tscOutputStream } = await externalLint(opts);\n  const internal = await internalLint('lint', opts);\n\n  try {\n    await throwOnTimeout(\n      createAnnotations(internal, eslint, prettier, tscOk, tscOutputStream),\n      { s: 30 },\n    );\n  } catch (err) {\n    log.warn('Failed to annotate lint results.');\n    log.subtle(inspect(err));\n  }\n\n  if (!internal.ok || !eslint.ok || !prettier.ok || !tscOk) {\n    process.exitCode = 1;\n\n    const tools = [\n      ...(internal.ok ? [] : ['skuba']),\n      ...(eslint.ok ? [] : ['ESLint']),\n      ...(prettier.ok ? [] : ['Prettier']),\n      ...(tscOk ? [] : ['tsc']),\n    ];\n\n    log.err(`${tools.join(', ')} found issues that require triage.`);\n\n    if (internal.fixable || eslint.fixable || !prettier.ok) {\n      const packageManager = await detectPackageManager();\n      log.newline();\n      log.warn(\n        `Try running ${log.bold(\n          packageManager.print.exec,\n          'skuba',\n          'format',\n        )} to fix them.`,\n      );\n    }\n  }\n\n  await autofix({\n    debug: opts.debug,\n    eslint: eslint.fixable,\n    prettier: !prettier.ok,\n    internal: internal.fixable,\n  });\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAwB;AAExB,kBAA4C;AAC5C,qBAAoB;AACpB,4BAAqC;AACrC,kBAA+B;AAE/B,sBAAkC;AAClC,qBAAwB;AACxB,sBAA6B;AAC7B,sBAA6B;AAGtB,MAAM,OAAO,OAClB,OAAO,QAAQ,KAAK,MAAM,CAAC,GAC3B,eAAqC,QACrC,gBAAgB,SACb;AACH,QAAM,OAAc;AAAA,IAClB,WAAO,0BAAa,IAAI;AAAA,IACxB,YAAQ,2BAAc,IAAI;AAAA,IAC1B,iBAAiB;AAAA,IACjB;AAAA,EACF;AAEA,QAAM,EAAE,QAAQ,UAAU,OAAO,gBAAgB,IAAI,UAAM,8BAAa,IAAI;AAC5E,QAAM,WAAW,UAAM,8BAAa,QAAQ,IAAI;AAEhD,MAAI;AACF,cAAM;AAAA,UACJ,mCAAkB,UAAU,QAAQ,UAAU,OAAO,eAAe;AAAA,MACpE,EAAE,GAAG,GAAG;AAAA,IACV;AAAA,EACF,SAAS,KAAK;AACZ,uBAAI,KAAK,kCAAkC;AAC3C,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AAAA,EACzB;AAEA,MAAI,CAAC,SAAS,MAAM,CAAC,OAAO,MAAM,CAAC,SAAS,MAAM,CAAC,OAAO;AACxD,YAAQ,WAAW;AAEnB,UAAM,QAAQ;AAAA,MACZ,GAAI,SAAS,KAAK,CAAC,IAAI,CAAC,OAAO;AAAA,MAC/B,GAAI,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ;AAAA,MAC9B,GAAI,SAAS,KAAK,CAAC,IAAI,CAAC,UAAU;AAAA,MAClC,GAAI,QAAQ,CAAC,IAAI,CAAC,KAAK;AAAA,IACzB;AAEA,uBAAI,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,oCAAoC;AAE/D,QAAI,SAAS,WAAW,OAAO,WAAW,CAAC,SAAS,IAAI;AACtD,YAAM,iBAAiB,UAAM,4CAAqB;AAClD,yBAAI,QAAQ;AACZ,yBAAI;AAAA,QACF,eAAe,mBAAI;AAAA,UACjB,eAAe,MAAM;AAAA,UACrB;AAAA,UACA;AAAA,QACF,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAEA,YAAM,wBAAQ;AAAA,IACZ,OAAO,KAAK;AAAA,IACZ,QAAQ,OAAO;AAAA,IACf,UAAU,CAAC,SAAS;AAAA,IACpB,UAAU,SAAS;AAAA,EACrB,CAAC;AACH;",
+  "sourcesContent": ["import type { Writable } from 'stream';\nimport { inspect } from 'util';\n\nimport { hasDebugFlag, hasSerialFlag } from '../../utils/args.js';\nimport { log } from '../../utils/logging.js';\nimport { detectPackageManager } from '../../utils/packageManager.js';\nimport { throwOnTimeout } from '../../utils/wait.js';\n\nimport { createAnnotations } from './annotate/index.js';\nimport { autofix } from './autofix.js';\nimport { externalLint } from './external.js';\nimport { internalLint } from './internal.js';\nimport type { Input } from './types.js';\n\nexport const lint = async (\n  args = process.argv.slice(2),\n  tscWriteable: Writable | undefined = undefined,\n  workerThreads = true,\n) => {\n  const opts: Input = {\n    debug: hasDebugFlag(args),\n    serial: hasSerialFlag(args),\n    tscOutputStream: tscWriteable,\n    workerThreads,\n  };\n\n  const { eslint, prettier, tscOk, tscOutputStream } = await externalLint(opts);\n  const internal = await internalLint('lint', opts);\n\n  try {\n    await throwOnTimeout(\n      createAnnotations(internal, eslint, prettier, tscOk, tscOutputStream),\n      { s: 30 },\n    );\n  } catch (err) {\n    log.warn('Failed to annotate lint results.');\n    log.subtle(inspect(err));\n  }\n\n  if (!internal.ok || !eslint.ok || !prettier.ok || !tscOk) {\n    process.exitCode = 1;\n\n    const tools = [\n      ...(internal.ok ? [] : ['skuba']),\n      ...(eslint.ok ? [] : ['ESLint']),\n      ...(prettier.ok ? [] : ['Prettier']),\n      ...(tscOk ? [] : ['tsc']),\n    ];\n\n    log.err(`${tools.join(', ')} found issues that require triage.`);\n\n    if (internal.fixable || eslint.fixable || !prettier.ok) {\n      const packageManager = await detectPackageManager();\n      log.newline();\n      log.warn(\n        `Try running ${log.bold(\n          `${packageManager.print.exec} skuba format`,\n        )} to fix them.`,\n      );\n    }\n  }\n\n  await autofix({\n    debug: opts.debug,\n    eslint: eslint.fixable,\n    prettier: !prettier.ok,\n    internal: internal.fixable,\n  });\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,kBAAwB;AAExB,kBAA4C;AAC5C,qBAAoB;AACpB,4BAAqC;AACrC,kBAA+B;AAE/B,sBAAkC;AAClC,qBAAwB;AACxB,sBAA6B;AAC7B,sBAA6B;AAGtB,MAAM,OAAO,OAClB,OAAO,QAAQ,KAAK,MAAM,CAAC,GAC3B,eAAqC,QACrC,gBAAgB,SACb;AACH,QAAM,OAAc;AAAA,IAClB,WAAO,0BAAa,IAAI;AAAA,IACxB,YAAQ,2BAAc,IAAI;AAAA,IAC1B,iBAAiB;AAAA,IACjB;AAAA,EACF;AAEA,QAAM,EAAE,QAAQ,UAAU,OAAO,gBAAgB,IAAI,UAAM,8BAAa,IAAI;AAC5E,QAAM,WAAW,UAAM,8BAAa,QAAQ,IAAI;AAEhD,MAAI;AACF,cAAM;AAAA,UACJ,mCAAkB,UAAU,QAAQ,UAAU,OAAO,eAAe;AAAA,MACpE,EAAE,GAAG,GAAG;AAAA,IACV;AAAA,EACF,SAAS,KAAK;AACZ,uBAAI,KAAK,kCAAkC;AAC3C,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AAAA,EACzB;AAEA,MAAI,CAAC,SAAS,MAAM,CAAC,OAAO,MAAM,CAAC,SAAS,MAAM,CAAC,OAAO;AACxD,YAAQ,WAAW;AAEnB,UAAM,QAAQ;AAAA,MACZ,GAAI,SAAS,KAAK,CAAC,IAAI,CAAC,OAAO;AAAA,MAC/B,GAAI,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ;AAAA,MAC9B,GAAI,SAAS,KAAK,CAAC,IAAI,CAAC,UAAU;AAAA,MAClC,GAAI,QAAQ,CAAC,IAAI,CAAC,KAAK;AAAA,IACzB;AAEA,uBAAI,IAAI,GAAG,MAAM,KAAK,IAAI,CAAC,oCAAoC;AAE/D,QAAI,SAAS,WAAW,OAAO,WAAW,CAAC,SAAS,IAAI;AACtD,YAAM,iBAAiB,UAAM,4CAAqB;AAClD,yBAAI,QAAQ;AACZ,yBAAI;AAAA,QACF,eAAe,mBAAI;AAAA,UACjB,GAAG,eAAe,MAAM,IAAI;AAAA,QAC9B,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAEA,YAAM,wBAAQ;AAAA,IACZ,OAAO,KAAK;AAAA,IACZ,QAAQ,OAAO;AAAA,IACf,UAAU,CAAC,SAAS;AAAA,IACpB,UAAU,SAAS;AAAA,EACrB,CAAC;AACH;",
   "names": []
 }

package/lib/cli/lint/internal.js

@@ -1,9 +1,7 @@
 "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)
@@ -17,22 +15,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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 internal_exports = {};
 __export(internal_exports, {
   internalLint: () => internalLint
 });
 module.exports = __toCommonJS(internal_exports);
+var import_node_util = require("node:util");
 var import_util = require("util");
-var import_chalk = __toESM(require("chalk"));
 var import_logging = require("../../utils/logging.js");
 var import_detectBadCodeowners = require("./internalLints/detectBadCodeowners.js");
 var import_noSkubaTemplateJs = require("./internalLints/noSkubaTemplateJs.js");
@@ -54,7 +44,7 @@ const lintSerially = async (mode, logger, additionalFlags) => {
       results.push(
         await lint(
           mode,
-          (0, import_logging.childLogger)(logger, { suffixes: [import_chalk.default.dim(name)] }),
+          (0, import_logging.childLogger)(logger, { suffixes: [(0, import_node_util.styleText)("dim", name)] }),
           additionalFlags
         )
       );
@@ -70,7 +60,7 @@ const lintConcurrently = async (mode, logger, additionalFlags) => {
         lintGroup.map(
           async ({ name, lint }) => lint(
             mode,
-            (0, import_logging.childLogger)(logger, { suffixes: [import_chalk.default.dim(name)] }),
+            (0, import_logging.childLogger)(logger, { suffixes: [(0, import_node_util.styleText)("dim", name)] }),
             additionalFlags
           )
         )
@@ -87,7 +77,9 @@ const internalLint = async (mode, input) => {
   const start = process.hrtime.bigint();
   const logger = (0, import_logging.createLogger)({
     debug: input?.debug ?? false,
-    prefixes: [...mode === "lint" ? [import_chalk.default.blueBright("skuba    \u2502")] : []]
+    prefixes: [
+      ...mode === "lint" ? [(0, import_node_util.styleText)("blueBright", "skuba    \u2502")] : []
+    ]
   });
   try {
     const lint = selectLintFunction(input);

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/lint/internal.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport chalk from 'chalk';\n\nimport { type Logger, childLogger, createLogger } from '../../utils/logging.js';\n\nimport { tryDetectBadCodeowners } from './internalLints/detectBadCodeowners.js';\nimport { noSkubaTemplateJs } from './internalLints/noSkubaTemplateJs.js';\nimport { tryRefreshConfigFiles } from './internalLints/refreshConfigFiles.js';\nimport { upgradeSkuba } from './internalLints/upgrade/index.js';\nimport type { Input } from './types.js';\n\nexport type InternalLintResult = {\n  ok: boolean;\n  fixable: boolean;\n  annotations?: Array<{\n    start_line?: number;\n    end_line?: number;\n    path: string;\n    message: string;\n  }>;\n};\n\nconst lints: Array<\n  Array<{\n    name: string;\n    lint: (\n      mode: 'format' | 'lint',\n      logger: Logger,\n      additionalFlags: string[],\n    ) => Promise<InternalLintResult>;\n  }>\n> = [\n  // Run upgradeSkuba first, in particular before refreshConfigFiles, for npmrc handling\n  [{ name: 'upgrade-skuba', lint: upgradeSkuba }],\n  [\n    { name: 'no-skuba-template-js', lint: noSkubaTemplateJs },\n    { name: 'refresh-config-files', lint: tryRefreshConfigFiles },\n    { name: 'detect-bad-codeowners', lint: tryDetectBadCodeowners },\n  ],\n];\n\nconst lintSerially = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  additionalFlags: string[],\n) => {\n  const results: InternalLintResult[] = [];\n  for (const lintGroup of lints) {\n    for (const { lint, name } of lintGroup) {\n      results.push(\n        await lint(\n          mode,\n          childLogger(logger, { suffixes: [chalk.dim(name)] }),\n          additionalFlags,\n        ),\n      );\n    }\n  }\n  return results;\n};\n\nconst lintConcurrently = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  additionalFlags: string[],\n) => {\n  const results: InternalLintResult[] = [];\n\n  for (const lintGroup of lints) {\n    results.push(\n      ...(await Promise.all(\n        lintGroup.map(async ({ name, lint }) =>\n          lint(\n            mode,\n            childLogger(logger, { suffixes: [chalk.dim(name)] }),\n            additionalFlags,\n          ),\n        ),\n      )),\n    );\n  }\n\n  return results;\n};\n\nconst selectLintFunction = (input?: Input) => {\n  const isSerial = input?.debug || input?.serial;\n  return isSerial ? lintSerially : lintConcurrently;\n};\n\nexport const internalLint = async (\n  mode: 'format' | 'lint',\n  input?: Input,\n): Promise<InternalLintResult> => {\n  const start = process.hrtime.bigint();\n  const logger = createLogger({\n    debug: input?.debug ?? false,\n    prefixes: [...(mode === 'lint' ? [chalk.blueBright('skuba    \u2502')] : [])],\n  });\n\n  try {\n    const lint = selectLintFunction(input);\n    const results = await lint(mode, logger, input?.additionalFlags ?? []);\n    const result = combineResults(results);\n    const end = process.hrtime.bigint();\n    logger.plain(`Processed skuba lints in ${logger.timing(start, end)}.`);\n    return result;\n  } catch (err) {\n    logger.err(logger.bold('Failed to run skuba lints.'));\n    logger.subtle(inspect(err));\n\n    process.exitCode = 1;\n\n    return { ok: false, fixable: false, annotations: [] };\n  }\n};\n\nconst combineResults = (results: InternalLintResult[]): InternalLintResult =>\n  results.reduce(\n    (cur, next) => ({\n      ok: cur.ok && next.ok,\n      fixable: cur.fixable || next.fixable,\n      annotations: [...(cur.annotations ?? []), ...(next.annotations ?? [])],\n    }),\n    { ok: true, fixable: false },\n  );\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,mBAAkB;AAElB,qBAAuD;AAEvD,iCAAuC;AACvC,+BAAkC;AAClC,gCAAsC;AACtC,qBAA6B;AAc7B,MAAM,QASF;AAAA;AAAA,EAEF,CAAC,EAAE,MAAM,iBAAiB,MAAM,4BAAa,CAAC;AAAA,EAC9C;AAAA,IACE,EAAE,MAAM,wBAAwB,MAAM,2CAAkB;AAAA,IACxD,EAAE,MAAM,wBAAwB,MAAM,gDAAsB;AAAA,IAC5D,EAAE,MAAM,yBAAyB,MAAM,kDAAuB;AAAA,EAChE;AACF;AAEA,MAAM,eAAe,OACnB,MACA,QACA,oBACG;AACH,QAAM,UAAgC,CAAC;AACvC,aAAW,aAAa,OAAO;AAC7B,eAAW,EAAE,MAAM,KAAK,KAAK,WAAW;AACtC,cAAQ;AAAA,QACN,MAAM;AAAA,UACJ;AAAA,cACA,4BAAY,QAAQ,EAAE,UAAU,CAAC,aAAAA,QAAM,IAAI,IAAI,CAAC,EAAE,CAAC;AAAA,UACnD;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,mBAAmB,OACvB,MACA,QACA,oBACG;AACH,QAAM,UAAgC,CAAC;AAEvC,aAAW,aAAa,OAAO;AAC7B,YAAQ;AAAA,MACN,GAAI,MAAM,QAAQ;AAAA,QAChB,UAAU;AAAA,UAAI,OAAO,EAAE,MAAM,KAAK,MAChC;AAAA,YACE;AAAA,gBACA,4BAAY,QAAQ,EAAE,UAAU,CAAC,aAAAA,QAAM,IAAI,IAAI,CAAC,EAAE,CAAC;AAAA,YACnD;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,qBAAqB,CAAC,UAAkB;AAC5C,QAAM,WAAW,OAAO,SAAS,OAAO;AACxC,SAAO,WAAW,eAAe;AACnC;AAEO,MAAM,eAAe,OAC1B,MACA,UACgC;AAChC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AACpC,QAAM,aAAS,6BAAa;AAAA,IAC1B,OAAO,OAAO,SAAS;AAAA,IACvB,UAAU,CAAC,GAAI,SAAS,SAAS,CAAC,aAAAA,QAAM,WAAW,iBAAY,CAAC,IAAI,CAAC,CAAE;AAAA,EACzE,CAAC;AAED,MAAI;AACF,UAAM,OAAO,mBAAmB,KAAK;AACrC,UAAM,UAAU,MAAM,KAAK,MAAM,QAAQ,OAAO,mBAAmB,CAAC,CAAC;AACrE,UAAM,SAAS,eAAe,OAAO;AACrC,UAAM,MAAM,QAAQ,OAAO,OAAO;AAClC,WAAO,MAAM,4BAA4B,OAAO,OAAO,OAAO,GAAG,CAAC,GAAG;AACrE,WAAO;AAAA,EACT,SAAS,KAAK;AACZ,WAAO,IAAI,OAAO,KAAK,4BAA4B,CAAC;AACpD,WAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,YAAQ,WAAW;AAEnB,WAAO,EAAE,IAAI,OAAO,SAAS,OAAO,aAAa,CAAC,EAAE;AAAA,EACtD;AACF;AAEA,MAAM,iBAAiB,CAAC,YACtB,QAAQ;AAAA,EACN,CAAC,KAAK,UAAU;AAAA,IACd,IAAI,IAAI,MAAM,KAAK;AAAA,IACnB,SAAS,IAAI,WAAW,KAAK;AAAA,IAC7B,aAAa,CAAC,GAAI,IAAI,eAAe,CAAC,GAAI,GAAI,KAAK,eAAe,CAAC,CAAE;AAAA,EACvE;AAAA,EACA,EAAE,IAAI,MAAM,SAAS,MAAM;AAC7B;",
-  "names": ["chalk"]
+  "sourcesContent": ["import { styleText } from 'node:util';\nimport { inspect } from 'util';\n\nimport { type Logger, childLogger, createLogger } from '../../utils/logging.js';\n\nimport { tryDetectBadCodeowners } from './internalLints/detectBadCodeowners.js';\nimport { noSkubaTemplateJs } from './internalLints/noSkubaTemplateJs.js';\nimport { tryRefreshConfigFiles } from './internalLints/refreshConfigFiles.js';\nimport { upgradeSkuba } from './internalLints/upgrade/index.js';\nimport type { Input } from './types.js';\n\nexport type InternalLintResult = {\n  ok: boolean;\n  fixable: boolean;\n  annotations?: Array<{\n    start_line?: number;\n    end_line?: number;\n    path: string;\n    message: string;\n  }>;\n};\n\nconst lints: Array<\n  Array<{\n    name: string;\n    lint: (\n      mode: 'format' | 'lint',\n      logger: Logger,\n      additionalFlags: string[],\n    ) => Promise<InternalLintResult>;\n  }>\n> = [\n  // Run upgradeSkuba first, in particular before refreshConfigFiles, for npmrc handling\n  [{ name: 'upgrade-skuba', lint: upgradeSkuba }],\n  [\n    { name: 'no-skuba-template-js', lint: noSkubaTemplateJs },\n    { name: 'refresh-config-files', lint: tryRefreshConfigFiles },\n    { name: 'detect-bad-codeowners', lint: tryDetectBadCodeowners },\n  ],\n];\n\nconst lintSerially = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  additionalFlags: string[],\n) => {\n  const results: InternalLintResult[] = [];\n  for (const lintGroup of lints) {\n    for (const { lint, name } of lintGroup) {\n      results.push(\n        await lint(\n          mode,\n          childLogger(logger, { suffixes: [styleText('dim', name)] }),\n          additionalFlags,\n        ),\n      );\n    }\n  }\n  return results;\n};\n\nconst lintConcurrently = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  additionalFlags: string[],\n) => {\n  const results: InternalLintResult[] = [];\n\n  for (const lintGroup of lints) {\n    results.push(\n      ...(await Promise.all(\n        lintGroup.map(async ({ name, lint }) =>\n          lint(\n            mode,\n            childLogger(logger, { suffixes: [styleText('dim', name)] }),\n            additionalFlags,\n          ),\n        ),\n      )),\n    );\n  }\n\n  return results;\n};\n\nconst selectLintFunction = (input?: Input) => {\n  const isSerial = input?.debug || input?.serial;\n  return isSerial ? lintSerially : lintConcurrently;\n};\n\nexport const internalLint = async (\n  mode: 'format' | 'lint',\n  input?: Input,\n): Promise<InternalLintResult> => {\n  const start = process.hrtime.bigint();\n  const logger = createLogger({\n    debug: input?.debug ?? false,\n    prefixes: [\n      ...(mode === 'lint' ? [styleText('blueBright', 'skuba    \u2502')] : []),\n    ],\n  });\n\n  try {\n    const lint = selectLintFunction(input);\n    const results = await lint(mode, logger, input?.additionalFlags ?? []);\n    const result = combineResults(results);\n    const end = process.hrtime.bigint();\n    logger.plain(`Processed skuba lints in ${logger.timing(start, end)}.`);\n    return result;\n  } catch (err) {\n    logger.err(logger.bold('Failed to run skuba lints.'));\n    logger.subtle(inspect(err));\n\n    process.exitCode = 1;\n\n    return { ok: false, fixable: false, annotations: [] };\n  }\n};\n\nconst combineResults = (results: InternalLintResult[]): InternalLintResult =>\n  results.reduce(\n    (cur, next) => ({\n      ok: cur.ok && next.ok,\n      fixable: cur.fixable || next.fixable,\n      annotations: [...(cur.annotations ?? []), ...(next.annotations ?? [])],\n    }),\n    { ok: true, fixable: false },\n  );\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA0B;AAC1B,kBAAwB;AAExB,qBAAuD;AAEvD,iCAAuC;AACvC,+BAAkC;AAClC,gCAAsC;AACtC,qBAA6B;AAc7B,MAAM,QASF;AAAA;AAAA,EAEF,CAAC,EAAE,MAAM,iBAAiB,MAAM,4BAAa,CAAC;AAAA,EAC9C;AAAA,IACE,EAAE,MAAM,wBAAwB,MAAM,2CAAkB;AAAA,IACxD,EAAE,MAAM,wBAAwB,MAAM,gDAAsB;AAAA,IAC5D,EAAE,MAAM,yBAAyB,MAAM,kDAAuB;AAAA,EAChE;AACF;AAEA,MAAM,eAAe,OACnB,MACA,QACA,oBACG;AACH,QAAM,UAAgC,CAAC;AACvC,aAAW,aAAa,OAAO;AAC7B,eAAW,EAAE,MAAM,KAAK,KAAK,WAAW;AACtC,cAAQ;AAAA,QACN,MAAM;AAAA,UACJ;AAAA,cACA,4BAAY,QAAQ,EAAE,UAAU,KAAC,4BAAU,OAAO,IAAI,CAAC,EAAE,CAAC;AAAA,UAC1D;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACA,SAAO;AACT;AAEA,MAAM,mBAAmB,OACvB,MACA,QACA,oBACG;AACH,QAAM,UAAgC,CAAC;AAEvC,aAAW,aAAa,OAAO;AAC7B,YAAQ;AAAA,MACN,GAAI,MAAM,QAAQ;AAAA,QAChB,UAAU;AAAA,UAAI,OAAO,EAAE,MAAM,KAAK,MAChC;AAAA,YACE;AAAA,gBACA,4BAAY,QAAQ,EAAE,UAAU,KAAC,4BAAU,OAAO,IAAI,CAAC,EAAE,CAAC;AAAA,YAC1D;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;AAEA,MAAM,qBAAqB,CAAC,UAAkB;AAC5C,QAAM,WAAW,OAAO,SAAS,OAAO;AACxC,SAAO,WAAW,eAAe;AACnC;AAEO,MAAM,eAAe,OAC1B,MACA,UACgC;AAChC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AACpC,QAAM,aAAS,6BAAa;AAAA,IAC1B,OAAO,OAAO,SAAS;AAAA,IACvB,UAAU;AAAA,MACR,GAAI,SAAS,SAAS,KAAC,4BAAU,cAAc,iBAAY,CAAC,IAAI,CAAC;AAAA,IACnE;AAAA,EACF,CAAC;AAED,MAAI;AACF,UAAM,OAAO,mBAAmB,KAAK;AACrC,UAAM,UAAU,MAAM,KAAK,MAAM,QAAQ,OAAO,mBAAmB,CAAC,CAAC;AACrE,UAAM,SAAS,eAAe,OAAO;AACrC,UAAM,MAAM,QAAQ,OAAO,OAAO;AAClC,WAAO,MAAM,4BAA4B,OAAO,OAAO,OAAO,GAAG,CAAC,GAAG;AACrE,WAAO;AAAA,EACT,SAAS,KAAK;AACZ,WAAO,IAAI,OAAO,KAAK,4BAA4B,CAAC;AACpD,WAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,YAAQ,WAAW;AAEnB,WAAO,EAAE,IAAI,OAAO,SAAS,OAAO,aAAa,CAAC,EAAE;AAAA,EACtD;AACF;AAEA,MAAM,iBAAiB,CAAC,YACtB,QAAQ;AAAA,EACN,CAAC,KAAK,UAAU;AAAA,IACd,IAAI,IAAI,MAAM,KAAK;AAAA,IACnB,SAAS,IAAI,WAAW,KAAK;AAAA,IAC7B,aAAa,CAAC,GAAI,IAAI,eAAe,CAAC,GAAI,GAAI,KAAK,eAAe,CAAC,CAAE;AAAA,EACvE;AAAA,EACA,EAAE,IAAI,MAAM,SAAS,MAAM;AAC7B;",
+  "names": []
 }

package/lib/cli/lint/internalLints/noSkubaTemplateJs.js

@@ -32,7 +32,7 @@ __export(noSkubaTemplateJs_exports, {
 });
 module.exports = __toCommonJS(noSkubaTemplateJs_exports);
 var import_path = __toESM(require("path"));
-var import_fs_extra = __toESM(require("fs-extra"));
+var import_fs = require("../../../utils/fs.js");
 var import_manifest = require("../../../utils/manifest.js");
 var import_packageManager = require("../../../utils/packageManager.js");
 const noSkubaTemplateJs = async (_mode, logger) => {
@@ -47,12 +47,10 @@ const noSkubaTemplateJs = async (_mode, logger) => {
     import_path.default.dirname(manifest.path),
     "skuba.template.js"
   );
-  if (await import_fs_extra.default.pathExists(templateConfigPath)) {
+  if (await (0, import_fs.pathExists)(templateConfigPath)) {
     logger.err(
       `Template is incomplete; run ${logger.bold(
-        packageManager.print.exec,
-        "skuba",
-        "configure"
+        `${packageManager.print.exec} skuba configure`
       )}. ${logger.dim("no-skuba-template-js")}`
     );
     return {

package/lib/cli/lint/internalLints/noSkubaTemplateJs.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/lint/internalLints/noSkubaTemplateJs.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\n\nimport type { Logger } from '../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../utils/manifest.js';\nimport { detectPackageManager } from '../../../utils/packageManager.js';\nimport type { InternalLintResult } from '../internal.js';\n\nexport const noSkubaTemplateJs = async (\n  _mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  const [manifest, packageManager] = await Promise.all([\n    getConsumerManifest(),\n    detectPackageManager(),\n  ]);\n\n  if (!manifest) {\n    // This will throw elsewhere\n    return { ok: true, fixable: false };\n  }\n\n  const templateConfigPath = path.join(\n    path.dirname(manifest.path),\n    'skuba.template.js',\n  );\n\n  if (await fs.pathExists(templateConfigPath)) {\n    logger.err(\n      `Template is incomplete; run ${logger.bold(\n        packageManager.print.exec,\n        'skuba',\n        'configure',\n      )}. ${logger.dim('no-skuba-template-js')}`,\n    );\n\n    return {\n      ok: false,\n      fixable: false,\n      annotations: [\n        {\n          path: 'skuba.template.js',\n          message: `Template is incomplete; run ${packageManager.print.exec} skuba configure.`,\n        },\n      ],\n    };\n  }\n\n  return { ok: true, fixable: false };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AAGf,sBAAoC;AACpC,4BAAqC;AAG9B,MAAM,oBAAoB,OAC/B,OACA,WACgC;AAChC,QAAM,CAAC,UAAU,cAAc,IAAI,MAAM,QAAQ,IAAI;AAAA,QACnD,qCAAoB;AAAA,QACpB,4CAAqB;AAAA,EACvB,CAAC;AAED,MAAI,CAAC,UAAU;AAEb,WAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,EACpC;AAEA,QAAM,qBAAqB,YAAAA,QAAK;AAAA,IAC9B,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAAA,IAC1B;AAAA,EACF;AAEA,MAAI,MAAM,gBAAAC,QAAG,WAAW,kBAAkB,GAAG;AAC3C,WAAO;AAAA,MACL,+BAA+B,OAAO;AAAA,QACpC,eAAe,MAAM;AAAA,QACrB;AAAA,QACA;AAAA,MACF,CAAC,KAAK,OAAO,IAAI,sBAAsB,CAAC;AAAA,IAC1C;AAEA,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa;AAAA,QACX;AAAA,UACE,MAAM;AAAA,UACN,SAAS,+BAA+B,eAAe,MAAM,IAAI;AAAA,QACnE;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AACpC;",
-  "names": ["path", "fs"]
+  "sourcesContent": ["import path from 'path';\n\nimport { pathExists } from '../../../utils/fs.js';\nimport type { Logger } from '../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../utils/manifest.js';\nimport { detectPackageManager } from '../../../utils/packageManager.js';\nimport type { InternalLintResult } from '../internal.js';\n\nexport const noSkubaTemplateJs = async (\n  _mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  const [manifest, packageManager] = await Promise.all([\n    getConsumerManifest(),\n    detectPackageManager(),\n  ]);\n\n  if (!manifest) {\n    // This will throw elsewhere\n    return { ok: true, fixable: false };\n  }\n\n  const templateConfigPath = path.join(\n    path.dirname(manifest.path),\n    'skuba.template.js',\n  );\n\n  if (await pathExists(templateConfigPath)) {\n    logger.err(\n      `Template is incomplete; run ${logger.bold(\n        `${packageManager.print.exec} skuba configure`,\n      )}. ${logger.dim('no-skuba-template-js')}`,\n    );\n\n    return {\n      ok: false,\n      fixable: false,\n      annotations: [\n        {\n          path: 'skuba.template.js',\n          message: `Template is incomplete; run ${packageManager.print.exec} skuba configure.`,\n        },\n      ],\n    };\n  }\n\n  return { ok: true, fixable: false };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,gBAA2B;AAE3B,sBAAoC;AACpC,4BAAqC;AAG9B,MAAM,oBAAoB,OAC/B,OACA,WACgC;AAChC,QAAM,CAAC,UAAU,cAAc,IAAI,MAAM,QAAQ,IAAI;AAAA,QACnD,qCAAoB;AAAA,QACpB,4CAAqB;AAAA,EACvB,CAAC;AAED,MAAI,CAAC,UAAU;AAEb,WAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,EACpC;AAEA,QAAM,qBAAqB,YAAAA,QAAK;AAAA,IAC9B,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAAA,IAC1B;AAAA,EACF;AAEA,MAAI,UAAM,sBAAW,kBAAkB,GAAG;AACxC,WAAO;AAAA,MACL,+BAA+B,OAAO;AAAA,QACpC,GAAG,eAAe,MAAM,IAAI;AAAA,MAC9B,CAAC,KAAK,OAAO,IAAI,sBAAsB,CAAC;AAAA,IAC1C;AAEA,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa;AAAA,QACX;AAAA,UACE,MAAM;AAAA,UACN,SAAS,+BAA+B,eAAe,MAAM,IAAI;AAAA,QACnE;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AACpC;",
+  "names": ["path"]
 }

package/lib/cli/lint/internalLints/refreshConfigFiles.js

@@ -122,9 +122,7 @@ const refreshConfigFiles = async (mode, logger) => {
         msg: `The ${logger.bold(
           filename
         )} file is out of date. Run \`${logger.bold(
-          packageManager.print.exec,
-          "skuba",
-          "format"
+          `${packageManager.print.exec} skuba format`
         )}\` to update it.`,
         filename
       };

package/lib/cli/lint/internalLints/refreshConfigFiles.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/lint/internalLints/refreshConfigFiles.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect, stripVTControlCharacters as stripAnsi } from 'util';\n\nimport fs from 'fs-extra';\n\nimport { Git } from '../../../index.js';\nimport {\n  findCurrentWorkspaceProjectRoot,\n  findWorkspaceRoot,\n} from '../../../utils/dir.js';\nimport type { Logger } from '../../../utils/logging.js';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../utils/packageManager.js';\nimport { readBaseTemplateFile } from '../../../utils/template.js';\nimport { getDestinationManifest } from '../../configure/analysis/package.js';\nimport { createDestinationFileReader } from '../../configure/analysis/project.js';\nimport { mergeWithConfigFile } from '../../configure/processing/configFile.js';\nimport type { InternalLintResult } from '../internal.js';\n\ntype ConditionOptions = {\n  packageManager: PackageManagerConfig;\n  isInWorkspaceRoot: boolean;\n};\n\ntype RefreshableConfigFile = {\n  name: string;\n  type: 'ignore' | 'pnpm-workspace';\n  additionalMapping?: (\n    s: string,\n    packageManager: PackageManagerConfig,\n  ) => string;\n  if?: (options: ConditionOptions) => boolean;\n};\n\nconst OLD_IGNORE_WARNING = `# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.\n# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.\n# You can use \\`skuba format\\` to generate the file or otherwise commit an empty file.\n# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.\n.npmrc\n`;\n\nconst removeOldWarning = (contents: string) =>\n  contents.includes(OLD_IGNORE_WARNING)\n    ? `${contents.replace(OLD_IGNORE_WARNING, '').trim()}\\n`\n    : contents;\n\nexport const REFRESHABLE_CONFIG_FILES: RefreshableConfigFile[] = [\n  {\n    name: '.gitignore',\n    type: 'ignore',\n    additionalMapping: removeOldWarning,\n  },\n  { name: '.prettierignore', type: 'ignore' },\n  {\n    name: 'pnpm-workspace.yaml',\n    type: 'pnpm-workspace',\n    if: ({ packageManager, isInWorkspaceRoot }) =>\n      isInWorkspaceRoot && packageManager.command === 'pnpm',\n  },\n  {\n    name: '.dockerignore',\n    type: 'ignore',\n    additionalMapping: removeOldWarning,\n  },\n];\n\nexport const refreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n) => {\n  const [manifest, gitRoot, workspaceRoot, currentWorkspaceProjectRoot] =\n    await Promise.all([\n      getDestinationManifest(),\n      Git.findRoot({ dir: process.cwd() }),\n      findWorkspaceRoot(),\n      findCurrentWorkspaceProjectRoot(),\n    ]);\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  const readDestinationFile = createDestinationFileReader(destinationRoot);\n\n  const refreshConfigFile = async (\n    {\n      name: filename,\n      type: fileType,\n      additionalMapping = (s) => s,\n      if: condition = () => true,\n    }: RefreshableConfigFile,\n    conditionOptions: ConditionOptions,\n  ) => {\n    if (!condition(conditionOptions)) {\n      return { needsChange: false };\n    }\n\n    const maybeReadPackageJson = async (type: RefreshableConfigFile['type']) =>\n      type === 'pnpm-workspace'\n        ? await readDestinationFile('package.json')\n        : undefined;\n\n    const [inputFile, templateFile, isGitIgnored, packageJson] =\n      await Promise.all([\n        readDestinationFile(filename),\n        readBaseTemplateFile(`_${filename}`),\n        gitRoot\n          ? Git.isFileGitIgnored({\n              gitRoot,\n              absolutePath: path.join(destinationRoot, filename),\n            })\n          : false,\n        maybeReadPackageJson(fileType),\n      ]);\n\n    // If the file is gitignored and doesn't exist, don't make it\n    if (inputFile === undefined && isGitIgnored) {\n      return { needsChange: false };\n    }\n\n    const data = additionalMapping(\n      inputFile\n        ? mergeWithConfigFile(templateFile, fileType, packageJson)(inputFile)\n        : templateFile,\n      packageManager,\n    );\n\n    const filepath = path.join(destinationRoot, filename);\n\n    if (mode === 'format') {\n      if (data === inputFile) {\n        return { needsChange: false };\n      }\n\n      await fs.writeFile(filepath, data);\n      return {\n        needsChange: false,\n        msg: `Refreshed ${logger.bold(filename)}.`,\n        filename,\n      };\n    }\n\n    if (data !== inputFile) {\n      return {\n        needsChange: true,\n        msg: `The ${logger.bold(\n          filename,\n        )} file is out of date. Run \\`${logger.bold(\n          packageManager.print.exec,\n          'skuba',\n          'format',\n        )}\\` to update it.`,\n        filename,\n      };\n    }\n\n    return { needsChange: false };\n  };\n\n  const packageManager = await detectPackageManager(destinationRoot);\n\n  const results = await Promise.all(\n    REFRESHABLE_CONFIG_FILES.map((conf) =>\n      refreshConfigFile(conf, {\n        packageManager,\n        isInWorkspaceRoot: workspaceRoot === currentWorkspaceProjectRoot,\n      }),\n    ),\n  );\n\n  // Log after for reproducible test output ordering\n  results.forEach((result) => {\n    if (result.msg) {\n      logger.warn(result.msg);\n    }\n  });\n\n  const anyNeedChanging = results.some(({ needsChange }) => needsChange);\n\n  return {\n    ok: !anyNeedChanging,\n    fixable: anyNeedChanging,\n    annotations: results.flatMap(({ needsChange, filename, msg }) =>\n      needsChange && msg\n        ? [\n            {\n              path: filename,\n              message: stripAnsi(msg),\n            },\n          ]\n        : [],\n    ),\n  };\n};\n\nexport const tryRefreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  try {\n    return await refreshConfigFiles(mode, logger);\n  } catch (err) {\n    logger.warn('Failed to refresh config files.');\n    logger.subtle(inspect(err));\n\n    return {\n      ok: false,\n      fixable: false,\n      annotations: [],\n    };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAA+D;AAE/D,sBAAe;AAEf,eAAoB;AACpB,iBAGO;AAEP,4BAGO;AACP,sBAAqC;AACrC,qBAAuC;AACvC,qBAA4C;AAC5C,wBAAoC;AAkBpC,MAAM,qBAAqB;AAAA;AAAA;AAAA;AAAA;AAAA;AAO3B,MAAM,mBAAmB,CAAC,aACxB,SAAS,SAAS,kBAAkB,IAChC,GAAG,SAAS,QAAQ,oBAAoB,EAAE,EAAE,KAAK,CAAC;AAAA,IAClD;AAEC,MAAM,2BAAoD;AAAA,EAC/D;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,IACN,mBAAmB;AAAA,EACrB;AAAA,EACA,EAAE,MAAM,mBAAmB,MAAM,SAAS;AAAA,EAC1C;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,IACN,IAAI,CAAC,EAAE,gBAAgB,kBAAkB,MACvC,qBAAqB,eAAe,YAAY;AAAA,EACpD;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,IACN,mBAAmB;AAAA,EACrB;AACF;AAEO,MAAM,qBAAqB,OAChC,MACA,WACG;AACH,QAAM,CAAC,UAAU,SAAS,eAAe,2BAA2B,IAClE,MAAM,QAAQ,IAAI;AAAA,QAChB,uCAAuB;AAAA,IACvB,aAAI,SAAS,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC;AAAA,QACnC,8BAAkB;AAAA,QAClB,4CAAgC;AAAA,EAClC,CAAC;AAEH,QAAM,kBAAkB,YAAAA,QAAK,QAAQ,SAAS,IAAI;AAElD,QAAM,0BAAsB,4CAA4B,eAAe;AAEvE,QAAM,oBAAoB,OACxB;AAAA,IACE,MAAM;AAAA,IACN,MAAM;AAAA,IACN,oBAAoB,CAAC,MAAM;AAAA,IAC3B,IAAI,YAAY,MAAM;AAAA,EACxB,GACA,qBACG;AACH,QAAI,CAAC,UAAU,gBAAgB,GAAG;AAChC,aAAO,EAAE,aAAa,MAAM;AAAA,IAC9B;AAEA,UAAM,uBAAuB,OAAO,SAClC,SAAS,mBACL,MAAM,oBAAoB,cAAc,IACxC;AAEN,UAAM,CAAC,WAAW,cAAc,cAAc,WAAW,IACvD,MAAM,QAAQ,IAAI;AAAA,MAChB,oBAAoB,QAAQ;AAAA,UAC5B,sCAAqB,IAAI,QAAQ,EAAE;AAAA,MACnC,UACI,aAAI,iBAAiB;AAAA,QACnB;AAAA,QACA,cAAc,YAAAA,QAAK,KAAK,iBAAiB,QAAQ;AAAA,MACnD,CAAC,IACD;AAAA,MACJ,qBAAqB,QAAQ;AAAA,IAC/B,CAAC;AAGH,QAAI,cAAc,UAAa,cAAc;AAC3C,aAAO,EAAE,aAAa,MAAM;AAAA,IAC9B;AAEA,UAAM,OAAO;AAAA,MACX,gBACI,uCAAoB,cAAc,UAAU,WAAW,EAAE,SAAS,IAClE;AAAA,MACJ;AAAA,IACF;AAEA,UAAM,WAAW,YAAAA,QAAK,KAAK,iBAAiB,QAAQ;AAEpD,QAAI,SAAS,UAAU;AACrB,UAAI,SAAS,WAAW;AACtB,eAAO,EAAE,aAAa,MAAM;AAAA,MAC9B;AAEA,YAAM,gBAAAC,QAAG,UAAU,UAAU,IAAI;AACjC,aAAO;AAAA,QACL,aAAa;AAAA,QACb,KAAK,aAAa,OAAO,KAAK,QAAQ,CAAC;AAAA,QACvC;AAAA,MACF;AAAA,IACF;AAEA,QAAI,SAAS,WAAW;AACtB,aAAO;AAAA,QACL,aAAa;AAAA,QACb,KAAK,OAAO,OAAO;AAAA,UACjB;AAAA,QACF,CAAC,+BAA+B,OAAO;AAAA,UACrC,eAAe,MAAM;AAAA,UACrB;AAAA,UACA;AAAA,QACF,CAAC;AAAA,QACD;AAAA,MACF;AAAA,IACF;AAEA,WAAO,EAAE,aAAa,MAAM;AAAA,EAC9B;AAEA,QAAM,iBAAiB,UAAM,4CAAqB,eAAe;AAEjE,QAAM,UAAU,MAAM,QAAQ;AAAA,IAC5B,yBAAyB;AAAA,MAAI,CAAC,SAC5B,kBAAkB,MAAM;AAAA,QACtB;AAAA,QACA,mBAAmB,kBAAkB;AAAA,MACvC,CAAC;AAAA,IACH;AAAA,EACF;AAGA,UAAQ,QAAQ,CAAC,WAAW;AAC1B,QAAI,OAAO,KAAK;AACd,aAAO,KAAK,OAAO,GAAG;AAAA,IACxB;AAAA,EACF,CAAC;AAED,QAAM,kBAAkB,QAAQ,KAAK,CAAC,EAAE,YAAY,MAAM,WAAW;AAErE,SAAO;AAAA,IACL,IAAI,CAAC;AAAA,IACL,SAAS;AAAA,IACT,aAAa,QAAQ;AAAA,MAAQ,CAAC,EAAE,aAAa,UAAU,IAAI,MACzD,eAAe,MACX;AAAA,QACE;AAAA,UACE,MAAM;AAAA,UACN,aAAS,YAAAC,0BAAU,GAAG;AAAA,QACxB;AAAA,MACF,IACA,CAAC;AAAA,IACP;AAAA,EACF;AACF;AAEO,MAAM,wBAAwB,OACnC,MACA,WACgC;AAChC,MAAI;AACF,WAAO,MAAM,mBAAmB,MAAM,MAAM;AAAA,EAC9C,SAAS,KAAK;AACZ,WAAO,KAAK,iCAAiC;AAC7C,WAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa,CAAC;AAAA,IAChB;AAAA,EACF;AACF;",
+  "sourcesContent": ["import path from 'path';\nimport { inspect, stripVTControlCharacters as stripAnsi } from 'util';\n\nimport fs from 'fs-extra';\n\nimport { Git } from '../../../index.js';\nimport {\n  findCurrentWorkspaceProjectRoot,\n  findWorkspaceRoot,\n} from '../../../utils/dir.js';\nimport type { Logger } from '../../../utils/logging.js';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../utils/packageManager.js';\nimport { readBaseTemplateFile } from '../../../utils/template.js';\nimport { getDestinationManifest } from '../../configure/analysis/package.js';\nimport { createDestinationFileReader } from '../../configure/analysis/project.js';\nimport { mergeWithConfigFile } from '../../configure/processing/configFile.js';\nimport type { InternalLintResult } from '../internal.js';\n\ntype ConditionOptions = {\n  packageManager: PackageManagerConfig;\n  isInWorkspaceRoot: boolean;\n};\n\ntype RefreshableConfigFile = {\n  name: string;\n  type: 'ignore' | 'pnpm-workspace';\n  additionalMapping?: (\n    s: string,\n    packageManager: PackageManagerConfig,\n  ) => string;\n  if?: (options: ConditionOptions) => boolean;\n};\n\nconst OLD_IGNORE_WARNING = `# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.\n# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.\n# You can use \\`skuba format\\` to generate the file or otherwise commit an empty file.\n# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.\n.npmrc\n`;\n\nconst removeOldWarning = (contents: string) =>\n  contents.includes(OLD_IGNORE_WARNING)\n    ? `${contents.replace(OLD_IGNORE_WARNING, '').trim()}\\n`\n    : contents;\n\nexport const REFRESHABLE_CONFIG_FILES: RefreshableConfigFile[] = [\n  {\n    name: '.gitignore',\n    type: 'ignore',\n    additionalMapping: removeOldWarning,\n  },\n  { name: '.prettierignore', type: 'ignore' },\n  {\n    name: 'pnpm-workspace.yaml',\n    type: 'pnpm-workspace',\n    if: ({ packageManager, isInWorkspaceRoot }) =>\n      isInWorkspaceRoot && packageManager.command === 'pnpm',\n  },\n  {\n    name: '.dockerignore',\n    type: 'ignore',\n    additionalMapping: removeOldWarning,\n  },\n];\n\nexport const refreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n) => {\n  const [manifest, gitRoot, workspaceRoot, currentWorkspaceProjectRoot] =\n    await Promise.all([\n      getDestinationManifest(),\n      Git.findRoot({ dir: process.cwd() }),\n      findWorkspaceRoot(),\n      findCurrentWorkspaceProjectRoot(),\n    ]);\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  const readDestinationFile = createDestinationFileReader(destinationRoot);\n\n  const refreshConfigFile = async (\n    {\n      name: filename,\n      type: fileType,\n      additionalMapping = (s) => s,\n      if: condition = () => true,\n    }: RefreshableConfigFile,\n    conditionOptions: ConditionOptions,\n  ) => {\n    if (!condition(conditionOptions)) {\n      return { needsChange: false };\n    }\n\n    const maybeReadPackageJson = async (type: RefreshableConfigFile['type']) =>\n      type === 'pnpm-workspace'\n        ? await readDestinationFile('package.json')\n        : undefined;\n\n    const [inputFile, templateFile, isGitIgnored, packageJson] =\n      await Promise.all([\n        readDestinationFile(filename),\n        readBaseTemplateFile(`_${filename}`),\n        gitRoot\n          ? Git.isFileGitIgnored({\n              gitRoot,\n              absolutePath: path.join(destinationRoot, filename),\n            })\n          : false,\n        maybeReadPackageJson(fileType),\n      ]);\n\n    // If the file is gitignored and doesn't exist, don't make it\n    if (inputFile === undefined && isGitIgnored) {\n      return { needsChange: false };\n    }\n\n    const data = additionalMapping(\n      inputFile\n        ? mergeWithConfigFile(templateFile, fileType, packageJson)(inputFile)\n        : templateFile,\n      packageManager,\n    );\n\n    const filepath = path.join(destinationRoot, filename);\n\n    if (mode === 'format') {\n      if (data === inputFile) {\n        return { needsChange: false };\n      }\n\n      await fs.writeFile(filepath, data);\n      return {\n        needsChange: false,\n        msg: `Refreshed ${logger.bold(filename)}.`,\n        filename,\n      };\n    }\n\n    if (data !== inputFile) {\n      return {\n        needsChange: true,\n        msg: `The ${logger.bold(\n          filename,\n        )} file is out of date. Run \\`${logger.bold(\n          `${packageManager.print.exec} skuba format`,\n        )}\\` to update it.`,\n        filename,\n      };\n    }\n\n    return { needsChange: false };\n  };\n\n  const packageManager = await detectPackageManager(destinationRoot);\n\n  const results = await Promise.all(\n    REFRESHABLE_CONFIG_FILES.map((conf) =>\n      refreshConfigFile(conf, {\n        packageManager,\n        isInWorkspaceRoot: workspaceRoot === currentWorkspaceProjectRoot,\n      }),\n    ),\n  );\n\n  // Log after for reproducible test output ordering\n  results.forEach((result) => {\n    if (result.msg) {\n      logger.warn(result.msg);\n    }\n  });\n\n  const anyNeedChanging = results.some(({ needsChange }) => needsChange);\n\n  return {\n    ok: !anyNeedChanging,\n    fixable: anyNeedChanging,\n    annotations: results.flatMap(({ needsChange, filename, msg }) =>\n      needsChange && msg\n        ? [\n            {\n              path: filename,\n              message: stripAnsi(msg),\n            },\n          ]\n        : [],\n    ),\n  };\n};\n\nexport const tryRefreshConfigFiles = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n): Promise<InternalLintResult> => {\n  try {\n    return await refreshConfigFiles(mode, logger);\n  } catch (err) {\n    logger.warn('Failed to refresh config files.');\n    logger.subtle(inspect(err));\n\n    return {\n      ok: false,\n      fixable: false,\n      annotations: [],\n    };\n  }\n};\n"],
+  "mappings": "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",
   "names": ["path", "fs", "stripAnsi"]
 }

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

@@ -96,9 +96,7 @@ const upgradeSkuba = async (mode, logger, additionalFlags = []) => {
     }
     logger.warn(
       `skuba has patches to apply. Run ${logger.bold(
-        packageManager.print.exec,
-        "skuba",
-        "format"
+        `${packageManager.print.exec} skuba format`
       )} to run them.`
     );
     return {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lint/internalLints/upgrade/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport type { ReadResult } from 'read-pkg-up';\nimport { gte, sort } from 'semver';\n\nimport type { Logger } from '../../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../../utils/manifest.js';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../../utils/packageManager.js';\nimport { getSkubaVersion } from '../../../../utils/version.js';\nimport { formatPackage } from '../../../configure/processing/package.js';\nimport type { SkubaPackageJson } from '../../../init/writePackageJson.js';\nimport type { InternalLintResult } from '../../internal.js';\n\nexport type Patches = Patch[];\nexport type Patch = {\n  apply: PatchFunction;\n  description: string;\n};\nexport type PatchReturnType =\n  | { result: 'apply' }\n  | { result: 'skip'; reason?: string };\n\nexport type PatchConfig = {\n  mode: 'format' | 'lint';\n  manifest: ReadResult;\n  packageManager: PackageManagerConfig;\n  dir?: string;\n};\n\nexport type PatchFunction = (config: PatchConfig) => Promise<PatchReturnType>;\n\nconst getPatches = async (manifestVersion: string): Promise<Patches> => {\n  const patches = await fs.readdir(path.join(__dirname, 'patches'), {\n    withFileTypes: true,\n  });\n\n  // The patches are sorted by the version they were added from.\n  // Only return patches that are newer or equal to the current version.\n  const patchesForVersion = sort(\n    patches.flatMap((patch) =>\n      // Is a directory rather than a JavaScript source file\n      patch.isDirectory() &&\n      // Has been added since the last patch run on the project\n      gte(patch.name, manifestVersion)\n        ? patch.name\n        : [],\n    ),\n  );\n\n  return (await Promise.all(patchesForVersion.map(resolvePatches))).flat();\n};\n\nconst fileExtensions = ['js', 'ts'];\n\n// Hack to allow our Jest environment/transform to resolve the patches\n// In normal scenarios this will resolve immediately after the .js import\nconst resolvePatches = async (version: string): Promise<Patches> => {\n  for (const extension of fileExtensions) {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access\n      return (await import(`./patches/${version}/index.${extension}`)).patches;\n    } catch {\n      // Ignore\n    }\n  }\n  throw new Error(`Could not resolve patches for ${version}`);\n};\n\nexport const upgradeSkuba = async (\n  mode: 'lint' | 'format',\n  logger: Logger,\n  additionalFlags: string[] = [],\n): Promise<InternalLintResult> => {\n  const [currentVersion, manifest, packageManager] = await Promise.all([\n    getSkubaVersion(),\n    getConsumerManifest(),\n    detectPackageManager(),\n  ]);\n\n  if (!manifest) {\n    throw new Error('Could not find a package json for this project');\n  }\n\n  manifest.packageJson.skuba ??= { version: '1.0.0' };\n\n  const manifestVersion = additionalFlags.includes('--force-apply-all-patches')\n    ? '1.0.0'\n    : (manifest.packageJson.skuba as SkubaPackageJson).version;\n\n  // We are up to date, skip patches\n  if (gte(manifestVersion, currentVersion)) {\n    return { ok: true, fixable: false };\n  }\n\n  const patches = await getPatches(manifestVersion);\n  // No patches to apply even if version out of date. Early exit to avoid unnecessary commits.\n  if (patches.length === 0) {\n    return { ok: true, fixable: false };\n  }\n\n  if (mode === 'lint') {\n    const results = await Promise.all(\n      patches.map(\n        async ({ apply }) =>\n          await apply({\n            mode,\n            manifest,\n            packageManager,\n          }),\n      ),\n    );\n\n    // No patches are applicable. Early exit to avoid unnecessary commits.\n    if (results.every(({ result }) => result === 'skip')) {\n      return { ok: true, fixable: false };\n    }\n\n    logger.warn(\n      `skuba has patches to apply. Run ${logger.bold(\n        packageManager.print.exec,\n        'skuba',\n        'format',\n      )} to run them.`,\n    );\n\n    return {\n      ok: false,\n      fixable: true,\n      annotations: [\n        {\n          // package.json as likely skuba version has changed\n          // TODO: locate the \"skuba\": {} config in the package.json and annotate on the version property\n          path: manifest.path,\n          message: `skuba has patches to apply. Run ${packageManager.print.exec} skuba format to run them.`,\n        },\n      ],\n    };\n  }\n\n  logger.plain('Updating skuba...');\n\n  // Run these in series in case a subsequent patch relies on a previous patch\n  for (const { apply, description } of patches) {\n    const result = await apply({\n      mode,\n      manifest,\n      packageManager,\n    });\n    logger.newline();\n    if (result.result === 'skip') {\n      logger.plain(\n        `Patch skipped: ${description}${\n          result.reason ? ` - ${result.reason}` : ''\n        }`,\n      );\n    } else {\n      logger.plain(`Patch applied: ${description}`);\n    }\n  }\n\n  const updatedManifest = await getConsumerManifest();\n  if (!updatedManifest) {\n    throw new Error('Could not find a package json for this project');\n  }\n\n  (updatedManifest.packageJson.skuba as SkubaPackageJson).version =\n    currentVersion;\n\n  const updatedPackageJson = await formatPackage(updatedManifest.packageJson);\n\n  await fs.writeFile(updatedManifest.path, updatedPackageJson);\n  logger.newline();\n  logger.plain('skuba update complete.');\n  logger.newline();\n\n  return {\n    ok: true,\n    fixable: false,\n  };\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\n\nimport fs from 'fs-extra';\nimport type { ReadResult } from 'read-pkg-up';\nimport { gte, sort } from 'semver';\n\nimport type { Logger } from '../../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../../utils/manifest.js';\nimport {\n  type PackageManagerConfig,\n  detectPackageManager,\n} from '../../../../utils/packageManager.js';\nimport { getSkubaVersion } from '../../../../utils/version.js';\nimport { formatPackage } from '../../../configure/processing/package.js';\nimport type { SkubaPackageJson } from '../../../init/writePackageJson.js';\nimport type { InternalLintResult } from '../../internal.js';\n\nexport type Patches = Patch[];\nexport type Patch = {\n  apply: PatchFunction;\n  description: string;\n};\nexport type PatchReturnType =\n  | { result: 'apply' }\n  | { result: 'skip'; reason?: string };\n\nexport type PatchConfig = {\n  mode: 'format' | 'lint';\n  manifest: ReadResult;\n  packageManager: PackageManagerConfig;\n  dir?: string;\n};\n\nexport type PatchFunction = (config: PatchConfig) => Promise<PatchReturnType>;\n\nconst getPatches = async (manifestVersion: string): Promise<Patches> => {\n  const patches = await fs.readdir(path.join(__dirname, 'patches'), {\n    withFileTypes: true,\n  });\n\n  // The patches are sorted by the version they were added from.\n  // Only return patches that are newer or equal to the current version.\n  const patchesForVersion = sort(\n    patches.flatMap((patch) =>\n      // Is a directory rather than a JavaScript source file\n      patch.isDirectory() &&\n      // Has been added since the last patch run on the project\n      gte(patch.name, manifestVersion)\n        ? patch.name\n        : [],\n    ),\n  );\n\n  return (await Promise.all(patchesForVersion.map(resolvePatches))).flat();\n};\n\nconst fileExtensions = ['js', 'ts'];\n\n// Hack to allow our Jest environment/transform to resolve the patches\n// In normal scenarios this will resolve immediately after the .js import\nconst resolvePatches = async (version: string): Promise<Patches> => {\n  for (const extension of fileExtensions) {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access\n      return (await import(`./patches/${version}/index.${extension}`)).patches;\n    } catch {\n      // Ignore\n    }\n  }\n  throw new Error(`Could not resolve patches for ${version}`);\n};\n\nexport const upgradeSkuba = async (\n  mode: 'lint' | 'format',\n  logger: Logger,\n  additionalFlags: string[] = [],\n): Promise<InternalLintResult> => {\n  const [currentVersion, manifest, packageManager] = await Promise.all([\n    getSkubaVersion(),\n    getConsumerManifest(),\n    detectPackageManager(),\n  ]);\n\n  if (!manifest) {\n    throw new Error('Could not find a package json for this project');\n  }\n\n  manifest.packageJson.skuba ??= { version: '1.0.0' };\n\n  const manifestVersion = additionalFlags.includes('--force-apply-all-patches')\n    ? '1.0.0'\n    : (manifest.packageJson.skuba as SkubaPackageJson).version;\n\n  // We are up to date, skip patches\n  if (gte(manifestVersion, currentVersion)) {\n    return { ok: true, fixable: false };\n  }\n\n  const patches = await getPatches(manifestVersion);\n  // No patches to apply even if version out of date. Early exit to avoid unnecessary commits.\n  if (patches.length === 0) {\n    return { ok: true, fixable: false };\n  }\n\n  if (mode === 'lint') {\n    const results = await Promise.all(\n      patches.map(\n        async ({ apply }) =>\n          await apply({\n            mode,\n            manifest,\n            packageManager,\n          }),\n      ),\n    );\n\n    // No patches are applicable. Early exit to avoid unnecessary commits.\n    if (results.every(({ result }) => result === 'skip')) {\n      return { ok: true, fixable: false };\n    }\n\n    logger.warn(\n      `skuba has patches to apply. Run ${logger.bold(\n        `${packageManager.print.exec} skuba format`,\n      )} to run them.`,\n    );\n\n    return {\n      ok: false,\n      fixable: true,\n      annotations: [\n        {\n          // package.json as likely skuba version has changed\n          // TODO: locate the \"skuba\": {} config in the package.json and annotate on the version property\n          path: manifest.path,\n          message: `skuba has patches to apply. Run ${packageManager.print.exec} skuba format to run them.`,\n        },\n      ],\n    };\n  }\n\n  logger.plain('Updating skuba...');\n\n  // Run these in series in case a subsequent patch relies on a previous patch\n  for (const { apply, description } of patches) {\n    const result = await apply({\n      mode,\n      manifest,\n      packageManager,\n    });\n    logger.newline();\n    if (result.result === 'skip') {\n      logger.plain(\n        `Patch skipped: ${description}${\n          result.reason ? ` - ${result.reason}` : ''\n        }`,\n      );\n    } else {\n      logger.plain(`Patch applied: ${description}`);\n    }\n  }\n\n  const updatedManifest = await getConsumerManifest();\n  if (!updatedManifest) {\n    throw new Error('Could not find a package json for this project');\n  }\n\n  (updatedManifest.packageJson.skuba as SkubaPackageJson).version =\n    currentVersion;\n\n  const updatedPackageJson = await formatPackage(updatedManifest.packageJson);\n\n  await fs.writeFile(updatedManifest.path, updatedPackageJson);\n  logger.newline();\n  logger.plain('skuba update complete.');\n  logger.newline();\n\n  return {\n    ok: true,\n    fixable: false,\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAe;AAEf,oBAA0B;AAG1B,sBAAoC;AACpC,4BAGO;AACP,qBAAgC;AAChC,qBAA8B;AAsB9B,MAAM,aAAa,OAAO,oBAA8C;AACtE,QAAM,UAAU,MAAM,gBAAAA,QAAG,QAAQ,YAAAC,QAAK,KAAK,WAAW,SAAS,GAAG;AAAA,IAChE,eAAe;AAAA,EACjB,CAAC;AAID,QAAM,wBAAoB;AAAA,IACxB,QAAQ;AAAA,MAAQ,CAAC;AAAA;AAAA,QAEf,MAAM,YAAY;AAAA,YAElB,mBAAI,MAAM,MAAM,eAAe,IAC3B,MAAM,OACN,CAAC;AAAA;AAAA,IACP;AAAA,EACF;AAEA,UAAQ,MAAM,QAAQ,IAAI,kBAAkB,IAAI,cAAc,CAAC,GAAG,KAAK;AACzE;AAEA,MAAM,iBAAiB,CAAC,MAAM,IAAI;AAIlC,MAAM,iBAAiB,OAAO,YAAsC;AAClE,aAAW,aAAa,gBAAgB;AACtC,QAAI;AAEF,cAAQ,MAAM,OAAO,aAAa,OAAO,UAAU,SAAS,KAAK;AAAA,IACnE,QAAQ;AAAA,IAER;AAAA,EACF;AACA,QAAM,IAAI,MAAM,iCAAiC,OAAO,EAAE;AAC5D;AAEO,MAAM,eAAe,OAC1B,MACA,QACA,kBAA4B,CAAC,MACG;AAChC,QAAM,CAAC,gBAAgB,UAAU,cAAc,IAAI,MAAM,QAAQ,IAAI;AAAA,QACnE,gCAAgB;AAAA,QAChB,qCAAoB;AAAA,QACpB,4CAAqB;AAAA,EACvB,CAAC;AAED,MAAI,CAAC,UAAU;AACb,UAAM,IAAI,MAAM,gDAAgD;AAAA,EAClE;AAEA,WAAS,YAAY,UAAU,EAAE,SAAS,QAAQ;AAElD,QAAM,kBAAkB,gBAAgB,SAAS,2BAA2B,IACxE,UACC,SAAS,YAAY,MAA2B;AAGrD,UAAI,mBAAI,iBAAiB,cAAc,GAAG;AACxC,WAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,EACpC;AAEA,QAAM,UAAU,MAAM,WAAW,eAAe;AAEhD,MAAI,QAAQ,WAAW,GAAG;AACxB,WAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,EACpC;AAEA,MAAI,SAAS,QAAQ;AACnB,UAAM,UAAU,MAAM,QAAQ;AAAA,MAC5B,QAAQ;AAAA,QACN,OAAO,EAAE,MAAM,MACb,MAAM,MAAM;AAAA,UACV;AAAA,UACA;AAAA,UACA;AAAA,QACF,CAAC;AAAA,MACL;AAAA,IACF;AAGA,QAAI,QAAQ,MAAM,CAAC,EAAE,OAAO,MAAM,WAAW,MAAM,GAAG;AACpD,aAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,IACpC;AAEA,WAAO;AAAA,MACL,mCAAmC,OAAO;AAAA,QACxC,GAAG,eAAe,MAAM,IAAI;AAAA,MAC9B,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa;AAAA,QACX;AAAA;AAAA;AAAA,UAGE,MAAM,SAAS;AAAA,UACf,SAAS,mCAAmC,eAAe,MAAM,IAAI;AAAA,QACvE;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,SAAO,MAAM,mBAAmB;AAGhC,aAAW,EAAE,OAAO,YAAY,KAAK,SAAS;AAC5C,UAAM,SAAS,MAAM,MAAM;AAAA,MACzB;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AACD,WAAO,QAAQ;AACf,QAAI,OAAO,WAAW,QAAQ;AAC5B,aAAO;AAAA,QACL,kBAAkB,WAAW,GAC3B,OAAO,SAAS,MAAM,OAAO,MAAM,KAAK,EAC1C;AAAA,MACF;AAAA,IACF,OAAO;AACL,aAAO,MAAM,kBAAkB,WAAW,EAAE;AAAA,IAC9C;AAAA,EACF;AAEA,QAAM,kBAAkB,UAAM,qCAAoB;AAClD,MAAI,CAAC,iBAAiB;AACpB,UAAM,IAAI,MAAM,gDAAgD;AAAA,EAClE;AAEA,EAAC,gBAAgB,YAAY,MAA2B,UACtD;AAEF,QAAM,qBAAqB,UAAM,8BAAc,gBAAgB,WAAW;AAE1E,QAAM,gBAAAD,QAAG,UAAU,gBAAgB,MAAM,kBAAkB;AAC3D,SAAO,QAAQ;AACf,SAAO,MAAM,wBAAwB;AACrC,SAAO,QAAQ;AAEf,SAAO;AAAA,IACL,IAAI;AAAA,IACJ,SAAS;AAAA,EACX;AACF;",
   "names": ["fs", "path"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/10.1.0/migrateNpmrcToPnpmWorkspace.js

@@ -35,30 +35,26 @@ var import_util = require("util");
 var import_fast_glob = require("fast-glob");
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_dir = require("../../../../../../utils/dir.js");
+var import_fs = require("../../../../../../utils/fs.js");
 var import_logging = require("../../../../../../utils/logging.js");
 var import_npmrc = require("../../../../../../utils/npmrc.js");
 var import_configFile = require("../../../../../configure/processing/configFile.js");
 const NPMRC = ".npmrc";
-const checkFileExists = async (filePath) => {
-  try {
-    await import_fs_extra.default.access(filePath);
-    return true;
-  } catch {
-    return false;
-  }
-};
 const migrateCustomNpmrcSettings = async () => {
-  const contents = await import_fs_extra.default.readFile(NPMRC, "utf-8");
+  const contents = await import_fs_extra.default.promises.readFile(NPMRC, "utf-8");
   const remainderLines = (0, import_configFile.replaceManagedSection)(contents, "").split("\n").map((line) => line.trim()).filter((line) => line.length > 0).filter((line) => !line.startsWith("#")).filter((line) => !(0, import_npmrc.hasNpmrcSecret)(line));
   if (remainderLines.length === 0) {
     return;
   }
   const pnpmWorkspaceFile = "pnpm-workspace.yaml";
-  const pnpmWorkspaceExists = await checkFileExists(pnpmWorkspaceFile);
+  const pnpmWorkspaceExists = await (0, import_fs.pathExists)(pnpmWorkspaceFile);
   if (!pnpmWorkspaceExists) {
-    await import_fs_extra.default.writeFile(pnpmWorkspaceFile, "");
+    await import_fs_extra.default.promises.writeFile(pnpmWorkspaceFile, "");
   }
-  const pnpmWorkspaceContents = await import_fs_extra.default.readFile(pnpmWorkspaceFile, "utf-8");
+  const pnpmWorkspaceContents = await import_fs_extra.default.promises.readFile(
+    pnpmWorkspaceFile,
+    "utf-8"
+  );
   const commentedLines = remainderLines.map((line) => `# ${line}`).join("\n");
   const newContents = `# TODO: Translate these settings to the required format for pnpm-workspace.yaml.
 # skuba moved these from .npmrc, but doesn't know what they mean.
@@ -67,19 +63,19 @@ const migrateCustomNpmrcSettings = async () => {
 ${commentedLines}
 
 ${pnpmWorkspaceContents}`;
-  await import_fs_extra.default.writeFile(pnpmWorkspaceFile, newContents);
+  await import_fs_extra.default.promises.writeFile(pnpmWorkspaceFile, newContents);
 };
 const fixDockerfiles = async () => {
   const fileNames = await (0, import_fast_glob.glob)(["**/Dockerfile*"]);
   await Promise.all(
     fileNames.map(async (fileName) => {
-      const contents = await import_fs_extra.default.readFile(fileName, "utf8");
+      const contents = await import_fs_extra.default.promises.readFile(fileName, "utf8");
       const patched = contents.replaceAll(
         "--mount=type=bind,source=.npmrc,target=.npmrc",
         "--mount=type=bind,source=pnpm-workspace.yaml,target=pnpm-workspace.yaml"
       );
       if (patched !== contents) {
-        await import_fs_extra.default.writeFile(fileName, patched);
+        await import_fs_extra.default.promises.writeFile(fileName, patched);
       }
     })
   );
@@ -88,13 +84,13 @@ const fixBuildkitePipelines = async () => {
   const fileNames = await (0, import_fast_glob.glob)(["**/.buildkite/**.{yml,yaml}"]);
   await Promise.all(
     fileNames.map(async (fileName) => {
-      const contents = await import_fs_extra.default.readFile(fileName, "utf8");
+      const contents = await import_fs_extra.default.promises.readFile(fileName, "utf8");
       const patched = contents.replace(
         /(cache-on:[\s\S]*?)([ \t]+-[ \t]+\.npmrc)([\s\S]*?)(?=\n[ \t]*\S|$)/g,
         (_, before, npmrcLine, after) => before + npmrcLine.replace(".npmrc", "pnpm-workspace.yaml") + after
       );
       if (patched !== contents) {
-        await import_fs_extra.default.writeFile(fileName, patched);
+        await import_fs_extra.default.promises.writeFile(fileName, patched);
       }
     })
   );
@@ -103,7 +99,7 @@ const forceUpgradeToPnpm10 = async () => {
   const fileNames = await (0, import_fast_glob.glob)(["**/package.json"]);
   await Promise.all(
     fileNames.map(async (fileName) => {
-      const contents = await import_fs_extra.default.readFile(fileName, "utf8");
+      const contents = await import_fs_extra.default.promises.readFile(fileName, "utf8");
       const packageManagerMatch = /"packageManager"\s*:\s*"pnpm@([^"]+)"/.exec(
         contents
       );
@@ -117,7 +113,7 @@ const forceUpgradeToPnpm10 = async () => {
           /"packageManager"(\s*):(\s*)"pnpm@[^"]+"/,
           '"packageManager"$1:$2"pnpm@10.8.1"'
         );
-        await import_fs_extra.default.writeFile(fileName, patched);
+        await import_fs_extra.default.promises.writeFile(fileName, patched);
       }
     })
   );
@@ -142,7 +138,7 @@ const migrateNpmrcToPnpmWorkspace = async ({
       reason: "not running in the workspace root"
     };
   }
-  const npmrcExists = await checkFileExists(NPMRC);
+  const npmrcExists = await (0, import_fs.pathExists)(NPMRC);
   if (!npmrcExists) {
     return {
       result: "skip",
@@ -160,7 +156,7 @@ const migrateNpmrcToPnpmWorkspace = async ({
     fixBuildkitePipelines(),
     forceUpgradeToPnpm10()
   ]);
-  await import_fs_extra.default.rm(NPMRC);
+  await import_fs_extra.default.promises.rm(NPMRC);
   return { result: "apply" };
 };
 const tryMigrateNpmrcToPnpmWorkspace = async (config) => {