Merge branch 'master' of github.com:trouble/payload into typescript/datePicker

src/admin/scss/app.scss

@@ -124,3 +124,5 @@ dialog {
 .payload__modal-item--enterDone {
   z-index: $z-modal;
 }
+
+@import '~payload-user-css';

src/admin/scss/custom.css

@@ -0,0 +1 @@
+/* Used as a placeholder for when the Payload app does not have custom CSS */

src/admin/scss/overrides.scss

@@ -0,0 +1 @@
+/* Used as a placeholder for when the Payload app does not have custom SCSS */

src/config/defaults.ts

@@ -14,6 +14,8 @@ export const defaults = {
     disable: false,
     indexHTML: path.resolve(__dirname, '../admin/index.html'),
     components: {},
+    css: path.resolve(__dirname, '../admin/scss/custom.css'),
+    scss: path.resolve(__dirname, '../admin/scss/overrides.scss'),
   },
   upload: {},
   email: {
@@ -44,7 +46,4 @@ export const defaults = {
   },
   hooks: {},
   localization: false,
-  paths: {
-    scss: path.resolve(__dirname, '../admin/scss/overrides.scss'),
-  },
 };

src/config/schema.ts

@@ -31,6 +31,8 @@ export default joi.object({
       }),
     disable: joi.bool(),
     indexHTML: joi.string(),
+    css: joi.string(),
+    scss: joi.string(),
     components: joi.object()
       .keys({
         Nav: component,
@@ -109,10 +111,4 @@ export default joi.object({
   hooks: joi.object().keys({
     afterError: joi.func(),
   }),
-  paths: joi.object()
-    .keys({
-      configDir: joi.string(),
-      config: joi.string(),
-      scss: joi.string(),
-    }),
 });

src/config/types.ts

@@ -62,6 +62,8 @@ export type PayloadConfig = {
     }
     disable?: boolean;
     indexHTML?: string;
+    css?: string
+    scss?: string
     components?: {
       Nav?: React.ComponentType
       Account?: React.ComponentType

src/webpack/getBaseConfig.ts

@@ -54,7 +54,8 @@ export default (config: Config): Configuration => ({
     alias: {
       'payload/config': config.paths.config,
       '@payloadcms/payload$': mockModulePath,
-      'payload-scss-overrides': config.paths.scss,
+      'payload-user-css': config.admin.css,
+      'payload-scss-overrides': config.admin.scss,
       dotenv: mockDotENVPath,
     },
     extensions: ['.ts', '.tsx', '.js', '.json'],