diff --git a/web/apps/auth/tsconfig.json b/web/apps/auth/tsconfig.json
index 3c5fb3cb3..3b238836d 100644
--- a/web/apps/auth/tsconfig.json
+++ b/web/apps/auth/tsconfig.json
@@ -1,11 +1,6 @@
 {
-    "extends": "@/build-config/tsconfig-typecheck.json",
-    "include": [
-        "src/**/*.ts",
-        "src/**/*.tsx",
-        "src/**/*.d.ts",
-        "../../packages/shared/themes/mui-theme.d.ts"
-    ],
+    "extends": "@/build-config/tsconfig-next.json",
+    "include": ["src", "../../packages/shared/themes/mui-theme.d.ts"],
     // Temporarily disable some things to get the existing code to compile
     // without warnings.
     "compilerOptions": {
@@ -13,9 +8,6 @@
 
         "jsxImportSource": "@emotion/react",
 
-        /* Also indicate expectation of a WebWorker runtime */
-        "lib": ["ESnext", "DOM", "DOM.Iterable", "WebWorker"],
-
         "verbatimModuleSyntax": false,
         "resolveJsonModule": false,
 
diff --git a/web/packages/build-config/tsconfig-next.json b/web/packages/build-config/tsconfig-next.json
new file mode 100644
index 000000000..922ba7a7c
--- /dev/null
+++ b/web/packages/build-config/tsconfig-next.json
@@ -0,0 +1,8 @@
+{
+    /* A base TSConfig for typechecking our Next.js apps and packages. */
+    "extends": "@/build-config/tsconfig-typecheck.json",
+    "compilerOptions": {
+        /* Also indicate expectation of a WebWorker runtime */
+        "lib": ["ESnext", "DOM", "DOM.Iterable", "WebWorker"]
+    }
+}
diff --git a/web/packages/media/tsconfig.json b/web/packages/media/tsconfig.json
index 5ec77ed60..01e2dc60c 100644
--- a/web/packages/media/tsconfig.json
+++ b/web/packages/media/tsconfig.json
@@ -1,9 +1,4 @@
 {
-    "extends": "@/build-config/tsconfig-typecheck.json",
-    "compilerOptions": {
-        /* Also indicate expectation of a WebWorker runtime */
-        "lib": ["ESnext", "DOM", "DOM.Iterable", "WebWorker"]
-    },
-    /* Typecheck all files with the given extensions (here or in subfolders) */
+    "extends": "@/build-config/tsconfig-next.json",
     "include": [".", "../../packages/next/global-electron.d.ts"]
 }
diff --git a/web/packages/next/tsconfig.json b/web/packages/next/tsconfig.json
index 887a3743a..b39c0995b 100644
--- a/web/packages/next/tsconfig.json
+++ b/web/packages/next/tsconfig.json
@@ -1,8 +1,4 @@
 {
-    "extends": "@/build-config/tsconfig-typecheck.json",
-    "compilerOptions": {
-        /* Also indicate expectation of a WebWorker runtime */
-        "lib": ["ESnext", "DOM", "DOM.Iterable", "WebWorker"]
-    },
+    "extends": "@/build-config/tsconfig-next.json",
     "include": ["."]
 }