skuba 10.1.0 → 10.2.0-config-20250421023131

package/lib/utils/logging.js

@@ -28,15 +28,22 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var logging_exports = {};
 __export(logging_exports, {
+  childLogger: () => childLogger,
   createLogger: () => createLogger,
   log: () => log,
   pluralise: () => pluralise
 });
 module.exports = __toCommonJS(logging_exports);
 var import_chalk = __toESM(require("chalk"));
-const createLogger = (debug, ...prefixes) => {
-  const log2 = (...message) => console.log(...prefixes, ...message);
+const createLogger = ({
+  debug,
+  prefixes = [],
+  suffixes = []
+}) => {
+  const logWithoutSuffixes = (...message) => console.log(...prefixes, ...message);
+  const log2 = (...message) => logWithoutSuffixes(...message, ...suffixes);
   return {
+    settings: { debug, prefixes, suffixes },
     bold: import_chalk.default.bold,
     dim: import_chalk.default.dim,
     formatSubtle: import_chalk.default.grey,
@@ -44,16 +51,22 @@ const createLogger = (debug, ...prefixes) => {
     debug: (...message) => debug ? log2(import_chalk.default.grey(...message)) : void 0,
     subtle: (...message) => log2(import_chalk.default.grey(...message)),
     err: (...message) => log2(import_chalk.default.red(...message)),
-    newline: () => log2(),
+    newline: () => logWithoutSuffixes(),
     ok: (...message) => log2(import_chalk.default.green(...message)),
     plain: (...message) => log2(...message),
     warn: (...message) => log2(import_chalk.default.yellow(...message))
   };
 };
-const log = createLogger(false);
+const log = createLogger({ debug: false });
+const childLogger = (logger, settings) => createLogger({
+  debug: settings.debug ?? logger.settings.debug,
+  prefixes: [...settings.prefixes ?? [], ...logger.settings.prefixes],
+  suffixes: [...logger.settings.suffixes, ...settings.suffixes ?? []]
+});
 const pluralise = (count, subject) => `${count} ${subject}${count === 1 ? "" : "s"}`;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  childLogger,
   createLogger,
   log,
   pluralise

package/lib/utils/logging.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/logging.ts"],
-  "sourcesContent": ["/* eslint-disable no-console */\n\nimport chalk from 'chalk';\n\nexport type Logger = typeof log;\n\nexport const createLogger = (debug: boolean, ...prefixes: unknown[]) => {\n  const log = (...message: unknown[]) => console.log(...prefixes, ...message);\n\n  return {\n    bold: chalk.bold,\n    dim: chalk.dim,\n    formatSubtle: chalk.grey,\n\n    timing: (start: bigint, end: bigint) =>\n      `${Number((end - start) / BigInt(10_000_000)) / 100}s`,\n\n    debug: (...message: unknown[]) =>\n      debug ? log(chalk.grey(...message)) : undefined,\n    subtle: (...message: unknown[]) => log(chalk.grey(...message)),\n    err: (...message: unknown[]) => log(chalk.red(...message)),\n    newline: () => log(),\n    ok: (...message: unknown[]) => log(chalk.green(...message)),\n    plain: (...message: unknown[]) => log(...message),\n    warn: (...message: unknown[]) => log(chalk.yellow(...message)),\n  };\n};\n\nexport const log = createLogger(false);\n\nexport const pluralise = (count: number, subject: string) =>\n  `${count} ${subject}${count === 1 ? '' : 's'}`;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,mBAAkB;AAIX,MAAM,eAAe,CAAC,UAAmB,aAAwB;AACtE,QAAMA,OAAM,IAAI,YAAuB,QAAQ,IAAI,GAAG,UAAU,GAAG,OAAO;AAE1E,SAAO;AAAA,IACL,MAAM,aAAAC,QAAM;AAAA,IACZ,KAAK,aAAAA,QAAM;AAAA,IACX,cAAc,aAAAA,QAAM;AAAA,IAEpB,QAAQ,CAAC,OAAe,QACtB,GAAG,QAAQ,MAAM,SAAS,OAAO,GAAU,CAAC,IAAI,GAAG;AAAA,IAErD,OAAO,IAAI,YACT,QAAQD,KAAI,aAAAC,QAAM,KAAK,GAAG,OAAO,CAAC,IAAI;AAAA,IACxC,QAAQ,IAAI,YAAuBD,KAAI,aAAAC,QAAM,KAAK,GAAG,OAAO,CAAC;AAAA,IAC7D,KAAK,IAAI,YAAuBD,KAAI,aAAAC,QAAM,IAAI,GAAG,OAAO,CAAC;AAAA,IACzD,SAAS,MAAMD,KAAI;AAAA,IACnB,IAAI,IAAI,YAAuBA,KAAI,aAAAC,QAAM,MAAM,GAAG,OAAO,CAAC;AAAA,IAC1D,OAAO,IAAI,YAAuBD,KAAI,GAAG,OAAO;AAAA,IAChD,MAAM,IAAI,YAAuBA,KAAI,aAAAC,QAAM,OAAO,GAAG,OAAO,CAAC;AAAA,EAC/D;AACF;AAEO,MAAM,MAAM,aAAa,KAAK;AAE9B,MAAM,YAAY,CAAC,OAAe,YACvC,GAAG,KAAK,IAAI,OAAO,GAAG,UAAU,IAAI,KAAK,GAAG;",
+  "sourcesContent": ["/* eslint-disable no-console */\n\nimport chalk from 'chalk';\n\nexport type Logger = typeof log;\n\nexport const createLogger = ({\n  debug,\n  prefixes = [],\n  suffixes = [],\n}: {\n  debug: boolean;\n  prefixes?: unknown[];\n  suffixes?: unknown[];\n}) => {\n  const logWithoutSuffixes = (...message: unknown[]) =>\n    console.log(...prefixes, ...message);\n\n  const log = (...message: unknown[]) =>\n    logWithoutSuffixes(...message, ...suffixes);\n\n  return {\n    settings: { debug, prefixes, suffixes },\n\n    bold: chalk.bold,\n    dim: chalk.dim,\n    formatSubtle: chalk.grey,\n\n    timing: (start: bigint, end: bigint) =>\n      `${Number((end - start) / BigInt(10_000_000)) / 100}s`,\n\n    debug: (...message: unknown[]) =>\n      debug ? log(chalk.grey(...message)) : undefined,\n    subtle: (...message: unknown[]) => log(chalk.grey(...message)),\n    err: (...message: unknown[]) => log(chalk.red(...message)),\n    newline: () => logWithoutSuffixes(),\n    ok: (...message: unknown[]) => log(chalk.green(...message)),\n    plain: (...message: unknown[]) => log(...message),\n    warn: (...message: unknown[]) => log(chalk.yellow(...message)),\n  };\n};\n\nexport const log = createLogger({ debug: false });\n\nexport const childLogger = (\n  logger: Logger,\n  settings: Partial<Logger['settings']>,\n) =>\n  createLogger({\n    debug: settings.debug ?? logger.settings.debug,\n    prefixes: [...(settings.prefixes ?? []), ...logger.settings.prefixes],\n    suffixes: [...logger.settings.suffixes, ...(settings.suffixes ?? [])],\n  });\n\nexport const pluralise = (count: number, subject: string) =>\n  `${count} ${subject}${count === 1 ? '' : 's'}`;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,mBAAkB;AAIX,MAAM,eAAe,CAAC;AAAA,EAC3B;AAAA,EACA,WAAW,CAAC;AAAA,EACZ,WAAW,CAAC;AACd,MAIM;AACJ,QAAM,qBAAqB,IAAI,YAC7B,QAAQ,IAAI,GAAG,UAAU,GAAG,OAAO;AAErC,QAAMA,OAAM,IAAI,YACd,mBAAmB,GAAG,SAAS,GAAG,QAAQ;AAE5C,SAAO;AAAA,IACL,UAAU,EAAE,OAAO,UAAU,SAAS;AAAA,IAEtC,MAAM,aAAAC,QAAM;AAAA,IACZ,KAAK,aAAAA,QAAM;AAAA,IACX,cAAc,aAAAA,QAAM;AAAA,IAEpB,QAAQ,CAAC,OAAe,QACtB,GAAG,QAAQ,MAAM,SAAS,OAAO,GAAU,CAAC,IAAI,GAAG;AAAA,IAErD,OAAO,IAAI,YACT,QAAQD,KAAI,aAAAC,QAAM,KAAK,GAAG,OAAO,CAAC,IAAI;AAAA,IACxC,QAAQ,IAAI,YAAuBD,KAAI,aAAAC,QAAM,KAAK,GAAG,OAAO,CAAC;AAAA,IAC7D,KAAK,IAAI,YAAuBD,KAAI,aAAAC,QAAM,IAAI,GAAG,OAAO,CAAC;AAAA,IACzD,SAAS,MAAM,mBAAmB;AAAA,IAClC,IAAI,IAAI,YAAuBD,KAAI,aAAAC,QAAM,MAAM,GAAG,OAAO,CAAC;AAAA,IAC1D,OAAO,IAAI,YAAuBD,KAAI,GAAG,OAAO;AAAA,IAChD,MAAM,IAAI,YAAuBA,KAAI,aAAAC,QAAM,OAAO,GAAG,OAAO,CAAC;AAAA,EAC/D;AACF;AAEO,MAAM,MAAM,aAAa,EAAE,OAAO,MAAM,CAAC;AAEzC,MAAM,cAAc,CACzB,QACA,aAEA,aAAa;AAAA,EACX,OAAO,SAAS,SAAS,OAAO,SAAS;AAAA,EACzC,UAAU,CAAC,GAAI,SAAS,YAAY,CAAC,GAAI,GAAG,OAAO,SAAS,QAAQ;AAAA,EACpE,UAAU,CAAC,GAAG,OAAO,SAAS,UAAU,GAAI,SAAS,YAAY,CAAC,CAAE;AACtE,CAAC;AAEI,MAAM,YAAY,CAAC,OAAe,YACvC,GAAG,KAAK,IAAI,OAAO,GAAG,UAAU,IAAI,KAAK,GAAG;",
   "names": ["log", "chalk"]
 }

package/lib/utils/worker.d.ts

@@ -7,6 +7,11 @@ export declare const execWorkerThread: <Input, Output>(filepath: string, input:
  * to the parent thread.
  */
 export declare const postWorkerOutput: <Input, Output>(fn: (input: Input) => Promise<Output>, logger?: {
+    settings: {
+        debug: boolean;
+        prefixes: unknown[];
+        suffixes: unknown[];
+    };
     bold: import("chalk").Chalk;
     dim: import("chalk").Chalk;
     formatSubtle: import("chalk").Chalk;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "10.1.0",
+  "version": "10.2.0-config-20250421023131",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -78,6 +78,7 @@
     "isomorphic-git": "^1.11.1",
     "jest": "^29.0.1",
     "jest-watch-typeahead": "^2.1.1",
+    "jiti": "^2.4.2",
     "lodash.mergewith": "^4.6.2",
     "minimist": "^1.2.6",
     "normalize-package-data": "^7.0.0",
@@ -98,7 +99,7 @@
     "tsx": "^4.16.2",
     "typescript": "~5.8.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.1.3"
+    "eslint-config-skuba": "5.1.4-config-20250421023131"
   },
   "devDependencies": {
     "@changesets/cli": "2.28.1",
@@ -106,7 +107,7 @@
     "@jest/reporters": "29.7.0",
     "@jest/test-result": "29.7.0",
     "@types/ejs": "3.1.5",
-    "@types/express": "5.0.0",
+    "@types/express": "5.0.1",
     "@types/fs-extra": "11.0.4",
     "@types/koa": "2.15.0",
     "@types/lodash.mergewith": "4.6.9",
@@ -115,19 +116,19 @@
     "@types/npm-registry-fetch": "8.0.7",
     "@types/npm-which": "3.0.3",
     "@types/picomatch": "3.0.2",
-    "@types/semver": "7.5.8",
-    "@types/supertest": "6.0.2",
+    "@types/semver": "7.7.0",
+    "@types/supertest": "6.0.3",
     "enhanced-resolve": "5.18.1",
-    "express": "5.0.1",
-    "fastify": "5.2.1",
+    "express": "5.1.0",
+    "fastify": "5.3.2",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
-    "koa": "2.16.0",
+    "koa": "2.16.1",
     "memfs": "4.17.0",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.1",
     "semver": "7.7.1",
-    "supertest": "7.0.0",
+    "supertest": "7.1.0",
     "type-fest": "2.19.0"
   },
   "peerDependencies": {
@@ -155,9 +156,11 @@
     "build": "scripts/build.sh",
     "changeset": "changeset",
     "deploy": "scripts/deploy.sh",
-    "format": "pnpm --silent skuba format",
-    "lint": "pnpm --silent skuba lint && pnpm --silent lint:md",
+    "format": "pnpm --silent skuba format && pnpm format:packages",
+    "format:packages": "pnpm --filter '!./template/**' format",
+    "lint": "pnpm --silent skuba lint && pnpm lint:packages && pnpm --silent lint:md",
     "lint:md": "remark --frail --quiet .",
+    "lint:packages": "pnpm --filter '!./template/**' lint",
     "release": "pnpm --silent build && changeset publish",
     "skuba": "pnpm --silent build && pnpm --silent skuba:exec",
     "skuba:exec": "node --experimental-vm-modules lib/skuba",

package/template/base/_.gitignore

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

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

@@ -4,7 +4,7 @@ agents:
 configs:
   plugins:
     - &aws-sm
-      seek-oss/aws-sm#v2.3.2:
+      seek-oss/aws-sm#v2.3.3:
         env:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.6.0:
+      - docker-compose#v5.7.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -28,7 +28,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.6.4",
+  "packageManager": "pnpm@10.7.1",
   "engines": {
     "node": ">=22"
   }

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

@@ -6,7 +6,7 @@ agents:
 configs:
   plugins:
     - &aws-sm
-      seek-oss/aws-sm#v2.3.2:
+      seek-oss/aws-sm#v2.3.3:
         env:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
@@ -38,7 +38,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.6.0:
+      - docker-compose#v5.7.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/greeter/package.json

@@ -17,9 +17,9 @@
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "*"
+    "skuba": "10.2.0-config-20250421023131"
   },
-  "packageManager": "pnpm@10.6.4",
+  "packageManager": "pnpm@10.7.1",
   "engines": {
     "node": ">=22"
   }

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

@@ -4,7 +4,7 @@ agents:
 configs:
   plugins:
     - &aws-sm
-      seek-oss/aws-sm#v2.3.2:
+      seek-oss/aws-sm#v2.3.3:
         env:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.6.0:
+      - docker-compose#v5.7.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -16,15 +16,15 @@
     "@koa/bodyparser": "^5.1.1",
     "@koa/router": "^13.0.0",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "^1.25.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.57.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.49.0",
-    "@opentelemetry/instrumentation-http": "^0.57.0",
-    "@opentelemetry/propagator-b3": "^1.25.0",
-    "@opentelemetry/sdk-node": "^0.57.0",
+    "@opentelemetry/core": "^2.0.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.200.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.51.0",
+    "@opentelemetry/instrumentation-http": "^0.200.0",
+    "@opentelemetry/propagator-b3": "^2.0.0",
+    "@opentelemetry/sdk-node": "^0.200.0",
     "@seek/logger": "^9.0.0",
     "hot-shots": "^10.0.0",
-    "koa": "^2.13.4",
+    "koa": "^2.16.1",
     "koa-compose": "^4.1.0",
     "seek-datadog-custom-metrics": "^4.6.3",
     "seek-koala": "^7.0.0",
@@ -44,7 +44,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.6.4",
+  "packageManager": "pnpm@10.7.1",
   "engines": {
     "node": ">=22"
   }

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

@@ -4,7 +4,7 @@ agents:
 configs:
   plugins:
     - &aws-sm
-      seek-oss/aws-sm#v2.3.2:
+      seek-oss/aws-sm#v2.3.3:
         env:
           NPM_READ_TOKEN: arn:aws:secretsmanager:ap-southeast-2:987872074697:secret:npm/npm-read-token
 
@@ -33,7 +33,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.6.0:
+        - docker-compose#v5.7.0:
             dependencies: false
             run: app
             environment:
@@ -63,7 +63,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.6.0:
+      - docker-compose#v5.7.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -667,6 +667,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "Arn",
           ],
         },
+        "MessageRetentionPeriod": 1209600,
         "QueueName": "serviceName",
         "RedrivePolicy": {
           "deadLetterTargetArn": {
@@ -690,6 +691,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "Arn",
           ],
         },
+        "MessageRetentionPeriod": 1209600,
         "QueueName": "serviceName-dead-letters",
       },
       "Type": "AWS::SQS::Queue",
@@ -1393,6 +1395,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "Arn",
           ],
         },
