Skip to content

Commit 083ab97

Browse files
adamwathanadamwathan
committed
Fix code style
1 parent a4bdae4 commit 083ab97

File tree

3 files changed

+50
-97
lines changed

3 files changed

+50
-97
lines changed

‎__tests__/mergeConfigWithDefaults.test.js

Lines changed: 23 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test('prefix key overrides default prefix', () => {
1818
appearance: ['responsive'],
1919
borderCollapse: [],
2020
borderColors: ['responsive', 'hover', 'focus'],
21-
}
21+
},
2222
}
2323

2424
const result = mergeConfigWithDefaults(userConfig, defaultConfig)
@@ -36,7 +36,7 @@ test('prefix key overrides default prefix', () => {
3636
appearance: ['responsive'],
3737
borderCollapse: [],
3838
borderColors: ['responsive', 'hover', 'focus'],
39-
}
39+
},
4040
})
4141
})
4242

@@ -58,7 +58,7 @@ test('important key overrides default important', () => {
5858
appearance: ['responsive'],
5959
borderCollapse: [],
6060
borderColors: ['responsive', 'hover', 'focus'],
61-
}
61+
},
6262
}
6363

6464
const result = mergeConfigWithDefaults(userConfig, defaultConfig)
@@ -76,7 +76,7 @@ test('important key overrides default important', () => {
7676
appearance: ['responsive'],
7777
borderCollapse: [],
7878
borderColors: ['responsive', 'hover', 'focus'],
79-
}
79+
},
8080
})
8181
})
8282

@@ -98,7 +98,7 @@ test('separator key overrides default separator', () => {
9898
appearance: ['responsive'],
9999
borderCollapse: [],
100100
borderColors: ['responsive', 'hover', 'focus'],
101-
}
101+
},
102102
}
103103

104104
const result = mergeConfigWithDefaults(userConfig, defaultConfig)
@@ -116,7 +116,7 @@ test('separator key overrides default separator', () => {
116116
appearance: ['responsive'],
117117
borderCollapse: [],
118118
borderColors: ['responsive', 'hover', 'focus'],
119-
}
119+
},
120120
})
121121
})
122122

