skuba 12.0.2 → 13.0.0-subpath-imports-20250721062938

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/package.json

@@ -2,6 +2,12 @@
   "name": "@seek/greeter",
   "private": true,
   "license": "UNLICENSED",
+  "imports": {
+    "#src/*": {
+      "@seek/<%- serviceName %>/source": "./src/*",
+      "default": "./lib/*"
+    }
+  },
   "scripts": {
     "build": "skuba build",
     "format": "skuba format",
@@ -17,7 +23,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "*"
+    "skuba": "13.0.0-subpath-imports-20250721062938"
   },
   "packageManager": "pnpm@10.12.4",
   "engines": {

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/package.json

@@ -2,6 +2,12 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
+  "imports": {
+    "#src/*": {
+      "@seek/<%- serviceName %>/source": "./src/*",
+      "default": "./lib/*"
+    }
+  },
   "scripts": {
     "build": "skuba build",
     "format": "skuba format",

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);

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

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

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

@@ -1,9 +1,9 @@
-import { logger } from 'src/framework/logging.js';
-import { metricsClient } from 'src/framework/metrics.js';
-import { validateRequestBody } from 'src/framework/validation.js';
-import * as storage from 'src/storage/jobs.js';
-import { JobInputSchema } from 'src/types/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 { validateRequestBody } from '#src/framework/validation.js';
+import * as storage from '#src/storage/jobs.js';
+import { JobInputSchema } from '#src/types/jobs.js';
+import type { Middleware } from '#src/types/koa.js';
 
 export const postJobHandler: Middleware = async (ctx) => {
   const jobInput = validateRequestBody(ctx, JobInputSchema);

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

@@ -1,5 +1,5 @@
-import { smokeTestJobStorage } from 'src/storage/jobs.js';
-import type { Middleware } from 'src/types/koa.js';
+import { smokeTestJobStorage } from '#src/storage/jobs.js';
+import type { Middleware } from '#src/types/koa.js';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

package/template/koa-rest-api/src/app.test.ts

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

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

@@ -1,5 +1,3 @@
-import './register.js';
-
 import { router } from './api/index.js';
 import { createApp } from './framework/server.js';
 

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

@@ -1,7 +1,7 @@
 import createLogger, { createDestination } from '@seek/logger';
 import { RequestLogging } from 'seek-koala';
 
-import { config } from 'src/config.js';
+import { config } from '#src/config.js';
 
 const { createContextMiddleware, mixin } =
   RequestLogging.createContextStorage();

package/template/koa-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/koa-rest-api/src/framework/server.test.ts

@@ -1,12 +1,12 @@
 import Router from '@koa/router';
 
-import { metricsClient } from 'src/testing/metrics.js';
-import { agentFromRouter } from 'src/testing/server.js';
-import { chance } from 'src/testing/types.js';
-import type { Middleware } from 'src/types/koa.js';
-
 import { stdoutMock } from './logging.js';
 
+import { metricsClient } from '#src/testing/metrics.js';
+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 router = new Router()

package/template/koa-rest-api/src/framework/server.ts

@@ -8,9 +8,9 @@ import {
   VersionMiddleware,
 } from 'seek-koala';
 
-import { config } from 'src/config.js';
-import { contextMiddleware, logger } from 'src/framework/logging.js';
-import { metricsClient } from 'src/framework/metrics.js';
+import { config } from '#src/config.js';
+import { contextMiddleware, logger } from '#src/framework/logging.js';
+import { metricsClient } from '#src/framework/metrics.js';
 
 const metrics = MetricsMiddleware.create(
   metricsClient,

package/template/koa-rest-api/src/framework/validation.test.ts

@@ -1,12 +1,12 @@
-import { agentFromMiddleware } from 'src/testing/server.js';
+import { jsonBodyParser } from './bodyParser.js';
+import { validate } from './validation.js';
+
+import { agentFromMiddleware } from '#src/testing/server.js';
 import {
   IdDescriptionSchema,
   chance,
   mockIdDescription,
-} from 'src/testing/types.js';
-
-import { jsonBodyParser } from './bodyParser.js';
-import { validate } from './validation.js';
+} from '#src/testing/types.js';
 
 const agent = agentFromMiddleware(jsonBodyParser, (ctx) => {
   const result = validate({

package/template/koa-rest-api/src/framework/validation.ts

@@ -2,7 +2,7 @@ import { ErrorMiddleware } from 'seek-koala';
 import type * as z from 'zod/v4';
 import type * as core from 'zod/v4/core';
 
-import type { Context } from 'src/types/koa.js';
+import type { Context } from '#src/types/koa.js';
 
 type InvalidFields = Record<string, string>;
 

package/template/koa-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/koa-rest-api/src/storage/jobs.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
 
-import type { Job, JobInput } from 'src/types/jobs.js';
+import type { Job, JobInput } from '#src/types/jobs.js';
 
 const jobStore: Record<string, Job> = {};
 

package/template/koa-rest-api/src/testing/metrics.ts

@@ -1,4 +1,4 @@
-import * as metrics from 'src/framework/metrics.js';
+import * as metrics from '#src/framework/metrics.js';
 
 function assertDefined<T>(value: T | undefined): asserts value is T {
   expect(value).toBeDefined();

package/template/koa-rest-api/src/testing/server.ts

@@ -2,7 +2,7 @@ import type Router from '@koa/router';
 import type Koa from 'koa';
 import request from 'supertest';
 
-import { createApp } from 'src/framework/server.js';
+import { createApp } from '#src/framework/server.js';
 
 /**
  * Create a new SuperTest agent from a Koa application.

package/template/koa-rest-api/src/testing/types.ts

@@ -1,7 +1,7 @@
 import { Chance } from 'chance';
 import * as z from 'zod/v4';
 
-import type { JobInput } from 'src/types/jobs.js';
+import type { JobInput } from '#src/types/jobs.js';
 
 export type IdDescription = z.infer<typeof IdDescriptionSchema>;
 

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

@@ -2,6 +2,12 @@
   "name": "@seek/<%- serviceName %>",
   "private": true,
   "license": "UNLICENSED",
+  "imports": {
+    "#src/*": {
+      "@seek/<%- serviceName %>/source": "./src/*",
+      "default": "./lib/*"
+    }
+  },
   "scripts": {
     "deploy": "cdk deploy appStack --require-approval never",
     "deploy:hotswap": "pnpm --silent run deploy --hotswap",
@@ -37,7 +43,7 @@
     "constructs": "^10.0.17",
     "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "*"
+    "skuba": "13.0.0-subpath-imports-20250721062938"
   },
   "packageManager": "pnpm@10.12.4",
   "engines": {

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

@@ -1,13 +1,13 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
 
-import { metricsClient } from 'src/framework/metrics.js';
-import { createCtx, createSqsEvent } from 'src/testing/handler.js';
-import { scoringService, sns } from 'src/testing/services.js';
-import { chance, mockJobPublishedEvent } from 'src/testing/types.js';
-
 import * as app from './app.js';
 import { stdoutMock } from './framework/logging.js';
 
+import { metricsClient } from '#src/framework/metrics.js';
+import { createCtx, createSqsEvent } from '#src/testing/handler.js';
+import { scoringService, sns } from '#src/testing/services.js';
+import { chance, mockJobPublishedEvent } from '#src/testing/types.js';
+
 describe('app', () => {
   it('exports a handler', () => expect(app).toHaveProperty('handler'));
 });

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

@@ -1,18 +1,16 @@
-import 'skuba-dive/register';
-
 import { isLambdaHook } from '@seek/aws-codedeploy-hooks';
 import type { SQSEvent } from 'aws-lambda';
 
-import { createHandler } from 'src/framework/handler.js';
-import { logger } from 'src/framework/logging.js';
-import { metricsClient } from 'src/framework/metrics.js';
-import { validateJson } from 'src/framework/validation.js';
+import { createHandler } from '#src/framework/handler.js';
+import { logger } from '#src/framework/logging.js';
+import { metricsClient } from '#src/framework/metrics.js';
+import { validateJson } from '#src/framework/validation.js';
 import {
   scoreJobPublishedEvent,
   scoringService,
-} from 'src/services/jobScorer.js';
-import { sendPipelineEvent } from 'src/services/pipelineEventSender.js';
-import { JobPublishedEventSchema } from 'src/types/pipelineEvents.js';
+} from '#src/services/jobScorer.js';
+import { sendPipelineEvent } from '#src/services/pipelineEventSender.js';
+import { JobPublishedEventSchema } from '#src/types/pipelineEvents.js';
 
 /**
  * Tests connectivity to ensure appropriate access and network configuration.

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

@@ -1,9 +1,9 @@
-import { createCtx } from 'src/testing/handler.js';
-import { chance } from 'src/testing/types.js';
-
 import { createHandler } from './handler.js';
 import { logger, stdoutMock } from './logging.js';
 
+import { createCtx } from '#src/testing/handler.js';
+import { chance } from '#src/testing/types.js';
+
 describe('createHandler', () => {
   const ctx = createCtx();
   const input = chance.paragraph();

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

@@ -1,8 +1,8 @@
 import type { Context as LambdaContext } from 'aws-lambda';
 import { datadog } from 'datadog-lambda-js';
 
-import { config } from 'src/config.js';
-import { logger, loggerContext } from 'src/framework/logging.js';
+import { config } from '#src/config.js';
+import { logger, loggerContext } from '#src/framework/logging.js';
 
 type Handler<Event, Output> = (
   event: Event,

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

@@ -2,7 +2,7 @@ import { AsyncLocalStorage } from 'async_hooks';
 
 import createLogger, { createDestination } from '@seek/logger';
 
-import { config } from 'src/config.js';
+import { config } from '#src/config.js';
 
 interface LoggerContext {
   awsRequestId: string;

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

@@ -1,6 +1,6 @@
 import { sendDistributionMetric } from 'datadog-lambda-js';
 
-import { config } from 'src/config.js';
+import { config } from '#src/config.js';
 
 const prefix = `${config.name}.`;
 

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

@@ -1,10 +1,10 @@
+import { validateJson } from './validation.js';
+
 import {
   IdDescriptionSchema,
   chance,
   mockIdDescription,
-} from 'src/testing/types.js';
-
-import { validateJson } from './validation.js';
+} from '#src/testing/types.js';
 
 describe('validateJson', () => {
   const idDescription = mockIdDescription();

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

@@ -1,8 +1,8 @@
-import type { JobScorerInput, JobScorerOutput } from 'src/types/jobScorer.js';
+import type { JobScorerInput, JobScorerOutput } from '#src/types/jobScorer.js';
 import type {
   JobPublishedEvent,
   JobScoredEvent,
-} from 'src/types/pipelineEvents.js';
+} from '#src/types/pipelineEvents.js';
 
 export const jobPublishedEventToScorerInput = (
   record: JobPublishedEvent,

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

@@ -1,8 +1,8 @@
-import { scoringService } from 'src/testing/services.js';
-import { chance, mockJobPublishedEvent } from 'src/testing/types.js';
-
 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);
 

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

@@ -1,16 +1,16 @@
 import {
   jobPublishedEventToScorerInput,
   jobScorerOutputToScoredEvent,
-} from 'src/mapping/jobScorer.js';
+} from '#src/mapping/jobScorer.js';
 import {
   type JobScorerInput,
   type JobScorerOutput,
   JobScorerOutputSchema,
-} from 'src/types/jobScorer.js';
+} from '#src/types/jobScorer.js';
 import type {
   JobPublishedEvent,
   JobScoredEvent,
-} from 'src/types/pipelineEvents.js';
+} from '#src/types/pipelineEvents.js';
 
 /* istanbul ignore next: simulation of an external service */
 export const scoringService = {

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

@@ -1,10 +1,10 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
 
-import { sns } from 'src/testing/services.js';
-import { chance } from 'src/testing/types.js';
-
 import { sendPipelineEvent } from './pipelineEventSender.js';
 
+import { sns } from '#src/testing/services.js';
+import { chance } from '#src/testing/types.js';
+
 describe('sendPipelineEvent', () => {
   afterEach(() => {
     jest.clearAllMocks();

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

@@ -1,9 +1,9 @@
 import { PublishCommand } from '@aws-sdk/client-sns';
 
-import { config } from 'src/config.js';
-
 import { sns } from './aws.js';
 
+import { config } from '#src/config.js';
+
 export const sendPipelineEvent = async (
   event: unknown,
   smokeTest: boolean = false,

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

@@ -3,8 +3,8 @@ import 'aws-sdk-client-mock-jest';
 import { PublishCommand } from '@aws-sdk/client-sns';
 import { mockClient } from 'aws-sdk-client-mock';
 
-import { sns as snsClient } from 'src/services/aws.js';
-import * as jobScorer from 'src/services/jobScorer.js';
+import { sns as snsClient } from '#src/services/aws.js';
+import * as jobScorer from '#src/services/jobScorer.js';
 
 export const scoringService = {
   request: jest.fn(),

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

@@ -1,7 +1,7 @@
 import { Chance } from 'chance';
 import * as z from 'zod/v4';
 
-import type { JobPublishedEvent } from 'src/types/pipelineEvents.js';
+import type { JobPublishedEvent } from '#src/types/pipelineEvents.js';
 
 export type IdDescription = z.infer<typeof IdDescriptionSchema>;
 

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

@@ -1,11 +1,12 @@
 {
   "compilerOptions": {
+    "customConditions": ["@seek/<%- serviceName %>/source"],
     "baseUrl": ".",
+    "module": "node18",
+    "moduleResolution": "node16",
     "lib": ["ES2024"],
     "outDir": "lib",
-    "paths": {
-      "src": ["src"]
-    },
+    "rootDir": ".",
     "target": "ES2024"
   },
   "exclude": ["lib*/**/*"],

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

@@ -2,6 +2,12 @@
   "name": "<%- moduleName %>",
   "version": "0.0.0-semantically-released",
   "description": "<%- description %>",
+  "imports": {
+    "#src/*": {
+      "@seek/<%- serviceName %>/source": "./src/*",
+      "default": "./lib/*"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/<%- orgName %>/<%- repoName %>.git"

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/tsconfig.json

@@ -3,6 +3,7 @@
     "lib": ["ES2022"],
     "outDir": "lib",
     "removeComments": false,
+    "rootDir": ".",
     "target": "ES2022"
   },
   "exclude": ["lib*/**/*"],

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

@@ -2,6 +2,12 @@
   "name": "<%- moduleName %>",
   "version": "0.0.0-semantically-released",
   "description": "<%- description %>",
+  "imports": {
+    "#src/*": {
+      "@seek/<%- serviceName %>/source": "./src/*",
+      "default": "./lib/*"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/<%- orgName %>/<%- repoName %>.git"

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

@@ -3,6 +3,7 @@
     "lib": ["ES2022"],
     "outDir": "lib",
     "removeComments": false,
+    "rootDir": ".",
     "target": "ES2022"
   },
   "exclude": ["lib*/**/*"],

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

@@ -1 +0,0 @@
-import 'skuba-dive/register';

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

@@ -1 +0,0 @@
-import 'skuba-dive/register';