+        "MessageRetentionPeriod": 1209600,
         "QueueName": "serviceName",
         "RedrivePolicy": {
           "deadLetterTargetArn": {
@@ -1416,6 +1419,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "Arn",
           ],
         },
+        "MessageRetentionPeriod": 1209600,
         "QueueName": "serviceName-dead-letters",
       },
       "Type": "AWS::SQS::Queue",

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

@@ -45,7 +45,7 @@ it.each(['dev', 'prod'])(
         (scope, id) => new aws_secretsmanager.Secret(scope, id),
       );
 
-    const app = new App();
+    const app = new App({ context: { 'aws:cdk:bundling-stacks': [] } });
 
     const stack = new AppStack(app, 'appStack');
 

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

@@ -41,6 +41,7 @@ export class AppStack extends Stack {
       {
         queueName: '<%- serviceName %>-dead-letters',
         encryptionMasterKey: kmsKey,
+        retentionPeriod: Duration.days(14),
       },
     );
 
@@ -51,6 +52,7 @@ export class AppStack extends Stack {
         queue: deadLetterQueue,
       },
       encryptionMasterKey: kmsKey,
+      retentionPeriod: Duration.days(14),
     });
 
     // const topic = aws_sns.Topic.fromTopicArn(

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

@@ -28,17 +28,17 @@
     "@types/aws-lambda": "^8.10.82",
     "@types/chance": "^1.1.3",
     "@types/node": "^22.13.10",
-    "aws-cdk": "^2.167.1",
-    "aws-cdk-lib": "^2.167.1",
+    "aws-cdk": "^2.1010.0",
+    "aws-cdk-lib": "^2.190.0",
     "aws-sdk-client-mock": "^4.0.0",
     "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "*"
+    "skuba": "10.2.0-config-20250421023131"
   },
-  "packageManager": "pnpm@10.6.4",
+  "packageManager": "pnpm@10.7.1",
   "engines": {
     "node": ">=22"
   }