skuba 9.2.0-wat-20250115035523 → 10.0.0-main-20250312042528

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "9.2.0-wat-20250115035523",
+  "version": "10.0.0-main-20250312042528",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -64,7 +64,7 @@
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
-    "esbuild": "~0.24.0",
+    "esbuild": "~0.25.0",
     "eslint": "^9.11.1",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
@@ -78,14 +78,14 @@
     "isomorphic-git": "^1.11.1",
     "jest": "^29.0.1",
     "jest-watch-typeahead": "^2.1.1",
-    "libnpmsearch": "^8.0.0",
     "lodash.mergewith": "^4.6.2",
     "minimist": "^1.2.6",
     "normalize-package-data": "^7.0.0",
+    "npm-registry-fetch": "^18.0.2",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
-    "prettier": "~3.4.0",
+    "prettier": "~3.5.0",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
     "semantic-release": "^22.0.12",
@@ -96,39 +96,37 @@
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
     "tsx": "^4.16.2",
-    "typescript": "~5.7.0",
-    "validate-npm-package-name": "^6.0.0",
+    "typescript": "~5.8.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.1.0-wat-20250115035523"
+    "eslint-config-skuba": "5.1.0-main-20250312042528"
   },
   "devDependencies": {
-    "@changesets/cli": "2.27.11",
+    "@changesets/cli": "2.28.1",
     "@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/express": "5.0.0",
     "@types/fs-extra": "11.0.4",
     "@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-registry-fetch": "8.0.7",
     "@types/npm-which": "3.0.3",
-    "@types/picomatch": "3.0.1",
+    "@types/picomatch": "3.0.2",
     "@types/semver": "7.5.8",
     "@types/supertest": "6.0.2",
-    "@types/validate-npm-package-name": "4.0.2",
-    "enhanced-resolve": "5.18.0",
-    "express": "4.21.2",
-    "fastify": "5.2.0",
+    "enhanced-resolve": "5.18.1",
+    "express": "5.0.1",
+    "fastify": "5.2.1",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
-    "koa": "2.15.3",
-    "memfs": "4.15.1",
+    "koa": "2.16.0",
+    "memfs": "4.17.0",
     "remark-cli": "12.0.1",
-    "remark-preset-lint-recommended": "7.0.0",
-    "semver": "7.6.3",
+    "remark-preset-lint-recommended": "7.0.1",
+    "semver": "7.7.1",
     "supertest": "7.0.0",
     "type-fest": "2.19.0"
   },

package/template/base/tsconfig.json

@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
-    "lib": ["ES2022"],
+    "lib": ["ES2024"],
     "outDir": "lib",
     "paths": {
       "src": ["src"]
     },
-    "target": "ES2022"
+    "target": "ES2024"
   },
   "exclude": ["lib*/**/*"],
   "extends": "skuba/config/tsconfig.json"

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

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -70,7 +70,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -87,7 +87,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -102,7 +102,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

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

@@ -9,6 +9,4 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:source:sha: '{{.CommitSHA}}'
-  seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
-  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
+  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema'

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

@@ -1 +1 @@
-20
+22

package/template/express-rest-api/Dockerfile

@@ -12,7 +12,7 @@ RUN pnpm install --offline --prod
 
 ###
 
-FROM gcr.io/distroless/nodejs20-debian12 AS runtime
+FROM gcr.io/distroless/nodejs22-debian12 AS runtime
 
 WORKDIR /workdir
 

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

@@ -1,6 +1,6 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.14
 
-FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

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

