Skip to content

Commit f988d66

Browse files
Merge pull request #15 from davidhellmann/v2
🐛 fix: handle case when no settings / values exists
2 parents 2ed3978 + 7bdbf2c commit f988d66

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tailwindcss-fluid-type",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"description": "Bring fluid type to tailwindcss",
55
"main": "src/index.js",
66
"license": "MIT",

src/utils/createData.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
const defaults = require("../config/defaults");
22

33
module.exports = (options, data) => {
4-
if (defaults.settings && defaults.values && options.settings && options.values) {
4+
if (defaults.settings && defaults.values) {
55
// Add settings
66
data.settings = Object.fromEntries(Object.entries({
7-
...defaults.settings, ...options.settings
7+
...defaults.settings, ...options?.settings
88
}).filter(([key]) => key !== 'unit').filter(([key]) => key !== 'prefix'));
99

1010
// Add values
11-
data.values = {...defaults.values, ...options.values }
11+
data.values = {...defaults.values, ...options?.values }
1212

1313
// Add prefix
14-
data.prefix = options.settings?.prefix || defaults.settings?.prefix || ''
15-
data.unit = options.settings?.unit || defaults.settings?.unit || 'rem'
14+
data.prefix = options?.settings?.prefix || defaults.settings?.prefix || ''
15+
data.unit = options?.settings?.unit || defaults.settings?.unit || 'rem'
1616

1717
// Add number check
1818
data.settingsAreNumbers = Object
@@ -21,4 +21,4 @@ module.exports = (options, data) => {
2121

2222
return data
2323
}
24-
}
24+
}

0 commit comments

Comments
 (0)