Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19,224 changes: 9,612 additions & 9,612 deletions __tests__/fixtures/tailwind-output.css

Large diffs are not rendered by default.

133 changes: 133 additions & 0 deletions __tests__/generateModules.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
import generateModules from '../src/util/generateModules'
import defineClasses from '../src/util/defineClasses'

function textAlign() {
return defineClasses({
'text-left': { 'text-align': 'left' },
'text-right': { 'text-align': 'right' },
'text-center': { 'text-align': 'center' },
})
}

function display() {
return defineClasses({
block: { display: 'block' },
inline: { display: 'inline' },
'inline-block': { display: 'inline-block' },
})
}

function borderStyle() {
return defineClasses({
'border-solid': { 'border-style': 'solid' },
'border-dashed': { 'border-style': 'dashed' },
'border-dotted': { 'border-style': 'dotted' },
})
}

test('an empty variants list generates a @variants at-rule with no parameters', () => {
const result = generateModules([{ name: 'textAlign', generator: textAlign }], {
textAlign: [],
})

const expected = `
@variants {
.text-left { text-align: left }
.text-right { text-align: right }
.text-center { text-align: center }
}
`
expect(result.toString()).toMatchCss(expected)
})

test('a `false` variants list generates no output', () => {
const result = generateModules([{ name: 'textAlign', generator: textAlign }], {
textAlign: false,
})

expect(result.toString()).toMatchCss('')
})

test('specified variants are included in the @variants at-rule', () => {
const result = generateModules([{ name: 'textAlign', generator: textAlign }], {
textAlign: ['responsive', 'hover'],
})

const expected = `
@variants responsive, hover {
.text-left { text-align: left }
.text-right { text-align: right }
.text-center { text-align: center }
}
`
expect(result.toString()).toMatchCss(expected)
})

test('options must provide variants for every module', () => {
expect(() => {
generateModules(
[{ name: 'textAlign', generator: textAlign }, { name: 'display', generator: display }],
{
textAlign: [],
}
)
}).toThrow()
})

test('variants can be different for each module', () => {
const result = generateModules(
[
{ name: 'textAlign', generator: textAlign },
{ name: 'display', generator: display },
{ name: 'borderStyle', generator: borderStyle },
],
{
textAlign: [],
display: false,
borderStyle: ['responsive', 'hover', 'focus'],
}
)

const expected = `
@variants {
.text-left { text-align: left }
.text-right { text-align: right }
.text-center { text-align: center }
}

@variants responsive, hover, focus {
.border-solid { border-style: solid }
.border-dashed { border-style: dashed }
.border-dotted { border-style: dotted }
}
`
expect(result.toString()).toMatchCss(expected)
})

test('generators can reference the generatorOptions object', () => {
const result = generateModules(
[
{
name: 'parameterized',
generator: generatorParams => {
return defineClasses({
foo: { color: generatorParams.color },
})
},
},
],
{
parameterized: [],
},
{
color: 'blue',
}
)

const expected = `
@variants {
.foo { color: blue }
}
`
expect(result.toString()).toMatchCss(expected)
})
43 changes: 43 additions & 0 deletions defaultConfig.stub.js
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,49 @@ module.exports = {
options: {
prefix: '',
important: false,
modules: {
appearance: ['responsive'],
backgroundColors: ['responsive', 'hover'],
backgroundPosition: ['responsive'],
backgroundSize: ['responsive'],
borderColors: ['responsive', 'hover'],
borderRadius: ['responsive'],
borderStyle: ['responsive'],
borderWidths: ['responsive'],
cursor: ['responsive'],
display: ['responsive'],
flexbox: ['responsive'],
float: ['responsive'],
fonts: ['responsive'],
fontWeights: ['responsive', 'hover'],
height: ['responsive'],
leading: ['responsive'],
lists: ['responsive'],
margin: ['responsive'],
maxHeight: ['responsive'],
maxWidth: ['responsive'],
minHeight: ['responsive'],
minWidth: ['responsive'],
negativeMargin: ['responsive'],
opacity: ['responsive'],
overflow: ['responsive'],
padding: ['responsive'],
pointerEvents: ['responsive'],
position: ['responsive'],
resize: ['responsive'],
shadows: ['responsive'],
textAlign: ['responsive'],
textColors: ['responsive', 'hover'],
textSizes: ['responsive'],
textStyle: ['responsive', 'hover'],
tracking: ['responsive'],
userSelect: ['responsive'],
verticalAlign: ['responsive'],
visibility: ['responsive'],
whitespace: ['responsive'],
width: ['responsive'],
zIndex: ['responsive'],
}
},

}
File renamed without changes.
11 changes: 4 additions & 7 deletions src/generators/backgroundColors.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import _ from 'lodash'
import defineClass from '../util/defineClass'
import hoverable from '../util/hoverable'

