diff --git a/packages/next/.swcrc-cjs b/packages/next/.swcrc-cjs
index 903575624..814897203 100644
--- a/packages/next/.swcrc-cjs
+++ b/packages/next/.swcrc-cjs
@@ -6,10 +6,10 @@
     "parser": {
       "syntax": "typescript",
       "tsx": true,
-      "dts": true,
-    },
+      "dts": true
+    }
   },
   "module": {
-    "type": "commonjs",
-  },
+    "type": "commonjs"
+  }
 }
diff --git a/packages/next/package.json b/packages/next/package.json
index a064a2fe8..c0f7c122f 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -11,8 +11,8 @@
     "directory": "packages/next"
   },
   "scripts": {
-    "build:cjs": "swc ./src/withPayload.js -d ./dist/cjs --config-file .swcrc-cjs",
-    "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types && pnpm build:webpack && rm dist/prod/index.js",
+    "build:cjs": "swc ./src/withPayload.js -o ./dist/cjs/withPayload.cjs --config-file .swcrc-cjs",
+    "build": "pnpm copyfiles && pnpm build:swc && p build:cjs && pnpm build:types && pnpm build:webpack && rm dist/prod/index.js",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "build:webpack": "webpack --config webpack.config.js",
@@ -28,6 +28,10 @@
       "require": "./src/index.js",
       "types": "./src/index.js"
     },
+    "./withPayload": {
+      "import": "./src/withPayload.js",
+      "require": "./src/withPayload.js"
+    },
     "./*": {
       "import": "./src/exports/*.ts",
       "require": "./src/exports/*.ts",
@@ -87,7 +91,7 @@
       },
       "./withPayload": {
         "import": "./dist/withPayload.js",
-        "require": "./dist/cjs/withPayload.js"
+        "require": "./dist/cjs/withPayload.cjs"
       },
       "./*": {
         "import": "./dist/exports/*.js",