@@ -14,22 +14,22 @@
   },
   "dependencies": {
     "@seek/logger": "^9.0.0",
-    "express": "^4.17.1",
+    "express": "^5.0.0",
     "hot-shots": "^10.0.0",
     "seek-datadog-custom-metrics": "^4.6.3",
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.10",
     "@types/supertest": "^6.0.0",
     "mime": "^4.0.1",
     "pino-pretty": "^13.0.0",
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.15.3",
+  "packageManager": "pnpm@10.6.1",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

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

@@ -38,7 +38,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/greeter/.nvmrc

@@ -1 +1 @@
-20
+22

package/template/greeter/Dockerfile

@@ -1,6 +1,6 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.14
 
-FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

package/template/greeter/README.md

@@ -69,7 +69,7 @@ It does not assume a deployment method or environment.
 For inspiration in this space, check out:
 
 - The `koa-rest-api` template for containerised deployments
-- The `lambda-sqs-worker` template for Lambda deployments
+- The `lambda-sqs-worker-cdk` template for Lambda deployments
 
 ## Support
 

package/template/greeter/package.json

@@ -16,11 +16,11 @@
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^20.9.0",
-    "skuba": "9.2.0-wat-20250115035523"
+    "@types/node": "^22.13.10",
+    "skuba": "10.0.0-main-20250312042528"
   },
-  "packageManager": "pnpm@9.15.3",
+  "packageManager": "pnpm@10.6.1",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

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

@@ -57,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -70,7 +70,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -87,7 +87,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -102,7 +102,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v3.0.0:
+      - seek-jobs/gantry#v4.0.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/koa-rest-api/.gantry/common.yml

@@ -9,6 +9,4 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:source:sha: '{{.CommitSHA}}'
-  seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
-  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#required-tags'
+  # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema'

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

@@ -1 +1 @@
-20
+22

package/template/koa-rest-api/Dockerfile

@@ -12,7 +12,7 @@ RUN pnpm install --offline --prod
 
 ###
 
-FROM gcr.io/distroless/nodejs20-debian12 AS runtime
+FROM gcr.io/distroless/nodejs22-debian12 AS runtime
 
 WORKDIR /workdir
 

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

@@ -1,6 +1,6 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.14
 
-FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

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

@@ -36,7 +36,7 @@
     "@types/co-body": "^6.1.3",
     "@types/koa": "^2.13.4",
     "@types/koa__router": "^12.0.0",
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.10",
     "@types/supertest": "^6.0.0",
     "chance": "^1.1.8",
     "mime": "^4.0.1",
@@ -44,8 +44,8 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.15.3",
+  "packageManager": "pnpm@10.6.1",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

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

@@ -5,13 +5,13 @@
       // open-telemetry/opentelemetry-js#3580
       "DOM",
 
-      "ES2022"
+      "ES2024"
     ],
     "outDir": "lib",
     "paths": {
       "src": ["src"]
     },
-    "target": "ES2022"
+    "target": "ES2024"
   },
   "exclude": ["lib*/**/*"],
   "extends": "skuba/config/tsconfig.json"

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

@@ -33,7 +33,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.5.0:
+        - docker-compose#v5.6.0:
             dependencies: false
             run: app
             environment:
@@ -63,7 +63,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.5.0:
+      - docker-compose#v5.6.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -1 +1 @@
-20
+22

package/template/lambda-sqs-worker-cdk/Dockerfile

@@ -1,9 +1,9 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.14
 
-FROM public.ecr.aws/docker/library/node:20-alpine AS dev-deps
+FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 
 # Needed for cdk
-RUN apk add --no-cache bash
+RUN apk add --no-cache bash git
 
 RUN --mount=type=bind,source=package.json,target=package.json \
     corepack enable pnpm && corepack install

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

@@ -227,7 +227,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs20.x",
+        "Runtime": "nodejs22.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",
@@ -953,7 +953,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs20.x",
+        "Runtime": "nodejs22.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",

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

@@ -13,7 +13,7 @@ import {
   aws_sqs,
 } from 'aws-cdk-lib';
 import type { Construct } from 'constructs';
-import { Datadog } from 'datadog-cdk-constructs-v2';
+import { DatadogLambda } from 'datadog-cdk-constructs-v2';
 
 import { config } from './config';
 
