diff --git a/packages/payload/.swcrc b/packages/payload/.swcrc
index d46b555fe..15eb20bc1 100644
--- a/packages/payload/.swcrc
+++ b/packages/payload/.swcrc
@@ -10,6 +10,6 @@
     }
   },
   "module": {
-    "type": "commonjs"
+    "type": "es6"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index c5029ee16..cb5d507e9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,7 +10,11 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "jsx": "preserve",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "noEmit": true,
     "outDir": "./dist",
     "resolveJsonModule": true,
@@ -18,7 +22,11 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": false,
-    "types": ["jest", "node", "@types/jest"],
+    "types": [
+      "jest",
+      "node",
+      "@types/jest"
+    ],
     "incremental": true,
     "isolatedModules": true,
     "plugins": [
@@ -27,28 +35,65 @@
       }
     ],
     "paths": {
-      "payload": ["./packages/payload/src"],
-      "payload/*": ["./packages/payload/src/exports/*"],
-      "@payloadcms/db-mongodb": ["./packages/db-mongodb/src"],
-      "@payloadcms/richtext-lexical": ["./packages/richtext-lexical/src"],
-      "@payloadcms/plugin-cloud": ["./packages/plugin-cloud/src"],
-      "@payloadcms/plugin-cloud-storage": ["./packages/plugin-cloud-storage/src"],
-      "@payloadcms/ui": ["./packages/ui/src/exports/index.ts"],
-      "@payloadcms/ui/*": ["./packages/ui/src/exports/*"],
-      "@payloadcms/ui/scss": ["./packages/ui/src/scss/styles.scss"],
-      "@payloadcms/ui/scss/app.scss": ["./packages/ui/src/scss/app.scss"],
-      "@payloadcms/translations": ["./packages/translations/src/exports/index.ts"],
+      "payload": [
+        "./packages/payload/src"
+      ],
+      "payload/*": [
+        "./packages/payload/src/exports/*"
+      ],
+      "@payloadcms/db-mongodb": [
+        "./packages/db-mongodb/src"
+      ],
+      "@payloadcms/richtext-lexical": [
+        "./packages/richtext-lexical/src"
+      ],
+      "@payloadcms/plugin-cloud": [
+        "./packages/plugin-cloud/src"
+      ],
+      "@payloadcms/plugin-cloud-storage": [
+        "./packages/plugin-cloud-storage/src"
+      ],
+      "@payloadcms/ui": [
+        "./packages/ui/src/exports/index.ts"
+      ],
+      "@payloadcms/ui/*": [
+        "./packages/ui/src/exports/*"
+      ],
+      "@payloadcms/ui/scss": [
+        "./packages/ui/src/scss/styles.scss"
+      ],
+      "@payloadcms/ui/scss/app.scss": [
+        "./packages/ui/src/scss/app.scss"
+      ],
+      "@payloadcms/translations": [
+        "./packages/translations/src/exports/index.ts"
+      ],
       "@payloadcms/translations/client": [
         "./packages/translations/src/_generatedFiles_/client/index.ts"
       ],
-      "@payloadcms/translations/api": ["./packages/translations/src/_generatedFiles_/api/index.ts"],
-      "@payloadcms/next/*": ["./packages/next/src/*"],
-      "@payloadcms/next": ["./packages/next/src/exports/*"],
-      "@payloadcms/graphql": ["./packages/graphql/src"],
-      "@payload-config": ["./test/_community/config.ts"]
+      "@payloadcms/translations/api": [
+        "./packages/translations/src/_generatedFiles_/api/index.ts"
+      ],
+      "@payloadcms/next/*": [
+        "./packages/next/src/*"
+      ],
+      "@payloadcms/next": [
+        "./packages/next/src/exports/*"
+      ],
+      "@payloadcms/graphql": [
+        "./packages/graphql/src"
+      ],
+      "@payload-config": [
+        "./test/_community/config.ts"
+      ]
     }
   },
-  "exclude": ["dist", "build", "temp", "node_modules"],
+  "exclude": [
+    "dist",
+    "build",
+    "temp",
+    "node_modules"
+  ],
   "composite": true,
   "references": [
     {
@@ -116,4 +161,4 @@
     "app/**/*.tsx",
     "scripts/**/*.ts"
   ]
-}
+}
\ No newline at end of file