skuba 8.1.0-patch-pnpm-package-20240411042949 → 8.1.0-pm-20240506055052

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,\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;",
+  "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;",
   "names": ["fs"]
 }

package/lib/utils/packageManager.js

@@ -34,7 +34,7 @@ __export(packageManager_exports, {
   packageManagerSchema: () => packageManagerSchema
 });
 module.exports = __toCommonJS(packageManager_exports);
-var import_detect_package_manager = require("detect-package-manager");
+var import_find_up = __toESM(require("find-up"));
 var import_is_installed_globally = __toESM(require("is-installed-globally"));
 var import_zod = require("zod");
 var import_logging = require("./logging");
@@ -59,10 +59,15 @@ const configForPackageManager = (packageManager) => ({
 });
 const detectPackageManager = async (cwd) => {
   let packageManager = DEFAULT_PACKAGE_MANAGER;
-  let raw;
   try {
-    raw = await (0, import_detect_package_manager.detect)({ cwd, includeGlobalBun: false });
-    packageManager = packageManagerSchema.parse(raw);
+    const [yarnDepth, pnpmDepth] = await Promise.all([
+      findDepth("yarn.lock", cwd),
+      findDepth("pnpm-lock.yaml", cwd)
+    ]);
+    if (yarnDepth === void 0 && pnpmDepth === void 0) {
+      throw new Error("No package manager lockfile found.");
+    }
+    packageManager = (pnpmDepth ?? -1) > (yarnDepth ?? -1) ? "pnpm" : "yarn";
   } catch (err) {
     import_logging.log.warn(
       `Failed to detect package manager; defaulting to ${import_logging.log.bold(
@@ -72,10 +77,6 @@ const detectPackageManager = async (cwd) => {
     import_logging.log.subtle(
       (() => {
         switch (true) {
-          case err instanceof import_zod.ZodError:
-            return `Expected ${Object.keys(PACKAGE_MANAGERS).join(
-              "|"
-            )}, received ${raw}`;
           case err instanceof Error:
             return err.message;
           default:
@@ -86,6 +87,10 @@ const detectPackageManager = async (cwd) => {
   }
   return configForPackageManager(packageManager);
 };
+const findDepth = async (filename, cwd) => {
+  const path = await (0, import_find_up.default)(filename, { cwd });
+  return path ? path.split("/").length : void 0;
+};
 const packageManagerSchema = import_zod.z.enum(["pnpm", "yarn"]).default(DEFAULT_PACKAGE_MANAGER);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/utils/packageManager.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/packageManager.ts"],
-  "sourcesContent": ["import { detect } from 'detect-package-manager';\nimport isInstalledGlobally from 'is-installed-globally';\nimport { ZodError, z } from 'zod';\n\nimport { log } from './logging';\n\n// TODO: consider changing to this to `pnpm` in a future major version.\nexport const DEFAULT_PACKAGE_MANAGER = 'yarn';\n\nexport type PackageManagerConfig =\n  (typeof PACKAGE_MANAGERS)[keyof typeof PACKAGE_MANAGERS] & {\n    command: PackageManager;\n  };\n\nconst PACKAGE_MANAGERS = {\n  pnpm: {\n    exec: 'pnpm exec',\n    install: 'pnpm install',\n    runSilent: 'pnpm --silent run',\n    update: isInstalledGlobally ? 'pnpm update --global' : 'pnpm update',\n  },\n  yarn: {\n    exec: 'yarn',\n    install: 'yarn install',\n    runSilent: 'yarn -s',\n    update: isInstalledGlobally ? 'yarn global upgrade' : 'yarn upgrade',\n  },\n};\n\nexport const configForPackageManager = (\n  packageManager: PackageManager,\n): PackageManagerConfig => ({\n  ...PACKAGE_MANAGERS[packageManager],\n  command: packageManager,\n});\n\nexport const detectPackageManager = async (\n  cwd?: string,\n): Promise<PackageManagerConfig> => {\n  let packageManager: PackageManager = DEFAULT_PACKAGE_MANAGER;\n\n  let raw: string | undefined;\n  try {\n    raw = await detect({ cwd, includeGlobalBun: false });\n\n    packageManager = packageManagerSchema.parse(raw);\n  } catch (err) {\n    log.warn(\n      `Failed to detect package manager; defaulting to ${log.bold(\n        DEFAULT_PACKAGE_MANAGER,\n      )}.`,\n    );\n    log.subtle(\n      (() => {\n        switch (true) {\n          case err instanceof ZodError:\n            return `Expected ${Object.keys(PACKAGE_MANAGERS).join(\n              '|',\n            )}, received ${raw}`;\n\n          case err instanceof Error:\n            return err.message;\n\n          default:\n            return String(err);\n        }\n      })(),\n    );\n  }\n\n  return configForPackageManager(packageManager);\n};\n\nexport type PackageManager = z.infer<typeof packageManagerSchema>;\n\nexport const packageManagerSchema = z\n  .enum(['pnpm', 'yarn'])\n  .default(DEFAULT_PACKAGE_MANAGER);\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oCAAuB;AACvB,mCAAgC;AAChC,iBAA4B;AAE5B,qBAAoB;AAGb,MAAM,0BAA0B;AAOvC,MAAM,mBAAmB;AAAA,EACvB,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,SAAS;AAAA,IACT,WAAW;AAAA,IACX,QAAQ,6BAAAA,UAAsB,yBAAyB;AAAA,EACzD;AAAA,EACA,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,SAAS;AAAA,IACT,WAAW;AAAA,IACX,QAAQ,6BAAAA,UAAsB,wBAAwB;AAAA,EACxD;AACF;AAEO,MAAM,0BAA0B,CACrC,oBAC0B;AAAA,EAC1B,GAAG,iBAAiB,cAAc;AAAA,EAClC,SAAS;AACX;AAEO,MAAM,uBAAuB,OAClC,QACkC;AAClC,MAAI,iBAAiC;AAErC,MAAI;AACJ,MAAI;AACF,UAAM,UAAM,sCAAO,EAAE,KAAK,kBAAkB,MAAM,CAAC;AAEnD,qBAAiB,qBAAqB,MAAM,GAAG;AAAA,EACjD,SAAS,KAAK;AACZ,uBAAI;AAAA,MACF,mDAAmD,mBAAI;AAAA,QACrD;AAAA,MACF,CAAC;AAAA,IACH;AACA,uBAAI;AAAA,OACD,MAAM;AACL,gBAAQ,MAAM;AAAA,UACZ,KAAK,eAAe;AAClB,mBAAO,YAAY,OAAO,KAAK,gBAAgB,EAAE;AAAA,cAC/C;AAAA,YACF,CAAC,cAAc,GAAG;AAAA,UAEpB,KAAK,eAAe;AAClB,mBAAO,IAAI;AAAA,UAEb;AACE,mBAAO,OAAO,GAAG;AAAA,QACrB;AAAA,MACF,GAAG;AAAA,IACL;AAAA,EACF;AAEA,SAAO,wBAAwB,cAAc;AAC/C;AAIO,MAAM,uBAAuB,aACjC,KAAK,CAAC,QAAQ,MAAM,CAAC,EACrB,QAAQ,uBAAuB;",
-  "names": ["isInstalledGlobally"]
+  "sourcesContent": ["import findUp from 'find-up';\nimport isInstalledGlobally from 'is-installed-globally';\nimport { z } from 'zod';\n\nimport { log } from './logging';\n\n// TODO: consider changing to this to `pnpm` in a future major version.\nexport const DEFAULT_PACKAGE_MANAGER = 'yarn';\n\nexport type PackageManagerConfig =\n  (typeof PACKAGE_MANAGERS)[keyof typeof PACKAGE_MANAGERS] & {\n    command: PackageManager;\n  };\n\nconst PACKAGE_MANAGERS = {\n  pnpm: {\n    exec: 'pnpm exec',\n    install: 'pnpm install',\n    runSilent: 'pnpm --silent run',\n    update: isInstalledGlobally ? 'pnpm update --global' : 'pnpm update',\n  },\n  yarn: {\n    exec: 'yarn',\n    install: 'yarn install',\n    runSilent: 'yarn -s',\n    update: isInstalledGlobally ? 'yarn global upgrade' : 'yarn upgrade',\n  },\n};\n\nexport const configForPackageManager = (\n  packageManager: PackageManager,\n): PackageManagerConfig => ({\n  ...PACKAGE_MANAGERS[packageManager],\n  command: packageManager,\n});\n\nexport const detectPackageManager = async (\n  cwd?: string,\n): Promise<PackageManagerConfig> => {\n  let packageManager: PackageManager = DEFAULT_PACKAGE_MANAGER;\n\n  try {\n    const [yarnDepth, pnpmDepth] = await Promise.all([\n      findDepth('yarn.lock', cwd),\n      findDepth('pnpm-lock.yaml', cwd),\n    ]);\n\n    if (yarnDepth === undefined && pnpmDepth === undefined) {\n      throw new Error('No package manager lockfile found.');\n    }\n\n    packageManager = (pnpmDepth ?? -1) > (yarnDepth ?? -1) ? 'pnpm' : 'yarn';\n  } catch (err) {\n    log.warn(\n      `Failed to detect package manager; defaulting to ${log.bold(\n        DEFAULT_PACKAGE_MANAGER,\n      )}.`,\n    );\n    log.subtle(\n      (() => {\n        switch (true) {\n          case err instanceof Error:\n            return err.message;\n\n          default:\n            return String(err);\n        }\n      })(),\n    );\n  }\n\n  return configForPackageManager(packageManager);\n};\n\nconst findDepth = async (filename: string, cwd?: string) => {\n  const path = await findUp(filename, { cwd });\n  return path ? path.split('/').length : undefined;\n};\n\nexport type PackageManager = z.infer<typeof packageManagerSchema>;\n\nexport const packageManagerSchema = z\n  .enum(['pnpm', 'yarn'])\n  .default(DEFAULT_PACKAGE_MANAGER);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAmB;AACnB,mCAAgC;AAChC,iBAAkB;AAElB,qBAAoB;AAGb,MAAM,0BAA0B;AAOvC,MAAM,mBAAmB;AAAA,EACvB,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,SAAS;AAAA,IACT,WAAW;AAAA,IACX,QAAQ,6BAAAA,UAAsB,yBAAyB;AAAA,EACzD;AAAA,EACA,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,SAAS;AAAA,IACT,WAAW;AAAA,IACX,QAAQ,6BAAAA,UAAsB,wBAAwB;AAAA,EACxD;AACF;AAEO,MAAM,0BAA0B,CACrC,oBAC0B;AAAA,EAC1B,GAAG,iBAAiB,cAAc;AAAA,EAClC,SAAS;AACX;AAEO,MAAM,uBAAuB,OAClC,QACkC;AAClC,MAAI,iBAAiC;AAErC,MAAI;AACF,UAAM,CAAC,WAAW,SAAS,IAAI,MAAM,QAAQ,IAAI;AAAA,MAC/C,UAAU,aAAa,GAAG;AAAA,MAC1B,UAAU,kBAAkB,GAAG;AAAA,IACjC,CAAC;AAED,QAAI,cAAc,UAAa,cAAc,QAAW;AACtD,YAAM,IAAI,MAAM,oCAAoC;AAAA,IACtD;AAEA,sBAAkB,aAAa,OAAO,aAAa,MAAM,SAAS;AAAA,EACpE,SAAS,KAAK;AACZ,uBAAI;AAAA,MACF,mDAAmD,mBAAI;AAAA,QACrD;AAAA,MACF,CAAC;AAAA,IACH;AACA,uBAAI;AAAA,OACD,MAAM;AACL,gBAAQ,MAAM;AAAA,UACZ,KAAK,eAAe;AAClB,mBAAO,IAAI;AAAA,UAEb;AACE,mBAAO,OAAO,GAAG;AAAA,QACrB;AAAA,MACF,GAAG;AAAA,IACL;AAAA,EACF;AAEA,SAAO,wBAAwB,cAAc;AAC/C;AAEA,MAAM,YAAY,OAAO,UAAkB,QAAiB;AAC1D,QAAM,OAAO,UAAM,eAAAC,SAAO,UAAU,EAAE,IAAI,CAAC;AAC3C,SAAO,OAAO,KAAK,MAAM,GAAG,EAAE,SAAS;AACzC;AAIO,MAAM,uBAAuB,aACjC,KAAK,CAAC,QAAQ,MAAM,CAAC,EACrB,QAAQ,uBAAuB;",
+  "names": ["isInstalledGlobally", "findUp"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "8.1.0-patch-pnpm-package-20240411042949",
+  "version": "8.1.0-pm-20240506055052",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -60,7 +60,6 @@
     "@types/node": ">=18.12",
     "chalk": "^4.1.0",
     "concurrently": "^8.0.0",
-    "detect-package-manager": "^3.0.1",
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
@@ -68,6 +67,7 @@
     "eslint": "^8.56.0",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
+    "find-up": "^5.0.0",
     "fs-extra": "^11.0.0",
     "function-arguments": "^1.0.9",
     "get-port": "^5.1.1",
@@ -139,7 +139,6 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@8.15.6",
   "engines": {
     "node": ">=18.18.0"
   },
@@ -162,11 +161,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/_.prettierignore

@@ -5,4 +5,5 @@
 gantry*.yaml
 gantry*.yml
 pnpm-lock.yaml
+coverage
 # end managed by skuba

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

@@ -25,7 +25,7 @@
     "skuba": "*",
     "supertest": "^6.1.6"
   },
-  "packageManager": "pnpm@8.15.6",
+  "packageManager": "pnpm@9.0.2",
   "engines": {
     "node": ">=20"
   }

package/template/greeter/package.json

@@ -18,7 +18,7 @@
     "@types/node": "^20.9.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@8.15.6",
+  "packageManager": "pnpm@9.0.2",
   "engines": {
     "node": ">=20"
   }

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

@@ -44,7 +44,7 @@
     "skuba": "*",
     "supertest": "^6.1.6"
   },
-  "packageManager": "pnpm@8.15.6",
+  "packageManager": "pnpm@9.0.2",
   "engines": {
     "node": ">=20"
   }

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

@@ -37,7 +37,7 @@
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@8.15.6",
+  "packageManager": "pnpm@9.0.2",
   "engines": {
     "node": ">=20"
   }

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

@@ -1,28 +1,5 @@
 {
   "app": "pnpm exec skuba node infra/index.ts",
-  "context": {
-    "global": {
-      "appName": "<%- serviceName %>"
-    },
-    "dev": {
-      "workerLambda": {
-        "reservedConcurrency": 2,
-        "environment": {
-          "ENVIRONMENT": "dev"
-        }
-      },
-      "sourceSnsTopicArn": "TODO: sourceSnsTopicArn"
-    },
-    "prod": {
-      "workerLambda": {
-        "reservedConcurrency": 20,
-        "environment": {
-          "ENVIRONMENT": "prod"
-        }
-      },
-      "sourceSnsTopicArn": "TODO: sourceSnsTopicArn"
-    }
-  },
   "progress": "events",
   "watch": {
     "include": "src/**/*.ts",

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

@@ -934,7 +934,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
         "RedrivePolicy": {
           "deadLetterTargetArn": {
             "Fn::GetAtt": [
-              "workerqueuedlq42262778",
+              "workerqueuedeadletters83F3505C",
               "Arn",
             ],
           },
@@ -997,7 +997,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
       },
       "Type": "AWS::SNS::Subscription",
     },
-    "workerqueuedlq42262778": {
+    "workerqueuedeadletters83F3505C": {
       "DeletionPolicy": "Delete",
       "Properties": {
         "KmsMasterKeyId": {
@@ -1006,7 +1006,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "Arn",
           ],
         },
-        "QueueName": "serviceName-dlq",
+        "QueueName": "serviceName-dead-letters",
       },
       "Type": "AWS::SQS::Queue",
       "UpdateReplacePolicy": "Delete",
@@ -1976,7 +1976,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
         "RedrivePolicy": {
           "deadLetterTargetArn": {
             "Fn::GetAtt": [
-              "workerqueuedlq42262778",
+              "workerqueuedeadletters83F3505C",
               "Arn",
             ],
           },
@@ -2039,7 +2039,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
       },
       "Type": "AWS::SNS::Subscription",
     },
-    "workerqueuedlq42262778": {
+    "workerqueuedeadletters83F3505C": {
       "DeletionPolicy": "Delete",
       "Properties": {
         "KmsMasterKeyId": {
@@ -2048,7 +2048,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "Arn",
           ],
         },
-        "QueueName": "serviceName-dlq",
+        "QueueName": "serviceName-dead-letters",
       },
       "Type": "AWS::SQS::Queue",
       "UpdateReplacePolicy": "Delete",

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

@@ -1,22 +1,6 @@
 import { App, aws_sns } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
 
-import cdkJson from '../cdk.json';
-
-import { AppStack } from './appStack';
-
-const contexts = [
-  {
-    stage: 'dev',
-    ...cdkJson.context,
-  },
-
-  {
-    stage: 'prod',
-    ...cdkJson.context,
-  },
-];
-
 const currentDate = '1212-12-12T12:12:12.121Z';
 
 jest.useFakeTimers({
@@ -31,14 +15,28 @@ jest.useFakeTimers({
   now: new Date(currentDate),
 });
 
-it.each(contexts)(
-  'returns expected CloudFormation stack for $stage',
-  (context) => {
+const originalEnv = process.env.ENVIRONMENT;
+
+afterAll(() => {
+  process.env.ENVIRONMENT = originalEnv;
+});
+
+afterEach(() => {
+  jest.resetModules();
+});
+
+it.each(['dev', 'prod'])(
+  'returns expected CloudFormation stack for %s',
+  async (env) => {
+    process.env.ENVIRONMENT = env;
+
+    const { AppStack } = await import('./appStack');
+
     jest
       .spyOn(aws_sns.Topic, 'fromTopicArn')
       .mockImplementation((scope, id) => new aws_sns.Topic(scope, id));
 
-    const app = new App({ context });
+    const app = new App();
 
     const stack = new AppStack(app, 'appStack');
 

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

@@ -15,15 +15,12 @@ import {
 } from 'aws-cdk-lib';
 import type { Construct } from 'constructs';
 
-import { EnvContextSchema, StageContextSchema } from '../shared/context-types';
+import { config } from './config';
 
 export class AppStack extends Stack {
   constructor(scope: Construct, id: string, props?: StackProps) {
     super(scope, id, props);
 
-    const stage = StageContextSchema.parse(this.node.tryGetContext('stage'));
-    const context = EnvContextSchema.parse(this.node.tryGetContext(stage));
-
     const accountPrincipal = new aws_iam.AccountPrincipal(this.account);
 
     const kmsKey = new aws_kms.Key(this, 'kms-key', {
@@ -35,10 +32,14 @@ export class AppStack extends Stack {
 
     kmsKey.grantEncrypt(accountPrincipal);
 
-    const deadLetterQueue = new aws_sqs.Queue(this, 'worker-queue-dlq', {
-      queueName: '<%- serviceName %>-dlq',
-      encryptionMasterKey: kmsKey,
-    });
+    const deadLetterQueue = new aws_sqs.Queue(
+      this,
+      'worker-queue-dead-letters',
+      {
+        queueName: '<%- serviceName %>-dead-letters',
+        encryptionMasterKey: kmsKey,
+      },
+    );
 
     const queue = new aws_sqs.Queue(this, 'worker-queue', {
       queueName: '<%- serviceName %>',
@@ -52,7 +53,7 @@ export class AppStack extends Stack {
     const topic = aws_sns.Topic.fromTopicArn(
       this,
       'source-topic',
-      context.sourceSnsTopicArn,
+      config.sourceSnsTopicArn,
     );
 
     topic.addSubscription(new aws_sns_subscriptions.SqsSubscription(queue));
@@ -89,13 +90,13 @@ export class AppStack extends Stack {
       functionName: '<%- serviceName %>',
       environment: {
         ...defaultWorkerEnvironment,
-        ...context.workerLambda.environment,
+        ...config.workerLambda.environment,
       },
       // https://github.com/aws/aws-cdk/issues/28237
       // This forces the lambda to be updated on every deployment
       // If you do not wish to use hotswap, you can remove the new Date().toISOString() from the description
       description: `Updated at ${new Date().toISOString()}`,
-      reservedConcurrentExecutions: context.workerLambda.reservedConcurrency,
+      reservedConcurrentExecutions: config.workerLambda.reservedConcurrency,
     });
 
     const alias = worker.addAlias('live', {
@@ -104,7 +105,7 @@ export class AppStack extends Stack {
 
     alias.addEventSource(
       new aws_lambda_event_sources.SqsEventSource(queue, {
-        maxConcurrency: context.workerLambda.reservedConcurrency,
+        maxConcurrency: config.workerLambda.reservedConcurrency,
       }),
     );
 
@@ -119,7 +120,7 @@ export class AppStack extends Stack {
         functionName: '<%- serviceName %>-pre-hook',
         environment: {
           ...defaultWorkerEnvironment,
-          ...context.workerLambda.environment,
+          ...config.workerLambda.environment,
           FUNCTION_NAME_TO_INVOKE: worker.functionName,
         },
       },
@@ -138,7 +139,7 @@ export class AppStack extends Stack {
         functionName: '<%- serviceName %>-post-hook',
         environment: {
           ...defaultWorkerEnvironment,
-          ...context.workerLambda.environment,
+          ...config.workerLambda.environment,
           FUNCTION_NAME_TO_PRUNE: worker.functionName,
         },
       },

package/template/lambda-sqs-worker-cdk/infra/config.ts

@@ -0,0 +1,41 @@
+import { z } from 'zod';
+
+const environment = z.enum(['dev', 'prod']).parse(process.env.ENVIRONMENT);
+
+type Environment = typeof environment;
+
+export interface Config {
+  appName: string;
+  workerLambda: {
+    reservedConcurrency: number;
+    environment: {
+      ENVIRONMENT: Environment;
+    };
+  };
+  sourceSnsTopicArn: string;
+}
+
+export const configs: Record<Environment, Config> = {
+  dev: {
+    appName: '<%- serviceName %>',
+    workerLambda: {
+      reservedConcurrency: 2,
+      environment: {
+        ENVIRONMENT: 'dev',
+      },
+    },
+    sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
+  },
+  prod: {
+    appName: '<%- serviceName %>',
+    workerLambda: {
+      reservedConcurrency: 20,
+      environment: {
+        ENVIRONMENT: 'prod',
+      },
+    },
+    sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
+  },
+};
+
+export const config = configs[environment];

package/template/lambda-sqs-worker-cdk/infra/index.ts

@@ -1,14 +1,11 @@
 import { App } from 'aws-cdk-lib';
 
-import { GlobalContextSchema } from '../shared/context-types';
-
 import { AppStack } from './appStack';
+import { config } from './config';
 
 const app = new App();
 
-const context = GlobalContextSchema.parse(app.node.tryGetContext('global'));
-
 // eslint-disable-next-line no-new
 new AppStack(app, 'appStack', {
-  stackName: context.appName,
+  stackName: config.appName,
 });

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

@@ -2,7 +2,7 @@
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
-    "deploy": "cdk deploy appStack --require-approval never --context stage=${ENVIRONMENT}",
+    "deploy": "cdk deploy appStack --require-approval never",
     "deploy:hotswap": "pnpm --silent deploy --hotswap",
     "deploy:watch": "pnpm --silent deploy:hotswap --watch",
     "format": "skuba format",
@@ -26,7 +26,7 @@
     "constructs": "^10.0.17",
     "skuba": "*"
   },
-  "packageManager": "pnpm@8.15.6",
+  "packageManager": "pnpm@9.0.2",
   "engines": {
     "node": ">=20"
   }

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

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

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

@@ -1,35 +0,0 @@
-"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

@@ -1,7 +0,0 @@
-{
-  "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

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