wrapper/tailwindcss
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix code style

Browse source
This commit is contained in:
Adam Wathan 2019-02-13 14:25:37 -05:00
parent 2342d72c5e
commit d95d28eec8
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
__tests__/resolveConfig.test.js
View file

@ -442,7 +442,7 @@ test('theme values in the extend section extend the existing theme', () => {
backgroundColors: {
customBackground: '#bada55',
},
}
},
},
}
@ -520,7 +520,7 @@ test('theme values in the extend section extend the user theme', () => {
height: {
customHeight: '500vh',
},
}
},
},
}
@ -536,7 +536,7 @@ test('theme values in the extend section extend the user theme', () => {
},
height: {
'0': 0,
'full': '100%',
full: '100%',
},
width: {
'0': 0,
@ -604,7 +604,7 @@ test('theme values in the extend section can extend values that are depended on
backgroundColors: {
customBackground: '#bada55',
},
}
},
},
}

5
src/util/resolveConfig.js
View file

@ -13,7 +13,8 @@ function resolveFunctionKeys(object) {
}
function without(object, key) {
return (({[key]: _, ...rest }) => rest)(object)
/* eslint-disable no-unused-vars */
return (({ [key]: _, ...rest }) => rest)(object)
}
function mergeExtensions(theme) {
@ -21,7 +22,7 @@ function mergeExtensions(theme) {
return isFunction(theme[key])
? mergedTheme => ({
...theme[key](mergedTheme),
...extensions
...extensions,
})
: {
...theme[key],