From a5a7d58caa11caf4cc7819e786347221e98dd204 Mon Sep 17 00:00:00 2001
From: Francois Best <github@francoisbest.com>
Date: Tue, 7 May 2024 22:19:22 +0200
Subject: [PATCH] fix: Forward fastify-sensible definitions

---
 src/{environment.ts => env.ts} |  0
 src/index.ts                   | 20 +++++++++++++-------
 src/logger.ts                  |  2 +-
 tests/integration/main.ts      |  2 +-
 tsconfig.json                  |  1 +
 tsup.config.ts                 |  2 +-
 6 files changed, 17 insertions(+), 10 deletions(-)
 rename src/{environment.ts => env.ts} (100%)

diff --git a/src/environment.ts b/src/env.ts
similarity index 100%
rename from src/environment.ts
rename to src/env.ts
diff --git a/src/index.ts b/src/index.ts
index 63de7fa..b991091 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,19 +1,25 @@
-import { AutoloadPluginOptions, fastifyAutoload } from '@fastify/autoload'
-import sensible from '@fastify/sensible'
+import { fastifyAutoload, type AutoloadPluginOptions } from '@fastify/autoload'
+import sensible, { type HttpErrors } from '@fastify/sensible'
 import underPressurePlugin, {
-  UnderPressureOptions
+  type UnderPressureOptions
 } from '@fastify/under-pressure'
-import Fastify, { FastifyHttpsOptions, FastifyInstance } from 'fastify'
+import Fastify, {
+  type FastifyHttpsOptions,
+  type FastifyInstance
+} from 'fastify'
 import https from 'node:https'
-import { fastifyMicroEnv, type FastifyMicroEnv } from './environment'
-import gracefulShutdown, { GracefulShutdownOptions } from './graceful-shutdown'
+import { fastifyMicroEnv, type FastifyMicroEnv } from './env'
+import gracefulShutdown, {
+  type GracefulShutdownOptions
+} from './graceful-shutdown'
 import { getLoggerOptions, makeReqIdGenerator } from './logger'
-import sentry, { SentryOptions } from './sentry'
+import sentry, { type SentryOptions } from './sentry'
 
 declare module 'fastify' {
   interface FastifyInstance {
     name?: string
     env: FastifyMicroEnv
+    httpErrors: HttpErrors
   }
 }
 
diff --git a/src/logger.ts b/src/logger.ts
index ffccc90..937d514 100644
--- a/src/logger.ts
+++ b/src/logger.ts
@@ -3,7 +3,7 @@ import crypto from 'node:crypto'
 import pino from 'pino'
 import * as redactEnv from 'redact-env'
 import SonicBoom from 'sonic-boom'
-import { FastifyMicroEnv } from './environment'
+import type { FastifyMicroEnv } from './env'
 import type { Options } from './index'
 import { randomID } from './randomID'
 
diff --git a/tests/integration/main.ts b/tests/integration/main.ts
index 8db51ab..2a214cf 100644
--- a/tests/integration/main.ts
+++ b/tests/integration/main.ts
@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
-import { createServer, startServer } from '../../dist'
+import { createServer, startServer } from '../../src'
 
 async function main() {
   const server = createServer({
diff --git a/tsconfig.json b/tsconfig.json
index 8c31759..86a0458 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,6 +7,7 @@
     "skipLibCheck": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
+    "verbatimModuleSyntax": true,
     "noEmit": true,
     "esModuleInterop": true,
     "module": "ESNext",
diff --git a/tsup.config.ts b/tsup.config.ts
index 354cb7d..154af13 100644
--- a/tsup.config.ts
+++ b/tsup.config.ts
@@ -3,7 +3,7 @@ import { defineConfig } from 'tsup'
 export default defineConfig({
   entry: {
     index: 'src/index.ts',
-    env: 'src/environment.ts'
+    env: 'src/env.ts'
   },
   format: ['esm'],
   dts: true,