skuba 8.1.0 → 8.2.1

package/lib/api/github/checkRun.js

@@ -31,10 +31,10 @@ __export(checkRun_exports, {
   createCheckRun: () => createCheckRun
 });
 module.exports = __toCommonJS(checkRun_exports);
-var import_rest = require("@octokit/rest");
 var import_logging = require("../../utils/logging");
 var Git = __toESM(require("../git"));
 var import_environment = require("./environment");
+var import_octokit = require("./octokit");
 const GITHUB_MAX_ANNOTATIONS = 50;
 const suffixTitle = (title, inputAnnotations) => {
   const addedAnnotations = inputAnnotations > GITHUB_MAX_ANNOTATIONS ? GITHUB_MAX_ANNOTATIONS : inputAnnotations;
@@ -59,7 +59,7 @@ const createCheckRun = async ({
     Git.getHeadCommitId({ dir }),
     Git.getOwnerAndRepo({ dir })
   ]);
-  const client = new import_rest.Octokit({ auth: (0, import_environment.apiTokenFromEnvironment)() });
+  const client = await (0, import_octokit.createRestClient)({ auth: (0, import_environment.apiTokenFromEnvironment)() });
   await client.checks.create({
     conclusion,
     head_sha: commitId,

package/lib/api/github/checkRun.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/api/github/checkRun.ts"],
-  "sourcesContent": ["import { Octokit } from '@octokit/rest';\nimport type { Endpoints } from '@octokit/types';\n\nimport { pluralise } from '../../utils/logging';\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\n\ntype Output = NonNullable<\n  Endpoints['PATCH /repos/{owner}/{repo}/check-runs/{check_run_id}']['parameters']['output']\n>;\n\nexport type Annotation = NonNullable<Output['annotations']>[number];\n\nconst GITHUB_MAX_ANNOTATIONS = 50;\n\n/**\n * Suffixes the title with the number of annotations added, e.g.\n *\n * ```text\n * Build #12 failed (24 annotations added)\n * ```\n */\nconst suffixTitle = (title: string, inputAnnotations: number): string => {\n  const addedAnnotations =\n    inputAnnotations > GITHUB_MAX_ANNOTATIONS\n      ? GITHUB_MAX_ANNOTATIONS\n      : inputAnnotations;\n\n  return `${title} (${pluralise(addedAnnotations, 'annotation')} added)`;\n};\n\n/**\n * Enriches the summary with more context about the check run.\n */\nconst createEnrichedSummary = (\n  summary: string,\n  inputAnnotations: number,\n): string =>\n  [\n    summary,\n    ...(inputAnnotations > GITHUB_MAX_ANNOTATIONS\n      ? [\n          `${inputAnnotations} annotations were provided, but only the first ${GITHUB_MAX_ANNOTATIONS} are visible in GitHub.`,\n        ]\n      : []),\n  ].join('\\n\\n');\n\n/**\n * {@link https://docs.github.com/en/rest/reference/checks#create-a-check-run}\n */\ninterface CreateCheckRunParameters {\n  /**\n   * Adds information from your analysis to specific lines of code.\n   * Annotations are visible on GitHub in the **Checks** and **Files changed**\n   * tab of the pull request.\n   */\n  annotations: Annotation[];\n\n  /**\n   * The final conclusion of the check.\n   */\n  conclusion: 'failure' | 'success';\n\n  /**\n   * The name of the check. For example, \"code-coverage\".\n   */\n  name: string;\n\n  /**\n   * The summary of the check run. This parameter supports Markdown.\n   */\n  summary: string;\n\n  /**\n   * The details of the check run. This parameter supports Markdown.\n   */\n  text?: string;\n\n  /**\n   * The title of the check run.\n   */\n  title: string;\n}\n\n/**\n * Asynchronously creates a GitHub check run with annotations.\n *\n * The first 50 `annotations` are written in full to GitHub.\n *\n * A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with the `checks:write` permission\n * must be present on the environment.\n */\nexport const createCheckRun = async ({\n  annotations,\n  conclusion,\n  name,\n  summary,\n  text,\n  title,\n}: CreateCheckRunParameters): Promise<void> => {\n  const dir = process.cwd();\n\n  const [commitId, { owner, repo }] = await Promise.all([\n    Git.getHeadCommitId({ dir }),\n    Git.getOwnerAndRepo({ dir }),\n  ]);\n\n  const client = new Octokit({ auth: apiTokenFromEnvironment() });\n\n  await client.checks.create({\n    conclusion,\n    head_sha: commitId,\n    name,\n    output: {\n      annotations: annotations.slice(0, GITHUB_MAX_ANNOTATIONS),\n      summary: createEnrichedSummary(summary, annotations.length),\n      text,\n      title: suffixTitle(title, annotations.length),\n    },\n    owner,\n    repo,\n  });\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAGxB,qBAA0B;AAC1B,UAAqB;AAErB,yBAAwC;AAQxC,MAAM,yBAAyB;AAS/B,MAAM,cAAc,CAAC,OAAe,qBAAqC;AACvE,QAAM,mBACJ,mBAAmB,yBACf,yBACA;AAEN,SAAO,GAAG,KAAK,SAAK,0BAAU,kBAAkB,YAAY,CAAC;AAC/D;AAKA,MAAM,wBAAwB,CAC5B,SACA,qBAEA;AAAA,EACE;AAAA,EACA,GAAI,mBAAmB,yBACnB;AAAA,IACE,GAAG,gBAAgB,kDAAkD,sBAAsB;AAAA,EAC7F,IACA,CAAC;AACP,EAAE,KAAK,MAAM;AA+CR,MAAM,iBAAiB,OAAO;AAAA,EACnC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA+C;AAC7C,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,CAAC,UAAU,EAAE,OAAO,KAAK,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,IACpD,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAAA,IAC3B,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAAA,EAC7B,CAAC;AAED,QAAM,SAAS,IAAI,oBAAQ,EAAE,UAAM,4CAAwB,EAAE,CAAC;AAE9D,QAAM,OAAO,OAAO,OAAO;AAAA,IACzB;AAAA,IACA,UAAU;AAAA,IACV;AAAA,IACA,QAAQ;AAAA,MACN,aAAa,YAAY,MAAM,GAAG,sBAAsB;AAAA,MACxD,SAAS,sBAAsB,SAAS,YAAY,MAAM;AAAA,MAC1D;AAAA,MACA,OAAO,YAAY,OAAO,YAAY,MAAM;AAAA,IAC9C;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AACH;",
+  "sourcesContent": ["import type { Endpoints } from '@octokit/types';\n\nimport { pluralise } from '../../utils/logging';\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\nimport { createRestClient } from './octokit';\n\ntype Output = NonNullable<\n  Endpoints['PATCH /repos/{owner}/{repo}/check-runs/{check_run_id}']['parameters']['output']\n>;\n\nexport type Annotation = NonNullable<Output['annotations']>[number];\n\nconst GITHUB_MAX_ANNOTATIONS = 50;\n\n/**\n * Suffixes the title with the number of annotations added, e.g.\n *\n * ```text\n * Build #12 failed (24 annotations added)\n * ```\n */\nconst suffixTitle = (title: string, inputAnnotations: number): string => {\n  const addedAnnotations =\n    inputAnnotations > GITHUB_MAX_ANNOTATIONS\n      ? GITHUB_MAX_ANNOTATIONS\n      : inputAnnotations;\n\n  return `${title} (${pluralise(addedAnnotations, 'annotation')} added)`;\n};\n\n/**\n * Enriches the summary with more context about the check run.\n */\nconst createEnrichedSummary = (\n  summary: string,\n  inputAnnotations: number,\n): string =>\n  [\n    summary,\n    ...(inputAnnotations > GITHUB_MAX_ANNOTATIONS\n      ? [\n          `${inputAnnotations} annotations were provided, but only the first ${GITHUB_MAX_ANNOTATIONS} are visible in GitHub.`,\n        ]\n      : []),\n  ].join('\\n\\n');\n\n/**\n * {@link https://docs.github.com/en/rest/reference/checks#create-a-check-run}\n */\ninterface CreateCheckRunParameters {\n  /**\n   * Adds information from your analysis to specific lines of code.\n   * Annotations are visible on GitHub in the **Checks** and **Files changed**\n   * tab of the pull request.\n   */\n  annotations: Annotation[];\n\n  /**\n   * The final conclusion of the check.\n   */\n  conclusion: 'failure' | 'success';\n\n  /**\n   * The name of the check. For example, \"code-coverage\".\n   */\n  name: string;\n\n  /**\n   * The summary of the check run. This parameter supports Markdown.\n   */\n  summary: string;\n\n  /**\n   * The details of the check run. This parameter supports Markdown.\n   */\n  text?: string;\n\n  /**\n   * The title of the check run.\n   */\n  title: string;\n}\n\n/**\n * Asynchronously creates a GitHub check run with annotations.\n *\n * The first 50 `annotations` are written in full to GitHub.\n *\n * A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with the `checks:write` permission\n * must be present on the environment.\n */\nexport const createCheckRun = async ({\n  annotations,\n  conclusion,\n  name,\n  summary,\n  text,\n  title,\n}: CreateCheckRunParameters): Promise<void> => {\n  const dir = process.cwd();\n\n  const [commitId, { owner, repo }] = await Promise.all([\n    Git.getHeadCommitId({ dir }),\n    Git.getOwnerAndRepo({ dir }),\n  ]);\n\n  const client = await createRestClient({ auth: apiTokenFromEnvironment() });\n\n  await client.checks.create({\n    conclusion,\n    head_sha: commitId,\n    name,\n    output: {\n      annotations: annotations.slice(0, GITHUB_MAX_ANNOTATIONS),\n      summary: createEnrichedSummary(summary, annotations.length),\n      text,\n      title: suffixTitle(title, annotations.length),\n    },\n    owner,\n    repo,\n  });\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,qBAA0B;AAC1B,UAAqB;AAErB,yBAAwC;AACxC,qBAAiC;AAQjC,MAAM,yBAAyB;AAS/B,MAAM,cAAc,CAAC,OAAe,qBAAqC;AACvE,QAAM,mBACJ,mBAAmB,yBACf,yBACA;AAEN,SAAO,GAAG,KAAK,SAAK,0BAAU,kBAAkB,YAAY,CAAC;AAC/D;AAKA,MAAM,wBAAwB,CAC5B,SACA,qBAEA;AAAA,EACE;AAAA,EACA,GAAI,mBAAmB,yBACnB;AAAA,IACE,GAAG,gBAAgB,kDAAkD,sBAAsB;AAAA,EAC7F,IACA,CAAC;AACP,EAAE,KAAK,MAAM;AA+CR,MAAM,iBAAiB,OAAO;AAAA,EACnC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAA+C;AAC7C,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,CAAC,UAAU,EAAE,OAAO,KAAK,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,IACpD,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAAA,IAC3B,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAAA,EAC7B,CAAC;AAED,QAAM,SAAS,UAAM,iCAAiB,EAAE,UAAM,4CAAwB,EAAE,CAAC;AAEzE,QAAM,OAAO,OAAO,OAAO;AAAA,IACzB;AAAA,IACA,UAAU;AAAA,IACV;AAAA,IACA,QAAQ;AAAA,MACN,aAAa,YAAY,MAAM,GAAG,sBAAsB;AAAA,MACxD,SAAS,sBAAsB,SAAS,YAAY,MAAM;AAAA,MAC1D;AAAA,MACA,OAAO,YAAY,OAAO,YAAY,MAAM;AAAA,IAC9C;AAAA,IACA;AAAA,IACA;AAAA,EACF,CAAC;AACH;",
   "names": []
 }

package/lib/api/github/issueComment.js

@@ -31,9 +31,9 @@ __export(issueComment_exports, {
   putIssueComment: () => putIssueComment
 });
 module.exports = __toCommonJS(issueComment_exports);
-var import_rest = require("@octokit/rest");
 var Git = __toESM(require("../git"));
 var import_environment = require("./environment");
+var import_octokit = require("./octokit");
 var import_pullRequest = require("./pullRequest");
 const getUserId = async (client) => {
   const { data } = await client.users.getAuthenticated();
@@ -43,7 +43,7 @@ const putIssueComment = async (params) => {
   const env = params.env ?? process.env;
   const dir = process.cwd();
   const { owner, repo } = await Git.getOwnerAndRepo({ dir });
-  const client = new import_rest.Octokit({ auth: (0, import_environment.apiTokenFromEnvironment)() });
+  const client = await (0, import_octokit.createRestClient)({ auth: (0, import_environment.apiTokenFromEnvironment)() });
   const issueNumber = params.issueNumber ?? await (0, import_pullRequest.getPullRequestNumber)({ client, env });
   if (!issueNumber) {
     throw new Error("Failed to infer an issue number");

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/api/github/issueComment.ts"],
-  "sourcesContent": ["import { Octokit } from '@octokit/rest';\n\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\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 = new Octokit({ 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;AAAA,kBAAwB;AAExB,UAAqB;AAErB,yBAAwC;AACxC,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,IAAI,oBAAQ,EAAE,UAAM,4CAAwB,EAAE,CAAC;AAE9D,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/api/github/octokit.d.ts

@@ -1,2 +1,6 @@
+import type { Octokit } from '@octokit/rest';
 import type { RequestParameters } from '@octokit/types';
+export declare const createRestClient: (options: {
+    auth: unknown;
+}) => Promise<Octokit>;
 export declare const graphql: <ResponseData>(query: string, parameters?: RequestParameters) => Promise<ResponseData>;

package/lib/api/github/octokit.js

@@ -28,12 +28,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var octokit_exports = {};
 __export(octokit_exports, {
+  createRestClient: () => createRestClient,
   graphql: () => graphql
 });
 module.exports = __toCommonJS(octokit_exports);
+const createRestClient = async (options) => new (await import("@octokit/rest")).Octokit(options);
 const graphql = async (query, parameters) => (await import("@octokit/graphql")).graphql(query, parameters);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  createRestClient,
   graphql
 });
 //# sourceMappingURL=octokit.js.map

package/lib/api/github/octokit.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/api/github/octokit.ts"],
-  "sourcesContent": ["import type { RequestParameters } from '@octokit/types';\n\nexport const graphql = async <ResponseData>(\n  query: string,\n  parameters?: RequestParameters,\n) =>\n  (await import('@octokit/graphql')).graphql<ResponseData>(query, parameters);\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEO,MAAM,UAAU,OACrB,OACA,gBAEC,MAAM,OAAO,kBAAkB,GAAG,QAAsB,OAAO,UAAU;",
+  "sourcesContent": ["import type { Octokit } from '@octokit/rest';\nimport type { RequestParameters } from '@octokit/types';\n\nexport const createRestClient = async (options: {\n  auth: unknown;\n}): Promise<Octokit> => new (await import('@octokit/rest')).Octokit(options);\n\nexport const graphql = async <ResponseData>(\n  query: string,\n  parameters?: RequestParameters,\n) =>\n  (await import('@octokit/graphql')).graphql<ResponseData>(query, parameters);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGO,MAAM,mBAAmB,OAAO,YAEf,KAAK,MAAM,OAAO,eAAe,GAAG,QAAQ,OAAO;AAEpE,MAAM,UAAU,OACrB,OACA,gBAEC,MAAM,OAAO,kBAAkB,GAAG,QAAsB,OAAO,UAAU;",
   "names": []
 }

package/lib/api/github/pullRequest.d.ts

@@ -1,4 +1,4 @@
-import { Octokit } from '@octokit/rest';
+import type { Octokit } from '@octokit/rest';
 interface GetPullRequestParameters {
     /**
      * A preconstructed Octokit client to interact with GitHub's APIs.

package/lib/api/github/pullRequest.js

@@ -31,9 +31,9 @@ __export(pullRequest_exports, {
   getPullRequestNumber: () => getPullRequestNumber
 });
 module.exports = __toCommonJS(pullRequest_exports);
-var import_rest = require("@octokit/rest");
 var Git = __toESM(require("../git"));
 var import_environment = require("./environment");
+var import_octokit = require("./octokit");
 const getPullRequestNumber = async (params = {}) => {
   const env = params.env ?? process.env;
   const dir = process.cwd();
@@ -43,7 +43,7 @@ const getPullRequestNumber = async (params = {}) => {
   if (Number.isSafeInteger(number)) {
     return number;
   }
-  const client = params.client ?? new import_rest.Octokit({ auth: (0, import_environment.apiTokenFromEnvironment)() });
+  const client = params.client ?? await (0, import_octokit.createRestClient)({ auth: (0, import_environment.apiTokenFromEnvironment)() });
   const [commitId, { owner, repo }] = await Promise.all([
     Git.getHeadCommitId({ dir, env }),
     Git.getOwnerAndRepo({ dir })

package/lib/api/github/pullRequest.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/api/github/pullRequest.ts"],
-  "sourcesContent": ["import { Octokit } from '@octokit/rest';\n\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\n\ninterface GetPullRequestParameters {\n  /**\n   * A preconstructed Octokit client to interact with GitHub's APIs.\n   *\n   * A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with write permissions must be\n   * present on the environment if this is not provided.\n   */\n  client?: Octokit;\n\n  env?: Record<string, string | undefined>;\n}\n\n/**\n * Gets the number of the current pull request.\n *\n * This tries to extract the pull request from common CI environment variables,\n * and falls back to querying the GitHub Repos API for the latest pull request\n * associated with the head commit. An error is thrown if there are no\n * associated pull requests, or if they are all closed or locked.\n */\nexport const getPullRequestNumber = async (\n  params: GetPullRequestParameters = {},\n): Promise<number> => {\n  const env = params.env ?? process.env;\n\n  const dir = process.cwd();\n\n  const number = Number(\n    env.BUILDKITE_PULL_REQUEST ??\n      env.GITHUB_REF?.replace(/^refs\\/pull\\/(\\d+).*$/, '$1'),\n  );\n\n  if (Number.isSafeInteger(number)) {\n    return number;\n  }\n\n  const client =\n    params.client ?? new Octokit({ auth: apiTokenFromEnvironment() });\n\n  const [commitId, { owner, repo }] = await Promise.all([\n    Git.getHeadCommitId({ dir, env }),\n    Git.getOwnerAndRepo({ dir }),\n  ]);\n\n  const response = await client.repos.listPullRequestsAssociatedWithCommit({\n    commit_sha: commitId,\n    owner,\n    repo,\n  });\n\n  const data = response.data\n    .filter((pr) => pr.state === 'open' && !pr.locked)\n    .sort((a, b) => b.updated_at.localeCompare(a.updated_at));\n\n  const pullRequestData = data[0];\n  if (!pullRequestData) {\n    throw new Error(\n      `Commit ${commitId} is not associated with an open GitHub pull request`,\n    );\n  }\n\n  return pullRequestData.number;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,UAAqB;AAErB,yBAAwC;AAsBjC,MAAM,uBAAuB,OAClC,SAAmC,CAAC,MAChB;AACpB,QAAM,MAAM,OAAO,OAAO,QAAQ;AAElC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,SAAS;AAAA,IACb,IAAI,0BACF,IAAI,YAAY,QAAQ,yBAAyB,IAAI;AAAA,EACzD;AAEA,MAAI,OAAO,cAAc,MAAM,GAAG;AAChC,WAAO;AAAA,EACT;AAEA,QAAM,SACJ,OAAO,UAAU,IAAI,oBAAQ,EAAE,UAAM,4CAAwB,EAAE,CAAC;AAElE,QAAM,CAAC,UAAU,EAAE,OAAO,KAAK,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,IACpD,IAAI,gBAAgB,EAAE,KAAK,IAAI,CAAC;AAAA,IAChC,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAAA,EAC7B,CAAC;AAED,QAAM,WAAW,MAAM,OAAO,MAAM,qCAAqC;AAAA,IACvE,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,OAAO,SAAS,KACnB,OAAO,CAAC,OAAO,GAAG,UAAU,UAAU,CAAC,GAAG,MAAM,EAChD,KAAK,CAAC,GAAG,MAAM,EAAE,WAAW,cAAc,EAAE,UAAU,CAAC;AAE1D,QAAM,kBAAkB,KAAK,CAAC;AAC9B,MAAI,CAAC,iBAAiB;AACpB,UAAM,IAAI;AAAA,MACR,UAAU,QAAQ;AAAA,IACpB;AAAA,EACF;AAEA,SAAO,gBAAgB;AACzB;",
+  "sourcesContent": ["import type { Octokit } from '@octokit/rest';\n\nimport * as Git from '../git';\n\nimport { apiTokenFromEnvironment } from './environment';\nimport { createRestClient } from './octokit';\n\ninterface GetPullRequestParameters {\n  /**\n   * A preconstructed Octokit client to interact with GitHub's APIs.\n   *\n   * A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with write permissions must be\n   * present on the environment if this is not provided.\n   */\n  client?: Octokit;\n\n  env?: Record<string, string | undefined>;\n}\n\n/**\n * Gets the number of the current pull request.\n *\n * This tries to extract the pull request from common CI environment variables,\n * and falls back to querying the GitHub Repos API for the latest pull request\n * associated with the head commit. An error is thrown if there are no\n * associated pull requests, or if they are all closed or locked.\n */\nexport const getPullRequestNumber = async (\n  params: GetPullRequestParameters = {},\n): Promise<number> => {\n  const env = params.env ?? process.env;\n\n  const dir = process.cwd();\n\n  const number = Number(\n    env.BUILDKITE_PULL_REQUEST ??\n      env.GITHUB_REF?.replace(/^refs\\/pull\\/(\\d+).*$/, '$1'),\n  );\n\n  if (Number.isSafeInteger(number)) {\n    return number;\n  }\n\n  const client =\n    params.client ??\n    (await createRestClient({ auth: apiTokenFromEnvironment() }));\n\n  const [commitId, { owner, repo }] = await Promise.all([\n    Git.getHeadCommitId({ dir, env }),\n    Git.getOwnerAndRepo({ dir }),\n  ]);\n\n  const response = await client.repos.listPullRequestsAssociatedWithCommit({\n    commit_sha: commitId,\n    owner,\n    repo,\n  });\n\n  const data = response.data\n    .filter((pr) => pr.state === 'open' && !pr.locked)\n    .sort((a, b) => b.updated_at.localeCompare(a.updated_at));\n\n  const pullRequestData = data[0];\n  if (!pullRequestData) {\n    throw new Error(\n      `Commit ${commitId} is not associated with an open GitHub pull request`,\n    );\n  }\n\n  return pullRequestData.number;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,UAAqB;AAErB,yBAAwC;AACxC,qBAAiC;AAsB1B,MAAM,uBAAuB,OAClC,SAAmC,CAAC,MAChB;AACpB,QAAM,MAAM,OAAO,OAAO,QAAQ;AAElC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,SAAS;AAAA,IACb,IAAI,0BACF,IAAI,YAAY,QAAQ,yBAAyB,IAAI;AAAA,EACzD;AAEA,MAAI,OAAO,cAAc,MAAM,GAAG;AAChC,WAAO;AAAA,EACT;AAEA,QAAM,SACJ,OAAO,UACN,UAAM,iCAAiB,EAAE,UAAM,4CAAwB,EAAE,CAAC;AAE7D,QAAM,CAAC,UAAU,EAAE,OAAO,KAAK,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,IACpD,IAAI,gBAAgB,EAAE,KAAK,IAAI,CAAC;AAAA,IAChC,IAAI,gBAAgB,EAAE,IAAI,CAAC;AAAA,EAC7B,CAAC;AAED,QAAM,WAAW,MAAM,OAAO,MAAM,qCAAqC;AAAA,IACvE,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,EACF,CAAC;AAED,QAAM,OAAO,SAAS,KACnB,OAAO,CAAC,OAAO,GAAG,UAAU,UAAU,CAAC,GAAG,MAAM,EAChD,KAAK,CAAC,GAAG,MAAM,EAAE,WAAW,cAAc,EAAE,UAAU,CAAC;AAE1D,QAAM,kBAAkB,KAAK,CAAC;AAC9B,MAAI,CAAC,iBAAiB;AACpB,UAAM,IAAI;AAAA,MACR,UAAU,QAAQ;AAAA,IACpB;AAAA,EACF;AAEA,SAAO,gBAAgB;AACzB;",
   "names": []
 }

package/lib/cli/configure/index.js

@@ -129,7 +129,7 @@ const configure = async () => {
       import_logging.log.warn(import_logging.log.bold("\u2717 Failed to install dependencies. Resume with:"));
       import_logging.log.newline();
       import_logging.log.plain(import_logging.log.bold(packageManager.install));
-      import_logging.log.plain(import_logging.log.bold(packageManager, "format"));
+      import_logging.log.plain(import_logging.log.bold(packageManager.command, "format"));
       import_logging.log.newline();
       process.exitCode = 1;
       return;
@@ -139,7 +139,7 @@ const configure = async () => {
     import_logging.log.newline();
     import_logging.log.ok(import_logging.log.bold("\u2714 All done! Try running:"));
     import_logging.log.newline();
-    import_logging.log.plain(import_logging.log.bold(packageManager, "format"));
+    import_logging.log.plain(import_logging.log.bold(packageManager.command, "format"));
   }
   import_logging.log.newline();
 };

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/configure/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport { Select } from 'enquirer';\n\nimport { createInclusionFilter } from '../../utils/dir';\nimport { createExec, ensureCommands } from '../../utils/exec';\nimport { log } from '../../utils/logging';\nimport { showLogoAndVersionInfo } from '../../utils/logo';\nimport { detectPackageManager } from '../../utils/packageManager';\nimport { BASE_TEMPLATE_DIR } from '../../utils/template';\nimport { hasProp } from '../../utils/validation';\n\nimport { analyseConfiguration } from './analyseConfiguration';\nimport { analyseDependencies } from './analyseDependencies';\nimport { auditWorkingTree } from './analysis/git';\nimport { getDestinationManifest } from './analysis/package';\nimport { ensureTemplateCompletion } from './ensureTemplateCompletion';\nimport { getEntryPoint } from './getEntryPoint';\nimport { getProjectType } from './getProjectType';\n\nconst shouldApply = async (name: string) => {\n  if (!process.stdin.isTTY) {\n    return 'yes';\n  }\n  const prompt = new Select({\n    choices: ['yes', 'no'] as const,\n    message: 'Apply changes?',\n    name,\n  });\n\n  const result = await prompt.run();\n\n  return result === 'yes';\n};\n\nexport const configure = async () => {\n  await showLogoAndVersionInfo();\n\n  const [manifest, packageManager] = await Promise.all([\n    getDestinationManifest(),\n    detectPackageManager(),\n  ]);\n\n  await ensureCommands(packageManager.command);\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  log.plain('Detected project root:', log.bold(destinationRoot));\n\n  const [include] = await Promise.all([\n    createInclusionFilter([\n      path.join(destinationRoot, '.gitignore'),\n      path.join(BASE_TEMPLATE_DIR, '_.gitignore'),\n    ]),\n\n    auditWorkingTree(destinationRoot),\n  ]);\n\n  const templateConfig = await ensureTemplateCompletion({\n    destinationRoot,\n    include,\n    manifest,\n  });\n\n  const type = await getProjectType({\n    manifest,\n    templateConfig,\n  });\n\n  const entryPoint = await getEntryPoint({\n    destinationRoot,\n    manifest,\n    templateConfig,\n    type,\n  });\n\n  const fixDependencies = await analyseDependencies({\n    destinationRoot,\n    include,\n    manifest,\n    type,\n  });\n\n  if (fixDependencies) {\n    log.newline();\n\n    if (await shouldApply('fixDependencies')) {\n      await fixDependencies();\n    }\n  }\n\n  const firstRun = hasProp(manifest.packageJson, 'skuba');\n\n  const fixConfiguration = await analyseConfiguration({\n    destinationRoot,\n    entryPoint,\n    firstRun,\n    packageManager,\n    type,\n  });\n\n  if (fixConfiguration) {\n    log.newline();\n\n    if (await shouldApply('fixConfiguration')) {\n      await fixConfiguration();\n    }\n  }\n\n  if (fixDependencies) {\n    const exec = createExec({\n      stdio: 'pipe',\n      streamStdio: packageManager.command,\n    });\n\n    log.newline();\n    try {\n      await exec(packageManager.install);\n    } catch {\n      log.newline();\n      log.warn(log.bold('\u2717 Failed to install dependencies. Resume with:'));\n\n      log.newline();\n      log.plain(log.bold(packageManager.install));\n      log.plain(log.bold(packageManager, 'format'));\n\n      log.newline();\n      process.exitCode = 1;\n      return;\n    }\n  }\n\n  if (fixConfiguration ?? fixDependencies) {\n    log.newline();\n    log.ok(log.bold('\u2714 All done! Try running:'));\n\n    log.newline();\n    log.plain(log.bold(packageManager, 'format'));\n  }\n\n  log.newline();\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\n\nimport { Select } from 'enquirer';\n\nimport { createInclusionFilter } from '../../utils/dir';\nimport { createExec, ensureCommands } from '../../utils/exec';\nimport { log } from '../../utils/logging';\nimport { showLogoAndVersionInfo } from '../../utils/logo';\nimport { detectPackageManager } from '../../utils/packageManager';\nimport { BASE_TEMPLATE_DIR } from '../../utils/template';\nimport { hasProp } from '../../utils/validation';\n\nimport { analyseConfiguration } from './analyseConfiguration';\nimport { analyseDependencies } from './analyseDependencies';\nimport { auditWorkingTree } from './analysis/git';\nimport { getDestinationManifest } from './analysis/package';\nimport { ensureTemplateCompletion } from './ensureTemplateCompletion';\nimport { getEntryPoint } from './getEntryPoint';\nimport { getProjectType } from './getProjectType';\n\nconst shouldApply = async (name: string) => {\n  if (!process.stdin.isTTY) {\n    return 'yes';\n  }\n  const prompt = new Select({\n    choices: ['yes', 'no'] as const,\n    message: 'Apply changes?',\n    name,\n  });\n\n  const result = await prompt.run();\n\n  return result === 'yes';\n};\n\nexport const configure = async () => {\n  await showLogoAndVersionInfo();\n\n  const [manifest, packageManager] = await Promise.all([\n    getDestinationManifest(),\n    detectPackageManager(),\n  ]);\n\n  await ensureCommands(packageManager.command);\n\n  const destinationRoot = path.dirname(manifest.path);\n\n  log.plain('Detected project root:', log.bold(destinationRoot));\n\n  const [include] = await Promise.all([\n    createInclusionFilter([\n      path.join(destinationRoot, '.gitignore'),\n      path.join(BASE_TEMPLATE_DIR, '_.gitignore'),\n    ]),\n\n    auditWorkingTree(destinationRoot),\n  ]);\n\n  const templateConfig = await ensureTemplateCompletion({\n    destinationRoot,\n    include,\n    manifest,\n  });\n\n  const type = await getProjectType({\n    manifest,\n    templateConfig,\n  });\n\n  const entryPoint = await getEntryPoint({\n    destinationRoot,\n    manifest,\n    templateConfig,\n    type,\n  });\n\n  const fixDependencies = await analyseDependencies({\n    destinationRoot,\n    include,\n    manifest,\n    type,\n  });\n\n  if (fixDependencies) {\n    log.newline();\n\n    if (await shouldApply('fixDependencies')) {\n      await fixDependencies();\n    }\n  }\n\n  const firstRun = hasProp(manifest.packageJson, 'skuba');\n\n  const fixConfiguration = await analyseConfiguration({\n    destinationRoot,\n    entryPoint,\n    firstRun,\n    packageManager,\n    type,\n  });\n\n  if (fixConfiguration) {\n    log.newline();\n\n    if (await shouldApply('fixConfiguration')) {\n      await fixConfiguration();\n    }\n  }\n\n  if (fixDependencies) {\n    const exec = createExec({\n      stdio: 'pipe',\n      streamStdio: packageManager.command,\n    });\n\n    log.newline();\n    try {\n      await exec(packageManager.install);\n    } catch {\n      log.newline();\n      log.warn(log.bold('\u2717 Failed to install dependencies. Resume with:'));\n\n      log.newline();\n      log.plain(log.bold(packageManager.install));\n      log.plain(log.bold(packageManager.command, 'format'));\n\n      log.newline();\n      process.exitCode = 1;\n      return;\n    }\n  }\n\n  if (fixConfiguration ?? fixDependencies) {\n    log.newline();\n    log.ok(log.bold('\u2714 All done! Try running:'));\n\n    log.newline();\n    log.plain(log.bold(packageManager.command, 'format'));\n  }\n\n  log.newline();\n};\n"],
+  "mappings": "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",
   "names": ["path"]
 }

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

@@ -2,7 +2,7 @@ import { type TemplateConfig } from '../../utils/template';
 import { type Choice } from './prompts';
 import { type InitConfig } from './types';
 export declare const runForm: <T = Record<string, string>>(props: {
-    choices: Readonly<Choice[]>;
+    choices: readonly Choice[];
     message: string;
     name: string;
 }) => Promise<T>;

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/init/getConfig.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { Form, type FormChoice } from 'enquirer';\nimport fs from 'fs-extra';\n\nimport { copyFiles } from '../../utils/copy';\nimport { isErrorWithCode } from '../../utils/error';\nimport { log } from '../../utils/logging';\nimport {\n  DEFAULT_PACKAGE_MANAGER,\n  configForPackageManager,\n} from '../../utils/packageManager';\nimport { getRandomPort } from '../../utils/port';\nimport {\n  TEMPLATE_CONFIG_FILENAME,\n  TEMPLATE_DIR,\n  type TemplateConfig,\n  templateConfigSchema,\n} from '../../utils/template';\n\nimport { downloadGitHubTemplate } from './git';\nimport {\n  BASE_PROMPT_PROPS,\n  type BaseFields,\n  type Choice,\n  GIT_PATH_PROMPT,\n  SHOULD_CONTINUE_PROMPT,\n  TEMPLATE_PROMPT,\n} from './prompts';\nimport { type InitConfig, initConfigInputSchema } from './types';\n\nexport const runForm = <T = Record<string, string>>(props: {\n  choices: Readonly<Choice[]>;\n  message: string;\n  name: string;\n}) => {\n  const { message, name } = props;\n\n  const choices = props.choices.map((choice) => ({\n    ...choice,\n    validate: (value: string | undefined) => {\n      if (\n        !value ||\n        value === '' ||\n        (value === choice.initial && !choice.allowInitial)\n      ) {\n        return 'Form is not complete';\n      }\n\n      return choice.validate?.(value) ?? true;\n    },\n  }));\n\n  const form = new Form<T>({\n    choices,\n    message,\n    name,\n    validate: async (values) => {\n      const results = await Promise.all(\n        choices.map((choice) => choice.validate(values[choice.name])),\n      );\n\n      return (\n        results.find((result) => typeof result === 'string') ??\n        results.every((result) => result === true)\n      );\n    },\n  });\n\n  return form.run();\n};\n\nconst confirmShouldContinue = async (choices: Readonly<FormChoice[]>) => {\n  const fieldsList = choices.map((choice) => choice.message);\n\n  log.newline();\n  log.plain('This template uses the following information:');\n  log.newline();\n  fieldsList.forEach((message) => log.subtle(`- ${message}`));\n\n  log.newline();\n  const result = await SHOULD_CONTINUE_PROMPT.run();\n\n  return result === 'yes';\n};\n\nconst createDirectory = async (dir: string) => {\n  try {\n    await fs.promises.mkdir(dir);\n  } catch (err) {\n    if (isErrorWithCode(err, 'EEXIST')) {\n      log.err(`The directory '${dir}' already exists.`);\n      process.exit(1);\n    }\n\n    throw err;\n  }\n};\n\nconst cloneTemplate = async (\n  templateName: string,\n  destinationDir: string,\n): Promise<TemplateConfig> => {\n  const isCustomTemplate = templateName.startsWith('github:');\n\n  if (isCustomTemplate) {\n    const gitHubPath = templateName.slice('github:'.length);\n\n    await downloadGitHubTemplate(gitHubPath, destinationDir);\n  } else {\n    const templateDir = path.join(TEMPLATE_DIR, templateName);\n\n    await copyFiles({\n      // assume built-in templates have no extraneous files\n      include: () => true,\n      sourceRoot: templateDir,\n      destinationRoot: destinationDir,\n      processors: [],\n      // built-in templates have files like _package.json\n      stripUnderscorePrefix: true,\n    });\n  }\n\n  const templateConfig = getTemplateConfig(\n    path.join(process.cwd(), destinationDir),\n  );\n\n  if (isCustomTemplate) {\n    log.newline();\n    log.warn(\n      'You may need to run',\n      log.bold(\n        configForPackageManager(templateConfig.packageManager).exec,\n        'skuba',\n        'configure',\n      ),\n      'once this is done.',\n    );\n  }\n\n  return templateConfig;\n};\n\nconst getTemplateName = async () => {\n  const templateSelection = await TEMPLATE_PROMPT.run();\n\n  if (templateSelection === 'github \u2192') {\n    const gitHubPath = await GIT_PATH_PROMPT.run();\n    return `github:${gitHubPath}`;\n  }\n\n  return templateSelection;\n};\n\nconst generatePlaceholders = (choices: FormChoice[]) =>\n  Object.fromEntries(\n    choices.map(({ name }) => [name, `<%- ${name} %>`] as const),\n  );\n\nexport const getTemplateConfig = (dir: string): TemplateConfig => {\n  const templateConfigPath = path.join(dir, TEMPLATE_CONFIG_FILENAME);\n\n  try {\n    /* eslint-disable-next-line @typescript-eslint/no-var-requires */\n    const templateConfig = require(templateConfigPath) as unknown;\n\n    return templateConfigSchema.parse(templateConfig);\n  } catch (err) {\n    if (isErrorWithCode(err, 'MODULE_NOT_FOUND')) {\n      return {\n        entryPoint: undefined,\n        fields: [],\n        packageManager: DEFAULT_PACKAGE_MANAGER,\n        type: undefined,\n      };\n    }\n\n    throw err;\n  }\n};\n\nconst baseToTemplateData = async ({\n  ownerName,\n  platformName,\n  repoName,\n  defaultBranch,\n}: BaseFields) => {\n  const [orgName, teamName] = ownerName.split('/');\n\n  const port = String(await getRandomPort());\n\n  if (!orgName) {\n    throw new Error(`Invalid format for owner name: ${ownerName}`);\n  }\n\n  return {\n    orgName,\n    ownerName,\n    repoName,\n    defaultBranch,\n    // Use standalone username in `teamName` contexts\n    teamName: teamName ?? orgName,\n\n    port,\n\n    platformName,\n    lambdaCdkArchitecture: platformName === 'amd64' ? 'X86_64' : 'ARM_64',\n    lambdaServerlessArchitecture:\n      platformName === 'amd64' ? 'x86_64' : platformName,\n  };\n};\n\nexport const configureFromPrompt = async (): Promise<InitConfig> => {\n  const { ownerName, platformName, repoName, defaultBranch } =\n    await runForm<BaseFields>(BASE_PROMPT_PROPS);\n  log.plain(chalk.cyan(repoName), 'by', chalk.cyan(ownerName));\n\n  const templateData = await baseToTemplateData({\n    ownerName,\n    platformName,\n    repoName,\n    defaultBranch,\n  });\n\n  const destinationDir = repoName;\n\n  await createDirectory(destinationDir);\n\n  log.newline();\n  const templateName = await getTemplateName();\n\n  const { entryPoint, fields, noSkip, packageManager, type } =\n    await cloneTemplate(templateName, destinationDir);\n\n  if (fields.length === 0) {\n    return {\n      destinationDir,\n      entryPoint,\n      packageManager,\n      templateComplete: true,\n      templateData,\n      templateName,\n      type,\n    };\n  }\n\n  const shouldContinue = noSkip ? true : await confirmShouldContinue(fields);\n\n  if (shouldContinue) {\n    log.newline();\n    const customAnswers = await runForm({\n      choices: fields,\n      message: chalk.bold(`Complete ${chalk.cyan(templateName)}:`),\n      name: 'customAnswers',\n    });\n\n    return {\n      destinationDir,\n      entryPoint,\n      packageManager,\n      templateComplete: true,\n      templateData: { ...templateData, ...customAnswers },\n      templateName,\n      type,\n    };\n  }\n\n  log.newline();\n  log.warn(\n    `Resume this later with ${chalk.bold(\n      configForPackageManager(packageManager).exec,\n      'skuba configure',\n    )}.`,\n  );\n\n  const customAnswers = generatePlaceholders(fields);\n\n  return {\n    destinationDir,\n    entryPoint,\n    packageManager,\n    templateComplete: false,\n    templateData: { ...templateData, ...customAnswers },\n    templateName,\n    type,\n  };\n};\n\nexport const readJSONFromStdIn = async () => {\n  let text = '';\n\n  await new Promise((resolve) =>\n    process.stdin\n      .on('data', (chunk) => (text += chunk.toString()))\n      .once('end', resolve),\n  );\n\n  text = text.trim();\n\n  if (text === '') {\n    log.err('No data from stdin.');\n    process.exit(1);\n  }\n\n  let value: unknown;\n\n  try {\n    value = JSON.parse(text) as unknown;\n  } catch {\n    log.err('Invalid JSON from stdin.');\n    process.exit(1);\n  }\n\n  return value;\n};\n\nconst configureFromPipe = async (): Promise<InitConfig> => {\n  const value = await readJSONFromStdIn();\n\n  const result = initConfigInputSchema.safeParse(value);\n\n  if (!result.success) {\n    log.err('Invalid data from stdin:');\n    log.err(result.error);\n    process.exit(1);\n  }\n\n  const { destinationDir, templateComplete, templateName } = result.data;\n\n  const templateData = {\n    ...(await baseToTemplateData(result.data.templateData)),\n    ...result.data.templateData,\n  };\n\n  await createDirectory(destinationDir);\n\n  const { entryPoint, fields, noSkip, packageManager, type } =\n    await cloneTemplate(templateName, destinationDir);\n\n  if (!templateComplete) {\n    if (noSkip) {\n      log.err('Templating for', log.bold(templateName), 'cannot be skipped.');\n      process.exit(1);\n    }\n\n    return {\n      ...result.data,\n      entryPoint,\n      packageManager,\n      templateData: {\n        ...templateData,\n        ...generatePlaceholders(fields),\n      },\n      type,\n    };\n  }\n\n  const required = fields.map(({ name }) => name);\n\n  const provided = new Set(Object.keys(templateData));\n\n  const missing = required.filter((name) => !provided.has(name));\n\n  if (missing.length > 0) {\n    log.err('This template uses the following information:');\n    log.newline();\n    missing.forEach((name) => log.err(`- ${name}`));\n    process.exit(1);\n  }\n\n  return {\n    ...result.data,\n    entryPoint,\n    packageManager,\n    templateData,\n    type,\n  };\n};\n\nexport const getConfig = () =>\n  process.stdin.isTTY ? configureFromPrompt() : configureFromPipe();\n"],
-  "mappings": "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",
+  "sourcesContent": ["import path from 'path';\n\nimport chalk from 'chalk';\nimport { Form, type FormChoice } from 'enquirer';\nimport fs from 'fs-extra';\n\nimport { copyFiles } from '../../utils/copy';\nimport { isErrorWithCode } from '../../utils/error';\nimport { log } from '../../utils/logging';\nimport {\n  DEFAULT_PACKAGE_MANAGER,\n  configForPackageManager,\n} from '../../utils/packageManager';\nimport { getRandomPort } from '../../utils/port';\nimport {\n  TEMPLATE_CONFIG_FILENAME,\n  TEMPLATE_DIR,\n  type TemplateConfig,\n  templateConfigSchema,\n} from '../../utils/template';\n\nimport { downloadGitHubTemplate } from './git';\nimport {\n  BASE_PROMPT_PROPS,\n  type BaseFields,\n  type Choice,\n  GIT_PATH_PROMPT,\n  SHOULD_CONTINUE_PROMPT,\n  TEMPLATE_PROMPT,\n} from './prompts';\nimport { type InitConfig, initConfigInputSchema } from './types';\n\nexport const runForm = <T = Record<string, string>>(props: {\n  choices: readonly Choice[];\n  message: string;\n  name: string;\n}) => {\n  const { message, name } = props;\n\n  const choices = props.choices.map((choice) => ({\n    ...choice,\n    validate: (value: string | undefined) => {\n      if (\n        !value ||\n        value === '' ||\n        (value === choice.initial && !choice.allowInitial)\n      ) {\n        return 'Form is not complete';\n      }\n\n      return choice.validate?.(value) ?? true;\n    },\n  }));\n\n  const form = new Form<T>({\n    choices,\n    message,\n    name,\n    validate: async (values) => {\n      const results = await Promise.all(\n        choices.map((choice) => choice.validate(values[choice.name])),\n      );\n\n      return (\n        results.find((result) => typeof result === 'string') ??\n        results.every((result) => result === true)\n      );\n    },\n  });\n\n  return form.run();\n};\n\nconst confirmShouldContinue = async (choices: readonly FormChoice[]) => {\n  const fieldsList = choices.map((choice) => choice.message);\n\n  log.newline();\n  log.plain('This template uses the following information:');\n  log.newline();\n  fieldsList.forEach((message) => log.subtle(`- ${message}`));\n\n  log.newline();\n  const result = await SHOULD_CONTINUE_PROMPT.run();\n\n  return result === 'yes';\n};\n\nconst createDirectory = async (dir: string) => {\n  try {\n    await fs.promises.mkdir(dir);\n  } catch (err) {\n    if (isErrorWithCode(err, 'EEXIST')) {\n      log.err(`The directory '${dir}' already exists.`);\n      process.exit(1);\n    }\n\n    throw err;\n  }\n};\n\nconst cloneTemplate = async (\n  templateName: string,\n  destinationDir: string,\n): Promise<TemplateConfig> => {\n  const isCustomTemplate = templateName.startsWith('github:');\n\n  if (isCustomTemplate) {\n    const gitHubPath = templateName.slice('github:'.length);\n\n    await downloadGitHubTemplate(gitHubPath, destinationDir);\n  } else {\n    const templateDir = path.join(TEMPLATE_DIR, templateName);\n\n    await copyFiles({\n      // assume built-in templates have no extraneous files\n      include: () => true,\n      sourceRoot: templateDir,\n      destinationRoot: destinationDir,\n      processors: [],\n      // built-in templates have files like _package.json\n      stripUnderscorePrefix: true,\n    });\n  }\n\n  const templateConfig = getTemplateConfig(\n    path.join(process.cwd(), destinationDir),\n  );\n\n  if (isCustomTemplate) {\n    log.newline();\n    log.warn(\n      'You may need to run',\n      log.bold(\n        configForPackageManager(templateConfig.packageManager).exec,\n        'skuba',\n        'configure',\n      ),\n      'once this is done.',\n    );\n  }\n\n  return templateConfig;\n};\n\nconst getTemplateName = async () => {\n  const templateSelection = await TEMPLATE_PROMPT.run();\n\n  if (templateSelection === 'github \u2192') {\n    const gitHubPath = await GIT_PATH_PROMPT.run();\n    return `github:${gitHubPath}`;\n  }\n\n  return templateSelection;\n};\n\nconst generatePlaceholders = (choices: FormChoice[]) =>\n  Object.fromEntries(\n    choices.map(({ name }) => [name, `<%- ${name} %>`] as const),\n  );\n\nexport const getTemplateConfig = (dir: string): TemplateConfig => {\n  const templateConfigPath = path.join(dir, TEMPLATE_CONFIG_FILENAME);\n\n  try {\n    /* eslint-disable-next-line @typescript-eslint/no-var-requires */\n    const templateConfig = require(templateConfigPath) as unknown;\n\n    return templateConfigSchema.parse(templateConfig);\n  } catch (err) {\n    if (isErrorWithCode(err, 'MODULE_NOT_FOUND')) {\n      return {\n        entryPoint: undefined,\n        fields: [],\n        packageManager: DEFAULT_PACKAGE_MANAGER,\n        type: undefined,\n      };\n    }\n\n    throw err;\n  }\n};\n\nconst baseToTemplateData = async ({\n  ownerName,\n  platformName,\n  repoName,\n  defaultBranch,\n}: BaseFields) => {\n  const [orgName, teamName] = ownerName.split('/');\n\n  const port = String(await getRandomPort());\n\n  if (!orgName) {\n    throw new Error(`Invalid format for owner name: ${ownerName}`);\n  }\n\n  return {\n    orgName,\n    ownerName,\n    repoName,\n    defaultBranch,\n    // Use standalone username in `teamName` contexts\n    teamName: teamName ?? orgName,\n\n    port,\n\n    platformName,\n    lambdaCdkArchitecture: platformName === 'amd64' ? 'X86_64' : 'ARM_64',\n    lambdaServerlessArchitecture:\n      platformName === 'amd64' ? 'x86_64' : platformName,\n  };\n};\n\nexport const configureFromPrompt = async (): Promise<InitConfig> => {\n  const { ownerName, platformName, repoName, defaultBranch } =\n    await runForm<BaseFields>(BASE_PROMPT_PROPS);\n  log.plain(chalk.cyan(repoName), 'by', chalk.cyan(ownerName));\n\n  const templateData = await baseToTemplateData({\n    ownerName,\n    platformName,\n    repoName,\n    defaultBranch,\n  });\n\n  const destinationDir = repoName;\n\n  await createDirectory(destinationDir);\n\n  log.newline();\n  const templateName = await getTemplateName();\n\n  const { entryPoint, fields, noSkip, packageManager, type } =\n    await cloneTemplate(templateName, destinationDir);\n\n  if (fields.length === 0) {\n    return {\n      destinationDir,\n      entryPoint,\n      packageManager,\n      templateComplete: true,\n      templateData,\n      templateName,\n      type,\n    };\n  }\n\n  const shouldContinue = noSkip ? true : await confirmShouldContinue(fields);\n\n  if (shouldContinue) {\n    log.newline();\n    const customAnswers = await runForm({\n      choices: fields,\n      message: chalk.bold(`Complete ${chalk.cyan(templateName)}:`),\n      name: 'customAnswers',\n    });\n\n    return {\n      destinationDir,\n      entryPoint,\n      packageManager,\n      templateComplete: true,\n      templateData: { ...templateData, ...customAnswers },\n      templateName,\n      type,\n    };\n  }\n\n  log.newline();\n  log.warn(\n    `Resume this later with ${chalk.bold(\n      configForPackageManager(packageManager).exec,\n      'skuba configure',\n    )}.`,\n  );\n\n  const customAnswers = generatePlaceholders(fields);\n\n  return {\n    destinationDir,\n    entryPoint,\n    packageManager,\n    templateComplete: false,\n    templateData: { ...templateData, ...customAnswers },\n    templateName,\n    type,\n  };\n};\n\nexport const readJSONFromStdIn = async () => {\n  let text = '';\n\n  await new Promise((resolve) =>\n    process.stdin\n      .on('data', (chunk) => (text += chunk.toString()))\n      .once('end', resolve),\n  );\n\n  text = text.trim();\n\n  if (text === '') {\n    log.err('No data from stdin.');\n    process.exit(1);\n  }\n\n  let value: unknown;\n\n  try {\n    value = JSON.parse(text) as unknown;\n  } catch {\n    log.err('Invalid JSON from stdin.');\n    process.exit(1);\n  }\n\n  return value;\n};\n\nconst configureFromPipe = async (): Promise<InitConfig> => {\n  const value = await readJSONFromStdIn();\n\n  const result = initConfigInputSchema.safeParse(value);\n\n  if (!result.success) {\n    log.err('Invalid data from stdin:');\n    log.err(result.error);\n    process.exit(1);\n  }\n\n  const { destinationDir, templateComplete, templateName } = result.data;\n\n  const templateData = {\n    ...(await baseToTemplateData(result.data.templateData)),\n    ...result.data.templateData,\n  };\n\n  await createDirectory(destinationDir);\n\n  const { entryPoint, fields, noSkip, packageManager, type } =\n    await cloneTemplate(templateName, destinationDir);\n\n  if (!templateComplete) {\n    if (noSkip) {\n      log.err('Templating for', log.bold(templateName), 'cannot be skipped.');\n      process.exit(1);\n    }\n\n    return {\n      ...result.data,\n      entryPoint,\n      packageManager,\n      templateData: {\n        ...templateData,\n        ...generatePlaceholders(fields),\n      },\n      type,\n    };\n  }\n\n  const required = fields.map(({ name }) => name);\n\n  const provided = new Set(Object.keys(templateData));\n\n  const missing = required.filter((name) => !provided.has(name));\n\n  if (missing.length > 0) {\n    log.err('This template uses the following information:');\n    log.newline();\n    missing.forEach((name) => log.err(`- ${name}`));\n    process.exit(1);\n  }\n\n  return {\n    ...result.data,\n    entryPoint,\n    packageManager,\n    templateData,\n    type,\n  };\n};\n\nexport const getConfig = () =>\n  process.stdin.isTTY ? configureFromPrompt() : configureFromPipe();\n"],
+  "mappings": "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",
   "names": ["fs", "path", "chalk", "customAnswers"]
 }

package/lib/wrapper/requestListener.js.map

@@ -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

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "8.1.0",
+  "version": "8.2.1",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -54,7 +54,7 @@
     "@jest/types": "^29.0.0",
     "@octokit/graphql": "^8.0.0",
     "@octokit/graphql-schema": "^15.3.0",
-    "@octokit/rest": "^20.0.0",
+    "@octokit/rest": "^21.0.0",
     "@octokit/types": "^13.0.0",
     "@types/jest": "^29.0.0",
     "@types/node": ">=18.12",
@@ -63,7 +63,7 @@
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
-    "esbuild": "~0.21.0",
+    "esbuild": "~0.23.0",
     "eslint": "^8.56.0",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",

package/template/base/_.gitignore

@@ -6,6 +6,7 @@
 .cdk.staging/
 .serverless/
 cdk.out/
+cdk.context.json
 node_modules*/
 
 /coverage*/

package/template/base/_.npmrc

@@ -1,4 +1,5 @@
 # managed by skuba
+package-manager-strict-version=true
 public-hoist-pattern[]="@types*"
 public-hoist-pattern[]="*eslint*"
 public-hoist-pattern[]="*prettier*"

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

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.3.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/express-rest-api/README.md

@@ -12,15 +12,15 @@ Next steps:
 
 2. [ ] Create a new repository in the appropriate GitHub organisation.
 3. [ ] Add the repository to BuildAgency;
-       see [Builds at SEEK] for more information.
+       see our internal [Buildkite Docs] for more information.
 4. [ ] Add Datadog configuration and data classification tags to [.gantry/common.yml](.gantry/common.yml);
        see the [Gantry] documentation for more information.
 5. [ ] Push local commits to the upstream GitHub branch.
 6. [ ] Configure [GitHub repository settings].
 7. [ ] Delete this checklist 😌.
 
-[builds at seek]: https://backstage.myseek.xyz/docs/default/component/builds-cicd-seek/
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
+[Buildkite Docs]: https://backstage.myseek.xyz/docs/default/component/buildkite-docs
+[GitHub repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 
 ## Design
 

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

@@ -38,7 +38,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.3.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/greeter/README.md

@@ -12,13 +12,13 @@ Next steps:
 
 2. [ ] Create a new repository in the appropriate GitHub organisation.
 3. [ ] Add the repository to BuildAgency;
-       see [Builds at SEEK] for more information.
+       see our internal [Buildkite Docs] for more information.
 4. [ ] Push local commits to the upstream GitHub branch.
 5. [ ] Configure [GitHub repository settings].
 6. [ ] Delete this checklist 😌.
 
-[builds at seek]: https://backstage.myseek.xyz/docs/default/component/builds-cicd-seek/
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
+[Buildkite Docs]: https://backstage.myseek.xyz/docs/default/component/buildkite-docs
+[GitHub repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 
 ## Design
 

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

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.3.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/koa-rest-api/README.md

@@ -12,15 +12,15 @@ Next steps:
 
 2. [ ] Create a new repository in the appropriate GitHub organisation.
 3. [ ] Add the repository to BuildAgency;
-       see [Builds at SEEK] for more information.
+       see our internal [Buildkite Docs] for more information.
 4. [ ] Add Datadog configuration and data classification tags to [.gantry/common.yml](.gantry/common.yml);
        see the [Gantry] documentation for more information.
 5. [ ] Push local commits to the upstream GitHub branch.
 6. [ ] Configure [GitHub repository settings].
 7. [ ] Delete this checklist 😌.
 
-[builds at seek]: https://backstage.myseek.xyz/docs/default/component/builds-cicd-seek/
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
+[Buildkite Docs]: https://backstage.myseek.xyz/docs/default/component/buildkite-docs
+[GitHub repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 
 ## Design
 

package/template/koa-rest-api/src/api/jobs/index.ts

@@ -1,6 +1,6 @@
 import Router from '@koa/router';
 
-import { jsonBodyParser } from 'src/framework/middleware';
+import { jsonBodyParser } from 'src/framework/bodyParser';
 
 import { getJobsHandler } from './getJobs';
 import { postJobHandler } from './postJob';

package/template/koa-rest-api/src/app.test.ts

@@ -10,16 +10,11 @@ describe('app', () => {
 
   it('has a happy health check', () => agent.get('/health').expect(200, ''));
 
-  it('has a reachable smoke test', async () => {
-    const response = await agent.get('/smoke');
-    expect(response.status).not.toBe(404);
-  });
+  it('has a reachable smoke test', () =>
+    agent.options('/smoke').expect(200, '').expect('Allow', 'HEAD, GET'));
 
-  it('has a reachable nested route', async () => {
-    const response = await agent.get('/jobs');
-    expect(response.status).not.toBe(404);
-  });
+  it('has a reachable nested route', () =>
+    agent.options('/jobs').expect(200, '').expect('Allow', /POST/));
 
-  it('has OPTIONS for a nested route', () =>
-    agent.options('/jobs').expect(200).expect('allow', /HEAD/));
+  it('handles an unknown route', () => agent.options('/admin.php').expect(404));
 });

package/template/koa-rest-api/src/framework/validation.test.ts

@@ -5,7 +5,7 @@ import {
   mockIdDescription,
 } from 'src/testing/types';
 
-import { jsonBodyParser } from './middleware';
+import { jsonBodyParser } from './bodyParser';
 import { validate } from './validation';
 
 const agent = agentFromMiddleware(jsonBodyParser, (ctx) => {

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

@@ -36,7 +36,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.2.0:
+        - docker-compose#v5.3.0:
             dependencies: false
             run: app
             propagate-environment: true
@@ -67,7 +67,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.3.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/lambda-sqs-worker/README.md

@@ -12,14 +12,14 @@ Next steps:
 
 2. [ ] Create a new repository in the appropriate GitHub organisation.
 3. [ ] Add the repository to BuildAgency;
-       see [Builds at SEEK] for more information.
+       see our internal [Buildkite Docs] for more information.
 4. [ ] Add Datadog extension, deployment bucket configuration and data classification tags to [serverless.yml](serverless.yml).
 5. [ ] Push local commits to the upstream GitHub branch.
 6. [ ] Configure [GitHub repository settings].
 7. [ ] Delete this checklist 😌.
 
-[builds at seek]: https://backstage.myseek.xyz/docs/default/component/builds-cicd-seek/
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
+[Buildkite Docs]: https://backstage.myseek.xyz/docs/default/component/buildkite-docs
+[GitHub repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 
 ## Design
 

package/template/lambda-sqs-worker/_.npmrc

@@ -1,4 +1,5 @@
 # managed by skuba
+package-manager-strict-version=true
 public-hoist-pattern[]="@types*"
 public-hoist-pattern[]="*eslint*"
 public-hoist-pattern[]="*prettier*"

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

@@ -33,7 +33,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.2.0:
+        - docker-compose#v5.3.0:
             dependencies: false
             run: app
             environment:
@@ -63,7 +63,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.3.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -83,6 +83,7 @@ steps:
           skip-pull-from-cache: true
 
   - wait
+
   - block: 🙋🏻‍♀️ Deploy Dev
     branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
 
@@ -95,25 +96,6 @@ steps:
     concurrency_group: '<%- repoName %>/deploy/dev'
     key: deploy-dev
 
-  - block: 🙋🏻‍♀️ Deploy Dev (Hotswap)
-    key: deploy-dev-hotswap-block
-    branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
-
-  - <<: *deploy
-    branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
-    depends_on: deploy-dev-hotswap-block
-    agents:
-      queue: <%- devBuildkiteQueueName %>
-    env:
-      ENVIRONMENT: dev
-    commands:
-      - echo '--- pnpm install --offline'
-      - pnpm install --offline
-      - echo '+++ pnpm run deploy:hotswap'
-      - pnpm run deploy:hotswap
-    label: 🤞 Deploy Dev (Hotswap)
-    concurrency_group: '<%- repoName %>/deploy/dev'
-
   - <<: *deploy
     env:
       ENVIRONMENT: prod

package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap

@@ -2,115 +2,6 @@
 
 exports[`returns expected CloudFormation stack for dev 1`] = `
 {
-  "Mappings": {
-    "ServiceprincipalMap": {
-      "af-south-1": {
-        "codedeploy": "codedeploy.af-south-1.amazonaws.com",
-      },
-      "ap-east-1": {
-        "codedeploy": "codedeploy.ap-east-1.amazonaws.com",
-      },
-      "ap-northeast-1": {
-        "codedeploy": "codedeploy.ap-northeast-1.amazonaws.com",
-      },
-      "ap-northeast-2": {
-        "codedeploy": "codedeploy.ap-northeast-2.amazonaws.com",
-      },
-      "ap-northeast-3": {
-        "codedeploy": "codedeploy.ap-northeast-3.amazonaws.com",
-      },
-      "ap-south-1": {
-        "codedeploy": "codedeploy.ap-south-1.amazonaws.com",
-      },
-      "ap-south-2": {
-        "codedeploy": "codedeploy.ap-south-2.amazonaws.com",
-      },
-      "ap-southeast-1": {
-        "codedeploy": "codedeploy.ap-southeast-1.amazonaws.com",
-      },
-      "ap-southeast-2": {
-        "codedeploy": "codedeploy.ap-southeast-2.amazonaws.com",
-      },
-      "ap-southeast-3": {
-        "codedeploy": "codedeploy.ap-southeast-3.amazonaws.com",
-      },
-      "ap-southeast-4": {
-        "codedeploy": "codedeploy.ap-southeast-4.amazonaws.com",
-      },
-      "ca-central-1": {
-        "codedeploy": "codedeploy.ca-central-1.amazonaws.com",
-      },
-      "cn-north-1": {
-        "codedeploy": "codedeploy.cn-north-1.amazonaws.com.cn",
-      },
-      "cn-northwest-1": {
-        "codedeploy": "codedeploy.cn-northwest-1.amazonaws.com.cn",
-      },
-      "eu-central-1": {
-        "codedeploy": "codedeploy.eu-central-1.amazonaws.com",
-      },
-      "eu-central-2": {
-        "codedeploy": "codedeploy.eu-central-2.amazonaws.com",
-      },
-      "eu-north-1": {
-        "codedeploy": "codedeploy.eu-north-1.amazonaws.com",
-      },
-      "eu-south-1": {
-        "codedeploy": "codedeploy.eu-south-1.amazonaws.com",
-      },
-      "eu-south-2": {
-        "codedeploy": "codedeploy.eu-south-2.amazonaws.com",
-      },
-      "eu-west-1": {
-        "codedeploy": "codedeploy.eu-west-1.amazonaws.com",
-      },
-      "eu-west-2": {
-        "codedeploy": "codedeploy.eu-west-2.amazonaws.com",
-      },
-      "eu-west-3": {
-        "codedeploy": "codedeploy.eu-west-3.amazonaws.com",
-      },
-      "il-central-1": {
-        "codedeploy": "codedeploy.il-central-1.amazonaws.com",
-      },
-      "me-central-1": {
-        "codedeploy": "codedeploy.me-central-1.amazonaws.com",
-      },
-      "me-south-1": {
-        "codedeploy": "codedeploy.me-south-1.amazonaws.com",
-      },
-      "sa-east-1": {
-        "codedeploy": "codedeploy.sa-east-1.amazonaws.com",
-      },
-      "us-east-1": {
-        "codedeploy": "codedeploy.us-east-1.amazonaws.com",
-      },
-      "us-east-2": {
-        "codedeploy": "codedeploy.us-east-2.amazonaws.com",
-      },
-      "us-gov-east-1": {
-        "codedeploy": "codedeploy.us-gov-east-1.amazonaws.com",
-      },
-      "us-gov-west-1": {
-        "codedeploy": "codedeploy.us-gov-west-1.amazonaws.com",
-      },
-      "us-iso-east-1": {
-        "codedeploy": "codedeploy.amazonaws.com",
-      },
-      "us-iso-west-1": {
-        "codedeploy": "codedeploy.amazonaws.com",
-      },
-      "us-isob-east-1": {
-        "codedeploy": "codedeploy.amazonaws.com",
-      },
-      "us-west-1": {
-        "codedeploy": "codedeploy.us-west-1.amazonaws.com",
-      },
-      "us-west-2": {
-        "codedeploy": "codedeploy.us-west-2.amazonaws.com",
-      },
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -203,15 +94,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
               "Action": "sts:AssumeRole",
               "Effect": "Allow",
               "Principal": {
-                "Service": {
-                  "Fn::FindInMap": [
-                    "ServiceprincipalMap",
-                    {
-                      "Ref": "AWS::Region",
-                    },
-                    "codedeploy",
-                  ],
-                },
+                "Service": "codedeploy.amazonaws.com",
               },
             },
           ],
@@ -1050,115 +933,6 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
 
 exports[`returns expected CloudFormation stack for prod 1`] = `
 {
-  "Mappings": {
-    "ServiceprincipalMap": {
-      "af-south-1": {
-        "codedeploy": "codedeploy.af-south-1.amazonaws.com",
-      },
-      "ap-east-1": {
-        "codedeploy": "codedeploy.ap-east-1.amazonaws.com",
-      },
-      "ap-northeast-1": {
-        "codedeploy": "codedeploy.ap-northeast-1.amazonaws.com",
-      },
-      "ap-northeast-2": {
-        "codedeploy": "codedeploy.ap-northeast-2.amazonaws.com",
-      },
-      "ap-northeast-3": {
-        "codedeploy": "codedeploy.ap-northeast-3.amazonaws.com",
-      },
-      "ap-south-1": {
-        "codedeploy": "codedeploy.ap-south-1.amazonaws.com",
-      },
-      "ap-south-2": {
-        "codedeploy": "codedeploy.ap-south-2.amazonaws.com",
-      },
-      "ap-southeast-1": {
-        "codedeploy": "codedeploy.ap-southeast-1.amazonaws.com",
-      },
-      "ap-southeast-2": {
-        "codedeploy": "codedeploy.ap-southeast-2.amazonaws.com",
-      },
-      "ap-southeast-3": {
-        "codedeploy": "codedeploy.ap-southeast-3.amazonaws.com",
-      },
-      "ap-southeast-4": {
-        "codedeploy": "codedeploy.ap-southeast-4.amazonaws.com",
-      },
-      "ca-central-1": {
-        "codedeploy": "codedeploy.ca-central-1.amazonaws.com",
-      },
-      "cn-north-1": {
-        "codedeploy": "codedeploy.cn-north-1.amazonaws.com.cn",
-      },
-      "cn-northwest-1": {
-        "codedeploy": "codedeploy.cn-northwest-1.amazonaws.com.cn",
-      },
-      "eu-central-1": {
-        "codedeploy": "codedeploy.eu-central-1.amazonaws.com",
-      },
-      "eu-central-2": {
-        "codedeploy": "codedeploy.eu-central-2.amazonaws.com",
-      },
-      "eu-north-1": {
-        "codedeploy": "codedeploy.eu-north-1.amazonaws.com",
-      },
-      "eu-south-1": {
-        "codedeploy": "codedeploy.eu-south-1.amazonaws.com",
-      },
-      "eu-south-2": {
-        "codedeploy": "codedeploy.eu-south-2.amazonaws.com",
-      },
-      "eu-west-1": {
-        "codedeploy": "codedeploy.eu-west-1.amazonaws.com",
-      },
-      "eu-west-2": {
-        "codedeploy": "codedeploy.eu-west-2.amazonaws.com",
-      },
-      "eu-west-3": {
-        "codedeploy": "codedeploy.eu-west-3.amazonaws.com",
-      },
-      "il-central-1": {
-        "codedeploy": "codedeploy.il-central-1.amazonaws.com",
-      },
-      "me-central-1": {
-        "codedeploy": "codedeploy.me-central-1.amazonaws.com",
-      },
-      "me-south-1": {
-        "codedeploy": "codedeploy.me-south-1.amazonaws.com",
-      },
-      "sa-east-1": {
-        "codedeploy": "codedeploy.sa-east-1.amazonaws.com",
-      },
-      "us-east-1": {
-        "codedeploy": "codedeploy.us-east-1.amazonaws.com",
-      },
-      "us-east-2": {
-        "codedeploy": "codedeploy.us-east-2.amazonaws.com",
-      },
-      "us-gov-east-1": {
-        "codedeploy": "codedeploy.us-gov-east-1.amazonaws.com",
-      },
-      "us-gov-west-1": {
-        "codedeploy": "codedeploy.us-gov-west-1.amazonaws.com",
-      },
-      "us-iso-east-1": {
-        "codedeploy": "codedeploy.amazonaws.com",
-      },
-      "us-iso-west-1": {
-        "codedeploy": "codedeploy.amazonaws.com",
-      },
-      "us-isob-east-1": {
-        "codedeploy": "codedeploy.amazonaws.com",
-      },
-      "us-west-1": {
-        "codedeploy": "codedeploy.us-west-1.amazonaws.com",
-      },
-      "us-west-2": {
-        "codedeploy": "codedeploy.us-west-2.amazonaws.com",
-      },
-    },
-  },
   "Parameters": {
     "BootstrapVersion": {
       "Default": "/cdk-bootstrap/hnb659fds/version",
@@ -1251,15 +1025,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
               "Action": "sts:AssumeRole",
               "Effect": "Allow",
               "Principal": {
-                "Service": {
-                  "Fn::FindInMap": [
-                    "ServiceprincipalMap",
-                    {
-                      "Ref": "AWS::Region",
-                    },
-                    "codedeploy",
-                  ],
-                },
+                "Service": "codedeploy.amazonaws.com",
               },
             },
           ],

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

@@ -4,7 +4,7 @@
   "license": "UNLICENSED",
   "scripts": {
     "deploy": "cdk deploy appStack --require-approval never",
-    "deploy:hotswap": "pnpm --silent deploy --hotswap",
+    "deploy:hotswap": "pnpm --silent run deploy --hotswap",
     "deploy:watch": "pnpm --silent deploy:hotswap --watch",
     "format": "skuba format",
     "lint": "skuba lint",

package/template/oss-npm-package/README.md

@@ -17,9 +17,9 @@ Next steps:
 6. [ ] Delete this checklist 😌.
 
 [#open-source]: https://slack.com/app_redirect?channel=C39P1H2SU
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
-[renovate]: https://github.com/apps/renovate
-[seek's open source rfc]: https://rfc.skinfra.xyz/RFC016-Open-Source.html
+[GitHub repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
+[Renovate]: https://github.com/apps/renovate
+[SEEK's Open Source RFC]: https://rfc.skinfra.xyz/RFC016-Open-Source.html
 
 ## API
 

package/template/private-npm-package/README.md

@@ -14,7 +14,7 @@ Next steps:
 4. [ ] Configure [GitHub repository settings].
 5. [ ] Delete this checklist 😌.
 
-[github repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
+[GitHub repository settings]: https://github.com/<%-orgName%>/<%-repoName%>/settings
 [installing on your repository]: https://github.com/SEEK-Jobs/gutenberg#installing-on-your-repository
 
 ## API