Skip to content

Commit

Permalink
Fix shadowed variable when using raw content (#9773)
Browse files Browse the repository at this point in the history
* Fix shadowed variable when using raw content

* Add test

* Update changelog

Co-authored-by: Jordan Pittman <jordan@cryptica.me>
  • Loading branch information
willcosgrove and thecrypticace committed Nov 8, 2022
1 parent 48c0dca commit 1f5d117
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Expand Up @@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

- Nothing yet!
### Fixed

- Fixed use of `raw` content in the CLI ([#9773](https://github.com/tailwindlabs/tailwindcss/pull/9773))

## [3.2.2] - 2022-11-04

Expand Down
34 changes: 34 additions & 0 deletions integrations/tailwindcss-cli/tests/integration.test.js
Expand Up @@ -191,6 +191,40 @@ describe('static build', () => {
`
)
})

it('should work with raw content', async () => {
await writeInputFile(
'../tailwind.config.js',
javascript`
module.exports = {
content: {
files: [{ raw: 'bg-red-500'}],
},
theme: {
extend: {
},
},
corePlugins: {
preflight: false,
},
plugins: [],
}
`
)

await $('node ../../lib/cli.js -i ./src/index.css -o ./dist/main.css', {
env: { NODE_ENV: 'production' },
})

expect(await readOutputFile('main.css')).toIncludeCss(
css`
.bg-red-500 {
--tw-bg-opacity: 1;
background-color: rgb(239 68 68 / var(--tw-bg-opacity));
}
`
)
})
})

describe('watcher', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/cli/build/plugin.js
Expand Up @@ -195,8 +195,8 @@ let state = {
return file !== null && typeof file === 'object'
})

for (let { raw: content, extension = 'html' } of rawContent) {
content.push({ content, extension })
for (let { raw: htmlContent, extension = 'html' } of rawContent) {
content.push({ content: htmlContent, extension })
}

return content
Expand Down

0 comments on commit 1f5d117

Please sign in to comment.