skuba 14.0.0-esmify-skuba-20251105034821 → 14.0.0-hacky-hack-lang-json-20260109051908

package/template/base/_pnpm-workspace.yaml

@@ -1,6 +1,6 @@
 # managed by skuba
 ignorePatchFailures: false
-# minimumReleaseAge: 4320 # 3 days
+minimumReleaseAge: 4320 # 3 days
 minimumReleaseAgeExclude:
   - '@seek/*'
   - '@skuba-lib/*'
@@ -8,16 +8,17 @@ minimumReleaseAgeExclude:
   - eslint-config-skuba
   - eslint-plugin-skuba
   - skuba
+  - skuba-dive
   - tsconfig-seek
 packageManagerStrictVersion: true
 publicHoistPattern:
+  - '@eslint/*'
   - '@types*'
-  - '@vitest/*'
   - eslint
   - eslint-config-skuba
   - prettier
   - esbuild
+  - jest
   - tsconfig-seek
   - typescript
-  - vitest
   # end managed by skuba

package/template/base/jest.config.ts

@@ -0,0 +1,19 @@
+import { Jest } from 'skuba';
+
+export default Jest.mergePreset({
+  coveragePathIgnorePatterns: ['src/testing'],
+  coverageThreshold: {
+    global: {
+      branches: 0,
+      functions: 0,
+      lines: 0,
+      statements: 0,
+    },
+  },
+  setupFiles: ['<rootDir>/jest.setup.ts'],
+  testPathIgnorePatterns: ['/test\\.ts'],
+  moduleNameMapper: {
+    '^#src/(.*)\\.js$': ['<rootDir>/src/$1'],
+    '^#src/(.*)$': ['<rootDir>/src/$1'],
+  },
+});

package/template/base/jest.setup.ts

@@ -0,0 +1,3 @@
+process.env.DEPLOYMENT = 'test';
+
+export {};

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

@@ -48,7 +48,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.11.0:
+      - docker-compose#v5.12.1:
           environment:
             - GITHUB_API_TOKEN
           mount-buildkite-agent: true

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

@@ -1 +1 @@
-22
+24

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

