Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue where dark mode experiment won't work if user has plugins array in config #2322

Merged
merged 1 commit into from
Sep 4, 2020
Merged

Fix issue where dark mode experiment won't work if user has plugins array in config #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions __tests__/darkMode.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,34 @@ test('generating dark mode variants uses the media strategy by default', () => {
})
})

test('dark mode variants can be generated even when the user has their own plugins array', () => {
const input = `
@variants dark {
.text-red {
color: red;
}
}
`

const expected = `
.text-red {
color: red;
}
@media (prefers-color-scheme: dark) {
.dark\\:text-red {
color: red;
}
}
`

expect.assertions(2)

return run(input, { plugins: [] }).then(result => {
expect(result.css).toMatchCss(expected)
expect(result.warnings().length).toBe(0)
})
})

test('dark mode variants can be generated using the class strategy', () => {
const input = `
@variants dark {
Expand Down
13 changes: 8 additions & 5 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import uniformColorPalette from './flagged/uniformColorPalette.js'
import extendedSpacingScale from './flagged/extendedSpacingScale.js'
import defaultLineHeights from './flagged/defaultLineHeights.js'
import extendedFontSizeScale from './flagged/extendedFontSizeScale.js'
import darkModeVariant from './flagged/darkModeVariant'
import darkModeVariant from './flagged/darkModeVariant.js'

function getDefaultConfigs(config) {
function getAllConfigs(config) {
const configs = [defaultConfig]

if (flagEnabled(config, 'uniformColorPalette')) {
Expand All @@ -40,9 +40,12 @@ function getDefaultConfigs(config) {

if (flagEnabled(config, 'darkModeVariant')) {
configs.unshift(darkModeVariant)
if (Array.isArray(config.plugins)) {
config.plugins = [...darkModeVariant.plugins, ...config.plugins]
}
}

return configs
return [config, ...configs]
}

function resolveConfigPath(filePath) {
Expand Down Expand Up @@ -78,7 +81,7 @@ function resolveConfigPath(filePath) {

const getConfigFunction = config => () => {
if (_.isUndefined(config) && !_.isObject(config)) {
return resolveConfig([...getDefaultConfigs(defaultConfig)])
return resolveConfig([...getAllConfigs(defaultConfig)])
}

// Skip this if Jest is running: https://github.com/facebook/jest/pull/9841#issuecomment-621417584
Expand All @@ -92,7 +95,7 @@ const getConfigFunction = config => () => {

const configObject = _.isObject(config) ? _.get(config, 'config', config) : require(config)

return resolveConfig([configObject, ...getDefaultConfigs(configObject)])
return resolveConfig([...getAllConfigs(configObject)])
}

const plugin = postcss.plugin('tailwind', config => {
Expand Down