diff --git a/packages/create-payload-app/.swcrc b/packages/create-payload-app/.swcrc
index 814897203..14463f4b0 100644
--- a/packages/create-payload-app/.swcrc
+++ b/packages/create-payload-app/.swcrc
@@ -10,6 +10,6 @@
     }
   },
   "module": {
-    "type": "commonjs"
+    "type": "es6"
   }
 }
diff --git a/packages/create-payload-app/bin/cli.js b/packages/create-payload-app/bin/cli.js
index 30f38aa97..9f4569c00 100755
--- a/packages/create-payload-app/bin/cli.js
+++ b/packages/create-payload-app/bin/cli.js
@@ -1,2 +1,4 @@
 #!/usr/bin/env node
-require('../dist/index.js')
+
+import { main } from '../dist/index.js'
+main()
diff --git a/packages/create-payload-app/package.json b/packages/create-payload-app/package.json
index a48f5fd5f..a56cff25f 100644
--- a/packages/create-payload-app/package.json
+++ b/packages/create-payload-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.0.0-alpha.54",
+  "version": "3.0.0-alpha.59",
   "license": "MIT",
   "type": "module",
   "homepage": "https://payloadcms.com",
diff --git a/packages/create-payload-app/src/index.ts b/packages/create-payload-app/src/index.ts
index e34d74cdd..c753e70a8 100644
--- a/packages/create-payload-app/src/index.ts
+++ b/packages/create-payload-app/src/index.ts
@@ -1,8 +1,12 @@
 import { Main } from './main.js'
 import { error } from './utils/log.js'
 
-async function main(): Promise<void> {
-  await new Main().init()
+export async function main(): Promise<void> {
+  try {
+    await new Main().init()
+  } catch (e) {
+    if (e instanceof Error) {
+      error(e.message)
+    }
+  }
 }
-
-main().catch((e) => error(`An error has occurred: ${e instanceof Error ? e.message : e}`))
diff --git a/packages/payload/.gitignore b/packages/payload/.gitignore
index bf9846511..ffc0797a2 100644
--- a/packages/payload/.gitignore
+++ b/packages/payload/.gitignore
@@ -20,3 +20,7 @@
 /versions.js
 /operations.js
 /operations.d.ts
+/node.js
+/node.d.ts
+/uploads.js
+/uploads.d.ts
diff --git a/packages/payload/node.d.ts b/packages/payload/node.d.ts
deleted file mode 100644
index 58a3d77ef..000000000
--- a/packages/payload/node.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { importConfig, importWithoutClientFiles } from './dist/utilities/importWithoutClientFiles.js';
-//# sourceMappingURL=node.d.ts.map
\ No newline at end of file
diff --git a/packages/payload/node.js b/packages/payload/node.js
deleted file mode 100644
index 9973c022e..000000000
--- a/packages/payload/node.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { importConfig, importWithoutClientFiles } from './dist/utilities/importWithoutClientFiles.js';
-
-//# sourceMappingURL=node.js.map
\ No newline at end of file