skuba 8.1.0-test-20240430085832 → 8.1.0

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/7.3.1/moveNpmrcOutOfIgnoreManagedSection.ts"],
-  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { NPMRC_LINES } from '../../../../../../utils/npmrc';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\n\nconst NPMRC_IGNORE_SECTION = `\n\n# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.\n# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.\n# You can use \\`skuba format\\` to generate the file or otherwise commit an empty file.\n# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.\n.npmrc\n`;\n\nconst moveNpmrcOutOfIgnoreManagedSection = async (\n  mode: 'format' | 'lint',\n  dir: string,\n  fileName: '.gitignore' | '.dockerignore',\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const ignoreFile = await readFile(fileName);\n\n  if (!ignoreFile) {\n    return { result: 'skip', reason: `no ${fileName} file found` };\n  }\n\n  let isIgnored: { inManaged: boolean } | undefined;\n  let currentlyInManagedSection = false;\n\n  for (const line of ignoreFile.split('\\n')) {\n    if (line.trim() === '# managed by skuba') {\n      currentlyInManagedSection = true;\n    } else if (line.trim() === '# end managed by skuba') {\n      currentlyInManagedSection = false;\n    }\n\n    if (line.trim() === '.npmrc' || line.trim() === '/.npmrc') {\n      isIgnored = { inManaged: currentlyInManagedSection };\n    }\n\n    if (line.trim() === '!.npmrc' || line.trim() === '!/.npmrc') {\n      isIgnored = undefined;\n    }\n  }\n\n  if (isIgnored && !isIgnored.inManaged) {\n    return { result: 'skip', reason: 'already ignored in unmanaged section' };\n  }\n\n  if (!isIgnored) {\n    return { result: 'skip', reason: 'not ignored' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  const newIgnoreFile =\n    ignoreFile\n      .split('\\n')\n      .filter((line) => !NPMRC_LINES.includes(line.trim()))\n      .join('\\n')\n      .trim() + NPMRC_IGNORE_SECTION;\n\n  await fs.promises.writeFile(path.join(dir, fileName), newIgnoreFile);\n\n  return { result: 'apply' };\n};\n\nexport const tryMoveNpmrcOutOfIgnoreManagedSection = (\n  type: '.gitignore' | '.dockerignore',\n) =>\n  (async (mode: 'format' | 'lint', dir = process.cwd()) => {\n    try {\n      return await moveNpmrcOutOfIgnoreManagedSection(mode, dir, type);\n    } catch (err) {\n      log.warn(`Failed to move .npmrc out of ${type} managed sections.`);\n      log.subtle(inspect(err));\n      return { result: 'skip', reason: 'due to an error' };\n    }\n  }) satisfies PatchFunction;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,mBAA4B;AAC5B,qBAA4C;AAE5C,MAAM,uBAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAS7B,MAAM,qCAAqC,OACzC,MACA,KACA,aAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,aAAa,MAAM,SAAS,QAAQ;AAE1C,MAAI,CAAC,YAAY;AACf,WAAO,EAAE,QAAQ,QAAQ,QAAQ,MAAM,QAAQ,cAAc;AAAA,EAC/D;AAEA,MAAI;AACJ,MAAI,4BAA4B;AAEhC,aAAW,QAAQ,WAAW,MAAM,IAAI,GAAG;AACzC,QAAI,KAAK,KAAK,MAAM,sBAAsB;AACxC,kCAA4B;AAAA,IAC9B,WAAW,KAAK,KAAK,MAAM,0BAA0B;AACnD,kCAA4B;AAAA,IAC9B;AAEA,QAAI,KAAK,KAAK,MAAM,YAAY,KAAK,KAAK,MAAM,WAAW;AACzD,kBAAY,EAAE,WAAW,0BAA0B;AAAA,IACrD;AAEA,QAAI,KAAK,KAAK,MAAM,aAAa,KAAK,KAAK,MAAM,YAAY;AAC3D,kBAAY;AAAA,IACd;AAAA,EACF;AAEA,MAAI,aAAa,CAAC,UAAU,WAAW;AACrC,WAAO,EAAE,QAAQ,QAAQ,QAAQ,uCAAuC;AAAA,EAC1E;AAEA,MAAI,CAAC,WAAW;AACd,WAAO,EAAE,QAAQ,QAAQ,QAAQ,cAAc;AAAA,EACjD;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,gBACJ,WACG,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,CAAC,yBAAY,SAAS,KAAK,KAAK,CAAC,CAAC,EACnD,KAAK,IAAI,EACT,KAAK,IAAI;AAEd,QAAM,gBAAAA,QAAG,SAAS,UAAU,YAAAC,QAAK,KAAK,KAAK,QAAQ,GAAG,aAAa;AAEnE,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,wCAAwC,CACnD,SAEC,OAAO,MAAyB,MAAM,QAAQ,IAAI,MAAM;AACvD,MAAI;AACF,WAAO,MAAM,mCAAmC,MAAM,KAAK,IAAI;AAAA,EACjE,SAAS,KAAK;AACZ,uBAAI,KAAK,gCAAgC,IAAI,oBAAoB;AACjE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { NPMRC_LINES } from '../../../../../../utils/npmrc';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\n\nconst NPMRC_IGNORE_SECTION = `\n\n# Ignore .npmrc. This is no longer managed by skuba as pnpm projects use a managed .npmrc.\n# IMPORTANT: if migrating to pnpm, remove this line and add an .npmrc IN THE SAME COMMIT.\n# You can use \\`skuba format\\` to generate the file or otherwise commit an empty file.\n# Doing so will conflict with a local .npmrc and make it more difficult to unintentionally commit auth secrets.\n.npmrc\n`;\n\nconst moveNpmrcOutOfIgnoreManagedSection = async (\n  mode: 'format' | 'lint',\n  dir: string,\n  fileName: '.gitignore' | '.dockerignore',\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const ignoreFile = await readFile(fileName);\n\n  if (!ignoreFile) {\n    return { result: 'skip', reason: `no ${fileName} file found` };\n  }\n\n  let isIgnored: { inManaged: boolean } | undefined;\n  let currentlyInManagedSection = false;\n\n  for (const line of ignoreFile.split('\\n')) {\n    if (line.trim() === '# managed by skuba') {\n      currentlyInManagedSection = true;\n    } else if (line.trim() === '# end managed by skuba') {\n      currentlyInManagedSection = false;\n    }\n\n    if (line.trim() === '.npmrc' || line.trim() === '/.npmrc') {\n      isIgnored = { inManaged: currentlyInManagedSection };\n    }\n\n    if (line.trim() === '!.npmrc' || line.trim() === '!/.npmrc') {\n      isIgnored = undefined;\n    }\n  }\n\n  if (isIgnored && !isIgnored.inManaged) {\n    return { result: 'skip', reason: 'already ignored in unmanaged section' };\n  }\n\n  if (!isIgnored) {\n    return { result: 'skip', reason: 'not ignored' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  const newIgnoreFile =\n    ignoreFile\n      .split('\\n')\n      .filter((line) => !NPMRC_LINES.includes(line.trim()))\n      .join('\\n')\n      .trim() + NPMRC_IGNORE_SECTION;\n\n  await fs.promises.writeFile(path.join(dir, fileName), newIgnoreFile);\n\n  return { result: 'apply' };\n};\n\nexport const tryMoveNpmrcOutOfIgnoreManagedSection = (\n  type: '.gitignore' | '.dockerignore',\n) =>\n  (async ({ mode, dir = process.cwd() }) => {\n    try {\n      return await moveNpmrcOutOfIgnoreManagedSection(mode, dir, type);\n    } catch (err) {\n      log.warn(`Failed to move .npmrc out of ${type} managed sections.`);\n      log.subtle(inspect(err));\n      return { result: 'skip', reason: 'due to an error' };\n    }\n  }) satisfies PatchFunction;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAAe;AAGf,qBAAoB;AACpB,mBAA4B;AAC5B,qBAA4C;AAE5C,MAAM,uBAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAS7B,MAAM,qCAAqC,OACzC,MACA,KACA,aAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,aAAa,MAAM,SAAS,QAAQ;AAE1C,MAAI,CAAC,YAAY;AACf,WAAO,EAAE,QAAQ,QAAQ,QAAQ,MAAM,QAAQ,cAAc;AAAA,EAC/D;AAEA,MAAI;AACJ,MAAI,4BAA4B;AAEhC,aAAW,QAAQ,WAAW,MAAM,IAAI,GAAG;AACzC,QAAI,KAAK,KAAK,MAAM,sBAAsB;AACxC,kCAA4B;AAAA,IAC9B,WAAW,KAAK,KAAK,MAAM,0BAA0B;AACnD,kCAA4B;AAAA,IAC9B;AAEA,QAAI,KAAK,KAAK,MAAM,YAAY,KAAK,KAAK,MAAM,WAAW;AACzD,kBAAY,EAAE,WAAW,0BAA0B;AAAA,IACrD;AAEA,QAAI,KAAK,KAAK,MAAM,aAAa,KAAK,KAAK,MAAM,YAAY;AAC3D,kBAAY;AAAA,IACd;AAAA,EACF;AAEA,MAAI,aAAa,CAAC,UAAU,WAAW;AACrC,WAAO,EAAE,QAAQ,QAAQ,QAAQ,uCAAuC;AAAA,EAC1E;AAEA,MAAI,CAAC,WAAW;AACd,WAAO,EAAE,QAAQ,QAAQ,QAAQ,cAAc;AAAA,EACjD;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,gBACJ,WACG,MAAM,IAAI,EACV,OAAO,CAAC,SAAS,CAAC,yBAAY,SAAS,KAAK,KAAK,CAAC,CAAC,EACnD,KAAK,IAAI,EACT,KAAK,IAAI;AAEd,QAAM,gBAAAA,QAAG,SAAS,UAAU,YAAAC,QAAK,KAAK,KAAK,QAAQ,GAAG,aAAa;AAEnE,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,wCAAwC,CACnD,SAEC,OAAO,EAAE,MAAM,MAAM,QAAQ,IAAI,EAAE,MAAM;AACxC,MAAI;AACF,WAAO,MAAM,mCAAmC,MAAM,KAAK,IAAI;AAAA,EACjE,SAAS,KAAK;AACZ,uBAAI,KAAK,gCAAgC,IAAI,oBAAoB;AACjE,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fs", "path"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/patchDockerfile.js

@@ -55,7 +55,10 @@ const patchDockerfile = async (mode, dir) => {
   await import_fs_extra.default.promises.writeFile(DOCKERFILE_FILENAME, patched);
   return { result: "apply" };
 };
-const tryPatchDockerfile = async (mode, dir = process.cwd()) => {
+const tryPatchDockerfile = async ({
+  mode,
+  dir = process.cwd()
+}) => {
   try {
     return await patchDockerfile(mode, dir);
   } catch (err) {

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/patchDockerfile.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/7.3.1/patchDockerfile.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\n\nconst DOCKERFILE_FILENAME = 'Dockerfile';\n\nconst NON_DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs:(18|20)/g;\nconst DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs(18|20)-debian11/g;\nconst VERSION_DEBIAN_REPLACE = 'gcr.io/distroless/nodejs$1-debian12';\n\nconst patchDockerfile = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const maybeDockerfile = await readFile(DOCKERFILE_FILENAME);\n\n  if (!maybeDockerfile) {\n    return { result: 'skip', reason: 'no Dockerfile found' };\n  }\n\n  const patched = maybeDockerfile\n    .replaceAll(NON_DEBIAN_REGEX, VERSION_DEBIAN_REPLACE)\n    .replaceAll(DEBIAN_REGEX, VERSION_DEBIAN_REPLACE);\n\n  if (patched === maybeDockerfile) {\n    return { result: 'skip' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await fs.promises.writeFile(DOCKERFILE_FILENAME, patched);\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchDockerfile: PatchFunction = async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    return await patchDockerfile(mode, dir);\n  } catch (err) {\n    log.warn('Failed to patch Dockerfile.');\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,sBAAe;AAGf,qBAAoB;AACpB,qBAA4C;AAE5C,MAAM,sBAAsB;AAE5B,MAAM,mBAAmB;AACzB,MAAM,eAAe;AACrB,MAAM,yBAAyB;AAE/B,MAAM,kBAAkB,OACtB,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,kBAAkB,MAAM,SAAS,mBAAmB;AAE1D,MAAI,CAAC,iBAAiB;AACpB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,sBAAsB;AAAA,EACzD;AAEA,QAAM,UAAU,gBACb,WAAW,kBAAkB,sBAAsB,EACnD,WAAW,cAAc,sBAAsB;AAElD,MAAI,YAAY,iBAAiB;AAC/B,WAAO,EAAE,QAAQ,OAAO;AAAA,EAC1B;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,gBAAAA,QAAG,SAAS,UAAU,qBAAqB,OAAO;AAExD,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,qBAAoC,OAC/C,MACA,MAAM,QAAQ,IAAI,MACf;AACH,MAAI;AACF,WAAO,MAAM,gBAAgB,MAAM,GAAG;AAAA,EACxC,SAAS,KAAK;AACZ,uBAAI,KAAK,6BAA6B;AACtC,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\n\nconst DOCKERFILE_FILENAME = 'Dockerfile';\n\nconst NON_DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs:(18|20)/g;\nconst DEBIAN_REGEX = /gcr.io\\/distroless\\/nodejs(18|20)-debian11/g;\nconst VERSION_DEBIAN_REPLACE = 'gcr.io/distroless/nodejs$1-debian12';\n\nconst patchDockerfile = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  const maybeDockerfile = await readFile(DOCKERFILE_FILENAME);\n\n  if (!maybeDockerfile) {\n    return { result: 'skip', reason: 'no Dockerfile found' };\n  }\n\n  const patched = maybeDockerfile\n    .replaceAll(NON_DEBIAN_REGEX, VERSION_DEBIAN_REPLACE)\n    .replaceAll(DEBIAN_REGEX, VERSION_DEBIAN_REPLACE);\n\n  if (patched === maybeDockerfile) {\n    return { result: 'skip' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  await fs.promises.writeFile(DOCKERFILE_FILENAME, patched);\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchDockerfile: PatchFunction = async ({\n  mode,\n  dir = process.cwd(),\n}) => {\n  try {\n    return await patchDockerfile(mode, dir);\n  } catch (err) {\n    log.warn('Failed to patch Dockerfile.');\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,sBAAe;AAGf,qBAAoB;AACpB,qBAA4C;AAE5C,MAAM,sBAAsB;AAE5B,MAAM,mBAAmB;AACzB,MAAM,eAAe;AACrB,MAAM,yBAAyB;AAE/B,MAAM,kBAAkB,OACtB,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,QAAM,kBAAkB,MAAM,SAAS,mBAAmB;AAE1D,MAAI,CAAC,iBAAiB;AACpB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,sBAAsB;AAAA,EACzD;AAEA,QAAM,UAAU,gBACb,WAAW,kBAAkB,sBAAsB,EACnD,WAAW,cAAc,sBAAsB;AAElD,MAAI,YAAY,iBAAiB;AAC/B,WAAO,EAAE,QAAQ,OAAO;AAAA,EAC1B;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,gBAAAA,QAAG,SAAS,UAAU,qBAAqB,OAAO;AAExD,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,qBAAoC,OAAO;AAAA,EACtD;AAAA,EACA,MAAM,QAAQ,IAAI;AACpB,MAAM;AACJ,MAAI;AACF,WAAO,MAAM,gBAAgB,MAAM,GAAG;AAAA,EACxC,SAAS,KAAK;AACZ,uBAAI,KAAK,6BAA6B;AACtC,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fs"]
 }

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/patchServerListener.js

@@ -75,7 +75,10 @@ const patchServerListener = async (mode, dir) => {
   );
   return { result: "apply" };
 };
-const tryPatchServerListener = async (mode, dir = process.cwd()) => {
+const tryPatchServerListener = async ({
+  mode,
+  dir = process.cwd()
+}) => {
   try {
     return await patchServerListener(mode, dir);
   } catch (err) {

package/lib/cli/lint/internalLints/upgrade/patches/7.3.1/patchServerListener.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/7.3.1/patchServerListener.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\nimport { formatPrettier } from '../../../../../configure/processing/prettier';\n\nconst SERVER_LISTENER_FILENAME = 'src/listen.ts';\n\nconst KEEP_ALIVE_CODE = `\n// Gantry ALB default idle timeout is 30 seconds\n// https://nodejs.org/docs/latest-v20.x/api/http.html#serverkeepalivetimeout\n// Node default is 5 seconds\n// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/application-load-balancers.html#connection-idle-timeout\n// AWS recommends setting an application timeout larger than the load balancer\nlistener.keepAliveTimeout = 31000;\n`;\n\nconst patchServerListener = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  let listener = await readFile(SERVER_LISTENER_FILENAME);\n  if (!listener) {\n    return { result: 'skip', reason: 'no listener file found' };\n  }\n\n  if (listener.includes('keepAliveTimeout')) {\n    return { result: 'skip', reason: 'keepAliveTimeout already configured' };\n  }\n\n  if (listener.includes('\\napp.listen(')) {\n    listener = listener.replace(\n      '\\napp.listen(',\n      '\\nconst listener = app.listen(',\n    );\n  }\n\n  if (!listener.includes('\\nconst listener = app.listen(')) {\n    return { result: 'skip', reason: 'no server listener found' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  listener = `${listener}${KEEP_ALIVE_CODE}`;\n\n  await fs.promises.writeFile(\n    SERVER_LISTENER_FILENAME,\n    await formatPrettier(listener, {\n      parser: 'typescript',\n    }),\n  );\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchServerListener: PatchFunction = async (\n  mode: 'format' | 'lint',\n  dir = process.cwd(),\n) => {\n  try {\n    return await patchServerListener(mode, dir);\n  } catch (err) {\n    log.warn('Failed to patch server listener.');\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,sBAAe;AAGf,qBAAoB;AACpB,qBAA4C;AAC5C,sBAA+B;AAE/B,MAAM,2BAA2B;AAEjC,MAAM,kBAAkB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASxB,MAAM,sBAAsB,OAC1B,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,MAAI,WAAW,MAAM,SAAS,wBAAwB;AACtD,MAAI,CAAC,UAAU;AACb,WAAO,EAAE,QAAQ,QAAQ,QAAQ,yBAAyB;AAAA,EAC5D;AAEA,MAAI,SAAS,SAAS,kBAAkB,GAAG;AACzC,WAAO,EAAE,QAAQ,QAAQ,QAAQ,sCAAsC;AAAA,EACzE;AAEA,MAAI,SAAS,SAAS,eAAe,GAAG;AACtC,eAAW,SAAS;AAAA,MAClB;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,MAAI,CAAC,SAAS,SAAS,gCAAgC,GAAG;AACxD,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,aAAW,GAAG,QAAQ,GAAG,eAAe;AAExC,QAAM,gBAAAA,QAAG,SAAS;AAAA,IAChB;AAAA,IACA,UAAM,gCAAe,UAAU;AAAA,MAC7B,QAAQ;AAAA,IACV,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,yBAAwC,OACnD,MACA,MAAM,QAAQ,IAAI,MACf;AACH,MAAI;AACF,WAAO,MAAM,oBAAoB,MAAM,GAAG;AAAA,EAC5C,SAAS,KAAK;AACZ,uBAAI,KAAK,kCAAkC;AAC3C,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project';\nimport { formatPrettier } from '../../../../../configure/processing/prettier';\n\nconst SERVER_LISTENER_FILENAME = 'src/listen.ts';\n\nconst KEEP_ALIVE_CODE = `\n// Gantry ALB default idle timeout is 30 seconds\n// https://nodejs.org/docs/latest-v20.x/api/http.html#serverkeepalivetimeout\n// Node default is 5 seconds\n// https://docs.aws.amazon.com/elasticloadbalancing/latest/application/application-load-balancers.html#connection-idle-timeout\n// AWS recommends setting an application timeout larger than the load balancer\nlistener.keepAliveTimeout = 31000;\n`;\n\nconst patchServerListener = async (\n  mode: 'format' | 'lint',\n  dir: string,\n): Promise<PatchReturnType> => {\n  const readFile = createDestinationFileReader(dir);\n\n  let listener = await readFile(SERVER_LISTENER_FILENAME);\n  if (!listener) {\n    return { result: 'skip', reason: 'no listener file found' };\n  }\n\n  if (listener.includes('keepAliveTimeout')) {\n    return { result: 'skip', reason: 'keepAliveTimeout already configured' };\n  }\n\n  if (listener.includes('\\napp.listen(')) {\n    listener = listener.replace(\n      '\\napp.listen(',\n      '\\nconst listener = app.listen(',\n    );\n  }\n\n  if (!listener.includes('\\nconst listener = app.listen(')) {\n    return { result: 'skip', reason: 'no server listener found' };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  listener = `${listener}${KEEP_ALIVE_CODE}`;\n\n  await fs.promises.writeFile(\n    SERVER_LISTENER_FILENAME,\n    await formatPrettier(listener, {\n      parser: 'typescript',\n    }),\n  );\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchServerListener: PatchFunction = async ({\n  mode,\n  dir = process.cwd(),\n}) => {\n  try {\n    return await patchServerListener(mode, dir);\n  } catch (err) {\n    log.warn('Failed to patch server listener.');\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,sBAAe;AAGf,qBAAoB;AACpB,qBAA4C;AAC5C,sBAA+B;AAE/B,MAAM,2BAA2B;AAEjC,MAAM,kBAAkB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASxB,MAAM,sBAAsB,OAC1B,MACA,QAC6B;AAC7B,QAAM,eAAW,4CAA4B,GAAG;AAEhD,MAAI,WAAW,MAAM,SAAS,wBAAwB;AACtD,MAAI,CAAC,UAAU;AACb,WAAO,EAAE,QAAQ,QAAQ,QAAQ,yBAAyB;AAAA,EAC5D;AAEA,MAAI,SAAS,SAAS,kBAAkB,GAAG;AACzC,WAAO,EAAE,QAAQ,QAAQ,QAAQ,sCAAsC;AAAA,EACzE;AAEA,MAAI,SAAS,SAAS,eAAe,GAAG;AACtC,eAAW,SAAS;AAAA,MAClB;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,MAAI,CAAC,SAAS,SAAS,gCAAgC,GAAG;AACxD,WAAO,EAAE,QAAQ,QAAQ,QAAQ,2BAA2B;AAAA,EAC9D;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,aAAW,GAAG,QAAQ,GAAG,eAAe;AAExC,QAAM,gBAAAA,QAAG,SAAS;AAAA,IAChB;AAAA,IACA,UAAM,gCAAe,UAAU;AAAA,MAC7B,QAAQ;AAAA,IACV,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,yBAAwC,OAAO;AAAA,EAC1D;AAAA,EACA,MAAM,QAAQ,IAAI;AACpB,MAAM;AACJ,MAAI;AACF,WAAO,MAAM,oBAAoB,MAAM,GAAG;AAAA,EAC5C,SAAS,KAAK;AACZ,uBAAI,KAAK,kCAAkC;AAC3C,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.0.0/index.d.ts

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

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

@@ -0,0 +1,35 @@
+"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 __exports = {};
+__export(__exports, {
+  patches: () => patches
+});
+module.exports = __toCommonJS(__exports);
+var import_patchPnpmPackageManager = require("./patchPnpmPackageManager");
+const patches = [
+  {
+    apply: import_patchPnpmPackageManager.tryPatchPnpmPackageManager,
+    description: "Ensure the pnpm package manager version specified in package.json is used in Dockerfiles"
+  }
+];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  patches
+});
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.0.0/index.ts"],
+  "sourcesContent": ["import type { Patches } from '../..';\n\nimport { tryPatchPnpmPackageManager } from './patchPnpmPackageManager';\n\nexport const patches: Patches = [\n  {\n    apply: tryPatchPnpmPackageManager,\n    description:\n      'Ensure the pnpm package manager version specified in package.json is used in Dockerfiles',\n  },\n];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,qCAA2C;AAEpC,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aACE;AAAA,EACJ;AACF;",
+  "names": []
+}

package/lib/cli/lint/internalLints/upgrade/patches/8.0.0/patchPnpmPackageManager.d.ts

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

package/lib/cli/lint/internalLints/upgrade/patches/8.0.0/patchPnpmPackageManager.js

@@ -0,0 +1,147 @@
+"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 patchPnpmPackageManager_exports = {};
+__export(patchPnpmPackageManager_exports, {
+  tryPatchPnpmPackageManager: () => tryPatchPnpmPackageManager
+});
+module.exports = __toCommonJS(patchPnpmPackageManager_exports);
+var import_util = require("util");
+var import_fast_glob = __toESM(require("fast-glob"));
+var import_fs_extra = require("fs-extra");
+var import_semver = require("semver");
+var import_logging = require("../../../../../../utils/logging");
+const DOCKERFILE_COREPACK_COMMAND = "RUN corepack enable pnpm";
+const PACKAGE_JSON_MOUNT = `RUN --mount=type=bind,source=package.json,target=package.json \\
+  corepack enable pnpm && corepack install`;
+const PACKAGE_JSON_CACHE = "- package.json#.packageManager";
+const BEFORE_PIPELINE_REGEX = /(\s*cache-on:\s*\n\s*-\s*\.npmrc\s*\n)((\s*)-\s*pnpm-lock\.yaml)/gm;
+const ECR_REGEX = /seek-oss\/docker-ecr-cache#v([\d\.]+)/gm;
+const fetchFiles = async (files) => Promise.all(
+  files.map(async (file) => {
+    const contents = await (0, import_fs_extra.readFile)(file, "utf8");
+    return {
+      file,
+      contents
+    };
+  })
+);
+const patchPnpmPackageManager = async ({
+  mode,
+  manifest,
+  packageManager
+}) => {
+  if (packageManager.command !== "pnpm") {
+    return {
+      result: "skip",
+      reason: "not using pnpm"
+    };
+  }
+  if (!manifest.packageJson.packageManager?.includes("pnpm")) {
+    return {
+      result: "skip",
+      reason: "no packageManager declaration in package.json found"
+    };
+  }
+  const [maybeDockerfiles, maybePipelines] = await Promise.all([
+    (0, import_fast_glob.default)(["Dockerfile*"]),
+    (0, import_fast_glob.default)([".buildkite/*.yml"])
+  ]);
+  if (!maybeDockerfiles.length || !maybePipelines.length) {
+    return {
+      result: "skip",
+      reason: "Either dockerfiles or pipelines were not found"
+    };
+  }
+  const [dockerfiles, pipelines] = await Promise.all([
+    fetchFiles(maybeDockerfiles),
+    fetchFiles(maybePipelines)
+  ]);
+  const dockerFilesToPatch = dockerfiles.filter(
+    ({ contents }) => contents.includes(DOCKERFILE_COREPACK_COMMAND) && !contents.includes("target=package.json")
+  );
+  const pipelinesToPatch = pipelines.filter(
+    ({ contents }) => Boolean(BEFORE_PIPELINE_REGEX.exec(contents))
+  );
+  if (!dockerFilesToPatch.length && !pipelinesToPatch.length) {
+    return {
+      result: "skip",
+      reason: "no pipeline or dockerfiles to patch"
+    };
+  }
+  if (mode === "lint") {
+    return { result: "apply" };
+  }
+  if (dockerFilesToPatch.length) {
+    await Promise.all(
+      dockerFilesToPatch.map(async ({ file, contents }) => {
+        const patchedContent = contents.replace(
+          DOCKERFILE_COREPACK_COMMAND,
+          PACKAGE_JSON_MOUNT
+        );
+        await (0, import_fs_extra.writeFile)(file, patchedContent);
+      })
+    );
+  }
+  if (pipelinesToPatch.length) {
+    await Promise.all(
+      pipelinesToPatch.map(async ({ file, contents }) => {
+        const patchedContent = contents.replace(
+          BEFORE_PIPELINE_REGEX,
+          `$1$3${PACKAGE_JSON_CACHE}
+$2`
+        );
+        const patchedEcrContent = patchedContent.replace(
+          ECR_REGEX,
+          (match, version) => {
+            if (typeof version === "string" && (0, import_semver.lt)(version, "2.2.0")) {
+              return "seek-oss/docker-ecr-cache#v2.2.0";
+            }
+            return match;
+          }
+        );
+        await (0, import_fs_extra.writeFile)(file, patchedEcrContent);
+      })
+    );
+  }
+  return { result: "apply" };
+};
+const tryPatchPnpmPackageManager = async (config) => {
+  try {
+    return await patchPnpmPackageManager(config);
+  } catch (err) {
+    import_logging.log.warn("Failed to patch pnpm packageManager CI configuration.");
+    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 = {
+  tryPatchPnpmPackageManager
+});
+//# sourceMappingURL=patchPnpmPackageManager.js.map

package/lib/cli/lint/internalLints/upgrade/patches/8.0.0/patchPnpmPackageManager.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.0.0/patchPnpmPackageManager.ts"],
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport { readFile, writeFile } from 'fs-extra';\nimport { lt } from 'semver';\n\nimport type { PatchFunction, PatchReturnType } from '../..';\nimport { log } from '../../../../../../utils/logging';\n\nconst DOCKERFILE_COREPACK_COMMAND = 'RUN corepack enable pnpm';\nconst PACKAGE_JSON_MOUNT = `RUN --mount=type=bind,source=package.json,target=package.json \\\\\n  corepack enable pnpm && corepack install`;\nconst PACKAGE_JSON_CACHE = '- package.json#.packageManager';\n\nconst BEFORE_PIPELINE_REGEX =\n  /(\\s*cache-on:\\s*\\n\\s*-\\s*\\.npmrc\\s*\\n)((\\s*)-\\s*pnpm-lock\\.yaml)/gm;\nconst ECR_REGEX = /seek-oss\\/docker-ecr-cache#v([\\d\\.]+)/gm;\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 patchPnpmPackageManager: PatchFunction = async ({\n  mode,\n  manifest,\n  packageManager,\n}): Promise<PatchReturnType> => {\n  if (packageManager.command !== 'pnpm') {\n    return {\n      result: 'skip',\n      reason: 'not using pnpm',\n    };\n  }\n\n  if (\n    !(\n      manifest.packageJson as { packageManager?: string }\n    ).packageManager?.includes('pnpm')\n  ) {\n    return {\n      result: 'skip',\n      reason: 'no packageManager declaration in package.json found',\n    };\n  }\n\n  const [maybeDockerfiles, maybePipelines] = await Promise.all([\n    fg(['Dockerfile*']),\n    fg(['.buildkite/*.yml']),\n  ]);\n\n  if (!maybeDockerfiles.length || !maybePipelines.length) {\n    return {\n      result: 'skip',\n      reason: 'Either dockerfiles or pipelines were not found',\n    };\n  }\n\n  const [dockerfiles, pipelines] = await Promise.all([\n    fetchFiles(maybeDockerfiles),\n    fetchFiles(maybePipelines),\n  ]);\n\n  const dockerFilesToPatch = dockerfiles.filter(\n    ({ contents }) =>\n      contents.includes(DOCKERFILE_COREPACK_COMMAND) &&\n      !contents.includes('target=package.json'),\n  );\n\n  const pipelinesToPatch = pipelines.filter(({ contents }) =>\n    Boolean(BEFORE_PIPELINE_REGEX.exec(contents)),\n  );\n\n  if (!dockerFilesToPatch.length && !pipelinesToPatch.length) {\n    return {\n      result: 'skip',\n      reason: 'no pipeline or dockerfiles to patch',\n    };\n  }\n\n  if (mode === 'lint') {\n    return { result: 'apply' };\n  }\n\n  if (dockerFilesToPatch.length) {\n    await Promise.all(\n      dockerFilesToPatch.map(async ({ file, contents }) => {\n        const patchedContent = contents.replace(\n          DOCKERFILE_COREPACK_COMMAND,\n          PACKAGE_JSON_MOUNT,\n        );\n        await writeFile(file, patchedContent);\n      }),\n    );\n  }\n\n  if (pipelinesToPatch.length) {\n    await Promise.all(\n      pipelinesToPatch.map(async ({ file, contents }) => {\n        const patchedContent = contents.replace(\n          BEFORE_PIPELINE_REGEX,\n          `$1$3${PACKAGE_JSON_CACHE}\\n$2`,\n        );\n\n        const patchedEcrContent = patchedContent.replace(\n          ECR_REGEX,\n          (match, version) => {\n            if (typeof version === 'string' && lt(version, '2.2.0')) {\n              return 'seek-oss/docker-ecr-cache#v2.2.0';\n            }\n            return match;\n          },\n        );\n\n        await writeFile(file, patchedEcrContent);\n      }),\n    );\n  }\n\n  return { result: 'apply' };\n};\n\nexport const tryPatchPnpmPackageManager: PatchFunction = async (config) => {\n  try {\n    return await patchPnpmPackageManager(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": "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",
+  "names": ["fg"]
+}

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import type { Writable } from 'stream';
 export interface Input {
     /**

package/lib/utils/args.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare const hasDebugFlag: (args?: string[]) => boolean;
 export declare const hasSerialFlag: (args?: string[], env?: NodeJS.ProcessEnv) => boolean;
 /**

package/lib/utils/copy.d.ts

@@ -1,5 +1,5 @@
 export type TextProcessor = (contents: string) => string;
-export declare const copyFile: (sourcePath: string, destinationPath: string, { overwrite, processors, }: Pick<CopyFilesOptions, 'overwrite' | 'processors'>) => Promise<void>;
+export declare const copyFile: (sourcePath: string, destinationPath: string, { overwrite, processors, }: Pick<CopyFilesOptions, "overwrite" | "processors">) => Promise<void>;
 interface CopyFilesOptions {
     sourceRoot: string;
     destinationRoot: string;

package/lib/utils/env.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * Whether the code is executing in a CI environment.
  */

package/lib/utils/error.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { inspect } from 'util';
 import { z } from 'zod';
 export type ConcurrentlyErrors = z.infer<typeof concurrentlyErrorsSchema>;

package/lib/utils/exec.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import stream from 'stream';
 import type { Color } from 'chalk';
 import execa, { type ExecaChildProcess } from 'execa';

package/lib/utils/template.d.ts

@@ -47,9 +47,9 @@ export declare const templateConfigSchema: z.ZodObject<{
         validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
     }[];
     packageManager: "yarn" | "pnpm";
+    type?: "package" | "application" | undefined;
     entryPoint?: string | undefined;
     noSkip?: boolean | undefined;
-    type?: "package" | "application" | undefined;
 }, {
     fields: {
         message: string;
@@ -57,10 +57,10 @@ export declare const templateConfigSchema: z.ZodObject<{
         initial: string;
         validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
     }[];
+    type?: "package" | "application" | undefined;
     entryPoint?: string | undefined;
-    noSkip?: boolean | undefined;
     packageManager?: "yarn" | "pnpm" | undefined;
-    type?: "package" | "application" | undefined;
+    noSkip?: boolean | undefined;
 }>;
 export declare const TEMPLATE_CONFIG_FILENAME = "skuba.template.js";
 export declare const TEMPLATE_DIR: string;

package/lib/wrapper/http.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import http from 'http';
 /**
  * Create an HTTP request listener based on the supplied function.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "8.1.0-test-20240430085832",
+  "version": "8.1.0",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -63,7 +63,7 @@
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
-    "esbuild": "~0.20.0",
+    "esbuild": "~0.21.0",
     "eslint": "^8.56.0",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
@@ -84,7 +84,7 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
-    "prettier": "~3.2.5",
+    "prettier": "~3.3.0",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
     "semantic-release": "^22.0.12",
@@ -97,42 +97,43 @@
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
-    "typescript": "~5.4.0",
+    "typescript": "~5.5.0",
     "validate-npm-package-name": "^5.0.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "4.0.0"
+    "eslint-config-skuba": "4.1.0"
   },
   "devDependencies": {
-    "@changesets/cli": "2.27.1",
+    "@changesets/cli": "2.27.6",
     "@changesets/get-github-info": "0.6.0",
     "@jest/reporters": "29.7.0",
     "@jest/test-result": "29.7.0",
     "@types/ejs": "3.1.5",
     "@types/express": "4.17.21",
     "@types/fs-extra": "11.0.4",
-    "@types/koa": "2.14.0",
+    "@types/koa": "2.15.0",
     "@types/libnpmsearch": "2.0.7",
     "@types/lodash.mergewith": "4.6.9",
+    "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
     "@types/npm-which": "3.0.3",
     "@types/picomatch": "2.3.3",
     "@types/supertest": "6.0.2",
     "@types/validate-npm-package-name": "4.0.2",
-    "enhanced-resolve": "5.15.0",
+    "enhanced-resolve": "5.17.0",
     "express": "4.19.2",
-    "fastify": "4.26.1",
+    "fastify": "4.28.0",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
-    "koa": "2.15.0",
-    "memfs": "4.6.0",
-    "remark-cli": "12.0.0",
-    "remark-preset-lint-recommended": "6.1.3",
-    "semver": "7.6.0",
-    "supertest": "6.3.4",
+    "koa": "2.15.3",
+    "memfs": "4.9.3",
+    "remark-cli": "12.0.1",
+    "remark-preset-lint-recommended": "7.0.0",
+    "semver": "7.6.2",
+    "supertest": "7.0.0",
     "type-fest": "2.19.0"
   },
   "peerDependencies": {
-    "skuba-dive": "2.0.1-test-20240430085832"
+    "skuba-dive": "1 || 2"
   },
   "peerDependenciesMeta": {
     "skuba-dive": {
@@ -150,7 +151,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "7.4.0"
+    "version": "8.1.0"
   },
   "scripts": {
     "build": "scripts/build.sh",
@@ -161,11 +162,11 @@
     "lint:md": "remark --frail --quiet .",
     "release": "pnpm --silent build && changeset publish",
     "skuba": "pnpm --silent build && pnpm --silent skuba:exec",
-    "skuba:exec": "node --env-file=.env lib/skuba",
+    "skuba:exec": "node --experimental-vm-modules lib/skuba",
     "stage": "changeset version && node ./.changeset/inject.js && pnpm format",
-    "test": "pnpm --silent skuba test --selectProjects unit",
+    "test": "pnpm --silent skuba test --selectProjects unit --",
     "test:ci": "pnpm --silent skuba test --runInBand",
-    "test:int": "pnpm --silent skuba test --runInBand --selectProjects integration",
+    "test:int": "pnpm --silent skuba test --selectProjects integration --runInBand",
     "test:template": "scripts/test-template.sh",
     "test:watch": "pnpm --silent skuba test --runInBand --watch"
   }

package/template/base/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["esbenp.prettier-vscode", "dbaeumer.vscode-eslint"]
+}

package/template/base/_.gitignore

@@ -1,6 +1,7 @@
 # managed by skuba
 .idea/*
 .vscode/*
+!.vscode/extensions.json
 
 .cdk.staging/
 .serverless/

package/template/express-rest-api/.gantry/dev.yml

@@ -1,6 +1,4 @@
 environment: dev
-env:
-  SOME_ENVIRONMENT_VARIABLE: dev-value
 
 maxInstanceCount: 1
 minInstanceCount: 1

package/template/express-rest-api/.gantry/prod.yml

@@ -1,6 +1,4 @@
 environment: prod
-env:
-  SOME_ENVIRONMENT_VARIABLE: prod-value
 
 maxInstanceCount: 10
 minInstanceCount: 3

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.7
+# syntax=docker/dockerfile:1.8
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

package/template/express-rest-api/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   app:
     image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''}

package/template/express-rest-api/gantry.apply.yml

@@ -9,16 +9,9 @@ owner: '{{values "owner"}}'
 image: '{{values "image"}}'
 
 env:
-  # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
-  AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1'
-
   ENVIRONMENT: '{{values "environment"}}'
   SERVICE: '{{values "service"}}'
 
-  {{range $key, $value := .Values.env}}
-  {{$key}}: {{$value}}
-  {{end}}
-
 {{if .Values.cloudwatchDashboardDisabled}}
 cloudwatchDashboardDisabled: {{values "cloudwatchDashboardDisabled"}}
 {{end}}

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

@@ -1,4 +1,5 @@
 {
+  "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
@@ -14,6 +15,8 @@
   "dependencies": {
     "@seek/logger": "^6.0.0",
     "express": "^4.17.1",
+    "hot-shots": "^10.0.0",
+    "seek-datadog-custom-metrics": "^4.6.3",
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
@@ -23,9 +26,9 @@
     "mime": "^4.0.1",
     "pino-pretty": "^11.0.0",
     "skuba": "*",
-    "supertest": "^6.1.6"
+    "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.0.2",
+  "packageManager": "pnpm@9.4.0",
   "engines": {
     "node": ">=20"
   }

package/template/express-rest-api/src/config.ts

@@ -7,8 +7,8 @@ interface Config {
   name: string;
   version: string;
 
-  metricsServer?: string;
-  port?: number;
+  metricsServer: string | null;
+  port: number | null;
 }
 
 type Environment = (typeof environments)[number];
@@ -26,19 +26,27 @@ const configs: Record<Environment, () => Omit<Config, 'environment'>> = {
     logLevel: 'debug',
     name: '<%- serviceName %>',
     version: 'local',
+
+    metricsServer: null,
+    port: null,
   }),
 
   test: () => ({
-    ...configs.local(),
-
     logLevel: Env.string('LOG_LEVEL', { default: 'silent' }),
+    name: '<%- serviceName %>',
     version: 'test',
+
+    metricsServer: null,
+    port: null,
   }),
 
   [dev]: () => ({
-    ...configs[prod](),
-
     logLevel: 'debug',
+    name: Env.string('SERVICE'),
+    version: Env.string('VERSION'),
+
+    metricsServer: 'localhost',
+    port: Env.nonNegativeInteger('PORT'),
   }),
 
   [prod]: () => ({