From ac8bcfac237ea46f77bb1ee9abf3b1139d52ed41 Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Thu, 5 Oct 2023 14:17:57 -0400
Subject: [PATCH] chore: proper dev webpack config

---
 dev/src/mocks/fileStub.js      | 1 -
 dev/src/mocks/promisifyMock.js | 1 -
 dev/src/payload.config.ts      | 4 ++--
 src/admin.js                   | 2 +-
 src/webpack.ts                 | 1 +
 5 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 dev/src/mocks/fileStub.js
 delete mode 100644 dev/src/mocks/promisifyMock.js

diff --git a/dev/src/mocks/fileStub.js b/dev/src/mocks/fileStub.js
deleted file mode 100644
index e25c9a3dc4..0000000000
--- a/dev/src/mocks/fileStub.js
+++ /dev/null
@@ -1 +0,0 @@
-export default 'file-stub'
diff --git a/dev/src/mocks/promisifyMock.js b/dev/src/mocks/promisifyMock.js
deleted file mode 100644
index b7c502ad8b..0000000000
--- a/dev/src/mocks/promisifyMock.js
+++ /dev/null
@@ -1 +0,0 @@
-export const promisify = () => {}
diff --git a/dev/src/payload.config.ts b/dev/src/payload.config.ts
index b2d31a7ed3..ddb9c6f1b7 100644
--- a/dev/src/payload.config.ts
+++ b/dev/src/payload.config.ts
@@ -12,17 +12,17 @@ export default buildConfig({
     // for development of this plugin.
     // No need to use these aliases within your own projects.
     webpack: config => {
-      const newConfig = {
+      return {
         ...config,
         resolve: {
           ...(config.resolve || {}),
           alias: {
             ...(config.resolve.alias || {}),
+            [path.resolve(__dirname, '../../src')]: path.resolve(__dirname, '../../src/admin.js'),
             react: path.resolve(__dirname, '../node_modules/react'),
           },
         },
       }
-      return newConfig
     },
   },
   typescript: {
diff --git a/src/admin.js b/src/admin.js
index 3e13b17b25..234898439f 100644
--- a/src/admin.js
+++ b/src/admin.js
@@ -1 +1 @@
-export const payloadCloud = config => config
+export const payloadCloud = () => config => config
diff --git a/src/webpack.ts b/src/webpack.ts
index 1db0bf6925..d288204eea 100644
--- a/src/webpack.ts
+++ b/src/webpack.ts
@@ -15,6 +15,7 @@ export const extendWebpackConfig =
       resolve: {
         ...(existingWebpackConfig.resolve || {}),
         alias: {
+          ...(existingWebpackConfig.resolve?.alias || {}),
           '@payloadcms/plugin-cloud': path.resolve(__dirname, './admin.js'),
         },
       },