Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Ensure base styles are wrapped in @layer
  • Loading branch information
adamwathan committed Sep 2, 2020
commit 5821b28e94b7211ed33cdac2b76e868e9d7ffbd4
62 changes: 62 additions & 0 deletions __tests__/purgeUnusedStyles.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,68 @@ test('components are purged by default in layers mode', () => {
)
})

test('you can specify which layers to purge', () => {
return inProduction(
suppressConsoleLogs(() => {
const inputPath = path.resolve(`${__dirname}/fixtures/tailwind-input.css`)
const input = fs.readFileSync(inputPath, 'utf8')

return postcss([
tailwind({
...config,
future: {
purgeLayersByDefault: true,
},
purge: {
mode: 'layers',
layers: ['utilities'],
content: [path.resolve(`${__dirname}/fixtures/**/*.html`)],
},
}),
])
.process(input, { from: inputPath })
.then(result => {
const rules = extractRules(result.root)
expect(rules).toContain('optgroup')
expect(rules).toContain('.container')
assertPurged(result)
})
})
)
})

test('you can purge just base and component layers (but why)', () => {
return inProduction(
suppressConsoleLogs(() => {
const inputPath = path.resolve(`${__dirname}/fixtures/tailwind-input.css`)
const input = fs.readFileSync(inputPath, 'utf8')

return postcss([
tailwind({
...config,
future: {
purgeLayersByDefault: true,
},
purge: {
mode: 'layers',
layers: ['base', 'components'],
content: [path.resolve(`${__dirname}/fixtures/**/*.html`)],
},
}),
])
.process(input, { from: inputPath })
.then(result => {
const rules = extractRules(result.root)
expect(rules).not.toContain('[type="checkbox"]')
expect(rules).not.toContain('.container')
expect(rules).toContain('.float-left')
expect(rules).toContain('.md\\:bg-red-500')
expect(rules).toContain('.lg\\:appearance-none')
})
})
)
})

test('does not purge components when mode is conservative', () => {
return inProduction(
suppressConsoleLogs(() => {
Expand Down
2 changes: 2 additions & 0 deletions src/lib/purgeUnusedStyles.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ function removeTailwindMarkers(css) {
css.walkAtRules('tailwind', rule => rule.remove())
css.walkComments(comment => {
switch (comment.text.trim()) {
case 'tailwind start base':
case 'tailwind end base':
case 'tailwind start components':
case 'tailwind start utilities':
case 'tailwind end components':
Expand Down
2 changes: 1 addition & 1 deletion src/util/processPlugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export default function(plugins, config) {
)
},
addBase: baseStyles => {
pluginBaseStyles.push(...parseStyles(baseStyles))
pluginBaseStyles.push(wrapWithLayer(parseStyles(baseStyles), 'base'))
},
addVariant: (name, generator) => {
pluginVariantGenerators[name] = generateVariantFunction(generator)
Expand Down