Skip to content

Remove false positive warning in CLI when using the --content option #7220

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

Merged
merged 2 commits into from
Jan 26, 2022
Merged

Remove false positive warning in CLI when using the --content option #7220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
103062f
ensure content files are available in config
RobinMalfait Jan 26, 2022
bebebdc
update changelog
RobinMalfait Jan 26, 2022
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- Nothing yet!
### Fixed

- Remove false positive warning in CLI when using the `--content` option ([#7220](https://github.com/tailwindlabs/tailwindcss/pull/7220))

## [3.0.16] - 2022-01-24

Expand Down
8 changes: 5 additions & 3 deletions src/cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,6 @@ async function build() {

function resolveConfig() {
let config = configPath ? require(configPath) : {}
let resolvedConfig = resolveConfigInternal(config)

if (args['--purge']) {
log.warn('purge-flag-deprecated', [
Expand All @@ -450,10 +449,13 @@ async function build() {
}

if (args['--content']) {
resolvedConfig.content.files = args['--content'].split(/(?<!{[^}]+),/)
let files = args['--content'].split(/(?<!{[^}]+),/)
let resolvedConfig = resolveConfigInternal(config, { content: { files } })
resolvedConfig.content.files = files
return resolvedConfig
}

return resolvedConfig
return resolveConfigInternal(config)
}

function extractFileGlobs(config) {
Expand Down