Merge pull request #15 from davidhellmann/v2

🐛 fix: handle case when no settings / values exists
davidhellmann · Oct 20, 2022 · f988d66 · f988d66
2 parents 2ed3978 + 7bdbf2c
commit f988d66
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-fluid-type",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Bring fluid type to tailwindcss",
   "main": "src/index.js",
   "license": "MIT",

diff --git a/src/utils/createData.js b/src/utils/createData.js
@@ -1,18 +1,18 @@
 const defaults = require("../config/defaults");
 
 module.exports = (options, data) => {
-    if (defaults.settings && defaults.values && options.settings && options.values) {
+    if (defaults.settings && defaults.values) {
         // Add settings
         data.settings = Object.fromEntries(Object.entries({
-            ...defaults.settings, ...options.settings
+            ...defaults.settings, ...options?.settings
         }).filter(([key]) => key !== 'unit').filter(([key]) => key !== 'prefix'));
 
         // Add values
-        data.values = {...defaults.values, ...options.values }
+        data.values = {...defaults.values, ...options?.values }
 
         // Add prefix
-        data.prefix = options.settings?.prefix || defaults.settings?.prefix || ''
-        data.unit = options.settings?.unit || defaults.settings?.unit || 'rem'
+        data.prefix = options?.settings?.prefix || defaults.settings?.prefix || ''
+        data.unit = options?.settings?.unit || defaults.settings?.unit || 'rem'
 
         // Add number check
         data.settingsAreNumbers = Object
@@ -21,4 +21,4 @@ module.exports = (options, data) => {
 
         return data
     }
-}
+}