Rework styles.js

Author: bradlc

src/index.js

@@ -1,5 +1,6 @@
 const plugin = require('tailwindcss/plugin')
 const merge = require('lodash/merge')
+const castArray = require('lodash/castArray')
 const styles = require('./styles')
 // const union = require('lodash/union')
 
@@ -14,12 +15,12 @@ function configToCss(config) {
       .reduce((acc, cur) => {
         return { ...acc, ...computed[cur](config[cur]) }
       }, {}),
-    ...(config.css || {}),
+    ...merge(...castArray(config.css || {})),
   }
 }
 
 module.exports = plugin.withOptions(
-  ({ modifiers = ['default', 'sm', 'lg', 'xl', '2xl'] } = {}) => {
+  ({ modifiers = ['sm', 'lg', 'xl', '2xl'] } = {}) => {
     return function ({ addComponents, theme, variants }) {
       const config = theme('typography', {})
 
@@ -42,41 +43,38 @@ module.exports = plugin.withOptions(
         [`@variants ${variants('typography').join(', ')}`]: [
           {
             '.prose': merge(
-              styles.shared,
-              !modifiers.includes('default')
-                ? {}
-                : styles.modifiers.default.css,
+              ...castArray(styles.default.css),
               configToCss(config.default || {})
             ),
             ...(!modifiers.includes('sm')
               ? {}
               : {
                   '.prose-sm': merge(
-                    styles.modifiers.sm.css,
+                    ...castArray(styles.sm.css),
                     configToCss(config.sm || {})
                   ),
                 }),
             ...(!modifiers.includes('lg')
               ? {}
               : {
                   '.prose-lg': merge(
-                    styles.modifiers.lg.css,
+                    ...castArray(styles.lg.css),
                     configToCss(config.lg || {})
                   ),
                 }),
             ...(!modifiers.includes('xl')
               ? {}
               : {
                   '.prose-xl': merge(
-                    styles.modifiers.xl.css,
+                    ...castArray(styles.xl.css),
                     configToCss(config.xl || {})
                   ),
                 }),
             ...(!modifiers.includes('2xl')
               ? {}
               : {
                   '.prose-2xl': merge(
-                    styles.modifiers['2xl'].css,
+                    ...castArray(styles['2xl'].css),
                     configToCss(config['2xl'] || {})
                   ),
                 }),