Merge branch 'master' of github.com:trouble/payload into fix/datePickerTypes

src/config/schema.ts

@@ -42,6 +42,7 @@ export default joi.object({
           Logo: component,
         }),
       }),
+    webpack: joi.func(),
   }),
   defaultDepth: joi.number()
     .min(0)
@@ -68,7 +69,6 @@ export default joi.object({
           fileSize: joi.number(),
         }),
     }),
-  webpack: joi.func(),
   serverModules: joi.array()
     .items(joi.string()),
   rateLimit: joi.object()

src/config/types.ts

@@ -75,6 +75,7 @@ export type PayloadConfig = {
         Dashboard?: React.ComponentType
       }
     }
+    webpack?: (config: Configuration) => Configuration;
   };
   collections?: PayloadCollectionConfig[];
   globals?: PayloadGlobalConfig[];
@@ -132,7 +133,6 @@ export type PayloadConfig = {
   hooks?: {
     afterError?: AfterErrorHook;
   };
-  webpack?: (config: Configuration) => Configuration;
 };
 
 export type Config = Omit<DeepRequired<PayloadConfig>, 'collections'> & {

src/webpack/getDevConfig.ts

@@ -46,7 +46,7 @@ export default (payloadConfig: Config): Configuration => {
     ],
   });
 
-  if (payloadConfig.webpack && typeof payloadConfig.webpack === 'function') {
+  if (payloadConfig.admin.webpack && typeof payloadConfig.admin.webpack === 'function') {
     config = payloadConfig.webpack(config);
   }
 

src/webpack/getProdConfig.ts

@@ -65,7 +65,7 @@ export default (payloadConfig: Config): Configuration => {
     config.plugins.push(new BundleAnalyzerPlugin());
   }
 
-  if (payloadConfig.webpack && typeof payloadConfig.webpack === 'function') {
+  if (payloadConfig.admin.webpack && typeof payloadConfig.admin.webpack === 'function') {
     config = payloadConfig.webpack(config);
   }