skuba 12.0.0-subpath-imports-20250710010820 → 12.0.0-subpath-imports-20250710043319

package/config/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "moduleResolution": "node16",
     "incremental": true,
     "isolatedModules": true,
     "module": "node18",
+    "moduleResolution": "node16",
     "noUnusedLocals": false,
     "noUnusedParameters": false,
     "resolveJsonModule": true

package/lib/cli/lint/internalLints/upgrade/patches/11.1.0/rewriteSrcImports.js

@@ -49,7 +49,7 @@ const fetchFiles = async (files) => Promise.all(
   })
 );
 const hasSkubaDiveRegisterImportRegex = /import\s+['"](?:skuba-dive\/register|\.\.?\/.*?register)(?:\.js)?['"];?\s*/gm;
-const hasSrcImportRegex = /import\s+(?:\{[^}]*\}|\*\s+as\s+\w+|\w+(?:\s*,\s*\{[^}]*\})?)\s+from\s+['"]src\/[^'"]*['"]/gm;
+const hasSrcImportRegex = /import\s+(?:type\s+\{[^}]*\}|\{[^}]*\}|\*\s+as\s+\w+|\w+(?:\s*,\s*\{[^}]*\})?)\s+from\s+['"]src\/[^'"]*['"]/gm;
 const replaceSrcImport = (contents) => contents.replace(
   hasSrcImportRegex,
   (match) => match.replace(/(['"])src\//g, "$1#src/")

package/lib/cli/lint/internalLints/upgrade/patches/11.1.0/rewriteSrcImports.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/11.1.0/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+(?:\\{[^}]*\\}|\\*\\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"],
+  "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "12.0.0-subpath-imports-20250710010820",
+  "version": "12.0.0-subpath-imports-20250710043319",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -105,7 +105,7 @@
     "tsx": "^4.16.2",
     "typescript": "~5.8.0",
     "zod": "^3.25.67",
-    "eslint-config-skuba": "7.0.0-subpath-imports-20250710010820"
+    "eslint-config-skuba": "7.0.0-subpath-imports-20250710043319"
   },
   "devDependencies": {
     "@changesets/cli": "2.29.5",
@@ -138,7 +138,7 @@
     "type-fest": "2.19.0"
   },
   "peerDependencies": {
-    "skuba-dive": "2.1.0-subpath-imports-20250710010820"
+    "skuba-dive": "1 || 2"
   },
   "peerDependenciesMeta": {
     "skuba-dive": {

package/template/base/_pnpm-workspace.yaml

@@ -8,5 +8,4 @@ publicHoistPattern:
   - esbuild
   - jest
   - tsconfig-seek
-
   # end managed by skuba

package/template/base/jest.config.ts

@@ -8,7 +8,7 @@ const isESM = packageJson.type === 'module';
 export default {
   preset: 'skuba',
   ...(isESM && {
-    extensionsToTreatAsEsm: ['.ts', '.tsx'],
+    extensionsToTreatAsEsm: ['.ts'],
   }),
   coveragePathIgnorePatterns: ['src/testing'],
   coverageThreshold: {

package/template/base/jest.setup.ts

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

package/template/greeter/package.json

@@ -20,11 +20,11 @@
     "test:watch": "skuba test --watch"
   },
   "dependencies": {
-    "skuba-dive": "2.1.0-subpath-imports-20250710010820"
+    "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "12.0.0-subpath-imports-20250710010820"
+    "skuba": "12.0.0-subpath-imports-20250710043319"
   },
   "packageManager": "pnpm@10.12.4",
   "engines": {

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

@@ -28,7 +28,7 @@
     "@seek/logger": "^10.0.0",
     "datadog-lambda-js": "^10.0.0",
     "dd-trace": "^5.0.0",
-    "skuba-dive": "2.1.0-subpath-imports-20250710010820",
+    "skuba-dive": "^2.0.0",
     "zod": "^3.25.67"
   },
   "devDependencies": {
@@ -44,7 +44,7 @@
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "12.0.0-subpath-imports-20250710010820"
+    "skuba": "12.0.0-subpath-imports-20250710043319"
   },
   "packageManager": "pnpm@10.12.4",
   "engines": {