skuba 13.0.0-subpath-imports-20250722044721 → 13.0.0-subpath-imports-20250730060533

package/lib/cli/lint/internalLints/upgrade/patches/{12.2.0 → 12.0.2}/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.2.0/index.ts"],
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.0.2/index.ts"],
   "sourcesContent": ["import type { Patches } from '../../index.js';\n\nimport { rewriteSrcImports } from './rewriteSrcImports.js';\n\nexport const patches: Patches = [\n  {\n    apply: rewriteSrcImports,\n    description: \"Rewrite all 'src' imports to be '#src'\",\n  },\n];\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,+BAAkC;AAE3B,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AACF;",
   "names": []

package/lib/cli/lint/internalLints/upgrade/patches/{12.2.0 → 12.0.2}/rewriteSrcImports.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.2.0/rewriteSrcImports.ts"],
+  "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.0.2/rewriteSrcImports.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 type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst fetchFiles = async (files: string[]) =>\n  Promise.all(\n    files.map(async (file) => {\n      const contents = await fs.promises.readFile(file, 'utf8');\n\n      return {\n        file,\n        contents,\n      };\n    }),\n  );\n\nexport const hasSkubaDiveRegisterImportRegex =\n  /import\\s+['\"](?:skuba-dive\\/register|\\.\\.?\\/.*?register)(?:\\.js)?['\"];?\\s*/gm;\n\nexport const hasSrcImportRegex =\n  /import\\s+(?:type\\s+\\{[^}]*\\}|\\{[^}]*\\}|\\*\\s+as\\s+\\w+|\\w+(?:\\s*,\\s*\\{[^}]*\\})?)\\s+from\\s+['\"]src\\/[^'\"]*['\"]/gm;\n\nexport const replaceSrcImport = (contents: string) =>\n  contents.replace(hasSrcImportRegex, (match) =>\n    match.replace(/(['\"])src\\//g, '$1#src/'),\n  );\n\nconst removeSkubaDiveRegisterImport = (contents: string) =>\n  contents.replace(hasSkubaDiveRegisterImportRegex, '');\n\nconst replaceAllImports = (contents: string) =>\n  removeSkubaDiveRegisterImport(replaceSrcImport(contents));\n\nexport const tryRewriteSrcImports: PatchFunction = async ({\n  mode,\n}): Promise<PatchReturnType> => {\n  const tsFileNames = await glob(['**/*.ts', '**/*.test.ts']);\n\n  if (!tsFileNames.length) {\n    return {\n      result: 'skip',\n      reason: 'no .ts or test.ts files found',\n    };\n  }\n\n  const tsFiles = await fetchFiles(tsFileNames);\n\n  const mapped = tsFiles.map(({ file, contents }) => ({\n    file,\n    before: contents,\n    after: replaceAllImports(contents),\n  }));\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  await Promise.all(\n    mapped.map(async ({ file, after }) => {\n      await fs.promises.writeFile(file, after);\n    }),\n  );\n\n  return { result: 'apply' };\n};\n\nexport const rewriteSrcImports: PatchFunction = async (config) => {\n  try {\n    return await tryRewriteSrcImports(config);\n  } catch (err) {\n    log.warn('Failed to rewrite src imports to #src');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAAe;AAEf,qBAAoB;AAGpB,MAAM,aAAa,OAAO,UACxB,QAAQ;AAAA,EACN,MAAM,IAAI,OAAO,SAAS;AACxB,UAAM,WAAW,MAAM,gBAAAA,QAAG,SAAS,SAAS,MAAM,MAAM;AAExD,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEK,MAAM,kCACX;AAEK,MAAM,oBACX;AAEK,MAAM,mBAAmB,CAAC,aAC/B,SAAS;AAAA,EAAQ;AAAA,EAAmB,CAAC,UACnC,MAAM,QAAQ,gBAAgB,SAAS;AACzC;AAEF,MAAM,gCAAgC,CAAC,aACrC,SAAS,QAAQ,iCAAiC,EAAE;AAEtD,MAAM,oBAAoB,CAAC,aACzB,8BAA8B,iBAAiB,QAAQ,CAAC;AAEnD,MAAM,uBAAsC,OAAO;AAAA,EACxD;AACF,MAAgC;AAC9B,QAAM,cAAc,UAAM,uBAAK,CAAC,WAAW,cAAc,CAAC;AAE1D,MAAI,CAAC,YAAY,QAAQ;AACvB,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,UAAU,MAAM,WAAW,WAAW;AAE5C,QAAM,SAAS,QAAQ,IAAI,CAAC,EAAE,MAAM,SAAS,OAAO;AAAA,IAClD;AAAA,IACA,QAAQ;AAAA,IACR,OAAO,kBAAkB,QAAQ;AAAA,EACnC,EAAE;AAEF,MAAI,SAAS,QAAQ;AACnB,WAAO;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,OAAO,IAAI,OAAO,EAAE,MAAM,MAAM,MAAM;AACpC,YAAM,gBAAAA,QAAG,SAAS,UAAU,MAAM,KAAK;AAAA,IACzC,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,oBAAmC,OAAO,WAAW;AAChE,MAAI;AACF,WAAO,MAAM,qBAAqB,MAAM;AAAA,EAC1C,SAAS,KAAK;AACZ,uBAAI,KAAK,uCAAuC;AAChD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fs"]

