skuba 9.0.0-main-20240929024119 → 9.0.0-main-20240930131437

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

@@ -29,7 +29,7 @@ const collapseDuplicateMergeKeys = async ({
   mode
 }) => {
   const buildkiteFiles = await (0, import_fast_glob.glob)(
-    [".buildkite/**/*.yml", ".buildkite/**/*.yaml"],
+    ["{apps/*/,packages/*/,./}.buildkite/**/*.y*ml"],
     { onlyFiles: true }
   );
   if (buildkiteFiles.length === 0) {

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

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

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

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

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

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

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

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

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "9.0.0-main-20240929024119",
+  "version": "9.0.0-main-20240930131437",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -101,7 +101,7 @@
     "typescript": "~5.6.0",
     "validate-npm-package-name": "^6.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.0.0-main-20240929024119"
+    "eslint-config-skuba": "5.0.0-main-20240930131437"
   },
   "devDependencies": {
     "@changesets/cli": "2.27.8",

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

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

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

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

package/template/greeter/package.json

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

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

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

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

@@ -13,6 +13,7 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
+    "@koa/bodyparser": "^5.1.1",
     "@koa/router": "^13.0.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^1.25.0",
@@ -24,7 +25,6 @@
     "@seek/logger": "^9.0.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.13.4",
-    "koa-bodyparser": "^4.3.0",
     "koa-compose": "^4.1.0",
     "seek-datadog-custom-metrics": "^4.6.3",
     "seek-koala": "^7.0.0",
@@ -33,8 +33,8 @@
   },
   "devDependencies": {
     "@types/chance": "^1.1.3",
+    "@types/co-body": "^6.1.3",
     "@types/koa": "^2.13.4",
-    "@types/koa-bodyparser": "^5.0.2",
     "@types/koa__router": "^12.0.0",
     "@types/node": "^20.16.5",
     "@types/supertest": "^6.0.0",

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

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

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

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

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

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

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

@@ -28,7 +28,7 @@
     "aws-cdk-lib": "^2.109.0",
     "constructs": "^10.0.17",
     "pino-pretty": "^11.0.0",
-    "skuba": "9.0.0-main-20240929024119"
+    "skuba": "9.0.0-main-20240930131437"
   },
   "packageManager": "pnpm@9.11.0",
   "engines": {