npm - skuba - Versions diffs - 9.0.0-renovate-eslint-9.x-20240923103202 → 9.0.0 - Mend

skuba 9.0.0-renovate-eslint-9.x-20240923103202 → 9.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

package/lib/api/github/issueComment.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/api/github/issueComment.ts"],
-  "sourcesContent": ["import type { Octokit } from '@octokit/rest';\n\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\nimport { createRestClient } from './octokit';\nimport { getPullRequestNumber } from './pullRequest';\n\nconst getUserId = async (client: Octokit): Promise<number> => {\n  const { data } = await client.users.getAuthenticated();\n\n  return data.id;\n};\n\n/**\n * https://docs.github.com/en/rest/reference/issues#create-an-issue-comment\n */\ninterface PutIssueCommentParameters {\n  /**\n   * The body of the issue comment.\n   */\n  body: string;\n\n  /**\n   * An internal identifier for the issue comment.\n   *\n   * This can be used to scope a given `put` to a particular comment, preventing\n   * it from clobbering other comments from the same bot or user.\n   *\n   * The identifier is embedded as hidden content in the comment body.\n   */\n  internalId?: string;\n\n  env?: Record<string, string | undefined>;\n\n  /**\n   * The number that identifies the GitHub issue.\n   *\n   * If this is not provided, the number will be inferred from the GitHub Repos\n   * API by finding the latest pull request associated with the head commit.\n   *\n   * https://docs.github.com/en/rest/reference/repos#list-pull-requests-associated-with-a-commit\n   */\n  issueNumber?: number;\n\n  /**\n   * The ID of authenticated bot or user that is putting the issue comment.\n   *\n   * This drives our `put` behaviour, which tries to locate and edit an existing\n   * comment before creating a new one. If this is not provided, the ID will be\n   * inferred from the GitHub Users API.\n   *\n   * https://docs.github.com/en/rest/reference/users#get-the-authenticated-user\n   *\n   * If you're at SEEK and using BuildAgency's GitHub API integration, you may\n   * use `'seek-build-agency'` as an optimisation to skip the user lookup.\n   *\n   * https://api.github.com/users/buildagencygitapitoken[bot]\n   */\n  userId?: number | 'seek-build-agency';\n}\n\ninterface IssueComment {\n  id: number;\n}\n\n/**\n * Asynchronously creates or updates a GitHub issue comment.\n *\n * This emulates `put` behaviour by overwriting the first existing comment by\n * the same author on the issue, enabling use cases like a persistent bot\n * comment at the top of the pull request that reflects the current status of a\n * CI check.\n *\n * A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with write permissions must be present\n * on the environment.\n */\nexport const putIssueComment = async (\n  params: PutIssueCommentParameters,\n): Promise<IssueComment> => {\n  const env = params.env ?? process.env;\n\n  const dir = process.cwd();\n\n  const { owner, repo } = await Git.getOwnerAndRepo({ dir });\n\n  const client = await createRestClient({ auth: apiTokenFromEnvironment() });\n\n  const issueNumber =\n    params.issueNumber ?? (await getPullRequestNumber({ client, env }));\n\n  if (!issueNumber) {\n    throw new Error('Failed to infer an issue number');\n  }\n\n  const comments = await client.issues.listComments({\n    issue_number: issueNumber,\n    owner,\n    repo,\n  });\n\n  const userId: number =\n    params.userId === 'seek-build-agency'\n      ? // https://api.github.com/users/buildagencygitapitoken[bot]\n        87109344\n      : params.userId ?? (await getUserId(client));\n\n  const commentId = comments.data.find(\n    (comment) =>\n      comment.user?.id === userId &&\n      (params.internalId\n        ? comment.body?.endsWith(`\\n\\n<!-- ${params.internalId} -->`)\n        : true),\n  )?.id;\n\n  const body = params.internalId\n    ? [params.body.trim(), `<!-- ${params.internalId} -->`].join('\\n\\n')\n    : params.body.trim();\n\n  const response = await (commentId\n    ? client.issues.updateComment({\n        body,\n        comment_id: commentId,\n        issue_number: issueNumber,\n        owner,\n        repo,\n      })\n    : client.issues.createComment({\n        body,\n        issue_number: issueNumber,\n        owner,\n        repo,\n      }));\n\n  return {\n    id: response.data.id,\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,UAAqB;AAErB,yBAAwC;AACxC,qBAAiC;AACjC,yBAAqC;AAErC,MAAM,YAAY,OAAO,WAAqC;AAC5D,QAAM,EAAE,KAAK,IAAI,MAAM,OAAO,MAAM,iBAAiB;AAErD,SAAO,KAAK;AACd;AAiEO,MAAM,kBAAkB,OAC7B,WAC0B;AAC1B,QAAM,MAAM,OAAO,OAAO,QAAQ;AAElC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,EAAE,OAAO,KAAK,IAAI,MAAM,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAEzD,QAAM,SAAS,UAAM,iCAAiB,EAAE,UAAM,4CAAwB,EAAE,CAAC;AAEzE,QAAM,cACJ,OAAO,eAAgB,UAAM,yCAAqB,EAAE,QAAQ,IAAI,CAAC;AAEnE,MAAI,CAAC,aAAa;AAChB,UAAM,IAAI,MAAM,iCAAiC;AAAA,EACnD;AAEA,QAAM,WAAW,MAAM,OAAO,OAAO,aAAa;AAAA,IAChD,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,SACJ,OAAO,WAAW;AAAA;AAAA,IAEd;AAAA,MACA,OAAO,UAAW,MAAM,UAAU,MAAM;AAE9C,QAAM,YAAY,SAAS,KAAK;AAAA,IAC9B,CAAC,YACC,QAAQ,MAAM,OAAO,WACpB,OAAO,aACJ,QAAQ,MAAM,SAAS;AAAA;AAAA,OAAY,OAAO,UAAU,MAAM,IAC1D;AAAA,EACR,GAAG;AAEH,QAAM,OAAO,OAAO,aAChB,CAAC,OAAO,KAAK,KAAK,GAAG,QAAQ,OAAO,UAAU,MAAM,EAAE,KAAK,MAAM,IACjE,OAAO,KAAK,KAAK;AAErB,QAAM,WAAW,OAAO,YACpB,OAAO,OAAO,cAAc;AAAA,IAC1B;AAAA,IACA,YAAY;AAAA,IACZ,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC,IACD,OAAO,OAAO,cAAc;AAAA,IAC1B;AAAA,IACA,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC;AAEL,SAAO;AAAA,IACL,IAAI,SAAS,KAAK;AAAA,EACpB;AACF;",
+  "sourcesContent": ["import type { Octokit } from '@octokit/rest';\n\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\nimport { createRestClient } from './octokit';\nimport { getPullRequestNumber } from './pullRequest';\n\nconst getUserId = async (client: Octokit): Promise<number> => {\n  const { data } = await client.users.getAuthenticated();\n\n  return data.id;\n};\n\n/**\n * https://docs.github.com/en/rest/reference/issues#create-an-issue-comment\n */\ninterface PutIssueCommentParameters {\n  /**\n   * The body of the issue comment.\n   */\n  body: string;\n\n  /**\n   * An internal identifier for the issue comment.\n   *\n   * This can be used to scope a given `put` to a particular comment, preventing\n   * it from clobbering other comments from the same bot or user.\n   *\n   * The identifier is embedded as hidden content in the comment body.\n   */\n  internalId?: string;\n\n  env?: Record<string, string | undefined>;\n\n  /**\n   * The number that identifies the GitHub issue.\n   *\n   * If this is not provided, the number will be inferred from the GitHub Repos\n   * API by finding the latest pull request associated with the head commit.\n   *\n   * https://docs.github.com/en/rest/reference/repos#list-pull-requests-associated-with-a-commit\n   */\n  issueNumber?: number;\n\n  /**\n   * The ID of authenticated bot or user that is putting the issue comment.\n   *\n   * This drives our `put` behaviour, which tries to locate and edit an existing\n   * comment before creating a new one. If this is not provided, the ID will be\n   * inferred from the GitHub Users API.\n   *\n   * https://docs.github.com/en/rest/reference/users#get-the-authenticated-user\n   *\n   * If you're at SEEK and using BuildAgency's GitHub API integration, you may\n   * use `'seek-build-agency'` as an optimisation to skip the user lookup.\n   *\n   * https://api.github.com/users/buildagencygitapitoken[bot]\n   */\n  userId?: number | 'seek-build-agency';\n}\n\ninterface IssueComment {\n  id: number;\n}\n\n/**\n * Asynchronously creates or updates a GitHub issue comment.\n *\n * This emulates `put` behaviour by overwriting the first existing comment by\n * the same author on the issue, enabling use cases like a persistent bot\n * comment at the top of the pull request that reflects the current status of a\n * CI check.\n *\n * A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with write permissions must be present\n * on the environment.\n */\nexport const putIssueComment = async (\n  params: PutIssueCommentParameters,\n): Promise<IssueComment> => {\n  const env = params.env ?? process.env;\n\n  const dir = process.cwd();\n\n  const { owner, repo } = await Git.getOwnerAndRepo({ dir });\n\n  const client = await createRestClient({ auth: apiTokenFromEnvironment() });\n\n  const issueNumber =\n    params.issueNumber ?? (await getPullRequestNumber({ client, env }));\n\n  if (!issueNumber) {\n    throw new Error('Failed to infer an issue number');\n  }\n\n  const comments = await client.issues.listComments({\n    issue_number: issueNumber,\n    owner,\n    repo,\n  });\n\n  const userId: number =\n    params.userId === 'seek-build-agency'\n      ? // https://api.github.com/users/buildagencygitapitoken[bot]\n        87109344\n      : (params.userId ?? (await getUserId(client)));\n\n  const commentId = comments.data.find(\n    (comment) =>\n      comment.user?.id === userId &&\n      (params.internalId\n        ? comment.body?.endsWith(`\\n\\n<!-- ${params.internalId} -->`)\n        : true),\n  )?.id;\n\n  const body = params.internalId\n    ? [params.body.trim(), `<!-- ${params.internalId} -->`].join('\\n\\n')\n    : params.body.trim();\n\n  const response = await (commentId\n    ? client.issues.updateComment({\n        body,\n        comment_id: commentId,\n        issue_number: issueNumber,\n        owner,\n        repo,\n      })\n    : client.issues.createComment({\n        body,\n        issue_number: issueNumber,\n        owner,\n        repo,\n      }));\n\n  return {\n    id: response.data.id,\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,UAAqB;AAErB,yBAAwC;AACxC,qBAAiC;AACjC,yBAAqC;AAErC,MAAM,YAAY,OAAO,WAAqC;AAC5D,QAAM,EAAE,KAAK,IAAI,MAAM,OAAO,MAAM,iBAAiB;AAErD,SAAO,KAAK;AACd;AAiEO,MAAM,kBAAkB,OAC7B,WAC0B;AAC1B,QAAM,MAAM,OAAO,OAAO,QAAQ;AAElC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,EAAE,OAAO,KAAK,IAAI,MAAM,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAEzD,QAAM,SAAS,UAAM,iCAAiB,EAAE,UAAM,4CAAwB,EAAE,CAAC;AAEzE,QAAM,cACJ,OAAO,eAAgB,UAAM,yCAAqB,EAAE,QAAQ,IAAI,CAAC;AAEnE,MAAI,CAAC,aAAa;AAChB,UAAM,IAAI,MAAM,iCAAiC;AAAA,EACnD;AAEA,QAAM,WAAW,MAAM,OAAO,OAAO,aAAa;AAAA,IAChD,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,SACJ,OAAO,WAAW;AAAA;AAAA,IAEd;AAAA,MACC,OAAO,UAAW,MAAM,UAAU,MAAM;AAE/C,QAAM,YAAY,SAAS,KAAK;AAAA,IAC9B,CAAC,YACC,QAAQ,MAAM,OAAO,WACpB,OAAO,aACJ,QAAQ,MAAM,SAAS;AAAA;AAAA,OAAY,OAAO,UAAU,MAAM,IAC1D;AAAA,EACR,GAAG;AAEH,QAAM,OAAO,OAAO,aAChB,CAAC,OAAO,KAAK,KAAK,GAAG,QAAQ,OAAO,UAAU,MAAM,EAAE,KAAK,MAAM,IACjE,OAAO,KAAK,KAAK;AAErB,QAAM,WAAW,OAAO,YACpB,OAAO,OAAO,cAAc;AAAA,IAC1B;AAAA,IACA,YAAY;AAAA,IACZ,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC,IACD,OAAO,OAAO,cAAc;AAAA,IAC1B;AAAA,IACA,cAAc;AAAA,IACd;AAAA,IACA;AAAA,EACF,CAAC;AAEL,SAAO;AAAA,IACL,IAAI,SAAS,KAAK;AAAA,EACpB;AACF;",
   "names": []
 }

package/lib/cli/adapter/eslint.js CHANGED Viewed

@@ -98,10 +98,10 @@ const runESLint = async (mode, logger, overrideConfigFile) => {
   }
   const ok = errors.length === 0;
   await ESLint.outputFixes(results);
-  const output = await formatter.format(results, {
-    cwd,
-    rulesMeta: engine.getRulesMetaForResults(results)
-  });
+  const output = await formatter.format(
+    results,
+    engine.getRulesMetaForResults(results)
+  );
   if (output) {
     logger.plain(output);
   }

package/lib/cli/adapter/eslint.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/adapter/eslint.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { type ESLint, type Linter, loadESLint } from 'eslint';\n\nimport { type Logger, pluralise } from '../../utils/logging';\n\nconst symbolForResult = (result: ESLint.LintResult) => {\n  if (result.errorCount) {\n    return chalk.red('\u25CB');\n  }\n\n  return result.warningCount ? chalk.yellow('\u25CD') : chalk.green('\u25CB');\n};\n\nexport interface ESLintResult {\n  messages: Linter.LintMessage[];\n  filePath: string;\n}\n\nexport interface ESLintOutput {\n  errors: ESLintResult[];\n  fixable: boolean;\n  ok: boolean;\n  output: string;\n  warnings: ESLintResult[];\n}\n\nexport const runESLint = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  overrideConfigFile?: string,\n): Promise<ESLintOutput> => {\n  logger.debug('Initialising ESLint...');\n\n  const cwd = process.cwd();\n\n  const ESLint = await loadESLint({ useFlatConfig: true });\n  const engine = new ESLint({\n    cache: true,\n    fix: mode === 'format',\n    overrideConfigFile,\n    overrideConfig: {\n      linterOptions: {\n        reportUnusedDisableDirectives: true,\n      },\n    },\n  });\n\n  logger.debug('Processing files...');\n\n  const start = process.hrtime.bigint();\n\n  const [formatter, { type, results }] = await Promise.all([\n    engine.loadFormatter(),\n    lintFiles(engine),\n  ]);\n\n  if (type === 'no-config') {\n    logger.plain(\n      'skuba could not find an eslint config file. Do you need to run format or configure?',\n    );\n    return { ok: false, fixable: false, errors: [], warnings: [], output: '' };\n  }\n\n  const end = process.hrtime.bigint();\n\n  logger.plain(\n    `Processed ${pluralise(results.length, 'file')} in ${logger.timing(\n      start,\n      end,\n    )}.`,\n  );\n\n  const errors: ESLintResult[] = [];\n  const warnings: ESLintResult[] = [];\n  let fixable = false;\n\n  for (const result of results) {\n    const relativePath = path.relative(cwd, result.filePath);\n    if (result.fixableErrorCount + result.fixableWarningCount) {\n      fixable = true;\n    }\n\n    if (result.errorCount) {\n      errors.push({\n        filePath: relativePath,\n        messages: result.messages,\n      });\n    }\n\n    if (result.warningCount) {\n      warnings.push({\n        filePath: relativePath,\n        messages: result.messages,\n      });\n    }\n\n    logger.debug(symbolForResult(result), relativePath);\n  }\n\n  const ok = errors.length === 0;\n\n  await ESLint.outputFixes(results);\n\n  const output = await formatter.format(results, {\n    cwd,\n    rulesMeta: engine.getRulesMetaForResults(results),\n  });\n\n  if (output) {\n    logger.plain(output);\n  }\n\n  return { errors, fixable, ok, output, warnings };\n};\n\nconst lintFiles = async (engine: ESLint) => {\n  try {\n    const result = await engine.lintFiles([]);\n    return { type: 'results', results: result } as const;\n  } catch (error) {\n    if (\n      error instanceof Error &&\n      error.message === 'Could not find config file.'\n    ) {\n      return { type: 'no-config', results: undefined } as const;\n    }\n    throw error;\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,oBAAqD;AAErD,qBAAuC;AAEvC,MAAM,kBAAkB,CAAC,WAA8B;AACrD,MAAI,OAAO,YAAY;AACrB,WAAO,aAAAA,QAAM,IAAI,QAAG;AAAA,EACtB;AAEA,SAAO,OAAO,eAAe,aAAAA,QAAM,OAAO,QAAG,IAAI,aAAAA,QAAM,MAAM,QAAG;AAClE;AAeO,MAAM,YAAY,OACvB,MACA,QACA,uBAC0B;AAC1B,SAAO,MAAM,wBAAwB;AAErC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,SAAS,UAAM,0BAAW,EAAE,eAAe,KAAK,CAAC;AACvD,QAAM,SAAS,IAAI,OAAO;AAAA,IACxB,OAAO;AAAA,IACP,KAAK,SAAS;AAAA,IACd;AAAA,IACA,gBAAgB;AAAA,MACd,eAAe;AAAA,QACb,+BAA+B;AAAA,MACjC;AAAA,IACF;AAAA,EACF,CAAC;AAED,SAAO,MAAM,qBAAqB;AAElC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AAEpC,QAAM,CAAC,WAAW,EAAE,MAAM,QAAQ,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,IACvD,OAAO,cAAc;AAAA,IACrB,UAAU,MAAM;AAAA,EAClB,CAAC;AAED,MAAI,SAAS,aAAa;AACxB,WAAO;AAAA,MACL;AAAA,IACF;AACA,WAAO,EAAE,IAAI,OAAO,SAAS,OAAO,QAAQ,CAAC,GAAG,UAAU,CAAC,GAAG,QAAQ,GAAG;AAAA,EAC3E;AAEA,QAAM,MAAM,QAAQ,OAAO,OAAO;AAElC,SAAO;AAAA,IACL,iBAAa,0BAAU,QAAQ,QAAQ,MAAM,CAAC,OAAO,OAAO;AAAA,MAC1D;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,SAAyB,CAAC;AAChC,QAAM,WAA2B,CAAC;AAClC,MAAI,UAAU;AAEd,aAAW,UAAU,SAAS;AAC5B,UAAM,eAAe,YAAAC,QAAK,SAAS,KAAK,OAAO,QAAQ;AACvD,QAAI,OAAO,oBAAoB,OAAO,qBAAqB;AACzD,gBAAU;AAAA,IACZ;AAEA,QAAI,OAAO,YAAY;AACrB,aAAO,KAAK;AAAA,QACV,UAAU;AAAA,QACV,UAAU,OAAO;AAAA,MACnB,CAAC;AAAA,IACH;AAEA,QAAI,OAAO,cAAc;AACvB,eAAS,KAAK;AAAA,QACZ,UAAU;AAAA,QACV,UAAU,OAAO;AAAA,MACnB,CAAC;AAAA,IACH;AAEA,WAAO,MAAM,gBAAgB,MAAM,GAAG,YAAY;AAAA,EACpD;AAEA,QAAM,KAAK,OAAO,WAAW;AAE7B,QAAM,OAAO,YAAY,OAAO;AAEhC,QAAM,SAAS,MAAM,UAAU,OAAO,SAAS;AAAA,IAC7C;AAAA,IACA,WAAW,OAAO,uBAAuB,OAAO;AAAA,EAClD,CAAC;AAED,MAAI,QAAQ;AACV,WAAO,MAAM,MAAM;AAAA,EACrB;AAEA,SAAO,EAAE,QAAQ,SAAS,IAAI,QAAQ,SAAS;AACjD;AAEA,MAAM,YAAY,OAAO,WAAmB;AAC1C,MAAI;AACF,UAAM,SAAS,MAAM,OAAO,UAAU,CAAC,CAAC;AACxC,WAAO,EAAE,MAAM,WAAW,SAAS,OAAO;AAAA,EAC5C,SAAS,OAAO;AACd,QACE,iBAAiB,SACjB,MAAM,YAAY,+BAClB;AACA,aAAO,EAAE,MAAM,aAAa,SAAS,OAAU;AAAA,IACjD;AACA,UAAM;AAAA,EACR;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { type ESLint, type Linter, loadESLint } from 'eslint';\n\nimport { type Logger, pluralise } from '../../utils/logging';\n\nconst symbolForResult = (result: ESLint.LintResult) => {\n  if (result.errorCount) {\n    return chalk.red('\u25CB');\n  }\n\n  return result.warningCount ? chalk.yellow('\u25CD') : chalk.green('\u25CB');\n};\n\nexport interface ESLintResult {\n  messages: Linter.LintMessage[];\n  filePath: string;\n}\n\nexport interface ESLintOutput {\n  errors: ESLintResult[];\n  fixable: boolean;\n  ok: boolean;\n  output: string;\n  warnings: ESLintResult[];\n}\n\nexport const runESLint = async (\n  mode: 'format' | 'lint',\n  logger: Logger,\n  overrideConfigFile?: string,\n): Promise<ESLintOutput> => {\n  logger.debug('Initialising ESLint...');\n\n  const cwd = process.cwd();\n\n  const ESLint = await loadESLint({ useFlatConfig: true });\n  const engine = new ESLint({\n    cache: true,\n    fix: mode === 'format',\n    overrideConfigFile,\n    overrideConfig: {\n      linterOptions: {\n        reportUnusedDisableDirectives: true,\n      },\n    },\n  });\n\n  logger.debug('Processing files...');\n\n  const start = process.hrtime.bigint();\n\n  const [formatter, { type, results }] = await Promise.all([\n    engine.loadFormatter(),\n    lintFiles(engine),\n  ]);\n\n  if (type === 'no-config') {\n    logger.plain(\n      'skuba could not find an eslint config file. Do you need to run format or configure?',\n    );\n    return { ok: false, fixable: false, errors: [], warnings: [], output: '' };\n  }\n\n  const end = process.hrtime.bigint();\n\n  logger.plain(\n    `Processed ${pluralise(results.length, 'file')} in ${logger.timing(\n      start,\n      end,\n    )}.`,\n  );\n\n  const errors: ESLintResult[] = [];\n  const warnings: ESLintResult[] = [];\n  let fixable = false;\n\n  for (const result of results) {\n    const relativePath = path.relative(cwd, result.filePath);\n    if (result.fixableErrorCount + result.fixableWarningCount) {\n      fixable = true;\n    }\n\n    if (result.errorCount) {\n      errors.push({\n        filePath: relativePath,\n        messages: result.messages,\n      });\n    }\n\n    if (result.warningCount) {\n      warnings.push({\n        filePath: relativePath,\n        messages: result.messages,\n      });\n    }\n\n    logger.debug(symbolForResult(result), relativePath);\n  }\n\n  const ok = errors.length === 0;\n\n  await ESLint.outputFixes(results);\n\n  const output = await formatter.format(\n    results,\n    engine.getRulesMetaForResults(results),\n  );\n\n  if (output) {\n    logger.plain(output);\n  }\n\n  return { errors, fixable, ok, output, warnings };\n};\n\nconst lintFiles = async (engine: ESLint) => {\n  try {\n    const result = await engine.lintFiles([]);\n    return { type: 'results', results: result } as const;\n  } catch (error) {\n    if (\n      error instanceof Error &&\n      error.message === 'Could not find config file.'\n    ) {\n      return { type: 'no-config', results: undefined } as const;\n    }\n    throw error;\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,oBAAqD;AAErD,qBAAuC;AAEvC,MAAM,kBAAkB,CAAC,WAA8B;AACrD,MAAI,OAAO,YAAY;AACrB,WAAO,aAAAA,QAAM,IAAI,QAAG;AAAA,EACtB;AAEA,SAAO,OAAO,eAAe,aAAAA,QAAM,OAAO,QAAG,IAAI,aAAAA,QAAM,MAAM,QAAG;AAClE;AAeO,MAAM,YAAY,OACvB,MACA,QACA,uBAC0B;AAC1B,SAAO,MAAM,wBAAwB;AAErC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,SAAS,UAAM,0BAAW,EAAE,eAAe,KAAK,CAAC;AACvD,QAAM,SAAS,IAAI,OAAO;AAAA,IACxB,OAAO;AAAA,IACP,KAAK,SAAS;AAAA,IACd;AAAA,IACA,gBAAgB;AAAA,MACd,eAAe;AAAA,QACb,+BAA+B;AAAA,MACjC;AAAA,IACF;AAAA,EACF,CAAC;AAED,SAAO,MAAM,qBAAqB;AAElC,QAAM,QAAQ,QAAQ,OAAO,OAAO;AAEpC,QAAM,CAAC,WAAW,EAAE,MAAM,QAAQ,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,IACvD,OAAO,cAAc;AAAA,IACrB,UAAU,MAAM;AAAA,EAClB,CAAC;AAED,MAAI,SAAS,aAAa;AACxB,WAAO;AAAA,MACL;AAAA,IACF;AACA,WAAO,EAAE,IAAI,OAAO,SAAS,OAAO,QAAQ,CAAC,GAAG,UAAU,CAAC,GAAG,QAAQ,GAAG;AAAA,EAC3E;AAEA,QAAM,MAAM,QAAQ,OAAO,OAAO;AAElC,SAAO;AAAA,IACL,iBAAa,0BAAU,QAAQ,QAAQ,MAAM,CAAC,OAAO,OAAO;AAAA,MAC1D;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,SAAyB,CAAC;AAChC,QAAM,WAA2B,CAAC;AAClC,MAAI,UAAU;AAEd,aAAW,UAAU,SAAS;AAC5B,UAAM,eAAe,YAAAC,QAAK,SAAS,KAAK,OAAO,QAAQ;AACvD,QAAI,OAAO,oBAAoB,OAAO,qBAAqB;AACzD,gBAAU;AAAA,IACZ;AAEA,QAAI,OAAO,YAAY;AACrB,aAAO,KAAK;AAAA,QACV,UAAU;AAAA,QACV,UAAU,OAAO;AAAA,MACnB,CAAC;AAAA,IACH;AAEA,QAAI,OAAO,cAAc;AACvB,eAAS,KAAK;AAAA,QACZ,UAAU;AAAA,QACV,UAAU,OAAO;AAAA,MACnB,CAAC;AAAA,IACH;AAEA,WAAO,MAAM,gBAAgB,MAAM,GAAG,YAAY;AAAA,EACpD;AAEA,QAAM,KAAK,OAAO,WAAW;AAE7B,QAAM,OAAO,YAAY,OAAO;AAEhC,QAAM,SAAS,MAAM,UAAU;AAAA,IAC7B;AAAA,IACA,OAAO,uBAAuB,OAAO;AAAA,EACvC;AAEA,MAAI,QAAQ;AACV,WAAO,MAAM,MAAM;AAAA,EACrB;AAEA,SAAO,EAAE,QAAQ,SAAS,IAAI,QAAQ,SAAS;AACjD;AAEA,MAAM,YAAY,OAAO,WAAmB;AAC1C,MAAI;AACF,UAAM,SAAS,MAAM,OAAO,UAAU,CAAC,CAAC;AACxC,WAAO,EAAE,MAAM,WAAW,SAAS,OAAO;AAAA,EAC5C,SAAS,OAAO;AACd,QACE,iBAAiB,SACjB,MAAM,YAAY,+BAClB;AACA,aAAO,EAAE,MAAM,aAAa,SAAS,OAAU;AAAA,IACjD;AACA,UAAM;AAAA,EACR;AACF;",
   "names": ["chalk", "path"]
 }

package/lib/cli/lint/autofix.js CHANGED Viewed

@@ -35,7 +35,6 @@ __export(autofix_exports, {
 module.exports = __toCommonJS(autofix_exports);
 var import_util = require("util");
 var import_simple_git = __toESM(require("simple-git"));
-var Buildkite = __toESM(require("../../api/buildkite"));
 var Git = __toESM(require("../../api/git"));
 var GitHub = __toESM(require("../../api/github"));
 var import_env = require("../../utils/env");
@@ -46,7 +45,6 @@ var import_eslint = require("../adapter/eslint");
 var import_prettier = require("../adapter/prettier");
 var import_project = require("../configure/analysis/project");
 var import_internal = require("./internal");
-const RENOVATE_DEFAULT_PREFIX = "renovate";
 const AUTOFIX_COMMIT_MESSAGE = "Run `skuba format`";
 const AUTOFIX_IGNORE_FILES_BASE = [
   {
@@ -78,19 +76,6 @@ const shouldPush = async ({
   if (isDefaultBuildkiteBranch || isProtectedGitHubBranch) {
     return false;
   }
-  if (currentBranch?.startsWith(RENOVATE_DEFAULT_PREFIX)) {
-    try {
-      await GitHub.getPullRequestNumber();
-    } catch {
-      const warning = "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.";
-      import_logging.log.warn(warning);
-      try {
-        await Buildkite.annotate(Buildkite.md.terminal(warning));
-      } catch {
-      }
-      return false;
-    }
-  }
   let headCommitMessage;
   try {
     headCommitMessage = await Git.getHeadCommitMessage({ dir });

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

@@ -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 * as Buildkite from '../../api/buildkite';\nimport * as Git from '../../api/git';\nimport * as GitHub from '../../api/github';\nimport { isCiEnv } from '../../utils/env';\nimport { createLogger, log } from '../../utils/logging';\nimport { hasNpmrcSecret } from '../../utils/npmrc';\nimport { throwOnTimeout } from '../../utils/wait';\nimport { runESLint } from '../adapter/eslint';\nimport { runPrettier } from '../adapter/prettier';\nimport { createDestinationFileReader } from '../configure/analysis/project';\n\nimport { internalLint } from './internal';\nimport type { Input } from './types';\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.eslint ? 'ESLint' : undefined,\n        params.internal ? 'skuba' : undefined,\n        'Prettier', // Prettier is always run\n      ]\n        .filter((s) => s !== undefined)\n        .join(', ')})...`,\n    );\n\n    const logger = createLogger(params.debug);\n\n    if (params.internal) {\n      await internalLint('format');\n    }\n\n    if (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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,wBAAsB;AAEtB,gBAA2B;AAC3B,UAAqB;AACrB,aAAwB;AACxB,iBAAwB;AACxB,qBAAkC;AAClC,mBAA+B;AAC/B,kBAA+B;AAC/B,oBAA0B;AAC1B,sBAA4B;AAC5B,qBAA4C;AAE5C,sBAA6B;AAG7B,MAAM,0BAA0B;AAEhC,MAAM,yBAAyB;AAExB,MAAM,4BAA+C;AAAA,EAC1D;AAAA,IACE,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AACF;AAEO,MAAM,6BAAgD;AAAA,EAC3D;AAAA,IACE,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AACF;AAEA,MAAM,aAAa,OAAO;AAAA,EACxB;AAAA,EACA;AACF,MAGM;AACJ,MAAI,KAAC,oBAAQ,GAAG;AAId,WAAO;AAAA,EACT;AAEA,QAAM,2BACJ,iBACA,CAAC,QAAQ,IAAI,mCAAmC,UAAU,MAAM,EAAE;AAAA,IAChE;AAAA,EACF;AAEF,QAAM,0BAA0B,QAAQ,IAAI,yBAAyB;AAErE,MAAI,4BAA4B,yBAAyB;AAGvD,WAAO;AAAA,EACT;AAEA,MAAI,eAAe,WAAW,uBAAuB,GAAG;AACtD,QAAI;AACF,YAAM,OAAO,qBAAqB;AAAA,IACpC,QAAQ;AACN,YAAM,UACJ;AACF,yBAAI,KAAK,OAAO;AAChB,UAAI;AACF,cAAM,UAAU,SAAS,UAAU,GAAG,SAAS,OAAO,CAAC;AAAA,MACzD,QAAQ;AAAA,MAAC;AAET,aAAO;AAAA,IACT;AAAA,EACF;AAEA,MAAI;AACJ,MAAI;AACF,wBAAoB,MAAM,IAAI,qBAAqB,EAAE,IAAI,CAAC;AAAA,EAC5D,QAAQ;AAAA,EAAC;AAET,MAAI,mBAAmB,WAAW,sBAAsB,GAAG;AAGzD,WAAO;AAAA,EACT;AAGA,SAAO;AACT;AAEA,MAAM,aAAa,OAAO,QAA4C;AACpE,QAAM,WAAW,UAAM,4CAA4B,GAAG,EAAE,QAAQ;AAGhE,UAAI,6BAAe,YAAY,EAAE,GAAG;AAClC,WAAO,CAAC,GAAG,2BAA2B,GAAG,0BAA0B;AAAA,EACrE;AAEA,SAAO;AACT;AAYO,MAAM,UAAU,OAAO,WAA6C;AACzE,QAAM,MAAM,QAAQ,IAAI;AAExB,MAAI,CAAC,OAAO,UAAU,CAAC,OAAO,YAAY,CAAC,OAAO,UAAU;AAC1D;AAAA,EACF;AAEA,MAAI;AACJ,MAAI;AACF,oBAAgB,MAAM,IAAI,cAAc,EAAE,IAAI,CAAC;AAAA,EACjD,QAAQ;AAAA,EAAC;AAET,MAAI,CAAE,MAAM,WAAW,EAAE,eAAe,IAAI,CAAC,GAAI;AAC/C;AAAA,EACF;AAEA,MAAI;AACF,uBAAI,QAAQ;AAEZ,uBAAI;AAAA,MACF,iCAAiC;AAAA,QAC/B,OAAO,SAAS,WAAW;AAAA,QAC3B,OAAO,WAAW,UAAU;AAAA,QAC5B;AAAA;AAAA,MACF,EACG,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,IAAI,CAAC;AAAA,IACf;AAEA,UAAM,aAAS,6BAAa,OAAO,KAAK;AAExC,QAAI,OAAO,UAAU;AACnB,gBAAM,8BAAa,QAAQ;AAAA,IAC7B;AAEA,QAAI,OAAO,QAAQ;AACjB,gBAAM,yBAAU,UAAU,QAAQ,OAAO,gBAAgB;AAAA,IAC3D;AAIA,cAAM,6BAAY,UAAU,MAAM;AAElC,QAAI,QAAQ,IAAI,gBAAgB;AAE9B,YAAMA,OAAM,MAAM,IAAI,iBAAiB;AAAA,QACrC;AAAA,QACA,SAAS;AAAA,QAET,QAAQ,MAAM,WAAW,GAAG;AAAA,MAC9B,CAAC;AAED,UAAI,CAACA,MAAK;AACR,eAAO,mBAAI,KAAK,wBAAwB;AAAA,MAC1C;AAEA,gBAAM,gCAAe,kBAAAC,SAAU,EAAE,KAAK,GAAG,EAAE,GAAG,GAAG,CAAC;AAClD,yBAAI,KAAK,qBAAqBD,IAAG,GAAG;AACpC;AAAA,IACF;AAGA,QAAI,CAAC,eAAe;AAClB,yBAAI,KAAK,yCAAyC;AAClD,yBAAI;AAAA,QACF;AAAA,MACF;AACA;AAAA,IACF;AAEA,UAAM,MAAM,UAAM;AAAA,MAChB,OAAO,qBAAqB;AAAA,QAC1B,QAAQ;AAAA,QACR;AAAA,QACA,iBAAiB;AAAA,QAEjB,QAAQ,MAAM,WAAW,GAAG;AAAA,MAC9B,CAAC;AAAA,MACD,EAAE,GAAG,GAAG;AAAA,IACV;AAEA,QAAI,CAAC,KAAK;AACR,aAAO,mBAAI,KAAK,wBAAwB;AAAA,IAC1C;AAEA,uBAAI,KAAK,qBAAqB,GAAG,GAAG;AAAA,EACtC,SAAS,KAAK;AACZ,uBAAI,KAAK,mBAAI,KAAK,4BAA4B,CAAC;AAC/C,uBAAI;AAAA,MACF,mBAAI;AAAA,QACF;AAAA,MACF;AAAA,IACF;AACA,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AAAA,EACzB;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport simpleGit from 'simple-git';\n\nimport * as Git from '../../api/git';\nimport * as GitHub from '../../api/github';\nimport { isCiEnv } from '../../utils/env';\nimport { createLogger, log } from '../../utils/logging';\nimport { hasNpmrcSecret } from '../../utils/npmrc';\nimport { throwOnTimeout } from '../../utils/wait';\nimport { runESLint } from '../adapter/eslint';\nimport { runPrettier } from '../adapter/prettier';\nimport { createDestinationFileReader } from '../configure/analysis/project';\n\nimport { internalLint } from './internal';\nimport type { Input } from './types';\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  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.eslint ? 'ESLint' : undefined,\n        params.internal ? 'skuba' : undefined,\n        'Prettier', // Prettier is always run\n      ]\n        .filter((s) => s !== undefined)\n        .join(', ')})...`,\n    );\n\n    const logger = createLogger(params.debug);\n\n    if (params.internal) {\n      await internalLint('format');\n    }\n\n    if (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": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,wBAAsB;AAEtB,UAAqB;AACrB,aAAwB;AACxB,iBAAwB;AACxB,qBAAkC;AAClC,mBAA+B;AAC/B,kBAA+B;AAC/B,oBAA0B;AAC1B,sBAA4B;AAC5B,qBAA4C;AAE5C,sBAA6B;AAG7B,MAAM,yBAAyB;AAExB,MAAM,4BAA+C;AAAA,EAC1D;AAAA,IACE,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AACF;AAEO,MAAM,6BAAgD;AAAA,EAC3D;AAAA,IACE,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,OAAO;AAAA,EACT;AACF;AAEA,MAAM,aAAa,OAAO;AAAA,EACxB;AAAA,EACA;AACF,MAGM;AACJ,MAAI,KAAC,oBAAQ,GAAG;AAId,WAAO;AAAA,EACT;AAEA,QAAM,2BACJ,iBACA,CAAC,QAAQ,IAAI,mCAAmC,UAAU,MAAM,EAAE;AAAA,IAChE;AAAA,EACF;AAEF,QAAM,0BAA0B,QAAQ,IAAI,yBAAyB;AAErE,MAAI,4BAA4B,yBAAyB;AAGvD,WAAO;AAAA,EACT;AAEA,MAAI;AACJ,MAAI;AACF,wBAAoB,MAAM,IAAI,qBAAqB,EAAE,IAAI,CAAC;AAAA,EAC5D,QAAQ;AAAA,EAAC;AAET,MAAI,mBAAmB,WAAW,sBAAsB,GAAG;AAGzD,WAAO;AAAA,EACT;AAGA,SAAO;AACT;AAEA,MAAM,aAAa,OAAO,QAA4C;AACpE,QAAM,WAAW,UAAM,4CAA4B,GAAG,EAAE,QAAQ;AAGhE,UAAI,6BAAe,YAAY,EAAE,GAAG;AAClC,WAAO,CAAC,GAAG,2BAA2B,GAAG,0BAA0B;AAAA,EACrE;AAEA,SAAO;AACT;AAYO,MAAM,UAAU,OAAO,WAA6C;AACzE,QAAM,MAAM,QAAQ,IAAI;AAExB,MAAI,CAAC,OAAO,UAAU,CAAC,OAAO,YAAY,CAAC,OAAO,UAAU;AAC1D;AAAA,EACF;AAEA,MAAI;AACJ,MAAI;AACF,oBAAgB,MAAM,IAAI,cAAc,EAAE,IAAI,CAAC;AAAA,EACjD,QAAQ;AAAA,EAAC;AAET,MAAI,CAAE,MAAM,WAAW,EAAE,eAAe,IAAI,CAAC,GAAI;AAC/C;AAAA,EACF;AAEA,MAAI;AACF,uBAAI,QAAQ;AAEZ,uBAAI;AAAA,MACF,iCAAiC;AAAA,QAC/B,OAAO,SAAS,WAAW;AAAA,QAC3B,OAAO,WAAW,UAAU;AAAA,QAC5B;AAAA;AAAA,MACF,EACG,OAAO,CAAC,MAAM,MAAM,MAAS,EAC7B,KAAK,IAAI,CAAC;AAAA,IACf;AAEA,UAAM,aAAS,6BAAa,OAAO,KAAK;AAExC,QAAI,OAAO,UAAU;AACnB,gBAAM,8BAAa,QAAQ;AAAA,IAC7B;AAEA,QAAI,OAAO,QAAQ;AACjB,gBAAM,yBAAU,UAAU,QAAQ,OAAO,gBAAgB;AAAA,IAC3D;AAIA,cAAM,6BAAY,UAAU,MAAM;AAElC,QAAI,QAAQ,IAAI,gBAAgB;AAE9B,YAAMA,OAAM,MAAM,IAAI,iBAAiB;AAAA,QACrC;AAAA,QACA,SAAS;AAAA,QAET,QAAQ,MAAM,WAAW,GAAG;AAAA,MAC9B,CAAC;AAED,UAAI,CAACA,MAAK;AACR,eAAO,mBAAI,KAAK,wBAAwB;AAAA,MAC1C;AAEA,gBAAM,gCAAe,kBAAAC,SAAU,EAAE,KAAK,GAAG,EAAE,GAAG,GAAG,CAAC;AAClD,yBAAI,KAAK,qBAAqBD,IAAG,GAAG;AACpC;AAAA,IACF;AAGA,QAAI,CAAC,eAAe;AAClB,yBAAI,KAAK,yCAAyC;AAClD,yBAAI;AAAA,QACF;AAAA,MACF;AACA;AAAA,IACF;AAEA,UAAM,MAAM,UAAM;AAAA,MAChB,OAAO,qBAAqB;AAAA,QAC1B,QAAQ;AAAA,QACR;AAAA,QACA,iBAAiB;AAAA,QAEjB,QAAQ,MAAM,WAAW,GAAG;AAAA,MAC9B,CAAC;AAAA,MACD,EAAE,GAAG,GAAG;AAAA,IACV;AAEA,QAAI,CAAC,KAAK;AACR,aAAO,mBAAI,KAAK,wBAAwB;AAAA,IAC1C;AAEA,uBAAI,KAAK,qBAAqB,GAAG,GAAG;AAAA,EACtC,SAAS,KAAK;AACZ,uBAAI,KAAK,mBAAI,KAAK,4BAA4B,CAAC;AAC/C,uBAAI;AAAA,MACF,mBAAI;AAAA,QACF;AAAA,MACF;AAAA,IACF;AACA,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AAAA,EACzB;AACF;",
   "names": ["ref", "simpleGit"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.js CHANGED Viewed

@@ -29,7 +29,7 @@ const collapseDuplicateMergeKeys = async ({
   mode
 }) => {
   const buildkiteFiles = await (0, import_fast_glob.glob)(
-    [".buildkite/**/*.yml", ".buildkite/**/*.yaml"],
+    ["{apps/*/,packages/*/,./}.buildkite/**/*.y*ml"],
     { onlyFiles: true }
   );
   if (buildkiteFiles.length === 0) {
@@ -46,16 +46,25 @@ const collapseDuplicateMergeKeys = async ({
     return { result: "apply" };
   }
   await Promise.all(
-    buildkiteFiles.map((name, i) => [name, i]).filter(([, i]) => replaced[i] !== input[i]).map(([name, i]) => import_fs_extra.promises.writeFile(name, replaced[i]))
+    buildkiteFiles.flatMap(
+      (name, i) => (
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        replaced[i] !== input[i] ? [import_fs_extra.promises.writeFile(name, replaced[i])] : []
+      )
+    )
   );
   return { result: "apply" };
 };
 const collapseDuplicateMergeKeysInFile = (input) => replaceAllUntilStable(
   input,
-  /^([ \-]*)<<: \[?(\*[^\n\]]+)\]?$\n^( *)<<: \[?(\*[^\n\]]+)\]?$/gm,
-  (match, a, b, c, d) => {
-    if (a.length === c.length) {
-      return `${a}<<: [${b}, ${d}]`;
+  /^([ \-]*)<<: \[?(\*[^\n#\]]+)\]?(\s*#.*)?$\n^( *)<<: \[?(\*[^\n#\]]+)\]?(\s*#.*)?$/gm,
+  (match, prefixA, keyA, commentA, prefixB, keyB, commentB) => {
+    if (prefixA.length === prefixB.length) {
+      return [
+        ...commentA ? [`${" ".repeat(prefixA.length)}${commentA.trim()}`] : [],
+        ...commentB ? [`${" ".repeat(prefixA.length)}${commentB.trim()}`] : [],
+        `${prefixA}<<: [${keyA.trim()}, ${keyB.trim()}]`
+      ].join("\n");
     }
     return match;
   }

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/collapseDuplicateMergeKeys.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport { promises as fs } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst collapseDuplicateMergeKeys: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const buildkiteFiles = await glob(\n    ['.buildkite/**/*.yml', '.buildkite/**/*.yaml'],\n    { onlyFiles: true },\n  );\n\n  if (buildkiteFiles.length === 0) {\n    return { result: 'skip', reason: 'no Buildkite files found' };\n  }\n\n  const input = await Promise.all(\n    buildkiteFiles.map((name) => fs.readFile(name, 'utf-8')),\n  );\n\n  const replaced = input.map(collapseDuplicateMergeKeysInFile);\n\n  if (replaced.every((r, i) => r === input[i])) {\n    return { result: 'skip', reason: 'no duplicate merge keys found' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await Promise.all(\n    buildkiteFiles\n      .map((name, i) => [name, i] as const)\n      .filter(([, i]) => replaced[i] !== input[i])\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n      .map(([name, i]) => fs.writeFile(name, replaced[i]!)),\n  );\n\n  return { result: 'apply' };\n};\n\nconst collapseDuplicateMergeKeysInFile = (input: string) =>\n  replaceAllUntilStable(\n    input,\n    /^([ \\-]*)<<: \\[?(\\*[^\\n\\]]+)\\]?$\\n^( *)<<: \\[?(\\*[^\\n\\]]+)\\]?$/gm,\n    (match, a, b, c, d) => {\n      if (a.length === c.length) {\n        return `${a}<<: [${b}, ${d}]`;\n      }\n      return match;\n    },\n  );\n\nconst replaceAllUntilStable = (\n  input: string,\n  searchValue: RegExp,\n  replacer: (substring: string, ...args: string[]) => string,\n): string => {\n  let output = input;\n  let previousOutput;\n\n  do {\n    previousOutput = output;\n    output = output.replace(searchValue, replacer);\n  } while (output !== previousOutput);\n\n  return output;\n};\n\nexport const tryCollapseDuplicateMergeKeys: PatchFunction = async (config) => {\n  try {\n    return await collapseDuplicateMergeKeys(config);\n  } catch (err) {\n    log.warn('Failed to collapse duplicate merge keys.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAA+B;AAG/B,qBAAoB;AAEpB,MAAM,6BAA4C,OAAO;AAAA,EACvD;AACF,MAAgC;AAC9B,QAAM,iBAAiB,UAAM;AAAA,IAC3B,CAAC,uBAAuB,sBAAsB;AAAA,IAC9C,EAAE,WAAW,KAAK;AAAA,EACpB;AAEA,MAAI,eAAe,WAAW,GAAG;AAC/B,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,QAAM,QAAQ,MAAM,QAAQ;AAAA,IAC1B,eAAe,IAAI,CAAC,SAAS,gBAAAA,SAAG,SAAS,MAAM,OAAO,CAAC;AAAA,EACzD;AAEA,QAAM,WAAW,MAAM,IAAI,gCAAgC;AAE3D,MAAI,SAAS,MAAM,CAAC,GAAG,MAAM,MAAM,MAAM,CAAC,CAAC,GAAG;AAC5C,WAAO,EAAE,QAAQ,QAAQ,QAAQ,gCAAgC;AAAA,EACnE;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,QAAQ;AAAA,IACZ,eACG,IAAI,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAU,EACnC,OAAO,CAAC,CAAC,EAAE,CAAC,MAAM,SAAS,CAAC,MAAM,MAAM,CAAC,CAAC,EAE1C,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,gBAAAA,SAAG,UAAU,MAAM,SAAS,CAAC,CAAE,CAAC;AAAA,EACxD;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEA,MAAM,mCAAmC,CAAC,UACxC;AAAA,EACE;AAAA,EACA;AAAA,EACA,CAAC,OAAO,GAAG,GAAG,GAAG,MAAM;AACrB,QAAI,EAAE,WAAW,EAAE,QAAQ;AACzB,aAAO,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;AAAA,IAC5B;AACA,WAAO;AAAA,EACT;AACF;AAEF,MAAM,wBAAwB,CAC5B,OACA,aACA,aACW;AACX,MAAI,SAAS;AACb,MAAI;AAEJ,KAAG;AACD,qBAAiB;AACjB,aAAS,OAAO,QAAQ,aAAa,QAAQ;AAAA,EAC/C,SAAS,WAAW;AAEpB,SAAO;AACT;AAEO,MAAM,gCAA+C,OAAO,WAAW;AAC5E,MAAI;AACF,WAAO,MAAM,2BAA2B,MAAM;AAAA,EAChD,SAAS,KAAK;AACZ,uBAAI,KAAK,0CAA0C;AACnD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport { promises as fs } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst collapseDuplicateMergeKeys: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const buildkiteFiles = await glob(\n    ['{apps/*/,packages/*/,./}.buildkite/**/*.y*ml'],\n    { onlyFiles: true },\n  );\n\n  if (buildkiteFiles.length === 0) {\n    return { result: 'skip', reason: 'no Buildkite files found' };\n  }\n\n  const input = await Promise.all(\n    buildkiteFiles.map((name) => fs.readFile(name, 'utf-8')),\n  );\n\n  const replaced = input.map(collapseDuplicateMergeKeysInFile);\n\n  if (replaced.every((r, i) => r === input[i])) {\n    return { result: 'skip', reason: 'no duplicate merge keys found' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await Promise.all(\n    buildkiteFiles.flatMap((name, i) =>\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n      replaced[i] !== input[i] ? [fs.writeFile(name, replaced[i]!)] : [],\n    ),\n  );\n\n  return { result: 'apply' };\n};\n\nconst collapseDuplicateMergeKeysInFile = (input: string) =>\n  replaceAllUntilStable(\n    input,\n    /^([ \\-]*)<<: \\[?(\\*[^\\n#\\]]+)\\]?(\\s*#.*)?$\\n^( *)<<: \\[?(\\*[^\\n#\\]]+)\\]?(\\s*#.*)?$/gm,\n    (match, prefixA, keyA, commentA, prefixB, keyB, commentB) => {\n      if (prefixA.length === prefixB.length) {\n        return [\n          ...(commentA\n            ? [`${' '.repeat(prefixA.length)}${commentA.trim()}`]\n            : []),\n          ...(commentB\n            ? [`${' '.repeat(prefixA.length)}${commentB.trim()}`]\n            : []),\n          `${prefixA}<<: [${keyA.trim()}, ${keyB.trim()}]`,\n        ].join('\\n');\n      }\n      return match;\n    },\n  );\n\nconst replaceAllUntilStable = (\n  input: string,\n  searchValue: RegExp,\n  replacer: (substring: string, ...args: string[]) => string,\n): string => {\n  let output = input;\n  let previousOutput;\n\n  do {\n    previousOutput = output;\n    output = output.replace(searchValue, replacer);\n  } while (output !== previousOutput);\n\n  return output;\n};\n\nexport const tryCollapseDuplicateMergeKeys: PatchFunction = async (config) => {\n  try {\n    return await collapseDuplicateMergeKeys(config);\n  } catch (err) {\n    log.warn('Failed to collapse duplicate merge keys.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAA+B;AAG/B,qBAAoB;AAEpB,MAAM,6BAA4C,OAAO;AAAA,EACvD;AACF,MAAgC;AAC9B,QAAM,iBAAiB,UAAM;AAAA,IAC3B,CAAC,8CAA8C;AAAA,IAC/C,EAAE,WAAW,KAAK;AAAA,EACpB;AAEA,MAAI,eAAe,WAAW,GAAG;AAC/B,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,QAAM,QAAQ,MAAM,QAAQ;AAAA,IAC1B,eAAe,IAAI,CAAC,SAAS,gBAAAA,SAAG,SAAS,MAAM,OAAO,CAAC;AAAA,EACzD;AAEA,QAAM,WAAW,MAAM,IAAI,gCAAgC;AAE3D,MAAI,SAAS,MAAM,CAAC,GAAG,MAAM,MAAM,MAAM,CAAC,CAAC,GAAG;AAC5C,WAAO,EAAE,QAAQ,QAAQ,QAAQ,gCAAgC;AAAA,EACnE;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,QAAQ;AAAA,IACZ,eAAe;AAAA,MAAQ,CAAC,MAAM;AAAA;AAAA,QAE5B,SAAS,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,gBAAAA,SAAG,UAAU,MAAM,SAAS,CAAC,CAAE,CAAC,IAAI,CAAC;AAAA;AAAA,IACnE;AAAA,EACF;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEA,MAAM,mCAAmC,CAAC,UACxC;AAAA,EACE;AAAA,EACA;AAAA,EACA,CAAC,OAAO,SAAS,MAAM,UAAU,SAAS,MAAM,aAAa;AAC3D,QAAI,QAAQ,WAAW,QAAQ,QAAQ;AACrC,aAAO;AAAA,QACL,GAAI,WACA,CAAC,GAAG,IAAI,OAAO,QAAQ,MAAM,CAAC,GAAG,SAAS,KAAK,CAAC,EAAE,IAClD,CAAC;AAAA,QACL,GAAI,WACA,CAAC,GAAG,IAAI,OAAO,QAAQ,MAAM,CAAC,GAAG,SAAS,KAAK,CAAC,EAAE,IAClD,CAAC;AAAA,QACL,GAAG,OAAO,QAAQ,KAAK,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC;AAAA,MAC/C,EAAE,KAAK,IAAI;AAAA,IACb;AACA,WAAO;AAAA,EACT;AACF;AAEF,MAAM,wBAAwB,CAC5B,OACA,aACA,aACW;AACX,MAAI,SAAS;AACb,MAAI;AAEJ,KAAG;AACD,qBAAiB;AACjB,aAAS,OAAO,QAAQ,aAAa,QAAQ;AAAA,EAC/C,SAAS,WAAW;AAEpB,SAAO;AACT;AAEO,MAAM,gCAA+C,OAAO,WAAW;AAC5E,MAAI;AACF,WAAO,MAAM,2BAA2B,MAAM;AAAA,EAChD,SAAS,KAAK;AACZ,uBAAI,KAAK,0CAA0C;AACnD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fs"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/index.js CHANGED Viewed

@@ -22,7 +22,9 @@ __export(__exports, {
 });
 module.exports = __toCommonJS(__exports);
 var import_collapseDuplicateMergeKeys = require("./collapseDuplicateMergeKeys");
+var import_moveNpmrcMounts = require("./moveNpmrcMounts");
 var import_patchDockerCompose = require("./patchDockerCompose");
+var import_patchDockerImages = require("./patchDockerImages");
 var import_upgradeESLint = require("./upgradeESLint");
 const patches = [
   {
@@ -36,6 +38,14 @@ const patches = [
   {
     apply: import_patchDockerCompose.tryPatchDockerComposeFiles,
     description: "Remove version field from docker-compose files"
+  },
+  {
+    apply: import_patchDockerImages.tryPatchDockerImages,
+    description: "Update docker image references to use public.ecr.aws and remove --platform flag"
+  },
+  {
+    apply: import_moveNpmrcMounts.tryMoveNpmrcMounts,
+    description: "Move .npmrc mounts from tmp/.npmrc to /tmp/.npmrc"
   }
 ];
 // Annotate the CommonJS export names for ESM import in node:

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/index.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/index.ts"],
-  "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryCollapseDuplicateMergeKeys } from './collapseDuplicateMergeKeys';\nimport { tryPatchDockerComposeFiles } from './patchDockerCompose';\nimport { tryUpgradeESLint } from './upgradeESLint';\n\nexport const patches: Patches = [\n  {\n    apply: tryCollapseDuplicateMergeKeys,\n    description: 'Collapse duplicate merge keys in .buildkite files',\n  },\n  {\n    apply: tryUpgradeESLint,\n    description: 'Upgrade to ESLint flat config',\n  },\n  {\n    apply: tryPatchDockerComposeFiles,\n    description: 'Remove version field from docker-compose files',\n  },\n];\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,wCAA8C;AAC9C,gCAA2C;AAC3C,2BAAiC;AAE1B,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
+  "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryCollapseDuplicateMergeKeys } from './collapseDuplicateMergeKeys';\nimport { tryMoveNpmrcMounts } from './moveNpmrcMounts';\nimport { tryPatchDockerComposeFiles } from './patchDockerCompose';\nimport { tryPatchDockerImages } from './patchDockerImages';\nimport { tryUpgradeESLint } from './upgradeESLint';\n\nexport const patches: Patches = [\n  {\n    apply: tryCollapseDuplicateMergeKeys,\n    description: 'Collapse duplicate merge keys in .buildkite files',\n  },\n  {\n    apply: tryUpgradeESLint,\n    description: 'Upgrade to ESLint flat config',\n  },\n  {\n    apply: tryPatchDockerComposeFiles,\n    description: 'Remove version field from docker-compose files',\n  },\n  {\n    apply: tryPatchDockerImages,\n    description:\n      'Update docker image references to use public.ecr.aws and remove --platform flag',\n  },\n  {\n    apply: tryMoveNpmrcMounts,\n    description: 'Move .npmrc mounts from tmp/.npmrc to /tmp/.npmrc',\n  },\n];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,wCAA8C;AAC9C,6BAAmC;AACnC,gCAA2C;AAC3C,+BAAqC;AACrC,2BAAiC;AAE1B,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aACE;AAAA,EACJ;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
   "names": []
 }

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/moveNpmrcMounts.d.ts ADDED Viewed

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

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/moveNpmrcMounts.js ADDED Viewed

@@ -0,0 +1,82 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var moveNpmrcMounts_exports = {};
+__export(moveNpmrcMounts_exports, {
+  tryMoveNpmrcMounts: () => tryMoveNpmrcMounts
+});
+module.exports = __toCommonJS(moveNpmrcMounts_exports);
+var import_util = require("util");
+var import_fast_glob = require("fast-glob");
+var import_fs_extra = require("fs-extra");
+var import_logging = require("../../../../../../utils/logging");
+const moveNpmrcMounts = async ({
+  mode
+}) => {
+  const buildkiteFiles = await (0, import_fast_glob.glob)(
+    ["{apps/*/,packages/*/,./}.buildkite/**/*.y*ml"],
+    { onlyFiles: true }
+  );
+  if (buildkiteFiles.length === 0) {
+    return { result: "skip", reason: "no Buildkite files found" };
+  }
+  const input = await Promise.all(
+    buildkiteFiles.map((name) => import_fs_extra.promises.readFile(name, "utf-8"))
+  );
+  const replaced = input.map(moveNpmrcMountsInFile);
+  if (replaced.every((r, i) => r === input[i])) {
+    return {
+      result: "skip",
+      reason: "no .npmrc mounts found need to be updated"
+    };
+  }
+  if (mode === "lint") {
+    return { result: "apply" };
+  }
+  await Promise.all(
+    buildkiteFiles.flatMap(
+      (name, i) => (
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        replaced[i] !== input[i] ? [import_fs_extra.promises.writeFile(name, replaced[i])] : []
+      )
+    )
+  );
+  return { result: "apply" };
+};
+const secret = /^(\s*)secrets: id=npm,src=tmp\/\.npmrc(\s*#?.*)$/gm;
+const outputPath = /^(\s*)output-path: tmp\/(\s*#?.*)$/gm;
+const moveNpmrcMountsInFile = (input) => {
+  if (!secret.test(input) || !outputPath.test(input)) {
+    return input;
+  }
+  return input.replaceAll(secret, "$1secrets: id=npm,src=/tmp/.npmrc$2").replaceAll(outputPath, "$1output-path: /tmp/$2");
+};
+const tryMoveNpmrcMounts = async (config) => {
+  try {
+    return await moveNpmrcMounts(config);
+  } catch (err) {
+    import_logging.log.warn("Failed to move .npmrc mounts");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  tryMoveNpmrcMounts
+});
+//# sourceMappingURL=moveNpmrcMounts.js.map

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/moveNpmrcMounts.js.map ADDED Viewed

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/moveNpmrcMounts.ts"],
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport { promises as fs } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst moveNpmrcMounts: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const buildkiteFiles = await glob(\n    ['{apps/*/,packages/*/,./}.buildkite/**/*.y*ml'],\n    { onlyFiles: true },\n  );\n\n  if (buildkiteFiles.length === 0) {\n    return { result: 'skip', reason: 'no Buildkite files found' };\n  }\n\n  const input = await Promise.all(\n    buildkiteFiles.map((name) => fs.readFile(name, 'utf-8')),\n  );\n\n  const replaced = input.map(moveNpmrcMountsInFile);\n\n  if (replaced.every((r, i) => r === input[i])) {\n    return {\n      result: 'skip',\n      reason: 'no .npmrc mounts found need to be updated',\n    };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await Promise.all(\n    buildkiteFiles.flatMap((name, i) =>\n      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n      replaced[i] !== input[i] ? [fs.writeFile(name, replaced[i]!)] : [],\n    ),\n  );\n\n  return { result: 'apply' };\n};\n\nconst secret = /^(\\s*)secrets: id=npm,src=tmp\\/\\.npmrc(\\s*#?.*)$/gm;\nconst outputPath = /^(\\s*)output-path: tmp\\/(\\s*#?.*)$/gm;\n\nconst moveNpmrcMountsInFile = (input: string) => {\n  if (!secret.test(input) || !outputPath.test(input)) {\n    return input;\n  }\n\n  return input\n    .replaceAll(secret, '$1secrets: id=npm,src=/tmp/.npmrc$2')\n    .replaceAll(outputPath, '$1output-path: /tmp/$2');\n};\n\nexport const tryMoveNpmrcMounts: PatchFunction = async (config) => {\n  try {\n    return await moveNpmrcMounts(config);\n  } catch (err) {\n    log.warn('Failed to move .npmrc mounts');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAA+B;AAG/B,qBAAoB;AAEpB,MAAM,kBAAiC,OAAO;AAAA,EAC5C;AACF,MAAgC;AAC9B,QAAM,iBAAiB,UAAM;AAAA,IAC3B,CAAC,8CAA8C;AAAA,IAC/C,EAAE,WAAW,KAAK;AAAA,EACpB;AAEA,MAAI,eAAe,WAAW,GAAG;AAC/B,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,QAAM,QAAQ,MAAM,QAAQ;AAAA,IAC1B,eAAe,IAAI,CAAC,SAAS,gBAAAA,SAAG,SAAS,MAAM,OAAO,CAAC;AAAA,EACzD;AAEA,QAAM,WAAW,MAAM,IAAI,qBAAqB;AAEhD,MAAI,SAAS,MAAM,CAAC,GAAG,MAAM,MAAM,MAAM,CAAC,CAAC,GAAG;AAC5C,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,QAAQ;AAAA,IACZ,eAAe;AAAA,MAAQ,CAAC,MAAM;AAAA;AAAA,QAE5B,SAAS,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,gBAAAA,SAAG,UAAU,MAAM,SAAS,CAAC,CAAE,CAAC,IAAI,CAAC;AAAA;AAAA,IACnE;AAAA,EACF;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEA,MAAM,SAAS;AACf,MAAM,aAAa;AAEnB,MAAM,wBAAwB,CAAC,UAAkB;AAC/C,MAAI,CAAC,OAAO,KAAK,KAAK,KAAK,CAAC,WAAW,KAAK,KAAK,GAAG;AAClD,WAAO;AAAA,EACT;AAEA,SAAO,MACJ,WAAW,QAAQ,qCAAqC,EACxD,WAAW,YAAY,wBAAwB;AACpD;AAEO,MAAM,qBAAoC,OAAO,WAAW;AACjE,MAAI;AACF,WAAO,MAAM,gBAAgB,MAAM;AAAA,EACrC,SAAS,KAAK;AACZ,uBAAI,KAAK,8BAA8B;AACvC,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "names": ["fs"]
+}

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/patchDockerCompose.js CHANGED Viewed

@@ -48,9 +48,7 @@ const fetchFiles = async (files) => Promise.all(
 const patchDockerComposeFiles = async ({
   mode
 }) => {
-  const maybeDockerComposeFiles = await Promise.resolve(
-    (0, import_fast_glob.default)(["docker-compose*.yml"])
-  );
+  const maybeDockerComposeFiles = await (0, import_fast_glob.default)(["docker-compose*.yml"]);
   if (!maybeDockerComposeFiles.length) {
     return {
       result: "skip",

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/patchDockerCompose.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/patchDockerCompose.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport { readFile, writeFile } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst DOCKER_COMPOSE_VERSION_REGEX = /^version: ['\"]?\\d+(\\.\\d+)*['\"]?\\n*/m;\n\nconst fetchFiles = async (files: string[]) =>\n  Promise.all(\n    files.map(async (file) => {\n      const contents = await readFile(file, 'utf8');\n\n      return {\n        file,\n        contents,\n      };\n    }),\n  );\n\nconst patchDockerComposeFiles: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const maybeDockerComposeFiles = await Promise.resolve(\n    fg(['docker-compose*.yml']),\n  );\n\n  if (!maybeDockerComposeFiles.length) {\n    return {\n      result: 'skip',\n      reason: 'no docker-compose files found',\n    };\n  }\n\n  const dockerComposeFiles = await fetchFiles(maybeDockerComposeFiles);\n\n  const dockerComposeFilesToPatch = dockerComposeFiles.filter(({ contents }) =>\n    DOCKER_COMPOSE_VERSION_REGEX.exec(contents),\n  );\n\n  if (!dockerComposeFilesToPatch.length) {\n    return {\n      result: 'skip',\n      reason: 'no docker-compose files to patch',\n    };\n  }\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  await Promise.all(\n    dockerComposeFilesToPatch.map(async ({ file, contents }) => {\n      const patchedContents = contents.replace(\n        DOCKER_COMPOSE_VERSION_REGEX,\n        '',\n      );\n      await writeFile(file, patchedContents);\n    }),\n  );\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchDockerComposeFiles: PatchFunction = async (config) => {\n  try {\n    return await patchDockerComposeFiles(config);\n  } catch (err) {\n    log.warn('Failed to patch pnpm packageManager CI configuration.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAe;AACf,sBAAoC;AAGpC,qBAAoB;AAEpB,MAAM,+BAA+B;AAErC,MAAM,aAAa,OAAO,UACxB,QAAQ;AAAA,EACN,MAAM,IAAI,OAAO,SAAS;AACxB,UAAM,WAAW,UAAM,0BAAS,MAAM,MAAM;AAE5C,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEF,MAAM,0BAAyC,OAAO;AAAA,EACpD;AACF,MAAgC;AAC9B,QAAM,0BAA0B,MAAM,QAAQ;AAAA,QAC5C,iBAAAA,SAAG,CAAC,qBAAqB,CAAC;AAAA,EAC5B;AAEA,MAAI,CAAC,wBAAwB,QAAQ;AACnC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,qBAAqB,MAAM,WAAW,uBAAuB;AAEnE,QAAM,4BAA4B,mBAAmB;AAAA,IAAO,CAAC,EAAE,SAAS,MACtE,6BAA6B,KAAK,QAAQ;AAAA,EAC5C;AAEA,MAAI,CAAC,0BAA0B,QAAQ;AACrC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,0BAA0B,IAAI,OAAO,EAAE,MAAM,SAAS,MAAM;AAC1D,YAAM,kBAAkB,SAAS;AAAA,QAC/B;AAAA,QACA;AAAA,MACF;AACA,gBAAM,2BAAU,MAAM,eAAe;AAAA,IACvC,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,6BAA4C,OAAO,WAAW;AACzE,MAAI;AACF,WAAO,MAAM,wBAAwB,MAAM;AAAA,EAC7C,SAAS,KAAK;AACZ,uBAAI,KAAK,uDAAuD;AAChE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport { readFile, writeFile } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst DOCKER_COMPOSE_VERSION_REGEX = /^version: ['\"]?\\d+(\\.\\d+)*['\"]?\\n*/m;\n\nconst fetchFiles = async (files: string[]) =>\n  Promise.all(\n    files.map(async (file) => {\n      const contents = await readFile(file, 'utf8');\n\n      return {\n        file,\n        contents,\n      };\n    }),\n  );\n\nconst patchDockerComposeFiles: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const maybeDockerComposeFiles = await fg(['docker-compose*.yml']);\n\n  if (!maybeDockerComposeFiles.length) {\n    return {\n      result: 'skip',\n      reason: 'no docker-compose files found',\n    };\n  }\n\n  const dockerComposeFiles = await fetchFiles(maybeDockerComposeFiles);\n\n  const dockerComposeFilesToPatch = dockerComposeFiles.filter(({ contents }) =>\n    DOCKER_COMPOSE_VERSION_REGEX.exec(contents),\n  );\n\n  if (!dockerComposeFilesToPatch.length) {\n    return {\n      result: 'skip',\n      reason: 'no docker-compose files to patch',\n    };\n  }\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  await Promise.all(\n    dockerComposeFilesToPatch.map(async ({ file, contents }) => {\n      const patchedContents = contents.replace(\n        DOCKER_COMPOSE_VERSION_REGEX,\n        '',\n      );\n      await writeFile(file, patchedContents);\n    }),\n  );\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchDockerComposeFiles: PatchFunction = async (config) => {\n  try {\n    return await patchDockerComposeFiles(config);\n  } catch (err) {\n    log.warn('Failed to patch pnpm packageManager CI configuration.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAe;AACf,sBAAoC;AAGpC,qBAAoB;AAEpB,MAAM,+BAA+B;AAErC,MAAM,aAAa,OAAO,UACxB,QAAQ;AAAA,EACN,MAAM,IAAI,OAAO,SAAS;AACxB,UAAM,WAAW,UAAM,0BAAS,MAAM,MAAM;AAE5C,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEF,MAAM,0BAAyC,OAAO;AAAA,EACpD;AACF,MAAgC;AAC9B,QAAM,0BAA0B,UAAM,iBAAAA,SAAG,CAAC,qBAAqB,CAAC;AAEhE,MAAI,CAAC,wBAAwB,QAAQ;AACnC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,qBAAqB,MAAM,WAAW,uBAAuB;AAEnE,QAAM,4BAA4B,mBAAmB;AAAA,IAAO,CAAC,EAAE,SAAS,MACtE,6BAA6B,KAAK,QAAQ;AAAA,EAC5C;AAEA,MAAI,CAAC,0BAA0B,QAAQ;AACrC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,0BAA0B,IAAI,OAAO,EAAE,MAAM,SAAS,MAAM;AAC1D,YAAM,kBAAkB,SAAS;AAAA,QAC/B;AAAA,QACA;AAAA,MACF;AACA,gBAAM,2BAAU,MAAM,eAAe;AAAA,IACvC,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,6BAA4C,OAAO,WAAW;AACzE,MAAI;AACF,WAAO,MAAM,wBAAwB,MAAM;AAAA,EAC7C,SAAS,KAAK;AACZ,uBAAI,KAAK,uDAAuD;AAChE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fg"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/patchDockerImages.d.ts ADDED Viewed

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

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/patchDockerImages.js ADDED Viewed

@@ -0,0 +1,141 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var patchDockerImages_exports = {};
+__export(patchDockerImages_exports, {
+  tryPatchDockerImages: () => tryPatchDockerImages
+});
+module.exports = __toCommonJS(patchDockerImages_exports);
+var import_util = require("util");
+var import_fast_glob = __toESM(require("fast-glob"));
+var import_fs_extra = require("fs-extra");
+var import_logging = require("../../../../../../utils/logging");
+const DOCKER_IMAGE_REGEX = /^(FROM\s?.*)(\s)(node|python)(:.*)/gm;
+const DOCKER_IMAGE_PLATFORM_REGEX = /^(FROM\s?.*)(--platform=[^\s]+) /gm;
+const DOCKER_COMPOSE_IMAGE_REGEX = /^(\s+image:\s)(node|python)(:.*)/gm;
+const PUBLIC_ECR = "public.ecr.aws/docker/library/";
+const fetchFiles = async (files) => Promise.all(
+  files.map(async (file) => {
+    const contents = await (0, import_fs_extra.readFile)(file, "utf8");
+    return {
+      file,
+      contents
+    };
+  })
+);
+const isInvalidPlatformFlagUsage = (contents) => {
+  const matches = [...contents.matchAll(DOCKER_IMAGE_PLATFORM_REGEX)];
+  if (!matches.length) {
+    return false;
+  }
+  const uniquePlatforms = [
+    ...new Set(matches.map(([, , platform]) => platform))
+  ];
+  if (uniquePlatforms.length > 1) {
+    return false;
+  }
+  if (uniquePlatforms[0]?.startsWith("--platform=$")) {
+    return false;
+  }
+  return true;
+};
+const patchDockerImages = async ({
+  mode
+}) => {
+  const [maybeDockerFilesPaths, maybeDockerComposePaths] = await Promise.all([
+    (0, import_fast_glob.default)(["Dockerfile*"]),
+    (0, import_fast_glob.default)(["docker-compose*.y*ml"])
+  ]);
+  if (!maybeDockerFilesPaths.length && !maybeDockerComposePaths.length) {
+    return {
+      result: "skip",
+      reason: "no Dockerfile or docker-compose files found"
+    };
+  }
+  const [dockerFiles, dockerComposeFiles] = await Promise.all([
+    fetchFiles(maybeDockerFilesPaths),
+    fetchFiles(maybeDockerComposePaths)
+  ]);
+  const dockerFilesToPatch = dockerFiles.filter(
+    ({ contents }) => DOCKER_IMAGE_REGEX.exec(contents) ?? isInvalidPlatformFlagUsage(contents)
+  );
+  const dockerComposeFilesToPatch = dockerComposeFiles.filter(
+    ({ contents }) => DOCKER_COMPOSE_IMAGE_REGEX.exec(contents)
+  );
+  if (!dockerFilesToPatch.length && !dockerComposeFilesToPatch.length) {
+    return {
+      result: "skip",
+      reason: "no Dockerfile or docker-compose files to patch"
+    };
+  }
+  if (mode === "lint") {
+    return {
+      result: "apply"
+    };
+  }
+  const dockerFilePatches = dockerFilesToPatch.map(
+    async ({ file, contents }) => {
+      let patchedContents = contents.replace(
+        DOCKER_IMAGE_REGEX,
+        `$1$2${PUBLIC_ECR}$3$4`
+      );
+      if (isInvalidPlatformFlagUsage(contents)) {
+        patchedContents = patchedContents.replace(
+          DOCKER_IMAGE_PLATFORM_REGEX,
+          "$1"
+        );
+      }
+      await (0, import_fs_extra.writeFile)(file, patchedContents);
+    }
+  );
+  const dockerComposeFilePatches = dockerComposeFilesToPatch.map(
+    async ({ file, contents }) => {
+      const patchedContents = contents.replace(
+        DOCKER_COMPOSE_IMAGE_REGEX,
+        `$1${PUBLIC_ECR}$2$3`
+      );
+      await (0, import_fs_extra.writeFile)(file, patchedContents);
+    }
+  );
+  await Promise.all([...dockerFilePatches, ...dockerComposeFilePatches]);
+  return { result: "apply" };
+};
+const tryPatchDockerImages = async (config) => {
+  try {
+    return await patchDockerImages(config);
+  } catch (err) {
+    import_logging.log.warn("Failed to patch Docker images");
+    import_logging.log.subtle((0, import_util.inspect)(err));
+    return { result: "skip", reason: "due to an error" };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  tryPatchDockerImages
+});
+//# sourceMappingURL=patchDockerImages.js.map

package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/patchDockerImages.js.map ADDED Viewed

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/patchDockerImages.ts"],
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport { readFile, writeFile } from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst DOCKER_IMAGE_REGEX = /^(FROM\\s?.*)(\\s)(node|python)(:.*)/gm;\nconst DOCKER_IMAGE_PLATFORM_REGEX = /^(FROM\\s?.*)(--platform=[^\\s]+) /gm;\nconst DOCKER_COMPOSE_IMAGE_REGEX = /^(\\s+image:\\s)(node|python)(:.*)/gm;\nconst PUBLIC_ECR = 'public.ecr.aws/docker/library/';\n\nconst fetchFiles = async (files: string[]) =>\n  Promise.all(\n    files.map(async (file) => {\n      const contents = await readFile(file, 'utf8');\n\n      return {\n        file,\n        contents,\n      };\n    }),\n  );\n\nconst isInvalidPlatformFlagUsage = (contents: string) => {\n  const matches = [...contents.matchAll(DOCKER_IMAGE_PLATFORM_REGEX)];\n\n  if (!matches.length) {\n    return false;\n  }\n\n  const uniquePlatforms = [\n    ...new Set(matches.map(([, , platform]) => platform as string)),\n  ];\n\n  // Multiple --platform flags are used which may indicate a multi arch build\n  if (uniquePlatforms.length > 1) {\n    return false;\n  }\n\n  // Avoid patching as they may be using args to set the platform\n  if (uniquePlatforms[0]?.startsWith('--platform=$')) {\n    return false;\n  }\n\n  return true;\n};\n\nconst patchDockerImages: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const [maybeDockerFilesPaths, maybeDockerComposePaths] = await Promise.all([\n    fg(['Dockerfile*']),\n    fg(['docker-compose*.y*ml']),\n  ]);\n\n  if (!maybeDockerFilesPaths.length && !maybeDockerComposePaths.length) {\n    return {\n      result: 'skip',\n      reason: 'no Dockerfile or docker-compose files found',\n    };\n  }\n\n  const [dockerFiles, dockerComposeFiles] = await Promise.all([\n    fetchFiles(maybeDockerFilesPaths),\n    fetchFiles(maybeDockerComposePaths),\n  ]);\n\n  const dockerFilesToPatch = dockerFiles.filter(\n    ({ contents }) =>\n      DOCKER_IMAGE_REGEX.exec(contents) ?? isInvalidPlatformFlagUsage(contents),\n  );\n\n  const dockerComposeFilesToPatch = dockerComposeFiles.filter(({ contents }) =>\n    DOCKER_COMPOSE_IMAGE_REGEX.exec(contents),\n  );\n\n  if (!dockerFilesToPatch.length && !dockerComposeFilesToPatch.length) {\n    return {\n      result: 'skip',\n      reason: 'no Dockerfile or docker-compose files to patch',\n    };\n  }\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  const dockerFilePatches = dockerFilesToPatch.map(\n    async ({ file, contents }) => {\n      let patchedContents = contents.replace(\n        DOCKER_IMAGE_REGEX,\n        `$1$2${PUBLIC_ECR}$3$4`,\n      );\n\n      if (isInvalidPlatformFlagUsage(contents)) {\n        patchedContents = patchedContents.replace(\n          DOCKER_IMAGE_PLATFORM_REGEX,\n          '$1',\n        );\n      }\n\n      await writeFile(file, patchedContents);\n    },\n  );\n\n  const dockerComposeFilePatches = dockerComposeFilesToPatch.map(\n    async ({ file, contents }) => {\n      const patchedContents = contents.replace(\n        DOCKER_COMPOSE_IMAGE_REGEX,\n        `$1${PUBLIC_ECR}$2$3`,\n      );\n      await writeFile(file, patchedContents);\n    },\n  );\n\n  await Promise.all([...dockerFilePatches, ...dockerComposeFilePatches]);\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchDockerImages: PatchFunction = async (config) => {\n  try {\n    return await patchDockerImages(config);\n  } catch (err) {\n    log.warn('Failed to patch Docker images');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": "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",
+  "names": ["fg"]
+}

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

@@ -98,9 +98,11 @@ const upgradeESLint = async ({
 };
 const writeTemporaryFiles = async (contents) => {
   const dir = await fsp.mkdtemp("eslint-migrate-config");
-  for (const [file, content] of Object.entries(contents)) {
-    await fsp.writeFile(import_path.default.join(dir, file), content);
-  }
+  await Promise.all(
+    Object.entries(contents).map(
+      ([file, content]) => fsp.writeFile(import_path.default.join(dir, file), content)
+    )
+  );
   return dir;
 };
 const fiddleWithOutput = (input) => {

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

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

package/lib/wrapper/requestListener.js.map CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/wrapper/requestListener.ts"],
-  "sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation';\n\nimport { serveRequestListener, startServer } from './http';\n\n// Express compatibility\ninterface FunctionConfig extends http.RequestListener {\n  port?: number;\n}\n\ninterface ObjectConfig {\n  // Koa compatibility\n  callback?: () => http.RequestListener;\n\n  requestListener?: http.RequestListener;\n\n  // Fastify compatibility\n  server?: http.Server;\n\n  default?: Promise<unknown>;\n  port?: unknown;\n}\n\nconst isConfig = (\n  data: unknown,\n): data is Promise<FunctionConfig> | Promise<ObjectConfig> =>\n  isFunction(data) || isObject(data);\n\ninterface Args {\n  availablePort?: number;\n  entryPoint: unknown;\n}\n\n/**\n * Create an HTTP server that calls into an exported `http.RequestListener`.\n *\n * This supports Express and Koa applications out of the box.\n */\nexport const runRequestListener = async ({\n  availablePort,\n  entryPoint,\n}: Args): Promise<void> => {\n  if (!isConfig(entryPoint)) {\n    // Assume an executable script with weird exports\n    return;\n  }\n\n  let config: FunctionConfig | ObjectConfig = await entryPoint;\n\n  if (typeof config === 'object' && isConfig(config.default)) {\n    // Prefer `export default` over `export =`\n    config = await config.default;\n  }\n\n  if (Object.keys(config).length === 0) {\n    // Assume an executable script with no exports\n    return;\n  }\n\n  const port = isIpPort(config.port) ? config.port : availablePort;\n\n  // http.Server support\n  if (typeof config !== 'function' && config instanceof http.Server) {\n    return startServer(config, port);\n  }\n\n  // Fastify workaround\n  if (\n    typeof config !== 'function' &&\n    config.server &&\n    config.server instanceof http.Server\n  ) {\n    return startServer(config.server, port);\n  }\n\n  const requestListener =\n    typeof config === 'function'\n      ? config\n      : config.requestListener ?? config.callback?.();\n\n  if (typeof requestListener !== 'function') {\n    // Assume an executable script with non-request listener exports\n    return;\n  }\n\n  return serveRequestListener(requestListener, port);\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAkD;AAoBlD,MAAM,WAAW,CACf,aAEA,8BAAW,IAAI,SAAK,4BAAS,IAAI;AAY5B,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,CAAC,SAAS,UAAU,GAAG;AAEzB;AAAA,EACF;AAEA,MAAI,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MAAI,OAAO,WAAW,cAAc,kBAAkB,YAAAC,QAAK,QAAQ;AACjE,eAAO,0BAAY,QAAQ,IAAI;AAAA,EACjC;AAGA,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAA,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACA,OAAO,mBAAmB,OAAO,WAAW;AAElD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
+  "sourcesContent": ["import http from 'http';\n\nimport { isFunction, isIpPort, isObject } from '../utils/validation';\n\nimport { serveRequestListener, startServer } from './http';\n\n// Express compatibility\ninterface FunctionConfig extends http.RequestListener {\n  port?: number;\n}\n\ninterface ObjectConfig {\n  // Koa compatibility\n  callback?: () => http.RequestListener;\n\n  requestListener?: http.RequestListener;\n\n  // Fastify compatibility\n  server?: http.Server;\n\n  default?: Promise<unknown>;\n  port?: unknown;\n}\n\nconst isConfig = (\n  data: unknown,\n): data is Promise<FunctionConfig> | Promise<ObjectConfig> =>\n  isFunction(data) || isObject(data);\n\ninterface Args {\n  availablePort?: number;\n  entryPoint: unknown;\n}\n\n/**\n * Create an HTTP server that calls into an exported `http.RequestListener`.\n *\n * This supports Express and Koa applications out of the box.\n */\nexport const runRequestListener = async ({\n  availablePort,\n  entryPoint,\n}: Args): Promise<void> => {\n  if (!isConfig(entryPoint)) {\n    // Assume an executable script with weird exports\n    return;\n  }\n\n  let config: FunctionConfig | ObjectConfig = await entryPoint;\n\n  if (typeof config === 'object' && isConfig(config.default)) {\n    // Prefer `export default` over `export =`\n    config = await config.default;\n  }\n\n  if (Object.keys(config).length === 0) {\n    // Assume an executable script with no exports\n    return;\n  }\n\n  const port = isIpPort(config.port) ? config.port : availablePort;\n\n  // http.Server support\n  if (typeof config !== 'function' && config instanceof http.Server) {\n    return startServer(config, port);\n  }\n\n  // Fastify workaround\n  if (\n    typeof config !== 'function' &&\n    config.server &&\n    config.server instanceof http.Server\n  ) {\n    return startServer(config.server, port);\n  }\n\n  const requestListener =\n    typeof config === 'function'\n      ? config\n      : (config.requestListener ?? config.callback?.());\n\n  if (typeof requestListener !== 'function') {\n    // Assume an executable script with non-request listener exports\n    return;\n  }\n\n  return serveRequestListener(requestListener, port);\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,wBAA+C;AAE/C,IAAAA,eAAkD;AAoBlD,MAAM,WAAW,CACf,aAEA,8BAAW,IAAI,SAAK,4BAAS,IAAI;AAY5B,MAAM,qBAAqB,OAAO;AAAA,EACvC;AAAA,EACA;AACF,MAA2B;AACzB,MAAI,CAAC,SAAS,UAAU,GAAG;AAEzB;AAAA,EACF;AAEA,MAAI,SAAwC,MAAM;AAElD,MAAI,OAAO,WAAW,YAAY,SAAS,OAAO,OAAO,GAAG;AAE1D,aAAS,MAAM,OAAO;AAAA,EACxB;AAEA,MAAI,OAAO,KAAK,MAAM,EAAE,WAAW,GAAG;AAEpC;AAAA,EACF;AAEA,QAAM,WAAO,4BAAS,OAAO,IAAI,IAAI,OAAO,OAAO;AAGnD,MAAI,OAAO,WAAW,cAAc,kBAAkB,YAAAC,QAAK,QAAQ;AACjE,eAAO,0BAAY,QAAQ,IAAI;AAAA,EACjC;AAGA,MACE,OAAO,WAAW,cAClB,OAAO,UACP,OAAO,kBAAkB,YAAAA,QAAK,QAC9B;AACA,eAAO,0BAAY,OAAO,QAAQ,IAAI;AAAA,EACxC;AAEA,QAAM,kBACJ,OAAO,WAAW,aACd,SACC,OAAO,mBAAmB,OAAO,WAAW;AAEnD,MAAI,OAAO,oBAAoB,YAAY;AAEzC;AAAA,EACF;AAEA,aAAO,mCAAqB,iBAAiB,IAAI;AACnD;",
   "names": ["import_http", "http"]
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "9.0.0-renovate-eslint-9.x-20240923103202",
+  "version": "9.0.0",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -65,7 +65,7 @@
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "esbuild": "~0.24.0",
-    "eslint": "^9.0.0",
+    "eslint": "^9.11.1",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
     "find-up": "^5.0.0",
@@ -81,7 +81,7 @@
     "libnpmsearch": "^7.0.0",
     "lodash.mergewith": "^4.6.2",
     "minimist": "^1.2.6",
-    "normalize-package-data": "^6.0.0",
+    "normalize-package-data": "^7.0.0",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
@@ -99,9 +99,9 @@
     "tsconfig-seek": "2.0.0",
     "tsx": "^4.16.2",
     "typescript": "~5.6.0",
-    "validate-npm-package-name": "^5.0.0",
+    "validate-npm-package-name": "^6.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.0.0-renovate-eslint-9.x-20240923103202"
+    "eslint-config-skuba": "5.0.0"
   },
   "devDependencies": {
     "@changesets/cli": "2.27.8",
@@ -121,12 +121,12 @@
     "@types/supertest": "6.0.2",
     "@types/validate-npm-package-name": "4.0.2",
     "enhanced-resolve": "5.17.1",
-    "express": "4.20.0",
-    "fastify": "4.28.1",
+    "express": "4.21.0",
+    "fastify": "5.0.0",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
     "koa": "2.15.3",
-    "memfs": "4.11.1",
+    "memfs": "4.12.0",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.0",
     "semver": "7.6.3",
@@ -152,7 +152,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "8.2.1"
+    "version": "9.0.0"
   },
   "scripts": {
     "build": "scripts/build.sh",

package/template/express-rest-api/.buildkite/pipeline.yml CHANGED Viewed

@@ -15,12 +15,12 @@ configs:
           - package.json#.packageManager
           - pnpm-lock.yaml
         dockerfile: Dockerfile.dev-deps
-        secrets: id=npm,src=tmp/.npmrc
+        secrets: id=npm,src=/tmp/.npmrc
     - &private-npm
       seek-oss/private-npm#v1.2.0:
         env: NPM_READ_TOKEN
-        output-path: tmp/
+        output-path: /tmp/
   base-steps:
     - &deploy

package/template/express-rest-api/Dockerfile CHANGED Viewed

@@ -12,7 +12,7 @@ RUN pnpm install --offline --prod
 ###
-FROM --platform=<%- platformName %> gcr.io/distroless/nodejs20-debian12 AS runtime
+FROM gcr.io/distroless/nodejs20-debian12 AS runtime
 WORKDIR /workdir

package/template/express-rest-api/Dockerfile.dev-deps CHANGED Viewed

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.10
-FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

package/template/express-rest-api/package.json CHANGED Viewed

@@ -13,7 +13,7 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@seek/logger": "^6.0.0",
+    "@seek/logger": "^9.0.0",
     "express": "^4.17.1",
     "hot-shots": "^10.0.0",
     "seek-datadog-custom-metrics": "^4.6.3",

package/template/greeter/.buildkite/pipeline.yml CHANGED Viewed

@@ -16,12 +16,12 @@ configs:
           - .npmrc
           - package.json#.packageManager
           - pnpm-lock.yaml
-        secrets: id=npm,src=tmp/.npmrc
+        secrets: id=npm,src=/tmp/.npmrc
     - &private-npm
       seek-oss/private-npm#v1.2.0:
         env: NPM_READ_TOKEN
-        output-path: tmp/
+        output-path: /tmp/
 steps:
   - label: 🧪 Test & Lint

package/template/greeter/Dockerfile CHANGED Viewed

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.10
-FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

package/template/greeter/package.json CHANGED Viewed

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "skuba": "9.0.0-renovate-eslint-9.x-20240923103202"
+    "skuba": "*"
   },
   "packageManager": "pnpm@9.11.0",
   "engines": {

package/template/koa-rest-api/.buildkite/pipeline.yml CHANGED Viewed

@@ -15,12 +15,12 @@ configs:
           - package.json#.packageManager
           - pnpm-lock.yaml
         dockerfile: Dockerfile.dev-deps
-        secrets: id=npm,src=tmp/.npmrc
+        secrets: id=npm,src=/tmp/.npmrc
     - &private-npm
       seek-oss/private-npm#v1.2.0:
         env: NPM_READ_TOKEN
-        output-path: tmp/
+        output-path: /tmp/
   base-steps:
     - &deploy

package/template/koa-rest-api/Dockerfile CHANGED Viewed

@@ -12,7 +12,7 @@ RUN pnpm install --offline --prod
 ###
-FROM --platform=<%- platformName %> gcr.io/distroless/nodejs20-debian12 AS runtime
+FROM gcr.io/distroless/nodejs20-debian12 AS runtime
 WORKDIR /workdir

package/template/koa-rest-api/Dockerfile.dev-deps CHANGED Viewed

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.10
-FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

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

@@ -13,7 +13,8 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@koa/router": "^12.0.0",
+    "@koa/bodyparser": "^5.1.1",
+    "@koa/router": "^13.0.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^1.25.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
@@ -21,10 +22,9 @@
     "@opentelemetry/instrumentation-http": "^0.53.0",
     "@opentelemetry/propagator-b3": "^1.25.0",
     "@opentelemetry/sdk-node": "^0.53.0",
-    "@seek/logger": "^6.0.0",
+    "@seek/logger": "^9.0.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.13.4",
-    "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.1.0",
     "seek-datadog-custom-metrics": "^4.6.3",
     "seek-koala": "^7.0.0",
@@ -33,8 +33,8 @@
   },
   "devDependencies": {
     "@types/chance": "^1.1.3",
+    "@types/co-body": "^6.1.3",
     "@types/koa": "^2.13.4",
-    "@types/koa-bodyparser": "^5.0.2",
     "@types/koa__router": "^12.0.0",
     "@types/node": "^20.16.5",
     "@types/supertest": "^6.0.0",

package/template/koa-rest-api/src/framework/bodyParser.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import bodyParser from 'koa-bodyparser';
+import { bodyParser } from '@koa/bodyparser';
 export const jsonBodyParser = bodyParser({ enableTypes: ['json'] });

package/template/koa-rest-api/src/framework/server.test.ts CHANGED Viewed

@@ -203,7 +203,6 @@ describe('createApp', () => {
   it('handles null error', async () => {
     middleware.mockImplementation(() => {
-      /* eslint-disable-next-line @typescript-eslint/only-throw-error */
       throw null;
     });

package/template/lambda-sqs-worker/.buildkite/pipeline.yml CHANGED Viewed

@@ -14,12 +14,12 @@ configs:
           - .npmrc
           - package.json#.packageManager
           - pnpm-lock.yaml
-        secrets: id=npm,src=tmp/.npmrc
+        secrets: id=npm,src=/tmp/.npmrc
     - &private-npm
       seek-oss/private-npm#v1.2.0:
         env: NPM_READ_TOKEN
-        output-path: tmp/
+        output-path: /tmp/
   base-steps:
     - &deploy

package/template/lambda-sqs-worker/Dockerfile CHANGED Viewed

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.10
-FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

package/template/lambda-sqs-worker/package.json CHANGED Viewed

@@ -18,8 +18,8 @@
     "@aws-sdk/client-codedeploy": "^3.363.0",
     "@aws-sdk/client-lambda": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
-    "@seek/logger": "^6.0.0",
-    "datadog-lambda-js": "^8.0.0",
+    "@seek/logger": "^9.0.0",
+    "datadog-lambda-js": "^9.0.0",
     "dd-trace": "^5.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"

package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml CHANGED Viewed

@@ -14,12 +14,12 @@ configs:
           - .npmrc
           - package.json#.packageManager
           - pnpm-lock.yaml
-        secrets: id=npm,src=tmp/.npmrc
+        secrets: id=npm,src=/tmp/.npmrc
     - &private-npm
       seek-oss/private-npm#v1.2.0:
         env: NPM_READ_TOKEN
-        output-path: tmp/
+        output-path: /tmp/
   base-steps:
     - &deploy

package/template/lambda-sqs-worker-cdk/Dockerfile CHANGED Viewed

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.10
-FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
 # Needed for cdk
 RUN apk add --no-cache bash

package/template/lambda-sqs-worker-cdk/package.json CHANGED Viewed

@@ -16,7 +16,7 @@
     "@aws-sdk/client-codedeploy": "^3.363.0",
     "@aws-sdk/client-lambda": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
-    "@seek/logger": "^6.0.0",
+    "@seek/logger": "^9.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
   },
@@ -28,7 +28,7 @@
     "aws-cdk-lib": "^2.109.0",
     "constructs": "^10.0.17",
     "pino-pretty": "^11.0.0",
-    "skuba": "9.0.0-renovate-eslint-9.x-20240923103202"
+    "skuba": "*"
   },
   "packageManager": "pnpm@9.11.0",
   "engines": {