skuba 14.0.0-replace-global-vars-20251121010036 → 14.0.0-rfc-pnpm-config-skuba-20260106120954

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "14.0.0-replace-global-vars-20251121010036",
+  "version": "14.0.0-rfc-pnpm-config-skuba-20260106120954",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -13,7 +13,6 @@
   },
   "license": "MIT",
   "sideEffects": false,
-  "type": "module",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "bin": {
@@ -21,10 +20,12 @@
   },
   "files": [
     "config/**/*",
+    "jest/**/*.js",
     "lib*/**/*.d.ts",
     "lib*/**/*.js",
     "lib*/**/*.js.map",
-    "template/**/*"
+    "template/**/*",
+    "jest-preset.js"
   ],
   "remarkConfig": {
     "plugins": [
@@ -54,21 +55,21 @@
     ]
   },
   "dependencies": {
+    "@ast-grep/lang-json": "^0.0.5",
+    "@ast-grep/napi": "^0.40.0",
     "@esbuild-plugins/tsconfig-paths": "^0.1.0",
-    "@eslint/migrate-config": "~1.3.8",
     "@inquirer/prompts": "^7.9.0",
+    "@jest/types": "^30.0.0",
     "@octokit/graphql": "^9.0.0",
     "@octokit/graphql-schema": "^15.3.0",
     "@octokit/rest": "^22.0.0",
-    "@octokit/types": "^15.0.0",
-    "@types/node": "^22.0.0",
-    "@vitest/coverage-v8": "^4.0.5",
-    "@vitest/ui": "^4.0.5",
-    "@vitest/utils": "^4.0.5",
+    "@octokit/types": "^16.0.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^24.10.2",
     "concurrently": "^9.0.0",
     "ejs": "^3.1.6",
-    "esbuild": "~0.25.0",
-    "eslint": "^9.11.1",
+    "esbuild": "~0.27.0",
+    "eslint": "^9.39.1",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
     "find-up": "^5.0.0",
@@ -79,72 +80,71 @@
     "ignore": "^7.0.0",
     "is-installed-globally": "^0.4.0",
     "isomorphic-git": "^1.11.1",
+    "jest": "^30.0.0",
+    "jest-watch-typeahead": "^3.0.1",
     "lodash.mergewith": "^4.6.2",
     "minimist": "^1.2.6",
-    "normalize-package-data": "^7.0.0",
+    "normalize-package-data": "^8.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.6.0",
+    "prettier": "~3.7.0",
     "prettier-plugin-packagejson": "^2.4.10",
-    "read-package-up": "^11.0.0",
+    "read-pkg-up": "^7.0.1",
     "semantic-release": "^24.2.3",
     "simple-git": "^3.5.0",
+    "ts-dedent": "^2.2.0",
+    "ts-jest": "^29.4.0",
+    "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
-    "tsx": "^4.16.2",
+    "tsx": "^4.21.0",
     "typescript": "~5.9.0",
-    "vitest": "^4.0.5",
     "zod": "^4.0.0",
-    "@skuba-lib/api": "^1.1.0-replace-global-vars-20251121010036",
-    "eslint-config-skuba": "7.3.0-replace-global-vars-20251121010036"
+    "@skuba-lib/api": "^2.0.0-rfc-pnpm-config-skuba-20260106120954",
+    "eslint-config-skuba": "8.0.0-rfc-pnpm-config-skuba-20260106120954"
   },
   "devDependencies": {
-    "@changesets/cli": "2.29.7",
-    "@changesets/get-github-info": "0.6.0",
+    "@changesets/cli": "2.29.8",
+    "@changesets/get-github-info": "0.7.0",
+    "@jest/reporters": "30.2.0",
+    "@jest/test-result": "30.2.0",
     "@types/ejs": "3.1.5",
-    "@types/express": "5.0.3",
+    "@types/express": "5.0.6",
     "@types/fs-extra": "11.0.4",
-    "@types/koa": "3.0.0",
+    "@types/koa": "3.0.1",
     "@types/lodash.mergewith": "4.6.9",
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
-    "@types/npm-registry-fetch": "8.0.8",
+    "@types/npm-registry-fetch": "8.0.9",
     "@types/npm-which": "3.0.4",
     "@types/picomatch": "4.0.2",
     "@types/semver": "7.7.1",
     "@types/supertest": "6.0.3",
-    "enhanced-resolve": "5.18.3",
-    "express": "5.1.0",
-    "fastify": "5.6.1",
+    "enhanced-resolve": "5.18.4",
+    "express": "5.2.1",
+    "fastify": "5.6.2",
+    "jest-diff": "30.2.0",
     "jsonfile": "6.2.0",
-    "koa": "3.0.3",
-    "memfs": "4.49.0",
+    "koa": "3.1.1",
+    "memfs": "4.51.1",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.1",
     "semver": "7.7.3",
     "supertest": "7.1.4",
-    "ts-dedent": "^2.2.0",
-    "type-fest": "2.19.0"
-  },
-  "peerDependencies": {
-    "skuba-dive": "3.0.0-replace-global-vars-20251121010036"
-  },
-  "peerDependenciesMeta": {
-    "skuba-dive": {
-      "optional": true
-    }
+    "type-fest": "2.19.0",
+    "pnpm-plugin-skuba": "1.0.0"
   },
   "engines": {
-    "node": ">=20.9.0"
+    "node": ">=22.14.0"
   },
   "skuba": {
     "build": "esbuild",
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "13.0.0"
+    "version": "13.1.1"
   },
   "scripts": {
     "build": "scripts/build.sh",
@@ -159,12 +159,12 @@
     "release": "pnpm --silent build && changeset publish",
     "skuba": "pnpm --silent build && pnpm --silent skuba:exec",
     "skuba:exec": "node lib/skuba",
-    "stage": "changeset version && node ./.changeset/inject.cjs && pnpm format",
-    "test": "pnpm --silent skuba test run",
-    "test:ci": "pnpm --silent skuba test run",
-    "test:int": "pnpm --silent skuba test run",
+    "stage": "changeset version && node ./.changeset/inject.js && pnpm format",
+    "test": "pnpm --silent skuba test --selectProjects unit",
+    "test:ci": "pnpm --silent skuba test --runInBand",
+    "test:int": "pnpm --silent skuba test --selectProjects integration --runInBand",
     "test:template": "scripts/test-template.sh",
     "test:template:updateSnapshot": "scripts/test-template.sh -u",
-    "test:watch": "pnpm --silent skuba test"
+    "test:watch": "pnpm --silent skuba test --runInBand --watch"
   }
 }

