diff --git a/examples/ai-analyst/tsconfig.json b/examples/ai-analyst/tsconfig.json
index 8d55dc982..8b732d6c7 100644
--- a/examples/ai-analyst/tsconfig.json
+++ b/examples/ai-analyst/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src"
+    "rootDir": "src",
+    "module": "ES2020",
+    "moduleResolution": "bundler"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/examples/ai-codegen/tsconfig.json b/examples/ai-codegen/tsconfig.json
index 8d55dc982..8b732d6c7 100644
--- a/examples/ai-codegen/tsconfig.json
+++ b/examples/ai-codegen/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src"
+    "rootDir": "src",
+    "module": "ES2020",
+    "moduleResolution": "bundler"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/examples/ai-sales/tsconfig.json b/examples/ai-sales/tsconfig.json
index 8d55dc982..8b732d6c7 100644
--- a/examples/ai-sales/tsconfig.json
+++ b/examples/ai-sales/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src"
+    "rootDir": "src",
+    "module": "ES2020",
+    "moduleResolution": "bundler"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/examples/ai-support/tsconfig.json b/examples/ai-support/tsconfig.json
index 8d55dc982..8b732d6c7 100644
--- a/examples/ai-support/tsconfig.json
+++ b/examples/ai-support/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src"
+    "rootDir": "src",
+    "module": "ES2020",
+    "moduleResolution": "bundler"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist"]
diff --git a/examples/plugin-bi/tsconfig.json b/examples/plugin-bi/tsconfig.json
index 3ea744efe..a14fc098c 100644
--- a/examples/plugin-bi/tsconfig.json
+++ b/examples/plugin-bi/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist",
-    "rootDir": "."
+    "rootDir": ".",
+    "module": "ES2020",
+    "moduleResolution": "bundler"
   },
   "include": ["src/**/*", "objectstack.config.ts"]
 }
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index 13e311fa3..3e5c24be7 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "module": "commonjs",
+    "module": "ES2020",
+    "moduleResolution": "bundler",
     "declaration": true,
     "outDir": "./dist",
     "strict": true,
diff --git a/packages/driver-memory/tsconfig.json b/packages/driver-memory/tsconfig.json
index 850f8b759..a2e0154a6 100644
--- a/packages/driver-memory/tsconfig.json
+++ b/packages/driver-memory/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "module": "commonjs",
+    "module": "ES2020",
+    "moduleResolution": "bundler",
     "declaration": true,
     "outDir": "./dist",
     "strict": true,
diff --git a/packages/objectql/tsconfig.json b/packages/objectql/tsconfig.json
index 9338828f6..b38211580 100644
--- a/packages/objectql/tsconfig.json
+++ b/packages/objectql/tsconfig.json
@@ -4,6 +4,8 @@
   "exclude": ["node_modules", "dist"],
   "compilerOptions": {
     "outDir": "dist",
-    "rootDir": "src"
+    "rootDir": "src",
+    "module": "ES2020",
+    "moduleResolution": "bundler"
   }
 }
diff --git a/packages/runtime/tsconfig.json b/packages/runtime/tsconfig.json
index 38ea4c7f0..a58d9ee89 100644
--- a/packages/runtime/tsconfig.json
+++ b/packages/runtime/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "module": "commonjs",
+    "module": "ES2020",
+    "moduleResolution": "bundler",
     "declaration": true,
     "outDir": "./dist",
     "strict": true,