skuba 13.0.3 → 14.0.0-esmify-skuba-20251031135439

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

@@ -1,8 +1,8 @@
-deployment: dev
+deployment: <%- devGantryEnvironmentName %>
 env: development
 
-maxInstanceCount: 1
 minInstanceCount: 1
+maxInstanceCount: 1
 
 # Disable dashboard for cost savings
 cloudwatchDashboardDisabled: true

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

@@ -1,8 +1,8 @@
-deployment: prod
+deployment: <%- prodGantryEnvironmentName %>
 env: production
 
-maxInstanceCount: 10
 minInstanceCount: 3
+maxInstanceCount: 10
 
 openTelemetry:
   enabled: true

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

@@ -2,6 +2,7 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
+  "type": "module",
   "imports": {
     "#src/*": {
       "@seek/<%- serviceName %>/source": "./src/*",
@@ -23,11 +24,11 @@
     "@koa/router": "^14.0.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.0.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.205.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.61.0",
-    "@opentelemetry/instrumentation-http": "^0.205.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.206.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.62.0",
+    "@opentelemetry/instrumentation-http": "^0.206.0",
     "@opentelemetry/propagator-b3": "^2.0.0",
-    "@opentelemetry/sdk-node": "^0.205.0",
+    "@opentelemetry/sdk-node": "^0.206.0",
     "@seek/logger": "^11.1.0",
     "hot-shots": "^11.0.0",
     "koa": "^3.0.1",
@@ -49,7 +50,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.17.1",
+  "packageManager": "pnpm@10.19.0",
   "engines": {
     "node": ">=22"
   }

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

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

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

@@ -1,3 +1,5 @@
+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,3 +1,5 @@
+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,3 +1,5 @@
+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,4 +1,5 @@
 import Router from '@koa/router';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { stdoutMock } from './logging.js';
 
@@ -7,8 +8,7 @@ import { agentFromRouter } from '#src/testing/server.js';
 import { chance } from '#src/testing/types.js';
 import type { Middleware } from '#src/types/koa.js';
 
-const middleware = jest.fn<void, Parameters<Middleware>>();
-
+const middleware = vi.fn<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,3 +1,5 @@
+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,3 +1,5 @@
+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/infra/__snapshots__/appStack.test.ts.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`returns expected CloudFormation stack for dev 1`] = `
 {
@@ -763,6 +763,14 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
     },
   },
   "Resources": {
+    "datadogapikeysecret046FEF06": {
+      "DeletionPolicy": "Delete",
+      "Properties": {
+        "GenerateSecretString": {},
+      },
+      "Type": "AWS::SecretsManager::Secret",
+      "UpdateReplacePolicy": "Delete",
+    },
     "destinationtopicDCE2E0B8": {
       "Properties": {
         "KmsMasterKeyId": {
@@ -920,7 +928,9 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
         },
         "Environment": {
           "Variables": {
-            "DD_API_KEY_SECRET_ARN": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME",
+            "DD_API_KEY_SECRET_ARN": {
+              "Ref": "datadogapikeysecret046FEF06",
+            },
             "DD_CAPTURE_LAMBDA_PAYLOAD": "false",
             "DD_ENV": "production",
             "DD_FLUSH_TO_LOG": "false",
@@ -1384,7 +1394,9 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
                 "secretsmanager:DescribeSecret",
               ],
               "Effect": "Allow",
-              "Resource": "arn:aws:secretsmanager:<Region>:<AccountId>:secret:TODO_SECRET_NAME-??????",
+              "Resource": {
+                "Ref": "datadogapikeysecret046FEF06",
+              },
             },
             {
               "Action": [

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

@@ -1,5 +1,6 @@
 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;
@@ -10,7 +11,7 @@ afterAll(() => {
 });
 
 afterEach(() => {
-  jest.resetModules();
+  vi.resetModules();
 });
 
 it.each(['dev', 'prod'])(
@@ -21,15 +22,16 @@ it.each(['dev', 'prod'])(
 
     const { AppStack } = await import('./appStack.js');
 
-    jest
-      .spyOn(aws_sns.Topic, 'fromTopicArn')
-      .mockImplementation((scope, id) => new aws_sns.Topic(scope, id));
+    vi.spyOn(aws_sns.Topic, 'fromTopicArn').mockImplementation(
+      (scope, id) => new aws_sns.Topic(scope, id),
+    );
 
-    jest
-      .spyOn(aws_secretsmanager.Secret, 'fromSecretPartialArn')
-      .mockImplementation(
-        (scope, id) => new aws_secretsmanager.Secret(scope, id),
-      );
+    vi.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 = 87;
+const DATADOG_EXTENSION_LAYER_VERSION = 88;
 
 // Updated by https://github.com/seek-oss/rynovate
 const DATADOG_NODE_LAYER_VERSION = 126;

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

@@ -2,6 +2,7 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
+  "type": "module",
   "imports": {
     "#src/*": {
       "@seek/<%- serviceName %>/source": "./src/*",
@@ -23,7 +24,7 @@
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/aws-codedeploy-hooks": "^2.0.0",
     "@seek/logger": "^11.1.0",
-    "skuba-dive": "^2.0.0",
+    "skuba-dive": "3.0.0-esmify-skuba-20251031135439",
     "zod": "^4.0.0"
   },
   "devDependencies": {
@@ -33,17 +34,17 @@
     "@types/node": "^22.13.10",
     "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",
+    "aws-sdk-client-mock": "^4.1.0",
+    "aws-sdk-client-mock-vitest": "^6.2.1",
     "chance": "^1.1.8",
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^3.0.0",
     "datadog-lambda-js": "^12.0.0",
     "dd-trace": "^5.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "*"
+    "skuba": "14.0.0-esmify-skuba-20251031135439"
   },
-  "packageManager": "pnpm@10.17.1",
+  "packageManager": "pnpm@10.19.0",
   "engines": {
     "node": ">=22"
   }

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

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

package/template/lambda-sqs-worker-cdk/src/app.test.ts

@@ -1,5 +1,14 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
 import type { SQSBatchResponse } from 'aws-lambda';
+import {
+  afterEach,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+} from 'vitest';
 
 import * as app from './app.js';
 import { stdoutMock } from './framework/logging.js';
@@ -20,7 +29,7 @@ describe('handler', () => {
 
   const score = chance.floating({ max: 1, min: 0 });
 
-  const distribution = jest
+  const distribution = vi
     .spyOn(metricsClient, 'distribution')
     .mockReturnValue();
 
@@ -41,9 +50,9 @@ describe('handler', () => {
   it('handles one record', async () => {
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+    await expect(app.handler(event, ctx)).resolves.toEqual({
       batchItemFailures: [],
-    });
+    } satisfies SQSBatchResponse);
 
     expect(scoringService.request).toHaveBeenCalledTimes(1);
 
@@ -72,9 +81,9 @@ describe('handler', () => {
       JSON.stringify(jobPublished),
     ]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+    await expect(app.handler(event, ctx)).resolves.toEqual({
       batchItemFailures: [],
-    });
+    } satisfies SQSBatchResponse);
 
     expect(stdoutMock.calls).toMatchObject([
       { count: 2, level: 20, msg: 'Received jobs' },
@@ -100,9 +109,9 @@ describe('handler', () => {
       JSON.stringify(jobPublished),
     ]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+    await expect(app.handler(event, ctx)).resolves.toEqual({
       batchItemFailures: [{ itemIdentifier: event.Records[0]!.messageId }],
-    });
+    } satisfies SQSBatchResponse);
 
     expect(stdoutMock.calls).toMatchObject([
       { count: 2, level: 20, msg: 'Received jobs' },
@@ -128,13 +137,13 @@ describe('handler', () => {
   it('returns a batchItemFailure on invalid input', () => {
     const event = createSqsEvent(['}']);
 
-    return expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+    return expect(app.handler(event, ctx)).resolves.toEqual({
       batchItemFailures: [
         {
           itemIdentifier: event.Records[0]!.messageId,
         },
       ],
-    });
+    } satisfies SQSBatchResponse);
   });
 
   it('bubbles up scoring service error', async () => {
@@ -144,9 +153,9 @@ describe('handler', () => {
 
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+    await expect(app.handler(event, ctx)).resolves.toEqual({
       batchItemFailures: [{ itemIdentifier: event.Records[0]!.messageId }],
-    });
+    } satisfies SQSBatchResponse);
 
     expect(stdoutMock.calls).toMatchObject([
       { count: 1, level: 20, msg: 'Received jobs' },
@@ -170,9 +179,9 @@ describe('handler', () => {
 
     const event = createSqsEvent([JSON.stringify(jobPublished)]);
 
-    await expect(app.handler(event, ctx)).resolves.toEqual<SQSBatchResponse>({
+    await expect(app.handler(event, ctx)).resolves.toEqual({
       batchItemFailures: [{ itemIdentifier: event.Records[0]!.messageId }],
-    });
+    } satisfies SQSBatchResponse);
 
     expect(stdoutMock.calls).toMatchObject([
       {

package/template/lambda-sqs-worker-cdk/src/framework/handler.test.ts

@@ -1,4 +1,5 @@
 import type { SQSEvent } from 'aws-lambda';
+import { afterEach, describe, expect, it } from 'vitest';
 
 import { createHandler } from './handler.js';
 import { logger, stdoutMock } from './logging.js';

package/template/lambda-sqs-worker-cdk/src/framework/validation.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from 'vitest';
+
 import { validateJson } from './validation.js';
 
 import {
@@ -30,17 +32,17 @@ describe('validateJson', () => {
 
     expect(() => validateJson(input, IdDescriptionSchema))
       .toThrowErrorMatchingInlineSnapshot(`
-      "[
-        {
-          "expected": "string",
-          "code": "invalid_type",
-          "path": [
-            "id"
-          ],
-          "message": "Invalid input: expected string, received null"
-        }
-      ]"
-    `);
+        [ZodError: [
+          {
+            "expected": "string",
+            "code": "invalid_type",
+            "path": [
+              "id"
+            ],
+            "message": "Invalid input: expected string, received null"
+          }
+        ]]
+      `);
   });
 
   it('blocks missing prop', () => {
@@ -48,25 +50,25 @@ describe('validateJson', () => {
 
     expect(() => validateJson(input, IdDescriptionSchema))
       .toThrowErrorMatchingInlineSnapshot(`
-      "[
-        {
-          "expected": "string",
-          "code": "invalid_type",
-          "path": [
-            "id"
-          ],
-          "message": "Invalid input: expected string, received undefined"
-        },
-        {
-          "expected": "string",
-          "code": "invalid_type",
-          "path": [
-            "description"
-          ],
-          "message": "Invalid input: expected string, received undefined"
-        }
-      ]"
-    `);
+        [ZodError: [
+          {
+            "expected": "string",
+            "code": "invalid_type",
+            "path": [
+              "id"
+            ],
+            "message": "Invalid input: expected string, received undefined"
+          },
+          {
+            "expected": "string",
+            "code": "invalid_type",
+            "path": [
+              "description"
+            ],
+            "message": "Invalid input: expected string, received undefined"
+          }
+        ]]
+      `);
   });
 
   it('blocks invalid JSON', () => {
@@ -75,7 +77,7 @@ describe('validateJson', () => {
     expect(() =>
       validateJson(input, IdDescriptionSchema),
     ).toThrowErrorMatchingInlineSnapshot(
-      `"Unexpected token '}', "}" is not valid JSON"`,
+      `[SyntaxError: Unexpected token '}', "}" is not valid JSON]`,
     );
   });
 });

package/template/lambda-sqs-worker-cdk/src/services/jobScorer.test.ts

@@ -1,12 +1,18 @@
+import { afterEach, beforeAll, describe, expect, it } from 'vitest';
+
 import * as jobScorer from './jobScorer.js';
 
 import { scoringService } from '#src/testing/services.js';
 import { chance, mockJobPublishedEvent } from '#src/testing/types.js';
 
 describe('scoreJobPublishedEvent', () => {
-  beforeAll(scoringService.spy);
+  beforeAll(() => {
+    scoringService.spy();
+  });
 
-  afterEach(scoringService.clear);
+  afterEach(() => {
+    scoringService.clear();
+  });
 
   it('scores an event', async () => {
     const score = chance.floating({ max: 1, min: 0 });

package/template/lambda-sqs-worker-cdk/src/services/pipelineEventSender.test.ts

@@ -1,4 +1,5 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { sendPipelineEvent } from './pipelineEventSender.js';
 
@@ -7,7 +8,7 @@ import { chance } from '#src/testing/types.js';
 
 describe('sendPipelineEvent', () => {
   afterEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
   });
 
   it('handles happy path', async () => {
@@ -34,7 +35,7 @@ describe('sendPipelineEvent', () => {
     return expect(
       sendPipelineEvent({}),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"SNS did not return a message ID"`,
+      `[Error: SNS did not return a message ID]`,
     );
   });
 });

