Skip to content

Commit 69ad700

Browse files
committed
🐛 fix: merge objects in the right order
1 parent 517c992 commit 69ad700

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
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": "v2.0.0-alpha.1",
3+
"version": "v2.0.0-alpha.2",
44
"description": "Bring fluid type to tailwindcss",
55
"main": "src/index.js",
66
"license": "MIT",

src/utils/createData.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ module.exports = (options, data) => {
44
if (defaults.settings && defaults.values && options.settings && options.values) {
55
// Add settings
66
data.settings = Object.fromEntries(Object.entries({
7-
...options.settings, ...defaults.settings
7+
...defaults.settings, ...options.settings
88
}).filter(([key]) => key !== 'unit').filter(([key]) => key !== 'prefix'));
99

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

1313
// Add prefix
1414
data.prefix = options.settings?.prefix || defaults.settings?.prefix || ''

0 commit comments

Comments
 (0)