diff --git a/.gitignore b/.gitignore
index 979f53fef9..4105694af0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,9 @@ typings/
 # TypeScript cache
 *.tsbuildinfo
 
+# Next.js declaration files (auto-generated)
+next-env.d.ts
+
 # Optional npm cache directory
 .npm
 
diff --git a/apps/docs/next-env.d.ts b/apps/docs/next-env.d.ts
deleted file mode 100644
index 1b3be0840f..0000000000
--- a/apps/docs/next-env.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/apps/docs/package.json b/apps/docs/package.json
index 5f9eb55ac1..793c1b69f1 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -31,7 +31,7 @@
     "preinstall": "npx only-allow pnpm",
     "presync": "pnpm run codegen:graphql",
     "pretest": "pnpm run codegen:examples",
-    "pretypecheck": "pnpm run codegen:graphql",
+    "pretypecheck": "pnpm run codegen:graphql && next typegen",
     "start": "next start",
     "sync": "tsx --conditions=react-server ./resources/rootSync.ts",
     "test": "pnpm supabase start && pnpm run test:local && pnpm supabase stop",
diff --git a/apps/studio/next-env.d.ts b/apps/studio/next-env.d.ts
deleted file mode 100644
index 254b73c165..0000000000
--- a/apps/studio/next-env.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-/// <reference path="./.next/types/routes.d.ts" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
diff --git a/apps/studio/package.json b/apps/studio/package.json
index 4320f6d587..b74d8bf090 100644
--- a/apps/studio/package.json
+++ b/apps/studio/package.json
@@ -16,6 +16,7 @@
     "test:ci": "vitest --run --coverage",
     "test:report": "open coverage/lcov-report/index.html",
     "deploy:staging": "VERCEL_ORG_ID=team_E6KJ1W561hMTjon1QSwOh0WO VERCEL_PROJECT_ID=QmcmhbiAtCMFTAHCuGgQscNbke4TzgWULECctNcKmxWCoT vercel --prod -A .vercel/staging.json",
+    "pretypecheck": "next typegen",
     "typecheck": "tsc --noEmit",
     "prettier:check": "prettier --cache --check .",
     "prettier:write": "prettier --cache --write .",
diff --git a/apps/www/next-env.d.ts b/apps/www/next-env.d.ts
deleted file mode 100644
index 36a4fe488a..0000000000
--- a/apps/www/next-env.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />
-/// <reference path="./.next/types/routes.d.ts" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/apps/www/package.json b/apps/www/package.json
index e6b7b16de4..048b243855 100644
--- a/apps/www/package.json
+++ b/apps/www/package.json
@@ -11,6 +11,7 @@
     "start": "next start",
     "lint": "next lint",
     "clean": "rimraf node_modules",
+    "pretypecheck": "next typegen",
     "typecheck": "pnpm run content:build && tsc --noEmit",
     "content:build": "node scripts/generateStaticContent.mjs",
     "prettier": "prettier --cache --write \"./{pages,components,lib,stores,styles,tests}/**/*.{ts,tsx,md,js,jsx,json}\"",