package/lib/cli/node/index.js

@@ -44,8 +44,8 @@ const node = async () => {
   const availablePort = await (0, import_get_port.default)();
   const commonArgs = [
     ...args.node,
-    "--require",
-    require.resolve("dotenv/config"),
+    "--env-file-if-exists",
+    ".env",
     "--require",
     require.resolve("tsconfig-paths/register")
   ];

package/lib/cli/node/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/node/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport execa from 'execa';\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const longRunning = true;\n\nexport const node = async () => {\n  const args = parseRunArgs(process.argv.slice(2));\n\n  const availablePort = await getPort();\n\n  const commonArgs = [\n    ...args.node,\n    '--require',\n    require.resolve('dotenv/config'),\n    '--require',\n    require.resolve('tsconfig-paths/register'),\n  ];\n\n  if (args.entryPoint) {\n    const exec = createExec({\n      env: {\n        __SKUBA_ENTRY_POINT: args.entryPoint,\n        __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n      },\n    });\n\n    return exec(\n      'tsx',\n      ...commonArgs,\n      path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n      ...args.script,\n    );\n  }\n\n  return execa(\n    require.resolve('tsx/cli'),\n    [\n      ...commonArgs,\n      '--require',\n      // Unsure if bug or feature that this is needed, but tsx appears to not do anything typescript in the REPL without this!\n      // Doesn't occur when just running the tsx binary directly \uD83E\uDDD0\n      require.resolve('tsx/patch-repl'),\n    ],\n    {\n      stdio: 'inherit',\n    },\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,wBAAyB;AAElB,MAAM,cAAc;AAEpB,MAAM,OAAO,YAAY;AAC9B,QAAM,WAAO,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAE/C,QAAM,gBAAgB,UAAM,gBAAAA,SAAQ;AAEpC,QAAM,aAAa;AAAA,IACjB,GAAG,KAAK;AAAA,IACR;AAAA,IACA,gBAAgB,eAAe;AAAA,IAC/B;AAAA,IACA,gBAAgB,yBAAyB;AAAA,EAC3C;AAEA,MAAI,KAAK,YAAY;AACnB,UAAM,WAAO,wBAAW;AAAA,MACtB,KAAK;AAAA,QACH,qBAAqB,KAAK;AAAA,QAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,MACtE;AAAA,IACF,CAAC;AAED,WAAO;AAAA,MACL;AAAA,MACA,GAAG;AAAA,MACH,YAAAC,QAAK,KAAK,WAAW,MAAM,MAAM,WAAW,UAAU;AAAA,MACtD,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AAEA,aAAO,aAAAC;AAAA,IACL,gBAAgB,SAAS;AAAA,IACzB;AAAA,MACE,GAAG;AAAA,MACH;AAAA;AAAA;AAAA,MAGA,gBAAgB,gBAAgB;AAAA,IAClC;AAAA,IACA;AAAA,MACE,OAAO;AAAA,IACT;AAAA,EACF;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport execa from 'execa';\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const longRunning = true;\n\nexport const node = async () => {\n  const args = parseRunArgs(process.argv.slice(2));\n\n  const availablePort = await getPort();\n\n  const commonArgs = [\n    ...args.node,\n    '--env-file-if-exists',\n    '.env',\n    '--require',\n    require.resolve('tsconfig-paths/register'),\n  ];\n\n  if (args.entryPoint) {\n    const exec = createExec({\n      env: {\n        __SKUBA_ENTRY_POINT: args.entryPoint,\n        __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n      },\n    });\n\n    return exec(\n      'tsx',\n      ...commonArgs,\n      path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n      ...args.script,\n    );\n  }\n\n  return execa(\n    require.resolve('tsx/cli'),\n    [\n      ...commonArgs,\n      '--require',\n      // Unsure if bug or feature that this is needed, but tsx appears to not do anything typescript in the REPL without this!\n      // Doesn't occur when just running the tsx binary directly \uD83E\uDDD0\n      require.resolve('tsx/patch-repl'),\n    ],\n    {\n      stdio: 'inherit',\n    },\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,wBAAyB;AAElB,MAAM,cAAc;AAEpB,MAAM,OAAO,YAAY;AAC9B,QAAM,WAAO,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAE/C,QAAM,gBAAgB,UAAM,gBAAAA,SAAQ;AAEpC,QAAM,aAAa;AAAA,IACjB,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB,yBAAyB;AAAA,EAC3C;AAEA,MAAI,KAAK,YAAY;AACnB,UAAM,WAAO,wBAAW;AAAA,MACtB,KAAK;AAAA,QACH,qBAAqB,KAAK;AAAA,QAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,MACtE;AAAA,IACF,CAAC;AAED,WAAO;AAAA,MACL;AAAA,MACA,GAAG;AAAA,MACH,YAAAC,QAAK,KAAK,WAAW,MAAM,MAAM,WAAW,UAAU;AAAA,MACtD,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AAEA,aAAO,aAAAC;AAAA,IACL,gBAAgB,SAAS;AAAA,IACzB;AAAA,MACE,GAAG;AAAA,MACH;AAAA;AAAA;AAAA,MAGA,gBAAgB,gBAAgB;AAAA,IAClC;AAAA,IACA;AAAA,MACE,OAAO;AAAA,IACT;AAAA,EACF;AACF;",
   "names": ["getPort", "path", "execa"]
 }

package/lib/cli/start/index.js

@@ -54,8 +54,8 @@ const start = async () => {
     "watch",
     "--clear-screen=false",
     ...args.node,
-    "--require",
-    "dotenv/config",
+    "--env-file-if-exists",
+    ".env",
     "--require",
     "tsconfig-paths/register",
     import_path.default.join(__dirname, "..", "..", "wrapper", "index.js"),

package/lib/cli/start/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cli/start/index.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { getEntryPointFromManifest } from '../../utils/manifest.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const start = async () => {\n  const [args, availablePort] = await Promise.all([\n    parseRunArgs(process.argv.slice(2)),\n    getPort(),\n  ]);\n\n  args.entryPoint ??= await getEntryPointFromManifest();\n\n  const execProcess = createExec({\n    env: {\n      __SKUBA_ENTRY_POINT: args.entryPoint,\n      __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n    },\n  });\n\n  return execProcess(\n    'tsx',\n    'watch',\n    '--clear-screen=false',\n    ...args.node,\n    '--require',\n    'dotenv/config',\n    '--require',\n    'tsconfig-paths/register',\n    path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n    ...args.script,\n  );\n};\n"],
+  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { getEntryPointFromManifest } from '../../utils/manifest.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const start = async () => {\n  const [args, availablePort] = await Promise.all([\n    parseRunArgs(process.argv.slice(2)),\n    getPort(),\n  ]);\n\n  args.entryPoint ??= await getEntryPointFromManifest();\n\n  const execProcess = createExec({\n    env: {\n      __SKUBA_ENTRY_POINT: args.entryPoint,\n      __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n    },\n  });\n\n  return execProcess(\n    'tsx',\n    'watch',\n    '--clear-screen=false',\n    ...args.node,\n    '--env-file-if-exists',\n    '.env',\n    '--require',\n    'tsconfig-paths/register',\n    path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n    ...args.script,\n  );\n};\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,sBAA0C;AAC1C,wBAAyB;AAElB,MAAM,QAAQ,YAAY;AAC/B,QAAM,CAAC,MAAM,aAAa,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,QAClC,gBAAAA,SAAQ;AAAA,EACV,CAAC;AAED,OAAK,eAAe,UAAM,2CAA0B;AAEpD,QAAM,kBAAc,wBAAW;AAAA,IAC7B,KAAK;AAAA,MACH,qBAAqB,KAAK;AAAA,MAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,IACtE;AAAA,EACF,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAAC,QAAK,KAAK,WAAW,MAAM,MAAM,WAAW,UAAU;AAAA,IACtD,GAAG,KAAK;AAAA,EACV;AACF;",
   "names": ["getPort", "path"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "13.0.0-subpath-imports-20250722044721",
+  "version": "13.0.0-subpath-imports-20250730060533",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -67,7 +67,6 @@
     "@types/node": "^22.0.0",
     "chalk": "^4.1.0",
     "concurrently": "^9.0.0",
-    "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "esbuild": "~0.25.0",
@@ -114,7 +113,7 @@
     "@types/ejs": "3.1.5",
     "@types/express": "5.0.3",
     "@types/fs-extra": "11.0.4",
-    "@types/koa": "2.15.0",
+    "@types/koa": "3.0.0",
     "@types/lodash.mergewith": "4.6.9",
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
@@ -128,7 +127,7 @@
     "fastify": "5.4.0",
     "jest-diff": "30.0.4",
     "jsonfile": "6.1.0",
-    "koa": "3.0.0",
+    "koa": "3.0.1",
     "memfs": "4.17.2",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.1",

package/template/base/_pnpm-workspace.yaml

@@ -1,10 +1,10 @@
 # managed by skuba
-nodeOptions: '${NODE_OPTIONS:- }  --experimental-vm-modules'
 packageManagerStrictVersion: true
 publicHoistPattern:
   - '@types*'
-  - '*eslint*'
-  - '*prettier*'
+  - eslint
+  - eslint-config-skuba
+  - prettier
   - esbuild
   - jest
   - tsconfig-seek

package/template/base/jest.config.ts

@@ -1,15 +1,6 @@
-import { readFileSync } from 'fs';
+import { Jest } from 'skuba';
 
-const packageJson = JSON.parse(readFileSync('package.json', 'utf8')) as {
-  type?: string;
-};
-const isESM = packageJson.type === 'module';
-
-export default {
-  preset: 'skuba',
-  ...(isESM && {
-    extensionsToTreatAsEsm: ['.ts'],
-  }),
+export default Jest.mergePreset({
   coveragePathIgnorePatterns: ['src/testing'],
   coverageThreshold: {
     global: {
@@ -21,4 +12,4 @@ export default {
   },
   setupFiles: ['<rootDir>/jest.setup.ts'],
   testPathIgnorePatterns: ['/test\\.ts'],
-};
+});

package/template/greeter/package.json

@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "13.0.0-subpath-imports-20250722044721"
+    "skuba": "13.0.0-subpath-imports-20250730060533"
   },
   "packageManager": "pnpm@10.12.4",
   "engines": {

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

@@ -30,17 +30,17 @@
     "@opentelemetry/sdk-node": "^0.203.0",
     "@seek/logger": "^10.0.0",
     "hot-shots": "^10.0.0",
-    "koa": "^2.16.1",
+    "koa": "^3.0.1",
     "koa-compose": "^4.1.0",
     "seek-datadog-custom-metrics": "^4.6.3",
-    "seek-koala": "^7.0.0",
+    "seek-koala": "^7.1.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.25.67"
   },
   "devDependencies": {
     "@types/chance": "^1.1.3",
     "@types/co-body": "^6.1.3",
-    "@types/koa": "^2.13.4",
+    "@types/koa": "^3.0.0",
     "@types/koa__router": "^12.0.0",
     "@types/node": "^22.13.10",
     "@types/supertest": "^6.0.0",

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

@@ -43,7 +43,7 @@
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "13.0.0-subpath-imports-20250722044721"
+    "skuba": "13.0.0-subpath-imports-20250730060533"
   },
   "packageManager": "pnpm@10.12.4",
   "engines": {