Merge pull request #2082 from system-ui/lachlanjc-tw3

system-ui · Jan 30, 2022 · f30b1cf · f30b1cf
2 parents 8894506 + 3ded464
commit f30b1cf
Show file tree

Hide file tree

Showing 7 changed files with 930 additions and 30,878 deletions.
diff --git a/packages/tailwind/package.json b/packages/tailwind/package.json
@@ -9,10 +9,10 @@
   "license": "MIT",
   "scripts": {},
   "devDependencies": {
-    "@theme-ui/css": "0.13.0",
+    "@theme-ui/css": "0.13.1",
     "babel-polyfill": "^6.26.0",
     "execa": "^5.0.0",
-    "tailwindcss": "^1.0.4"
+    "tailwindcss": "^3.0.15"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/tailwind/src/index.ts b/packages/tailwind/src/index.ts
@@ -6,6 +6,7 @@ const KEY_MAPPING: {
   space: 'spacing',
   radii: 'borderRadius',
   fonts: 'fontFamily',
+  breakpoints: 'screens',
   borderStyles: 'borderStyle',
   shadows: 'boxShadow',
   fontSizes: 'fontSize',
@@ -21,21 +22,24 @@ export default (theme: Theme, config: { [Key: string]: unknown } = {}) => {
     [Key: string]: unknown
   }>((acc, [key, value]) => {
     const matchingKey = KEY_MAPPING[key]
+    const valueAsObj = Array.isArray(value)
+      ? Object.fromEntries(Object.entries(value))
+      : value
     if (!matchingKey) {
       return {
         ...acc,
-        [key]: value,
+        [key]: valueAsObj,
       }
     } else if (Array.isArray(matchingKey)) {
-      matchingKey.forEach(twKey => {
-        acc[twKey] = value
+      matchingKey.forEach((twKey) => {
+        acc[twKey] = valueAsObj
       })
 
       return acc
     } else {
       return {
         ...acc,
-        [matchingKey]: value,
+        [matchingKey]: valueAsObj,
       }
     }
   }, {})