package/template/lambda-sqs-worker-cdk/src/testing/services.ts

@@ -1,18 +1,19 @@
-import 'aws-sdk-client-mock-jest';
+import 'aws-sdk-client-mock-vitest/extend';
 
 import { PublishCommand } from '@aws-sdk/client-sns';
 import { mockClient } from 'aws-sdk-client-mock';
+import { vi } from 'vitest';
 
 import { sns as snsClient } from '#src/services/aws.js';
 import * as jobScorer from '#src/services/jobScorer.js';
 
 export const scoringService = {
-  request: jest.fn(),
+  request: vi.fn(),
 
   clear: () => scoringService.request.mockClear(),
 
   spy: () =>
-    jest
+    vi
       .spyOn(jobScorer.scoringService, 'request')
       .mockImplementation(scoringService.request),
 };

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

@@ -26,7 +26,7 @@ jobs:
         uses: pnpm/action-setup@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
 

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

@@ -22,7 +22,7 @@ jobs:
         uses: pnpm/action-setup@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
 

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

@@ -14,6 +14,7 @@
   },
   "license": "MIT",
   "sideEffects": false,
+  "type": "module",
   "main": "./lib-commonjs/index.js",
   "module": "./lib-es2015/index.js",
   "types": "./lib-types/index.d.ts",

package/template/oss-npm-package/skuba.template.js

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

package/template/oss-npm-package/src/index.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from 'vitest';
+
 import { log } from './index.js';
 
 describe('app', () => {

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

@@ -14,6 +14,7 @@
   },
   "license": "UNLICENSED",
   "sideEffects": false,
+  "type": "module",
   "main": "./lib-commonjs/index.js",
   "module": "./lib-es2015/index.js",
   "types": "./lib-types/index.d.ts",

package/template/private-npm-package/skuba.template.js

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

package/template/private-npm-package/src/index.test.ts

@@ -1,3 +1,5 @@
+import { describe, expect, it } from 'vitest';
+
 import { log } from './index.js';
 
 describe('app', () => {

package/config/jest.js

@@ -1 +0,0 @@
-module.exports = require('../jest-preset');

package/config/prettier.d.ts

@@ -1,4 +0,0 @@
-export const singleQuote: boolean;
-export const tabWidth: number;
-export const trailingComma: 'all';
-export const plugins: ['prettier-plugin-packagejson'];