@@ -80,7 +80,7 @@ export class AppStack extends Stack {
 
     const worker = new aws_lambda_nodejs.NodejsFunction(this, 'worker', {
       architecture: aws_lambda.Architecture[architecture],
-      runtime: aws_lambda.Runtime.NODEJS_20_X,
+      runtime: aws_lambda.Runtime.NODEJS_22_X,
       environmentEncryption: kmsKey,
       // aws-sdk-v3 sets this to true by default, so it is not necessary to set the environment variable
       // https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/node-reusing-connections.html
@@ -89,7 +89,7 @@ export class AppStack extends Stack {
       timeout: Duration.seconds(30),
       bundling: {
         sourceMap: true,
-        target: 'node20',
+        target: 'node22',
         // aws-sdk-v3 is set as an external module by default, but we want it to be bundled with the function
         externalModules: [],
         nodeModules: ['datadog-lambda-js', 'dd-trace'],
@@ -117,7 +117,7 @@ export class AppStack extends Stack {
       config.datadogApiKeySecretArn,
     );
 
-    const datadog = new Datadog(this, 'datadog', {
+    const datadog = new DatadogLambda(this, 'datadog', {
       apiKeySecret: datadogSecret,
       addLayers: false,
       enableDatadogLogs: false,

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

@@ -4,7 +4,7 @@ const ENVIRONMENTS = ['dev', 'prod'] as const;
 
 type Environment = (typeof ENVIRONMENTS)[number];
 
-export const environment = Env.oneOf(ENVIRONMENTS)('ENVIRONMENT');
+const environment = Env.oneOf(ENVIRONMENTS)('ENVIRONMENT');
 
 interface Config {
   appName: string;

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

@@ -2,17 +2,15 @@ import { HookStack } from '@seek/aws-codedeploy-infra';
 import { App } from 'aws-cdk-lib';
 
 import { AppStack } from './appStack';
-import { config, environment } from './config';
+import { config } from './config';
 
 const app = new App();
 
 const appStack = new AppStack(app, 'appStack', {
   stackName: config.appName,
   tags: {
-    'seek:env:label': environment,
-    'seek:source:sha': process.env.BUILDKITE_COMMIT ?? 'na',
-    // 'seek:source:url': 'TODO: add source URL',
-    // 'seek:system:name': 'TODO: add system name',
+    'seek:source:url': 'https://github.com/SEEK-Jobs/<%- repoName %>',
+    // 'seek:system:name': 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema',
   },
 });
 

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

@@ -18,7 +18,7 @@
     "@aws-sdk/client-lambda": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/logger": "^9.0.0",
-    "datadog-lambda-js": "^9.0.0",
+    "datadog-lambda-js": "^10.0.0",
     "dd-trace": "^5.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
@@ -27,19 +27,19 @@
     "@seek/aws-codedeploy-infra": "^2.1.0",
     "@types/aws-lambda": "^8.10.82",
     "@types/chance": "^1.1.3",
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.10",
     "aws-cdk": "^2.167.1",
     "aws-cdk-lib": "^2.167.1",
     "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": "^1.18.0",
+    "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "9.2.0-wat-20250115035523"
+    "skuba": "10.0.0-main-20250312042528"
   },
-  "packageManager": "pnpm@9.15.3",
+  "packageManager": "pnpm@10.6.1",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

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

@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
-    "lib": ["ES2022"],
+    "lib": ["ES2024"],
     "outDir": "lib",
     "paths": {
       "src": ["src"]
     },
-    "target": "ES2022"
+    "target": "ES2024"
   },
   "exclude": ["lib*/**/*"],
   "extends": "skuba/config/tsconfig.json"

package/template/oss-npm-package/.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: ^22.14
 
       - name: Set up pnpm
         run: corepack enable pnpm && corepack install

package/template/oss-npm-package/.github/workflows/validate.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: ^22.14
 
       - name: Set up pnpm
         run: corepack enable pnpm && corepack install

package/template/oss-npm-package/.nvmrc

@@ -1 +1 @@
-20
+22

package/template/oss-npm-package/_package.json

@@ -34,7 +34,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.10",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },

package/template/private-npm-package/.nvmrc

@@ -1 +1 @@
-20
+22

package/template/private-npm-package/_package.json

@@ -34,12 +34,12 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "^20.16.5",
+    "@types/node": "^22.13.10",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },
   "packageManager": "pnpm@8.15.1",
   "engines": {
-    "node": ">=18.12"
+    "node": ">=22"
   }
 }