skuba 9.0.0-main-20240924121500 → 9.0.0-main-20240928013837

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

@@ -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/lint/internalLints/upgrade/patches/8.2.1/index.js

@@ -23,6 +23,7 @@ __export(__exports, {
 module.exports = __toCommonJS(__exports);
 var import_collapseDuplicateMergeKeys = require("./collapseDuplicateMergeKeys");
 var import_patchDockerCompose = require("./patchDockerCompose");
+var import_patchDockerImages = require("./patchDockerImages");
 var import_upgradeESLint = require("./upgradeESLint");
 const patches = [
   {
@@ -36,6 +37,10 @@ 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"
   }
 ];
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -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 { 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"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,wCAA8C;AAC9C,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;AACF;",
   "names": []
 }

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

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

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

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

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

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

@@ -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/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": "9.0.0-main-20240924121500",
+  "version": "9.0.0-main-20240928013837",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -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-main-20240924121500"
+    "eslint-config-skuba": "5.0.0-main-20240928013837"
   },
   "devDependencies": {
     "@changesets/cli": "2.27.8",

package/template/express-rest-api/Dockerfile

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

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

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

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

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "skuba": "9.0.0-main-20240924121500"
+    "skuba": "9.0.0-main-20240928013837"
   },
   "packageManager": "pnpm@9.11.0",
   "engines": {

package/template/koa-rest-api/Dockerfile

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

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

@@ -13,7 +13,7 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@koa/router": "^12.0.0",
+    "@koa/router": "^13.0.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^1.25.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
@@ -21,7 +21,7 @@
     "@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",

package/template/lambda-sqs-worker/Dockerfile

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

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

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

@@ -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-main-20240924121500"
+    "skuba": "9.0.0-main-20240928013837"
   },
   "packageManager": "pnpm@9.11.0",
   "engines": {