skuba 12.0.0-enforce-file-extensions-20250618112549 → 12.0.0-subpath-imports-20250710010820

package/lib/cli/migrate/nodeVersion/index.js

@@ -45,83 +45,83 @@ const subPatches = ({
 ` },
   {
     files: "**/Dockerfile*",
-    regex: /^FROM(.*) (public.ecr.aws\/docker\/library\/)?node:([0-9]+(?:\.[0-9]+(?:\.[0-9]+)?)?)(-[a-z0-9]+)?(@sha256:[a-f0-9]{64})?( .*)?$/gm,
+    regex: () => /^FROM(.*) (public.ecr.aws\/docker\/library\/)?node:([0-9]+(?:\.[0-9]+(?:\.[0-9]+)?)?)(-[a-z0-9]+)?(@sha256:[a-f0-9]{64})?( .*)?$/gm,
     replace: `FROM$1 $2node:${nodeVersion}$4$6`
   },
   {
     files: "**/Dockerfile*",
-    regex: /^FROM(.*) gcr.io\/distroless\/nodejs\d+-debian(\d+)(@sha256:[a-f0-9]{64})?(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
+    regex: () => /^FROM(.*) gcr.io\/distroless\/nodejs\d+-debian(\d+)(@sha256:[a-f0-9]{64})?(\.[^- \n]+)?(-[^ \n]+)?( .+|)$/gm,
     replace: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$2$4$5$6`
   },
   {
     files: "**/serverless*.y*ml",
-    regex: /\bnodejs\d+.x\b/gm,
+    regex: () => /\bnodejs\d+.x\b/gm,
     tests: [import_checks.isPatchableServerlessVersion],
     replace: `nodejs${nodeVersion}.x`
   },
   {
     files: "**/serverless*.y*ml",
-    regex: /\bnode\d+\b/gm,
+    regex: () => /\bnode\d+\b/gm,
     tests: [import_checks.isPatchableServerlessVersion],
     replace: `node${nodeVersion}`
   },
   {
     files: "**/infra/**/*.ts",
-    regex: /NODEJS_\d+_X/g,
+    regex: () => /NODEJS_\d+_X/g,
     replace: `NODEJS_${nodeVersion}_X`
   },
   {
     files: "**/infra/**/*.ts",
-    regex: /(target:\s*'node)(\d+)(.+)$/gm,
+    regex: () => /(target:\s*'node)(\d+)(.+)$/gm,
     replace: `$1${nodeVersion}$3`
   },
   {
     files: "**/.buildkite/*",
-    regex: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    regex: () => /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
     replace: `$1$2$3${nodeVersion}$5`
   },
   {
     files: ".node-version*",
-    regex: /(\d+(?:\.\d+)*)/g,
+    regex: () => /(\d+(?:\.\d+)*)/g,
     replace: `${nodeVersion}`
   },
   {
     files: "**/package.json",
-    regex: /(["']engines["']:\s*{[\s\S]*?["']node["']:\s*["']>=)(\d+(?:\.\d+)*)(['"]\s*})/gm,
+    regex: () => /(["']engines["']:\s*{[\s\S]*?["']node["']:\s*["']>=)(\d+(?:\.\d+)*)(['"]\s*})/gm,
     tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
     replace: `$1${nodeVersion}$3`
   },
   {
     files: "**/tsconfig*.json",
-    regex: /("target":\s*")(ES\d+)"/gim,
+    regex: () => /("target":\s*")(ES\d+)"/gim,
     tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
     replace: `$1${ECMAScriptVersion}"`
   },
   {
     files: "**/tsconfig*.json",
-    regex: /("lib":\s*\[)([\S\s]*?)(ES\d+)([\S\s]*?)(\])/gim,
+    regex: () => /("lib":\s*\[)([\S\s]*?)(ES\d+)([\S\s]*?)(\])/gim,
     tests: [import_checks.isPatchableServerlessVersion, import_checks.isPatchableSkubaType],
     replace: `$1$2${ECMAScriptVersion}$4$5`
   },
   {
     files: "**/docker-compose*.y*ml",
-    regex: /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
+    regex: () => /(image: )(public.ecr.aws\/docker\/library\/)?(node:)[0-9.]+(\.[^- \n]+)?(-[^ \n]+)?$/gm,
     replace: `$1$2$3${nodeVersion}$5`
   }
 ];
 const runSubPatch = async (dir, patch) => {
   const readFile = (0, import_project.createDestinationFileReader)(dir);
-  const paths = patch.file ? [patch.file] : await (0, import_fast_glob.glob)(patch.files ?? [], { cwd: dir });
+  const paths = patch.file ? [patch.file] : await (0, import_fast_glob.glob)(patch.files ?? [], {
+    cwd: dir,
+    ignore: ["**/node_modules/**"]
+  });
   await Promise.all(
     paths.map(async (path) => {
-      if (path.includes("node_modules")) {
-        return;
-      }
       const contents = await readFile(path);
       if (!contents) {
         return;
       }
-      if (patch.regex && !patch.regex.test(contents)) {
+      if (patch.regex && !patch.regex().test(contents)) {
         return;
       }
       if (patch.tests) {
@@ -148,7 +148,7 @@ const writePatchedContents = async ({
   regex
 }) => await import_fs_extra.default.promises.writeFile(
   path,
-  regex ? contents.replaceAll(regex, templated) : templated
+  regex ? contents.replaceAll(regex(), templated) : templated
 );
 const upgrade = async (versions, dir) => {
   for (const subPatch of subPatches(versions)) {

package/lib/cli/migrate/nodeVersion/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/cli/migrate/nodeVersion/index.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../utils/logging.js';\nimport { createDestinationFileReader } from '../../configure/analysis/project.js';\n\nimport {\n  isPatchableNodeVersion,\n  isPatchableServerlessVersion,\n  isPatchableSkubaType,\n} from './checks.js';\n\ntype FileSelector =\n  | { files: string; file?: never }\n  | { file: string; files?: never };\n\ntype SubPatch = FileSelector & {\n  tests?: Array<(path: string) => Promise<boolean>>;\n  regex?: RegExp;\n  replace: string;\n};\n\nconst subPatches = ({\n  nodeVersion,\n  ECMAScriptVersion,\n}: Versions): SubPatch[] => [\n  { file: '.nvmrc', replace: `${nodeVersion}\\n` },\n  {\n    files: '**/Dockerfile*',\n\n    regex:\n      /^FROM(.*) (public.ecr.aws\\/docker\\/library\\/)?node:([0-9]+(?:\\.[0-9]+(?:\\.[0-9]+)?)?)(-[a-z0-9]+)?(@sha256:[a-f0-9]{64})?( .*)?$/gm,\n    replace: `FROM$1 $2node:${nodeVersion}$4$6`,\n  },\n  {\n    files: '**/Dockerfile*',\n    regex:\n      /^FROM(.*) gcr.io\\/distroless\\/nodejs\\d+-debian(\\d+)(@sha256:[a-f0-9]{64})?(\\.[^- \\n]+)?(-[^ \\n]+)?( .+|)$/gm,\n    replace: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$2$4$5$6`,\n  },\n\n  {\n    files: '**/serverless*.y*ml',\n    regex: /\\bnodejs\\d+.x\\b/gm,\n    tests: [isPatchableServerlessVersion],\n    replace: `nodejs${nodeVersion}.x`,\n  },\n  {\n    files: '**/serverless*.y*ml',\n    regex: /\\bnode\\d+\\b/gm,\n    tests: [isPatchableServerlessVersion],\n    replace: `node${nodeVersion}`,\n  },\n\n  {\n    files: '**/infra/**/*.ts',\n    regex: /NODEJS_\\d+_X/g,\n    replace: `NODEJS_${nodeVersion}_X`,\n  },\n  {\n    files: '**/infra/**/*.ts',\n    regex: /(target:\\s*'node)(\\d+)(.+)$/gm,\n    replace: `$1${nodeVersion}$3`,\n  },\n\n  {\n    files: '**/.buildkite/*',\n    regex:\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n    replace: `$1$2$3${nodeVersion}$5`,\n  },\n  {\n    files: '.node-version*',\n    regex: /(\\d+(?:\\.\\d+)*)/g,\n    replace: `${nodeVersion}`,\n  },\n\n  {\n    files: '**/package.json',\n    regex:\n      /([\"']engines[\"']:\\s*{[\\s\\S]*?[\"']node[\"']:\\s*[\"']>=)(\\d+(?:\\.\\d+)*)(['\"]\\s*})/gm,\n    tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n    replace: `$1${nodeVersion}$3`,\n  },\n\n  {\n    files: '**/tsconfig*.json',\n    regex: /(\"target\":\\s*\")(ES\\d+)\"/gim,\n    tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n    replace: `$1${ECMAScriptVersion}\"`,\n  },\n  {\n    files: '**/tsconfig*.json',\n    regex: /(\"lib\":\\s*\\[)([\\S\\s]*?)(ES\\d+)([\\S\\s]*?)(\\])/gim,\n    tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n    replace: `$1$2${ECMAScriptVersion}$4$5`,\n  },\n\n  {\n    files: '**/docker-compose*.y*ml',\n    regex:\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n\n    replace: `$1$2$3${nodeVersion}$5`,\n  },\n];\n\ntype Versions = {\n  nodeVersion: number;\n  ECMAScriptVersion: string;\n};\n\nconst runSubPatch = async (dir: string, patch: SubPatch) => {\n  const readFile = createDestinationFileReader(dir);\n  const paths = patch.file\n    ? [patch.file]\n    : await glob(patch.files ?? [], { cwd: dir });\n\n  await Promise.all(\n    paths.map(async (path) => {\n      if (path.includes('node_modules')) {\n        return;\n      }\n      const contents = await readFile(path);\n      if (!contents) {\n        return;\n      }\n\n      if (patch.regex && !patch.regex.test(contents)) {\n        return;\n      }\n\n      if (patch.tests) {\n        const results = await Promise.all(\n          patch.tests.map((test) => test(path)),\n        );\n        if (!results.every(Boolean)) {\n          return;\n        }\n      }\n\n      await writePatchedContents({\n        path,\n        contents,\n        templated: patch.replace,\n        regex: patch.regex,\n      });\n    }),\n  );\n};\n\nconst writePatchedContents = async ({\n  path,\n  contents,\n  templated,\n  regex,\n}: {\n  path: string;\n  contents: string;\n  templated: string;\n  regex?: RegExp;\n}) =>\n  await fs.promises.writeFile(\n    path,\n    regex ? contents.replaceAll(regex, templated) : templated,\n  );\n\nconst upgrade = async (versions: Versions, dir: string) => {\n  for (const subPatch of subPatches(versions)) {\n    await runSubPatch(dir, subPatch);\n  }\n};\n\nexport const nodeVersionMigration = async (\n  {\n    nodeVersion,\n    ECMAScriptVersion,\n  }: {\n    nodeVersion: number;\n    ECMAScriptVersion: string;\n  },\n  dir = process.cwd(),\n) => {\n  log.ok(`Upgrading to Node.js ${nodeVersion}`);\n  try {\n    if (!(await isPatchableNodeVersion(nodeVersion, dir))) {\n      throw new Error('Node.js version is not patchable');\n    }\n\n    await upgrade({ nodeVersion, ECMAScriptVersion }, dir);\n\n    log.ok('Upgraded to Node.js', nodeVersion);\n  } catch (error) {\n    log.err('Failed to upgrade');\n    log.subtle(inspect(error));\n    process.exitCode = 1;\n  }\n};\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../utils/logging.js';\nimport { createDestinationFileReader } from '../../configure/analysis/project.js';\n\nimport {\n  isPatchableNodeVersion,\n  isPatchableServerlessVersion,\n  isPatchableSkubaType,\n} from './checks.js';\n\ntype FileSelector =\n  | { files: string; file?: never }\n  | { file: string; files?: never };\n\ntype SubPatch = FileSelector & {\n  tests?: Array<(path: string) => Promise<boolean>>;\n  regex?: () => RegExp;\n  replace: string;\n};\n\nconst subPatches = ({\n  nodeVersion,\n  ECMAScriptVersion,\n}: Versions): SubPatch[] => [\n  { file: '.nvmrc', replace: `${nodeVersion}\\n` },\n  {\n    files: '**/Dockerfile*',\n\n    regex: () =>\n      /^FROM(.*) (public.ecr.aws\\/docker\\/library\\/)?node:([0-9]+(?:\\.[0-9]+(?:\\.[0-9]+)?)?)(-[a-z0-9]+)?(@sha256:[a-f0-9]{64})?( .*)?$/gm,\n    replace: `FROM$1 $2node:${nodeVersion}$4$6`,\n  },\n  {\n    files: '**/Dockerfile*',\n    regex: () =>\n      /^FROM(.*) gcr.io\\/distroless\\/nodejs\\d+-debian(\\d+)(@sha256:[a-f0-9]{64})?(\\.[^- \\n]+)?(-[^ \\n]+)?( .+|)$/gm,\n    replace: `FROM$1 gcr.io/distroless/nodejs${nodeVersion}-debian$2$4$5$6`,\n  },\n\n  {\n    files: '**/serverless*.y*ml',\n    regex: () => /\\bnodejs\\d+.x\\b/gm,\n    tests: [isPatchableServerlessVersion],\n    replace: `nodejs${nodeVersion}.x`,\n  },\n  {\n    files: '**/serverless*.y*ml',\n    regex: () => /\\bnode\\d+\\b/gm,\n    tests: [isPatchableServerlessVersion],\n    replace: `node${nodeVersion}`,\n  },\n\n  {\n    files: '**/infra/**/*.ts',\n    regex: () => /NODEJS_\\d+_X/g,\n    replace: `NODEJS_${nodeVersion}_X`,\n  },\n  {\n    files: '**/infra/**/*.ts',\n    regex: () => /(target:\\s*'node)(\\d+)(.+)$/gm,\n    replace: `$1${nodeVersion}$3`,\n  },\n\n  {\n    files: '**/.buildkite/*',\n    regex: () =>\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n    replace: `$1$2$3${nodeVersion}$5`,\n  },\n  {\n    files: '.node-version*',\n    regex: () => /(\\d+(?:\\.\\d+)*)/g,\n    replace: `${nodeVersion}`,\n  },\n\n  {\n    files: '**/package.json',\n    regex: () =>\n      /([\"']engines[\"']:\\s*{[\\s\\S]*?[\"']node[\"']:\\s*[\"']>=)(\\d+(?:\\.\\d+)*)(['\"]\\s*})/gm,\n    tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n    replace: `$1${nodeVersion}$3`,\n  },\n\n  {\n    files: '**/tsconfig*.json',\n    regex: () => /(\"target\":\\s*\")(ES\\d+)\"/gim,\n    tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n    replace: `$1${ECMAScriptVersion}\"`,\n  },\n  {\n    files: '**/tsconfig*.json',\n    regex: () => /(\"lib\":\\s*\\[)([\\S\\s]*?)(ES\\d+)([\\S\\s]*?)(\\])/gim,\n    tests: [isPatchableServerlessVersion, isPatchableSkubaType],\n    replace: `$1$2${ECMAScriptVersion}$4$5`,\n  },\n\n  {\n    files: '**/docker-compose*.y*ml',\n    regex: () =>\n      /(image: )(public.ecr.aws\\/docker\\/library\\/)?(node:)[0-9.]+(\\.[^- \\n]+)?(-[^ \\n]+)?$/gm,\n\n    replace: `$1$2$3${nodeVersion}$5`,\n  },\n];\n\ntype Versions = {\n  nodeVersion: number;\n  ECMAScriptVersion: string;\n};\n\nconst runSubPatch = async (dir: string, patch: SubPatch) => {\n  const readFile = createDestinationFileReader(dir);\n  const paths = patch.file\n    ? [patch.file]\n    : await glob(patch.files ?? [], {\n        cwd: dir,\n        ignore: ['**/node_modules/**'],\n      });\n\n  await Promise.all(\n    paths.map(async (path) => {\n      const contents = await readFile(path);\n      if (!contents) {\n        return;\n      }\n\n      if (patch.regex && !patch.regex().test(contents)) {\n        return;\n      }\n\n      if (patch.tests) {\n        const results = await Promise.all(\n          patch.tests.map((test) => test(path)),\n        );\n        if (!results.every(Boolean)) {\n          return;\n        }\n      }\n\n      await writePatchedContents({\n        path,\n        contents,\n        templated: patch.replace,\n        regex: patch.regex,\n      });\n    }),\n  );\n};\n\nconst writePatchedContents = async ({\n  path,\n  contents,\n  templated,\n  regex,\n}: {\n  path: string;\n  contents: string;\n  templated: string;\n  regex?: () => RegExp;\n}) =>\n  await fs.promises.writeFile(\n    path,\n    regex ? contents.replaceAll(regex(), templated) : templated,\n  );\n\nconst upgrade = async (versions: Versions, dir: string) => {\n  for (const subPatch of subPatches(versions)) {\n    await runSubPatch(dir, subPatch);\n  }\n};\n\nexport const nodeVersionMigration = async (\n  {\n    nodeVersion,\n    ECMAScriptVersion,\n  }: {\n    nodeVersion: number;\n    ECMAScriptVersion: string;\n  },\n  dir = process.cwd(),\n) => {\n  log.ok(`Upgrading to Node.js ${nodeVersion}`);\n  try {\n    if (!(await isPatchableNodeVersion(nodeVersion, dir))) {\n      throw new Error('Node.js version is not patchable');\n    }\n\n    await upgrade({ nodeVersion, ECMAScriptVersion }, dir);\n\n    log.ok('Upgraded to Node.js', nodeVersion);\n  } catch (error) {\n    log.err('Failed to upgrade');\n    log.subtle(inspect(error));\n    process.exitCode = 1;\n  }\n};\n"],
+  "mappings": "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",
   "names": ["fs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "12.0.0-enforce-file-extensions-20250618112549",
+  "version": "12.0.0-subpath-imports-20250710010820",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -13,6 +13,13 @@
   },
   "license": "MIT",
   "sideEffects": false,
+  "imports": {
+    "#src/*": {
+      "types": "./src/*",
+      "import": "./lib/*",
+      "require": "./lib/*"
+    }
+  },
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "bin": {
@@ -52,12 +59,12 @@
   "dependencies": {
     "@esbuild-plugins/tsconfig-paths": "^0.1.0",
     "@eslint/migrate-config": "~1.3.8",
-    "@jest/types": "^29.0.0",
+    "@jest/types": "^30.0.0",
     "@octokit/graphql": "^9.0.0",
     "@octokit/graphql-schema": "^15.3.0",
-    "@octokit/rest": "^21.0.0",
+    "@octokit/rest": "^22.0.0",
     "@octokit/types": "^14.0.0",
-    "@types/jest": "^29.0.0",
+    "@types/jest": "^30.0.0",
     "@types/node": "^22.0.0",
     "chalk": "^4.1.0",
     "concurrently": "^9.0.0",
@@ -76,8 +83,8 @@
     "ignore": "^7.0.0",
     "is-installed-globally": "^0.4.0",
     "isomorphic-git": "^1.11.1",
-    "jest": "^29.0.1",
-    "jest-watch-typeahead": "^2.1.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",
@@ -85,53 +92,53 @@
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^4.0.0",
-    "prettier": "~3.5.0",
+    "prettier": "~3.6.0",
     "prettier-plugin-packagejson": "^2.4.10",
     "read-pkg-up": "^7.0.1",
     "semantic-release": "^24.2.3",
     "simple-git": "^3.5.0",
     "ts-dedent": "^2.2.0",
-    "ts-jest": "^29.1.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",
     "typescript": "~5.8.0",
-    "zod": "^3.22.4",
-    "eslint-config-skuba": "7.0.0-enforce-file-extensions-20250618112549"
+    "zod": "^3.25.67",
+    "eslint-config-skuba": "7.0.0-subpath-imports-20250710010820"
   },
   "devDependencies": {
-    "@changesets/cli": "2.29.3",
+    "@changesets/cli": "2.29.5",
     "@changesets/get-github-info": "0.6.0",
-    "@jest/reporters": "29.7.0",
-    "@jest/test-result": "29.7.0",
+    "@jest/reporters": "30.0.2",
+    "@jest/test-result": "30.0.2",
     "@types/ejs": "3.1.5",
-    "@types/express": "5.0.1",
+    "@types/express": "5.0.3",
     "@types/fs-extra": "11.0.4",
     "@types/koa": "2.15.0",
     "@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/npm-registry-fetch": "8.0.8",
+    "@types/npm-which": "3.0.4",
     "@types/picomatch": "4.0.0",
     "@types/semver": "7.7.0",
     "@types/supertest": "6.0.3",
-    "enhanced-resolve": "5.18.1",
+    "enhanced-resolve": "5.18.2",
     "express": "5.1.0",
-    "fastify": "5.3.2",
-    "jest-diff": "29.7.0",
+    "fastify": "5.4.0",
+    "jest-diff": "30.0.3",
     "jsonfile": "6.1.0",
     "koa": "3.0.0",
-    "memfs": "4.17.1",
+    "memfs": "4.17.2",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.1",
-    "semver": "7.7.1",
-    "supertest": "7.1.0",
+    "semver": "7.7.2",
+    "supertest": "7.1.1",
     "type-fest": "2.19.0"
   },
   "peerDependencies": {
-    "skuba-dive": "1 || 2"
+    "skuba-dive": "2.1.0-subpath-imports-20250710010820"
   },
   "peerDependenciesMeta": {
     "skuba-dive": {
@@ -149,7 +156,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "11.0.0"
+    "version": "11.1.0"
   },
   "scripts": {
     "build": "scripts/build.sh",
@@ -158,14 +165,14 @@
     "format": "pnpm --silent skuba format && pnpm format:packages",
     "format:packages": "pnpm --filter '!./template/**' format",
     "lint": "pnpm --silent skuba lint && pnpm --silent lint:md",
-    "lint:all": "pnpm lint && pnpm lint:packages",
+    "lint-all": "pnpm lint && pnpm lint:packages",
     "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 --no-warnings=ExperimentalWarning lib/skuba",
     "stage": "changeset version && node ./.changeset/inject.js && pnpm format",
-    "test": "pnpm --silent skuba test --selectProjects unit --",
+    "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",

package/template/base/_.prettierrc.js

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

package/template/base/_eslint.config.js

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

package/template/base/_pnpm-workspace.yaml

@@ -1,4 +1,5 @@
 # managed by skuba
+nodeOptions: '${NODE_OPTIONS:- }  --experimental-vm-modules'
 packageManagerStrictVersion: true
 publicHoistPattern:
   - '@types*'
@@ -7,4 +8,5 @@ publicHoistPattern:
   - esbuild
   - jest
   - tsconfig-seek
+
   # end managed by skuba

package/template/base/jest.config.ts

@@ -1,6 +1,15 @@
-import { Jest } from 'skuba';
+import { readFileSync } from 'fs';
 
-export default Jest.mergePreset({
+const packageJson = JSON.parse(readFileSync('package.json', 'utf8')) as {
+  type?: string;
+};
+const isESM = packageJson.type === 'module';
+
+export default {
+  preset: 'skuba',
+  ...(isESM && {
+    extensionsToTreatAsEsm: ['.ts', '.tsx'],
+  }),
   coveragePathIgnorePatterns: ['src/testing'],
   coverageThreshold: {
     global: {
@@ -10,6 +19,11 @@ export default Jest.mergePreset({
       statements: 0,
     },
   },
+  moduleNameMapper: {
+    '^#src$': '<rootDir>/src',
+    '^#src\/(.*)\\.js$': '<rootDir>/src/$1',
+    '^#src\/(.*)$': '<rootDir>/src/$1',
+  },
   setupFiles: ['<rootDir>/jest.setup.ts'],
   testPathIgnorePatterns: ['/test\\.ts'],
-});
+};

package/template/base/jest.setup.ts

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

package/template/base/tsconfig.json

@@ -2,10 +2,10 @@
   "compilerOptions": {
     "baseUrl": ".",
     "lib": ["ES2024"],
+    "moduleResolution": "node16",
+    "module": "node18",
     "outDir": "lib",
-    "paths": {
-      "src": ["src"]
-    },
+    "rootDir": ".",
     "target": "ES2024"
   },
   "exclude": ["lib*/**/*"],

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

@@ -48,7 +48,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.9.0:
+      - docker-compose#v5.10.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.16
+# syntax=docker/dockerfile:1.17
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

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

@@ -2,6 +2,13 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
+  "imports": {
+    "#src/*": {
+      "types": "./src/*",
+      "import": "./lib/*",
+      "require": "./lib/*"
+    }
+  },
   "scripts": {
     "build": "skuba build",
     "format": "skuba format",
@@ -28,7 +35,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.12.1",
+  "packageManager": "pnpm@10.12.4",
   "engines": {
     "node": ">=22"
   }

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

@@ -1,5 +1,3 @@
-import './register.js';
-
 import express from 'express';
 
 import { healthCheckHandler } from './api/healthCheck.js';

package/template/express-rest-api/src/framework/logging.ts

@@ -1,6 +1,6 @@
 import createLogger from '@seek/logger';
 
-import { config } from 'src/config.js';
+import { config } from '#src/config.js';
 
 export const logger = createLogger({
   base: {

package/template/express-rest-api/src/framework/metrics.ts

@@ -1,10 +1,10 @@
 import { StatsD } from 'hot-shots';
 import { createStatsDClient } from 'seek-datadog-custom-metrics';
 
-import { config } from 'src/config.js';
-
 import { logger } from './logging.js';
 
+import { config } from '#src/config.js';
+
 /* istanbul ignore next: StatsD client is not our responsibility */
 export const metricsClient = createStatsDClient(StatsD, config, (err) =>
   logger.error({ err }, 'StatsD error'),

package/template/express-rest-api/src/listen.ts

@@ -1,5 +1,3 @@
-import './register.js';
-
 import app from './app.js';
 import { config } from './config.js';
 import { logger } from './framework/logging.js';

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

@@ -29,7 +29,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.9.0:
+      - docker-compose#v5.10.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/greeter/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.16
+# syntax=docker/dockerfile:1.17
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

package/template/greeter/package.json

@@ -2,6 +2,13 @@
   "name": "@seek/greeter",
   "private": true,
   "license": "UNLICENSED",
+  "imports": {
+    "#src/*": {
+      "types": "./src/*",
+      "import": "./lib/*",
+      "require": "./lib/*"
+    }
+  },
   "scripts": {
     "build": "skuba build",
     "format": "skuba format",
@@ -13,13 +20,13 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "skuba-dive": "^2.0.0"
+    "skuba-dive": "2.1.0-subpath-imports-20250710010820"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "12.0.0-enforce-file-extensions-20250618112549"
+    "skuba": "12.0.0-subpath-imports-20250710010820"
   },
-  "packageManager": "pnpm@10.12.1",
+  "packageManager": "pnpm@10.12.4",
   "engines": {
     "node": ">=22"
   }

package/template/greeter/src/app.ts

@@ -1,4 +1,4 @@
-import 'skuba-dive/register';
-
 /* eslint-disable-next-line no-console */
 console.log('Hello world');
+
+export {};

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

@@ -48,7 +48,7 @@ steps:
       GET_NPM_TOKEN: please
     plugins:
       - *docker-ecr-cache
-      - docker-compose#v5.9.0:
+      - docker-compose#v5.10.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.16
+# syntax=docker/dockerfile:1.17
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

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

@@ -2,6 +2,13 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
+  "imports": {
+    "#src/*": {
+      "types": "./src/*",
+      "import": "./lib/*",
+      "require": "./lib/*"
+    }
+  },
   "scripts": {
     "build": "skuba build",
     "format": "skuba format",
@@ -13,15 +20,15 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "@koa/bodyparser": "^5.1.1",
+    "@koa/bodyparser": "^6.0.0",
     "@koa/router": "^13.0.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.0.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.201.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.53.0",
-    "@opentelemetry/instrumentation-http": "^0.201.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.202.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.54.0",
+    "@opentelemetry/instrumentation-http": "^0.202.0",
     "@opentelemetry/propagator-b3": "^2.0.0",
-    "@opentelemetry/sdk-node": "^0.201.0",
+    "@opentelemetry/sdk-node": "^0.202.0",
     "@seek/logger": "^10.0.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.16.1",
@@ -29,7 +36,7 @@
     "seek-datadog-custom-metrics": "^4.6.3",
     "seek-koala": "^7.0.0",
     "skuba-dive": "^2.0.0",
-    "zod": "^3.19.1"
+    "zod": "^3.25.67"
   },
   "devDependencies": {
     "@types/chance": "^1.1.3",
@@ -44,7 +51,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@10.12.1",
+  "packageManager": "pnpm@10.12.4",
   "engines": {
     "node": ">=22"
   }

package/template/koa-rest-api/src/api/healthCheck.ts

@@ -1,4 +1,4 @@
-import type { Middleware } from 'src/types/koa.js';
+import type { Middleware } from '#src/types/koa.js';
 
 /**
  * Signifies that the API is available to serve requests.

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

@@ -1,7 +1,7 @@
-import { agentFromRouter } from 'src/testing/server.js';
-
 import { jobRouter } from './index.js';
 
+import { agentFromRouter } from '#src/testing/server.js';
+
 const agent = agentFromRouter(jobRouter);
 
 describe('getJobsHandler', () => {

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

@@ -1,7 +1,7 @@
-import { logger } from 'src/framework/logging.js';
-import { metricsClient } from 'src/framework/metrics.js';
-import * as storage from 'src/storage/jobs.js';
-import type { Middleware } from 'src/types/koa.js';
+import { logger } from '#src/framework/logging.js';
+import { metricsClient } from '#src/framework/metrics.js';
+import * as storage from '#src/storage/jobs.js';
+import type { Middleware } from '#src/types/koa.js';
 
 export const getJobsHandler: Middleware = async (ctx) => {
   const jobs = await storage.readJobs();

package/template/koa-rest-api/src/api/jobs/index.ts

@@ -1,10 +1,10 @@
 import Router from '@koa/router';
 
-import { jsonBodyParser } from 'src/framework/bodyParser.js';
-
 import { getJobsHandler } from './getJobs.js';
 import { postJobHandler } from './postJob.js';
 
+import { jsonBodyParser } from '#src/framework/bodyParser.js';
+
 export const jobRouter = new Router()
   .get('/', getJobsHandler)
   .post('/', jsonBodyParser, postJobHandler);