diff --git a/.gitignore b/.gitignore
index 7329a851..1dc66f75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,6 @@ pnpm-debug.log*
 
 # macOS-specific files
 .DS_Store
+
+# astro
+.astro
diff --git a/src/env.d.ts b/src/env.d.ts
index f964fe0c..e815b359 100644
--- a/src/env.d.ts
+++ b/src/env.d.ts
@@ -1 +1,3 @@
+/* eslint-disable @typescript-eslint/triple-slash-reference */
+/// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
diff --git a/tsconfig.json b/tsconfig.json
index 1373da18..9e00ac8c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "extends": "astro/tsconfigs/base",
   "compilerOptions": {
     // Enable top-level await, and other modern ESM features.
     "target": "ESNext",
@@ -15,6 +16,8 @@
     "strict": true,
     // Define the base url and paths.
     "baseUrl": "./src",
+    // When type checking, take into account null and undefined.
+    "strictNullChecks": true,
     "paths": {
       "@components/*": ["components/*"],
       "@constants/*": ["constants/*"],