From 418d2238370973db7f1cdd4bc07e0c1234cb2e0d Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Thu, 17 Jun 2021 14:45:44 -0400 Subject: [PATCH 1/7] Update fixtures --- tests/fixtures/tailwind-output-flagged.css | 2 +- tests/fixtures/tailwind-output-important.css | 2 +- tests/fixtures/tailwind-output-no-color-opacity.css | 2 +- tests/fixtures/tailwind-output.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/fixtures/tailwind-output-flagged.css b/tests/fixtures/tailwind-output-flagged.css index 19dfb8408dee..b6aa6f54d4cf 100644 --- a/tests/fixtures/tailwind-output-flagged.css +++ b/tests/fixtures/tailwind-output-flagged.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.1.2 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.2.0 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/tests/fixtures/tailwind-output-important.css b/tests/fixtures/tailwind-output-important.css index a155639693c0..17af2cdfb086 100644 --- a/tests/fixtures/tailwind-output-important.css +++ b/tests/fixtures/tailwind-output-important.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.1.2 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.2.0 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/tests/fixtures/tailwind-output-no-color-opacity.css b/tests/fixtures/tailwind-output-no-color-opacity.css index 80f7502ee971..12c0613bb307 100644 --- a/tests/fixtures/tailwind-output-no-color-opacity.css +++ b/tests/fixtures/tailwind-output-no-color-opacity.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.1.2 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.2.0 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/tests/fixtures/tailwind-output.css b/tests/fixtures/tailwind-output.css index 19dfb8408dee..b6aa6f54d4cf 100644 --- a/tests/fixtures/tailwind-output.css +++ b/tests/fixtures/tailwind-output.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.1.2 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.2.0 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ From 70ca673d965da17a9c46a14e3dda7bed888c0c47 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 18 Jun 2021 14:46:00 +0200 Subject: [PATCH 2/7] ensure the CLI in watch mode keeps running when on error (#4693) --- src/cli.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/cli.js b/src/cli.js index 39a8a070ee2d..80b590e9337e 100644 --- a/src/cli.js +++ b/src/cli.js @@ -705,6 +705,13 @@ async function build() { let end = process.hrtime.bigint() console.error('Done in', (end - start) / BigInt(1e6) + 'ms.') }) + .catch((err) => { + if (err.name === 'CssSyntaxError') { + console.error(err.toString()) + } else { + console.error(err) + } + }) } let css = input From 0b6176bacffc9cf2ae84cc1109b0f0ec7c3190d8 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 18 Jun 2021 15:37:52 +0200 Subject: [PATCH 3/7] Fix media queries for postcss7 (#4695) This fixes a postcss7 issues where .append() does not clear the children --- src/util/pluginUtils.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/util/pluginUtils.js b/src/util/pluginUtils.js index 1ef78e56e73e..8d67f35e015c 100644 --- a/src/util/pluginUtils.js +++ b/src/util/pluginUtils.js @@ -82,7 +82,9 @@ export function transformAllSelectors(transformSelector, { wrap, withRule } = {} if (wrap) { let wrapper = wrap() - wrapper.append(container.nodes) + let nodes = container.nodes + container.removeAll() + wrapper.append(nodes) container.append(wrapper) } } @@ -102,7 +104,9 @@ export function transformAllClasses(transformClass, { wrap, withRule } = {}) { if (wrap) { let wrapper = wrap() - wrapper.append(container.nodes) + let nodes = container.nodes + container.removeAll() + wrapper.append(nodes) container.append(wrapper) } } @@ -122,7 +126,9 @@ export function transformLastClasses(transformClass, { wrap, withRule } = {}) { if (wrap) { let wrapper = wrap() - wrapper.append(container.nodes) + let nodes = container.nodes + container.removeAll() + wrapper.append(nodes) container.append(wrapper) } } From 0148ee9535d5ca07a3dff722f19f49d362a5683f Mon Sep 17 00:00:00 2001 From: Adam Wathan Date: Fri, 18 Jun 2021 09:39:17 -0400 Subject: [PATCH 4/7] Update changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 248e9efcd9a3..d14afaaf9512 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -Nothing yet! +### Fixed + +- Recover from errors gracefully in CLI watch mode ([#4693](https://github.com/tailwindlabs/tailwindcss/pull/4693)) +- Fix issue with media queries not being generated properly when using PostCSS 7 ([#4695](https://github.com/tailwindlabs/tailwindcss/pull/4695)) ## [2.2.0] - 2021-06-17 From ade93d2343699f0dc0e132a42e0b5c2ce03dfd78 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 18 Jun 2021 15:41:08 +0200 Subject: [PATCH 5/7] update changelog --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d14afaaf9512..247bd1740512 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Nothing yet! + +## [2.2.1] - 2021-06-18 + ### Fixed - Recover from errors gracefully in CLI watch mode ([#4693](https://github.com/tailwindlabs/tailwindcss/pull/4693)) @@ -1434,7 +1438,8 @@ No release notes - Everything! -[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.0...HEAD +[unreleased]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.1...HEAD +[2.2.1]: https://github.com/tailwindlabs/tailwindcss/compare/v2.2.0...v2.2.1 [2.2.0]: https://github.com/tailwindlabs/tailwindcss/compare/v2.1.4...v2.2.0 [2.1.4]: https://github.com/tailwindlabs/tailwindcss/compare/v2.1.3...v2.1.4 [2.1.3]: https://github.com/tailwindlabs/tailwindcss/compare/v2.1.2...v2.1.3 From ea7b3f618945c34d7b436e8bed650aaafa257af6 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 18 Jun 2021 15:42:18 +0200 Subject: [PATCH 6/7] rebuild fixtures --- tests/fixtures/tailwind-output-flagged.css | 2 +- tests/fixtures/tailwind-output-important.css | 2 +- tests/fixtures/tailwind-output-no-color-opacity.css | 2 +- tests/fixtures/tailwind-output.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/fixtures/tailwind-output-flagged.css b/tests/fixtures/tailwind-output-flagged.css index b6aa6f54d4cf..0f3be0c6f34f 100644 --- a/tests/fixtures/tailwind-output-flagged.css +++ b/tests/fixtures/tailwind-output-flagged.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.2.0 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.2.1 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/tests/fixtures/tailwind-output-important.css b/tests/fixtures/tailwind-output-important.css index 17af2cdfb086..02d061fef24e 100644 --- a/tests/fixtures/tailwind-output-important.css +++ b/tests/fixtures/tailwind-output-important.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.2.0 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.2.1 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/tests/fixtures/tailwind-output-no-color-opacity.css b/tests/fixtures/tailwind-output-no-color-opacity.css index 12c0613bb307..1409def624ad 100644 --- a/tests/fixtures/tailwind-output-no-color-opacity.css +++ b/tests/fixtures/tailwind-output-no-color-opacity.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.2.0 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.2.1 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ diff --git a/tests/fixtures/tailwind-output.css b/tests/fixtures/tailwind-output.css index b6aa6f54d4cf..0f3be0c6f34f 100644 --- a/tests/fixtures/tailwind-output.css +++ b/tests/fixtures/tailwind-output.css @@ -1,4 +1,4 @@ -/*! tailwindcss v2.2.0 | MIT License | https://tailwindcss.com */ +/*! tailwindcss v2.2.1 | MIT License | https://tailwindcss.com */ /*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */ From 2fd6575095cd058f1e6a7f318b63e29a8ac7c934 Mon Sep 17 00:00:00 2001 From: Robin Malfait Date: Fri, 18 Jun 2021 15:42:31 +0200 Subject: [PATCH 7/7] 2.2.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9422756eb4f1..c9d0db5d710e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "tailwindcss", - "version": "2.2.0", + "version": "2.2.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "version": "2.2.0", + "version": "2.2.1", "license": "MIT", "dependencies": { "@fullhuman/postcss-purgecss": "^4.0.3", diff --git a/package.json b/package.json index f4ee9fc95c4e..70f6001ca1cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tailwindcss", - "version": "2.2.0", + "version": "2.2.1", "description": "A utility-first CSS framework for rapidly building custom user interfaces.", "license": "MIT", "main": "lib/index.js",