diff --git a/apps/web/package.json b/apps/web/package.json
index 25f74838..bfbe138c 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -26,6 +26,7 @@
     "@tanstack/react-query-persist-client": "^5.75.4",
     "@types/uuid": "^10.0.0",
     "clsx": "^2.1.1",
+    "core-js": "3.42.0",
     "dexie": "^4.0.9",
     "dexie-react-hooks": "^1.1.7",
     "graphql": "^16.11.0",
diff --git a/apps/web/src/root.tsx b/apps/web/src/root.tsx
index bef40dd3..56655598 100644
--- a/apps/web/src/root.tsx
+++ b/apps/web/src/root.tsx
@@ -11,6 +11,7 @@ import { createQueryClient, createIDBPersister } from "./lib/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { BlueprintProvider } from "@blueprintjs/core";
 import { PersistQueryClientProvider } from "@tanstack/react-query-persist-client";
+import "core-js/actual/array"; // Polyfill for ES2023.Array
 import type { Route } from "./+types/root";
 import "normalize.css/normalize.css";
 import "@blueprintjs/core/lib/css/blueprint.css";
diff --git a/apps/web/tsconfig.node.json b/apps/web/tsconfig.node.json
index f57c3430..0497970b 100644
--- a/apps/web/tsconfig.node.json
+++ b/apps/web/tsconfig.node.json
@@ -11,10 +11,8 @@
   ],
   "compilerOptions": {
     "composite": true,
-    "types": ["node"],
-    "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "bundler",
+    "target": "esnext",
+    "module": "nodenext",
     "noEmit": true,
   }
 }
\ No newline at end of file
diff --git a/apps/web/tsconfig.vite.json b/apps/web/tsconfig.vite.json
index d948211b..045352b8 100644
--- a/apps/web/tsconfig.vite.json
+++ b/apps/web/tsconfig.vite.json
@@ -15,7 +15,7 @@
     "types": ["@testing-library/jest-dom", "vite/client"],
     "rootDirs": [".", "./.react-router/types"],
     "target": "es2015",
-    "lib": ["es2023", "DOM", "WebWorker"],
+    "lib": ["ES2015", "ES2023.Array", "DOM", "WebWorker"],
     "useDefineForClassFields": true,
     "module": "ESNext",
     "sourceMap": true,
diff --git a/packages/typescript-config/base.json b/packages/typescript-config/base.json
index 0bc063ae..1dc9de6f 100644
--- a/packages/typescript-config/base.json
+++ b/packages/typescript-config/base.json
@@ -2,8 +2,6 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "Default",
   "compilerOptions": {
-    "lib": ["es2023"],
-    "target": "es2015",
     "composite": false,
     "declaration": true,
     "declarationMap": true,
@@ -11,7 +9,6 @@
     "forceConsistentCasingInFileNames": true,
     "inlineSources": false,
     "isolatedModules": true,
-    "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "noUnusedLocals": false,
     "noUnusedParameters": false,
diff --git a/packages/vite-plugin-process-env/tsconfig.json b/packages/vite-plugin-process-env/tsconfig.json
index 23d17c9c..fe0675f3 100644
--- a/packages/vite-plugin-process-env/tsconfig.json
+++ b/packages/vite-plugin-process-env/tsconfig.json
@@ -3,4 +3,8 @@
   "extends": "@repo/typescript-config/base.json",
   "include": ["src", "tests"],
   "exclude": ["node_modules"],
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "nodenext",
+  }
 }
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5508c656..10adfb42 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -170,6 +170,9 @@ importers:
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
+      core-js:
+        specifier: 3.42.0
+        version: 3.42.0
       dexie:
         specifier: ^4.0.9
         version: 4.0.9
@@ -3650,6 +3653,9 @@ packages:
   copy-anything@2.0.6:
     resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==}
 
+  core-js@3.42.0:
+    resolution: {integrity: sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==}
+
   cors@2.8.5:
     resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
     engines: {node: '>= 0.10'}
@@ -11471,6 +11477,8 @@ snapshots:
     dependencies:
       is-what: 3.14.1
 
+  core-js@3.42.0: {}
+
   cors@2.8.5:
     dependencies:
       object-assign: 4.1.1