package/template/base/_.prettierrc.js

@@ -1 +1 @@
-export { default } from 'skuba/config/prettier.js';
+module.exports = require('skuba/config/prettier');

package/template/base/_eslint.config.js

@@ -1 +1 @@
-export { default } from 'eslint-config-skuba';
+module.exports = require('eslint-config-skuba');

package/template/base/_pnpm-workspace.yaml

@@ -1,23 +0,0 @@
-# managed by skuba
-ignorePatchFailures: false
-# minimumReleaseAge: 4320 # 3 days
-minimumReleaseAgeExclude:
-  - '@seek/*'
-  - '@skuba-lib/*'
-  - eslint-config-seek
-  - eslint-config-skuba
-  - eslint-plugin-skuba
-  - skuba
-  - tsconfig-seek
-packageManagerStrictVersion: true
-publicHoistPattern:
-  - '@types*'
-  - '@vitest/*'
-  - eslint
-  - eslint-config-skuba
-  - prettier
-  - esbuild
-  - 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.20.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-replace-global-vars-20251121010036"
+    "skuba-dive": "4.0.0-rfc-pnpm-config-skuba-20260106120954"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "14.0.0-replace-global-vars-20251121010036"
+    "skuba": "14.0.0-rfc-pnpm-config-skuba-20260106120954"
   },
-  "packageManager": "pnpm@10.20.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.0.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.20.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`] = `
 {
@@ -216,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",
               ],
             ],
           },
@@ -241,7 +241,7 @@ exports[`returns expected CloudFormation stack for dev 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs22.x",
+        "Runtime": "nodejs24.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",
@@ -762,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": {
@@ -927,9 +919,7 @@ 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",
@@ -968,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",
               ],
             ],
           },
@@ -993,7 +983,7 @@ exports[`returns expected CloudFormation stack for prod 1`] = `
             "Arn",
           ],
         },
-        "Runtime": "nodejs22.x",
+        "Runtime": "nodejs24.x",
         "Tags": [
           {
             "Key": "aws-codedeploy-hooks",
@@ -1392,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': [] } });