Skip to content

Commit

Permalink
Fix crash when watching renamed files on FreeBSD (#12193)
Browse files Browse the repository at this point in the history
* Fix file watching bug when renaming files on FreeBSD

* Update changelog

* Add delay to test

* Bump delay

* Update test
  • Loading branch information
thecrypticace committed Oct 17, 2023
1 parent e9ca7ab commit 0b0862b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Improve RegEx parser, reduce possibilities as the key for arbitrary properties ([#12121](https://github.com/tailwindlabs/tailwindcss/pull/12121))
- Fix sorting of utilities that share multiple candidates ([#12173](https://github.com/tailwindlabs/tailwindcss/pull/12173))
- Ensure variants with arbitrary values and a modifier are correctly matched in the RegEx based parser ([#12179](https://github.com/tailwindlabs/tailwindcss/pull/12179))
- Fix crash when watching renamed files on FreeBSD ([#12193](https://github.com/tailwindlabs/tailwindcss/pull/12193))

### Added

Expand Down
4 changes: 3 additions & 1 deletion integrations/rollup-sass/tests/integration.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,8 @@ describe('watcher', () => {
)
await runningProcess.onStderr(ready)

await new Promise((resolve) => setTimeout(resolve, 5000))

expect(await readOutputFile('index.css')).toIncludeCss(
css`
.btn {
Expand Down Expand Up @@ -334,5 +336,5 @@ describe('watcher', () => {
)

return runningProcess.stop()
})
}, 30000)
})
2 changes: 1 addition & 1 deletion src/cli/build/watching.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export function createWatcher(args, { state, rebuild }) {
// This is very likely a chokidar bug but it's one we need to work around
// We treat this as a change event and rebuild the CSS
watcher.on('raw', (evt, filePath, meta) => {
if (evt !== 'rename') {
if (evt !== 'rename' || filePath === null) {
return
}

Expand Down

0 comments on commit 0b0862b

Please sign in to comment.