export default function({ backgroundColors }) {
return hoverable(
_.map(backgroundColors, (color, className) => {
return defineClass(`bg-${className}`, {
'background-color': color,
})
return _.map(backgroundColors, (color, className) => {
return defineClass(`bg-${className}`, {
'background-color': color,
})
)
})
}
11 changes: 4 additions & 7 deletions src/generators/borderColors.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import _ from 'lodash'
import defineClass from '../util/defineClass'
import hoverable from '../util/hoverable'

export default function({ borderColors }) {
return hoverable(
_.map(_.omit(borderColors, 'default'), (color, className) => {
return defineClass(`border-${className}`, {
'border-color': color,
})
return _.map(_.omit(borderColors, 'default'), (color, className) => {
return defineClass(`border-${className}`, {
'border-color': color,
})
)
})
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 10 additions & 0 deletions src/generators/fontWeights.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import _ from 'lodash'
import defineClass from '../util/defineClass'

export default function({ fontWeights }) {
return _.map(fontWeights, (weight, modifier) => {
return defineClass(`font-${modifier}`, {
'font-weight': `${weight}`,
})
})
}
File renamed without changes.
14 changes: 14 additions & 0 deletions src/generators/height.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import _ from 'lodash'
import defineClass from '../util/defineClass'

function defineHeights(heights) {
return _.map(heights, (size, modifer) => {
return defineClass(`h-${modifer}`, {
height: `${size}`,
})
})
}

export default function(config) {
return _.flatten([defineHeights(config.height)])
}
File renamed without changes.
31 changes: 31 additions & 0 deletions src/generators/margin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import _ from 'lodash'
import defineClasses from '../util/defineClasses'

function defineMargin(margin) {
const generators = [
(size, modifier) =>
defineClasses({
[`m-${modifier}`]: { margin: `${size}` },
}),
(size, modifier) =>
defineClasses({
[`my-${modifier}`]: { 'margin-top': `${size}`, 'margin-bottom': `${size}` },
[`mx-${modifier}`]: { 'margin-left': `${size}`, 'margin-right': `${size}` },
}),
(size, modifier) =>
defineClasses({
[`mt-${modifier}`]: { 'margin-top': `${size}` },
[`mr-${modifier}`]: { 'margin-right': `${size}` },
[`mb-${modifier}`]: { 'margin-bottom': `${size}` },
[`ml-${modifier}`]: { 'margin-left': `${size}` },
}),
]

return _.flatMap(generators, generator => {
return _.flatMap(margin, generator)
})
}

export default function({ margin }) {
return _.flatten([defineMargin(margin)])
}
14 changes: 14 additions & 0 deletions src/generators/maxHeight.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import _ from 'lodash'
import defineClass from '../util/defineClass'

function defineMaxHeights(heights) {
return _.map(heights, (size, modifer) => {
return defineClass(`max-h-${modifer}`, {
'max-height': `${size}`,
})
})
}

export default function(config) {
return _.flatten([defineMaxHeights(config.maxHeight)])
}
14 changes: 14 additions & 0 deletions src/generators/maxWidth.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import _ from 'lodash'
import defineClass from '../util/defineClass'

function defineMaxWidths(widths) {
return _.map(widths, (size, modifer) => {
return defineClass(`max-w-${modifer}`, {
'max-width': `${size}`,
})
})
}

export default function(config) {
return _.flatten([defineMaxWidths(config.maxWidth)])
}
14 changes: 14 additions & 0 deletions src/generators/minHeight.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import _ from 'lodash'
import defineClass from '../util/defineClass'

function defineMinHeights(heights) {
return _.map(heights, (size, modifer) => {
return defineClass(`min-h-${modifer}`, {
'min-height': `${size}`,
})
})
}

export default function(config) {
return _.flatten([defineMinHeights(config.minHeight)])
}
14 changes: 14 additions & 0 deletions src/generators/minWidth.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import _ from 'lodash'
import defineClass from '../util/defineClass'

function defineMinWidths(widths) {
return _.map(widths, (size, modifer) => {
return defineClass(`min-w-${modifer}`, {
'min-width': `${size}`,
})
})
}

export default function(config) {
return _.flatten([defineMinWidths(config.minWidth)])
}
33 changes: 33 additions & 0 deletions src/generators/negativeMargin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import _ from 'lodash'
import defineClasses from '../util/defineClasses'

function defineNegativeMargin(negativeMargin) {
const generators = [
(size, modifier) =>
defineClasses({
[`-m-${modifier}`]: { margin: `${size}` },
}),
(size, modifier) =>
defineClasses({
[`-my-${modifier}`]: { 'margin-top': `${size}`, 'margin-bottom': `${size}` },
[`-mx-${modifier}`]: { 'margin-left': `${size}`, 'margin-right': `${size}` },
}),
(size, modifier) =>
defineClasses({
[`-mt-${modifier}`]: { 'margin-top': `${size}` },
[`-mr-${modifier}`]: { 'margin-right': `${size}` },
[`-mb-${modifier}`]: { 'margin-bottom': `${size}` },
[`-ml-${modifier}`]: { 'margin-left': `${size}` },
}),
]

return _.flatMap(generators, generator => {
return _.flatMap(negativeMargin, (size, modifier) => {
return generator(`${size}` === '0' ? `${size}` : `-${size}`, modifier)
})
})
}

export default function({ negativeMargin }) {
return _.flatten([defineNegativeMargin(negativeMargin)])
}
Loading