@@ -137,24 +137,13 @@ test('theme key is merged instead of replaced', () => {
137137
colors: {
138138
'grey-darker': '#606f7b',
139139
'grey-dark': '#8795a1',
140-
'grey': '#b8c2cc',
140+
grey: '#b8c2cc',
141141
'grey-light': '#dae1e7',
142142
'grey-lighter': '#f1f5f8',
143143
},
144144
fonts: {
145-
sans: [
146-
'system-ui',
147-
'BlinkMacSystemFont',
148-
'-apple-system',
149-
'Roboto',
150-
'sans-serif',
151-
],
152-
serif: [
153-
'Constantia',
154-
'Lucida Bright',
155-
'Georgia',
156-
'serif',
157-
],
145+
sans: ['system-ui', 'BlinkMacSystemFont', '-apple-system', 'Roboto', 'sans-serif'],
146+
serif: ['Constantia', 'Lucida Bright', 'Georgia', 'serif'],
158147
},
159148
screens: {
160149
sm: '500px',
@@ -166,7 +155,7 @@ test('theme key is merged instead of replaced', () => {
166155
appearance: ['responsive'],
167156
borderCollapse: [],
168157
borderColors: ['responsive', 'hover', 'focus'],
169-
}
158+
},
170159
}
171160

172161
const result = mergeConfigWithDefaults(userConfig, defaultConfig)
@@ -179,24 +168,13 @@ test('theme key is merged instead of replaced', () => {
179168
colors: {
180169
'grey-darker': '#606f7b',
181170
'grey-dark': '#8795a1',
182-
'grey': '#b8c2cc',
171+
grey: '#b8c2cc',
183172
'grey-light': '#dae1e7',
184173
'grey-lighter': '#f1f5f8',
185174
},
186175
fonts: {
187-
sans: [
188-
'system-ui',
189-
'BlinkMacSystemFont',
190-
'-apple-system',
191-
'Roboto',
192-
'sans-serif',
193-
],
194-
serif: [
195-
'Constantia',
196-
'Lucida Bright',
197-
'Georgia',
198-
'serif',
199-
],
176+
sans: ['system-ui', 'BlinkMacSystemFont', '-apple-system', 'Roboto', 'sans-serif'],
177+
serif: ['Constantia', 'Lucida Bright', 'Georgia', 'serif'],
200178
},
201179
screens: {
202180
mobile: '400px',
@@ -206,7 +184,7 @@ test('theme key is merged instead of replaced', () => {
206184
appearance: ['responsive'],
207185
borderCollapse: [],
208186
borderColors: ['responsive', 'hover', 'focus'],
209-
}
187+
},
210188
})
211189
})
212190

@@ -215,7 +193,7 @@ test('variants key is merged instead of replaced', () => {
215193
variants: {
216194
backgroundAttachment: [],
217195
borderColors: ['responsive', 'hover', 'focus', 'active'],
218-
}
196+
},
219197
}
220198

221199
const defaultConfig = {
@@ -226,24 +204,13 @@ test('variants key is merged instead of replaced', () => {
226204
colors: {
227205
'grey-darker': '#606f7b',
228206
'grey-dark': '#8795a1',
229-
'grey': '#b8c2cc',
207+
grey: '#b8c2cc',
230208
'grey-light': '#dae1e7',
231209
'grey-lighter': '#f1f5f8',
232210
},
233211
fonts: {
234-
sans: [
235-
'system-ui',
236-
'BlinkMacSystemFont',
237-
'-apple-system',
238-
'Roboto',
239-
'sans-serif',
240-
],
241-
serif: [
242-
'Constantia',
243-
'Lucida Bright',
244-
'Georgia',
245-
'serif',
246-
],
212+
sans: ['system-ui', 'BlinkMacSystemFont', '-apple-system', 'Roboto', 'sans-serif'],
213+
serif: ['Constantia', 'Lucida Bright', 'Georgia', 'serif'],
247214
},
248215
screens: {
249216
sm: '500px',
@@ -257,7 +224,7 @@ test('variants key is merged instead of replaced', () => {
257224
borderCollapse: [],
258225
borderColors: ['responsive', 'hover', 'focus'],
259226
borderRadius: ['responsive'],
260-
}
227+
},
261228
}
262229

263230
const result = mergeConfigWithDefaults(userConfig, defaultConfig)
@@ -270,24 +237,13 @@ test('variants key is merged instead of replaced', () => {
270237
colors: {
271238
'grey-darker': '#606f7b',
272239
'grey-dark': '#8795a1',
273-
'grey': '#b8c2cc',
240+
grey: '#b8c2cc',
274241
'grey-light': '#dae1e7',
275242
'grey-lighter': '#f1f5f8',
276243
},
277244
fonts: {
278-
sans: [
279-
'system-ui',
280-
'BlinkMacSystemFont',
281-
'-apple-system',
282-
'Roboto',
283-
'sans-serif',
284-
],
285-
serif: [
286-
'Constantia',
287-
'Lucida Bright',
288-
'Georgia',
289-
'serif',
290-
],
245+
sans: ['system-ui', 'BlinkMacSystemFont', '-apple-system', 'Roboto', 'sans-serif'],
246+
serif: ['Constantia', 'Lucida Bright', 'Georgia', 'serif'],
291247
},
292248
screens: {
293249
sm: '500px',
@@ -301,7 +257,7 @@ test('variants key is merged instead of replaced', () => {
301257
borderCollapse: [],
302258
borderColors: ['responsive', 'hover', 'focus', 'active'],
303259
borderRadius: ['responsive'],
304-
}
260+
},
305261
})
306262
})
307263

‎defaultTheme.js

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,97 @@
1-
module.exports = function () {
1+
module.exports = function() {
22
const colors = {
33
transparent: 'transparent',
44

5-
'black': '#22292f',
5+
black: '#22292f',
66
'grey-darkest': '#3d4852',
77
'grey-darker': '#606f7b',
88
'grey-dark': '#8795a1',
9-
'grey': '#b8c2cc',
9+
grey: '#b8c2cc',
1010
'grey-light': '#dae1e7',
1111
'grey-lighter': '#f1f5f8',
1212
'grey-lightest': '#f8fafc',
13-
'white': '#ffffff',
13+
white: '#ffffff',
1414

1515
'red-darkest': '#3b0d0c',
1616
'red-darker': '#621b18',
1717
'red-dark': '#cc1f1a',
18-
'red': '#e3342f',
18+
red: '#e3342f',
1919
'red-light': '#ef5753',
2020
'red-lighter': '#f9acaa',
2121
'red-lightest': '#fcebea',
2222

2323
'orange-darkest': '#462a16',
2424
'orange-darker': '#613b1f',
2525
'orange-dark': '#de751f',
26-
'orange': '#f6993f',
26+
orange: '#f6993f',
2727
'orange-light': '#faad63',
2828
'orange-lighter': '#fcd9b6',
2929
'orange-lightest': '#fff5eb',
3030

3131
'yellow-darkest': '#453411',
3232
'yellow-darker': '#684f1d',
3333
'yellow-dark': '#f2d024',
34-
'yellow': '#ffed4a',
34+
yellow: '#ffed4a',
3535
'yellow-light': '#fff382',
3636
'yellow-lighter': '#fff9c2',
3737
'yellow-lightest': '#fcfbeb',
3838

3939
'green-darkest': '#0f2f21',
4040
'green-darker': '#1a4731',
4141
'green-dark': '#1f9d55',
42-
'green': '#38c172',
42+
green: '#38c172',
4343
'green-light': '#51d88a',
4444
'green-lighter': '#a2f5bf',
4545
'green-lightest': '#e3fcec',
4646

4747
'teal-darkest': '#0d3331',
4848
'teal-darker': '#20504f',
4949
'teal-dark': '#38a89d',
50-
'teal': '#4dc0b5',
50+
teal: '#4dc0b5',
5151
'teal-light': '#64d5ca',
5252
'teal-lighter': '#a0f0ed',
5353
'teal-lightest': '#e8fffe',
5454

5555
'blue-darkest': '#12283a',
5656
'blue-darker': '#1c3d5a',
5757
'blue-dark': '#2779bd',
58-
'blue': '#3490dc',
58+
blue: '#3490dc',
5959
'blue-light': '#6cb2eb',
6060
'blue-lighter': '#bcdefa',
6161
'blue-lightest': '#eff8ff',
6262

6363
'indigo-darkest': '#191e38',
6464
'indigo-darker': '#2f365f',
6565
'indigo-dark': '#5661b3',
66-
'indigo': '#6574cd',
66+
indigo: '#6574cd',
6767
'indigo-light': '#7886d7',
6868
'indigo-lighter': '#b2b7ff',
6969
'indigo-lightest': '#e6e8ff',
7070

7171
'purple-darkest': '#21183c',
7272
'purple-darker': '#382b5f',
7373
'purple-dark': '#794acf',
74-
'purple': '#9561e2',
74+
purple: '#9561e2',
7575
'purple-light': '#a779e9',
7676
'purple-lighter': '#d6bbfc',
7777
'purple-lightest': '#f3ebff',
7878

7979
'pink-darkest': '#451225',
8080
'pink-darker': '#6f213f',
8181
'pink-dark': '#eb5286',
82-
'pink': '#f66d9b',
82+
pink: '#f66d9b',
8383
'pink-light': '#fa7ea8',
8484
'pink-lighter': '#ffbbca',
8585
'pink-lightest': '#ffebef',
8686
}
8787

8888
return {
89-
colors: colors,
89+
colors,
9090
screens: {
91-
'sm': '576px',
92-
'md': '768px',
93-
'lg': '992px',
94-
'xl': '1200px',
91+
sm: '576px',
92+
md: '768px',
93+
lg: '992px',
94+
xl: '1200px',
9595
},
9696
fonts: {
9797
sans: [
@@ -120,14 +120,7 @@ module.exports = function () {
120120
'Georgia',
121121
'serif',
122122
],
123-
mono: [
124-
'Menlo',
125-
'Monaco',
126-
'Consolas',
127-
'Liberation Mono',
128-
'Courier New',
129-
'monospace'
130-
],
123+
mono: ['Menlo', 'Monaco', 'Consolas', 'Liberation Mono', 'Courier New', 'monospace'],
131124
},
132125
textSizes: {
133126
xs: '.75rem', // 12px

‎src/util/mergeConfigWithDefaults.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
import _ from 'lodash'
22

33
export default function(userConfig, defaultConfig) {
4-
return _.defaults({
5-
theme: _.defaults(userConfig.theme, defaultConfig.theme),
6-
variants: _.defaults(userConfig.variants, defaultConfig.variants),
7-
}, userConfig, defaultConfig)
4+
return _.defaults(
5+
{
6+
theme: _.defaults(userConfig.theme, defaultConfig.theme),
7+
variants: _.defaults(userConfig.variants, defaultConfig.variants),
8+
},
9+
userConfig,
10+
defaultConfig
11+
)
812
}

0 commit comments

Comments
 (0)