@@ -2,7 +2,6 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
-  "type": "module",
   "imports": {
     "#src/*": {
       "@seek/<%- serviceName %>/source": "./src/*",
@@ -22,16 +21,16 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.0.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.206.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.62.0",
-    "@opentelemetry/instrumentation-http": "^0.206.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.208.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.64.0",
+    "@opentelemetry/instrumentation-http": "^0.208.0",
     "@opentelemetry/propagator-b3": "^2.0.0",
-    "@opentelemetry/sdk-node": "^0.206.0",
+    "@opentelemetry/sdk-node": "^0.208.0",
     "@seek/logger": "^11.1.0",
     "express": "^5.0.0",
-    "hot-shots": "^11.0.0",
+    "hot-shots": "^12.0.0",
     "seek-datadog-custom-metrics": "^6.0.0",
-    "skuba-dive": "^2.0.0"
+    "skuba-dive": "^3.0.0"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",
@@ -41,8 +40,8 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.19.0",
+  "packageManager": "pnpm@10.27.0",
   "engines": {
-    "node": ">=22"
+    "node": ">=24"
   }
 }

package/template/express-rest-api/skuba.template.js

@@ -2,7 +2,7 @@
  * Run `skuba configure` to finish templating and remove this file.
  */
 
-export default {
+module.exports = {
   entryPoint: 'src/app.ts',
   fields: [
     {

package/template/express-rest-api/src/app.test.ts

@@ -1,5 +1,4 @@
 import request from 'supertest';
-import { describe, it } from 'vitest';
 
 import app from './app.js';
 

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

@@ -29,7 +29,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.11.0:
+      - docker-compose#v5.12.1:
           environment:
             - GITHUB_API_TOKEN
           mount-buildkite-agent: true

package/template/greeter/.nvmrc

@@ -1 +1 @@
-22
+24

package/template/greeter/package.json

@@ -2,7 +2,6 @@
   "name": "@seek/greeter",
   "private": true,
   "license": "UNLICENSED",
-  "type": "module",
   "imports": {
     "#src/*": {
       "@seek/<%- serviceName %>/source": "./src/*",
@@ -20,14 +19,14 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "skuba-dive": "3.0.0-esmify-skuba-20251105034821"
+    "skuba-dive": "4.0.0-hacky-hack-lang-json-20260109051908"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "14.0.0-esmify-skuba-20251105034821"
+    "skuba": "14.0.0-hacky-hack-lang-json-20260109051908"
   },
-  "packageManager": "pnpm@10.19.0",
+  "packageManager": "pnpm@10.27.0",
   "engines": {
-    "node": ">=22"
+    "node": ">=24"
   }
 }

package/template/greeter/skuba.template.js

@@ -2,7 +2,7 @@
  * Run `skuba configure` to finish templating and remove this file.
  */
 
-export default {
+module.exports = {
   entryPoint: 'src/app.ts',
   fields: [
     {

package/template/greeter/src/app.test.ts

@@ -1,7 +1,5 @@
-import { describe, expect, it } from 'vitest';
-
 import * as app from './app.js';
 
 describe('app', () => {
-  it('is importable', () => expect(app).toBeDefined());
+  it('is importable', () => expect(app).toEqual({}));
 });

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

@@ -48,7 +48,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.11.0:
+      - docker-compose#v5.12.1:
           environment:
             - GITHUB_API_TOKEN
           mount-buildkite-agent: true

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

@@ -1 +1 @@
-22
+24

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

@@ -2,7 +2,6 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
-  "type": "module",
   "imports": {
     "#src/*": {
       "@seek/<%- serviceName %>/source": "./src/*",
@@ -21,28 +20,27 @@
   },
   "dependencies": {
     "@koa/bodyparser": "^6.0.0",
-    "@koa/router": "^14.0.0",
+    "@koa/router": "15.2.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.0.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.206.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.62.0",
-    "@opentelemetry/instrumentation-http": "^0.206.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.208.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.64.0",
+    "@opentelemetry/instrumentation-http": "^0.208.0",
     "@opentelemetry/propagator-b3": "^2.0.0",
-    "@opentelemetry/sdk-node": "^0.206.0",
+    "@opentelemetry/sdk-node": "^0.208.0",
     "@seek/logger": "^11.1.0",
-    "hot-shots": "^11.0.0",
+    "hot-shots": "^12.0.0",
     "koa": "^3.0.1",
     "koa-compose": "^4.1.0",
     "seek-datadog-custom-metrics": "^6.0.0",
     "seek-koala": "^7.1.0",
-    "skuba-dive": "^2.0.0",
+    "skuba-dive": "^3.0.0",
     "zod": "^4.0.0"
   },
   "devDependencies": {
     "@types/chance": "^1.1.3",
     "@types/co-body": "^6.1.3",
     "@types/koa": "^3.0.0",
-    "@types/koa__router": "^12.0.0",
     "@types/node": "^22.13.10",
     "@types/supertest": "^6.0.0",
     "chance": "^1.1.8",
@@ -50,8 +48,8 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.19.0",
+  "packageManager": "pnpm@10.27.0",
   "engines": {
-    "node": ">=22"
+    "node": ">=24"
   }
 }

package/template/koa-rest-api/skuba.template.js

@@ -2,7 +2,7 @@
  * Run `skuba configure` to finish templating and remove this file.
  */
 
-export default {
+module.exports = {
   entryPoint: 'src/app.ts',
   fields: [
     {

package/template/koa-rest-api/src/api/jobs/getJobs.test.ts

@@ -1,5 +1,3 @@
-import { describe, it } from 'vitest';
-
 import { jobRouter } from './index.js';
 
 import { agentFromRouter } from '#src/testing/server.js';

package/template/koa-rest-api/src/api/jobs/postJob.test.ts

@@ -1,5 +1,3 @@
-import { describe, expect, it } from 'vitest';
-
 import { jobRouter } from './index.js';
 
 import { agentFromRouter } from '#src/testing/server.js';

package/template/koa-rest-api/src/app.test.ts

@@ -1,5 +1,3 @@
-import { describe, expect, it } from 'vitest';
-
 import app from './app.js';
 
 import { agentFromApp } from '#src/testing/server.js';

package/template/koa-rest-api/src/framework/server.test.ts

@@ -1,5 +1,4 @@
 import Router from '@koa/router';
-import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { stdoutMock } from './logging.js';
 
@@ -8,7 +7,8 @@ import { agentFromRouter } from '#src/testing/server.js';
 import { chance } from '#src/testing/types.js';
 import type { Middleware } from '#src/types/koa.js';
 
-const middleware = vi.fn<Middleware>();
+const middleware = jest.fn<void, Parameters<Middleware>>();
+
 const router = new Router()
   .use('/nested', new Router().put('/:param', middleware).routes())
   .get('/', middleware);

package/template/koa-rest-api/src/framework/validation.test.ts

@@ -1,5 +1,3 @@
-import { describe, expect, it } from 'vitest';
-
 import { jsonBodyParser } from './bodyParser.js';
 import { validate } from './validation.js';
 

package/template/koa-rest-api/src/testing/metrics.ts

@@ -1,5 +1,3 @@
-import { expect } from 'vitest';
-
 import * as metrics from '#src/framework/metrics.js';
 
 function assertDefined<T>(value: T | undefined): asserts value is T {

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

@@ -23,7 +23,7 @@ configs:
       concurrency: 1
       plugins:
         - *docker-ecr-cache
-        - docker-compose#v5.11.0:
+        - docker-compose#v5.12.1:
             dependencies: false
             environment:
               - GITHUB_API_TOKEN
@@ -53,7 +53,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.11.0:
+      - docker-compose#v5.12.1:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -1 +1 @@
-22
+24

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

@@ -1,4 +1,4 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`returns expected CloudFormation stack for dev 1`] = `
 {
@@ -184,7 +184,6 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "DD_LAMBDA_HANDLER": "index.handler",
             "DD_LOGS_INJECTION": "false",
             "DD_MERGE_XRAY_TRACES": "false",
-            "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
             "DD_SERVICE": "serviceName",
             "DD_SITE": "datadoghq.com",
@@ -217,7 +216,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
                 {
                   "Ref": "AWS::Region",
                 },
-                ":464622532012:layer:Datadog-Node22-x:x",
+                ":464622532012:layer:Datadog-Node24-x:x",
               ],
             ],
           },
@@ -242,7 +241,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs22.x",
+        "Runtime": "nodejs24.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",
@@ -763,14 +762,6 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
     },
   },
   "Resources": {
-    "datadogapikeysecret046FEF06": {
-      "DeletionPolicy": "Delete",
-      "Properties": {
-        "GenerateSecretString": {},
-      },
-      "Type": "AWS::SecretsManager::Secret",
-      "UpdateReplacePolicy": "Delete",
-    },
     "destinationtopicDCE2E0B8": {
       "Properties": {
         "KmsMasterKeyId": {
@@ -928,16 +919,13 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
         },
         "Environment": {
           "Variables": {
-            "DD_API_KEY_SECRET_ARN": {
-              "Ref": "datadogapikeysecret046FEF06",
-            },
+            "DD_API_KEY_SECRET_ARN": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key",
             "DD_CAPTURE_LAMBDA_PAYLOAD": "false",
             "DD_ENV": "production",
             "DD_FLUSH_TO_LOG": "false",
             "DD_LAMBDA_HANDLER": "index.handler",
             "DD_LOGS_INJECTION": "false",
             "DD_MERGE_XRAY_TRACES": "false",
-            "DD_SERVERLESS_APPSEC_ENABLED": "false",
             "DD_SERVERLESS_LOGS_ENABLED": "false",
             "DD_SERVICE": "serviceName",
             "DD_SITE": "datadoghq.com",
@@ -970,7 +958,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
                 {
                   "Ref": "AWS::Region",
                 },
-                ":464622532012:layer:Datadog-Node22-x:x",
+                ":464622532012:layer:Datadog-Node24-x:x",
               ],
             ],
           },
@@ -995,7 +983,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs22.x",
+        "Runtime": "nodejs24.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",
@@ -1394,9 +1382,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
                 "secretsmanager:DescribeSecret",
               ],
               "Effect": "Allow",
-              "Resource": {
-                "Ref": "datadogapikeysecret046FEF06",
-              },
+              "Resource": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key-??????",
             },
             {
               "Action": [

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

@@ -1,6 +1,5 @@
 import { App, aws_secretsmanager, aws_sns } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
-import { afterAll, afterEach, expect, it, vi } from 'vitest';
 
 const originalDeployment = process.env.DEPLOYMENT;
 const originalVersion = process.env.VERSION;
@@ -11,7 +10,7 @@ afterAll(() => {
 });
 
 afterEach(() => {
-  vi.resetModules();
+  jest.resetModules();
 });
 
 it.each(['dev', 'prod'])(
@@ -22,16 +21,15 @@ it.each(['dev', 'prod'])(
 
     const { AppStack } = await import('./appStack.js');
 
-    vi.spyOn(aws_sns.Topic, 'fromTopicArn').mockImplementation(
-      (scope, id) => new aws_sns.Topic(scope, id),
-    );
+    jest
+      .spyOn(aws_sns.Topic, 'fromTopicArn')
+      .mockImplementation((scope, id) => new aws_sns.Topic(scope, id));
 
-    vi.spyOn(
-      aws_secretsmanager.Secret,
-      'fromSecretPartialArn',
-    ).mockImplementation(
-      (scope, id) => new aws_secretsmanager.Secret(scope, id),
-    );
+    jest
+      .spyOn(aws_secretsmanager.Secret, 'fromSecretPartialArn')
+      .mockImplementation(
+        (scope, id) => new aws_secretsmanager.Secret(scope, id),
+      );
 
     const app = new App({ context: { 'aws:cdk:bundling-stacks': [] } });
 

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

@@ -19,7 +19,7 @@ import { DatadogLambda } from 'datadog-cdk-constructs-v2';
 import { config } from './config.js';
 
 // Updated by https://github.com/seek-oss/rynovate
-const DATADOG_EXTENSION_LAYER_VERSION = 88;
+const DATADOG_EXTENSION_LAYER_VERSION = 91;
 
 // Updated by https://github.com/seek-oss/rynovate
 const DATADOG_NODE_LAYER_VERSION = 126;
@@ -86,7 +86,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_22_X,
+      runtime: aws_lambda.Runtime.NODEJS_24_X,
       memorySize: 512,
       environmentEncryption: kmsKey,
       // aws-sdk-v3 sets this to true by default, so it is not necessary to set the environment variable
@@ -96,7 +96,7 @@ export class AppStack extends Stack {
       timeout: Duration.seconds(30),
       bundling: {
         sourceMap: true,
-        target: 'node22',
+        target: 'node24',
         // aws-sdk-v3 is set as an external module by default, but we want it to be bundled with the function
         externalModules: [],
         esbuildArgs: {

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

@@ -40,8 +40,7 @@ const configs: Record<Deployment, Config> = {
       },
     },
 
-    datadogApiKeySecretArn:
-      'arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME',
+    datadogApiKeySecretArn: '<%- devDataDogApiKeySecretArn %>',
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
   },
   prod: {
@@ -57,8 +56,7 @@ const configs: Record<Deployment, Config> = {
       },
     },
 
-    datadogApiKeySecretArn:
-      'arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME',
+    datadogApiKeySecretArn: '<%- prodDataDogApiKeySecretArn %>',
     sourceSnsTopicArn: 'TODO: sourceSnsTopicArn',
   },
 };

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

@@ -2,7 +2,6 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
-  "type": "module",
   "imports": {
     "#src/*": {
       "@seek/<%- serviceName %>/source": "./src/*",
@@ -21,10 +20,11 @@
   "dependencies": {
     "@aws-sdk/client-codedeploy": "^3.363.0",
     "@aws-sdk/client-lambda": "^3.363.0",
+    "@aws-sdk/client-secrets-manager": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/aws-codedeploy-hooks": "^2.0.0",
     "@seek/logger": "^11.1.0",
-    "skuba-dive": "3.0.0-esmify-skuba-20251105034821",
+    "skuba-dive": "4.0.0-hacky-hack-lang-json-20260109051908",
     "zod": "^4.0.0"
   },
   "devDependencies": {
@@ -33,19 +33,19 @@
     "@types/chance": "^1.1.3",
     "@types/node": "^22.13.10",
     "aws-cdk": "^2.1010.0",
-    "aws-cdk-lib": "^2.190.0",
-    "aws-sdk-client-mock": "^4.1.0",
-    "aws-sdk-client-mock-vitest": "^6.2.1",
+    "aws-cdk-lib": "^2.232.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": "^3.0.0",
+    "datadog-cdk-constructs-v2": "^3.4.0",
     "datadog-lambda-js": "^12.0.0",
     "dd-trace": "^5.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "14.0.0-esmify-skuba-20251105034821"
+    "skuba": "14.0.0-hacky-hack-lang-json-20260109051908"
   },
-  "packageManager": "pnpm@10.19.0",
+  "packageManager": "pnpm@10.27.0",
   "engines": {
-    "node": ">=22"
+    "node": ">=24"
   }
 }

package/template/lambda-sqs-worker-cdk/skuba.template.js

@@ -2,7 +2,7 @@
  * Run `skuba configure` to finish templating and remove this file.
  */
 
-export default {
+module.exports = {
   entryPoint: 'src/app.ts#handler',
   fields: [
     {
@@ -22,6 +22,18 @@ export default {
       initial: 'my-team-aws-account-prod:cicd',
       validate: (value) => /^.+:.+$/.test(value),
     },
+    {
+      name: 'devDataDogApiKeySecretArn',
+      message: 'Dev DataDog API Key Secret ARN',
+      initial:
+        'arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key',
+    },
+    {
+      name: 'prodDataDogApiKeySecretArn',
+      message: 'Prod DataDog API Key Secret ARN',
+      initial:
+        'arn:aws:secretsmanager:<Region>:<AccountId>:secret:datadog-api-key',
+    },
   ],
   packageManager: 'pnpm',
   type: 'application',