From c666b37ce935d6927aed89d103b0eaaa2a2d460e Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 9 Feb 2025 10:47:16 -0500 Subject: [PATCH 01/29] dep: update to Tailwind CSS v4.0.5 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.5 --- CHANGELOG.md | 7 +++++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 681448b..d7a67c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # tailwindcss-ruby changelog +## v4.0.5 + +* Update to [Tailwind CSS v4.0.5](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.5) @flavorjones + + Upgrade guide at https://tailwindcss.com/docs/upgrade-guide + + ## v4.0.4 * Update to [Tailwind CSS v4.0.4](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.4) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 38de47d..5da88eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.3) + tailwindcss-ruby (4.0.5) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 265c6d6..4692f47 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.4" + VERSION = "v4.0.5" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index 719c055..aea027c 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.4" + VERSION = "4.0.5" end end From 90df07c0480c7ced022c3428067be0f961db0841 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sat, 7 Dec 2024 12:03:05 -0500 Subject: [PATCH 02/29] Add a script to automate upstream bumps and update CONTRIBUTING.md --- CONTRIBUTING.md | 18 ++++++--- bin/bump-upstream | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 6 deletions(-) create mode 100755 bin/bump-upstream diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7a0bbc0..e4332fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,20 +4,26 @@ This doc is a brief introduction on modifying and maintaining this gem. ## Updating to the latest upstream tailwindcss version -Update `lib/tailwindcss/ruby/upstream.rb` with the upstream version. +Please don't submit PRs to the maintainer with an upstream bump. -Run `bundle exec rake clobber` then `bundle exec rake download` to ensure the tailwindcss binaries can be downloaded, and that you have the correct versions on local disk. +- [ ] run `bin/bump-upstream` +- [ ] push the branch, create a PR ## Cutting a release of tailwindcss-ruby -- bump the version +- if it's just bumping the upstream: + - [ ] follow the steps above + - [ ] when the PR is green, merge the PR + - [ ] create a git tag (after updating local `main`) +- else if the gem is being changed in some other way: - [ ] update `lib/tailwindcss/ruby/version.rb` - [ ] update `CHANGELOG.md` - - [ ] commit and create a git tag + - [ ] `git commit` + - [ ] `git tag` - build the native gems: - - [ ] `bundle exec rake clobber` if needed to clean up possibly-old tailwindcss executables + - [ ] `bundle exec rake clobber` (if needed to clean up old tailwindcss executables) - [ ] `bundle exec rake package` -- push +- push source and gems: - [ ] `for g in pkg/*.gem ; do gem push $g ; done` - [ ] `git push && git push --tags` - announce diff --git a/bin/bump-upstream b/bin/bump-upstream new file mode 100755 index 0000000..77fbbb0 --- /dev/null +++ b/bin/bump-upstream @@ -0,0 +1,99 @@ +#!/usr/bin/env bash + +set -eu +set -o pipefail + +if [[ $# -lt 1 ]] ; then + echo "Usage: $(basename $0) " + echo + echo "Where is the tag name of the Tailwind CSS release." + exit 1 +fi + +PAGER="" # we don't want gh to use a pager +git_cmd=$(command -v git) +gh_cmd=$(command -v gh) +sed_cmd=$(command -v sed) + +fail() { + echo "Error: $*" >&2 + exit 1 +} + +upstream_tag=$1 +gem_version=$(echo $upstream_tag | $sed_cmd -E 's/^v//' | sed -E 's/-/./') +gem_tag="v${gem_version}" + +github_user=$($git_cmd config github.user || true) +if [[ -z "$github_user" ]]; then + fail "github.user is not set in git config" +fi + +# view the release. will fail if the release does not exist +$gh_cmd release view ${upstream_tag} --repo tailwindlabs/tailwindcss + +# get on the right starting branch +if [[ -n "$($git_cmd status --porcelain --untracked-files=no)" ]]; then + fail "found uncommitted changes" +fi + +if [[ $upstream_tag =~ ^v4 ]] ; then + base_branch="v4.x" + + changelog_extra=$(cat </dev/null 2>&1; then + fail "current branch is not tracking a remote branch" +fi + +# +# modify the upstream version and gem version +# +$sed_cmd -E -i "s/^(\s+)VERSION\s+=.*/\1VERSION = \"${upstream_tag}\"/" lib/tailwindcss/ruby/upstream.rb +$sed_cmd -E -i "s/^(\s+)VERSION\s+=.*/\1VERSION = \"${gem_version}\"/" lib/tailwindcss/ruby/version.rb + +bundle install + +# +# modify the changelog +# +replacement_text=$(cat < Date: Mon, 10 Feb 2025 08:52:52 -0500 Subject: [PATCH 03/29] dep: update to Tailwind CSS v4.0.6 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.6 --- CHANGELOG.md | 7 +++++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7a67c6..d6920e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # tailwindcss-ruby changelog +## v4.0.6 + +* Update to [Tailwind CSS v4.0.6](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.6) @flavorjones + + Upgrade guide at https://tailwindcss.com/docs/upgrade-guide + + ## v4.0.5 * Update to [Tailwind CSS v4.0.5](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.5) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 5da88eb..1f20641 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.5) + tailwindcss-ruby (4.0.6) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 4692f47..5eeb186 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.5" + VERSION = "v4.0.6" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index aea027c..c84bb69 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.5" + VERSION = "4.0.6" end end From 9975d91d6ddc0f252a47b7d0fff3551e1b97aa17 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Wed, 19 Feb 2025 08:33:54 -0500 Subject: [PATCH 04/29] dev: drop the changelog extra message I think we can stop reminding people where the upgrade guide is now. [skip ci] --- bin/bump-upstream | 8 -------- 1 file changed, 8 deletions(-) diff --git a/bin/bump-upstream b/bin/bump-upstream index 77fbbb0..78a78b4 100755 --- a/bin/bump-upstream +++ b/bin/bump-upstream @@ -39,15 +39,8 @@ fi if [[ $upstream_tag =~ ^v4 ]] ; then base_branch="v4.x" - - changelog_extra=$(cat < Date: Wed, 19 Feb 2025 08:36:04 -0500 Subject: [PATCH 05/29] dep: update to Tailwind CSS v4.0.7 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.7 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6920e3..88ffb80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.0.7 + +* Update to [Tailwind CSS v4.0.7](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.7) @flavorjones + + ## v4.0.6 * Update to [Tailwind CSS v4.0.6](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.6) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 1f20641..299abda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.6) + tailwindcss-ruby (4.0.7) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 5eeb186..5c430fe 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.6" + VERSION = "v4.0.7" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index c84bb69..a5afece 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.6" + VERSION = "4.0.7" end end From 8d0cd65314da47670411787b9a5adbd0cf57aca9 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 21 Feb 2025 11:27:38 -0500 Subject: [PATCH 06/29] dep: bundle update --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 299abda..58a2710 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,38 +7,38 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - json (2.9.1) - language_server-protocol (3.17.0.3) + json (2.10.1) + language_server-protocol (3.17.0.4) lint_roller (1.1.0) minitest (5.25.4) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.1) ast (~> 2.4.1) racc racc (1.8.1) rainbow (3.1.1) rake (13.2.1) regexp_parser (2.10.0) - rubocop (1.69.2) + rubocop (1.71.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.36.2, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.37.0) + rubocop-ast (1.38.0) parser (>= 3.3.1.0) rubocop-performance (1.23.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - standard (1.43.0) + standard (1.45.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.69.1) + rubocop (~> 1.71.0) standard-custom (~> 1.0.0) standard-performance (~> 1.6) standard-custom (1.0.2) @@ -47,7 +47,7 @@ GEM standard-performance (1.6.0) lint_roller (~> 1.1) rubocop-performance (~> 1.23.0) - unicode-display_width (3.1.3) + unicode-display_width (3.1.4) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) From d897c6dfb69c72bec0f9d4abc17e7ed560a65f72 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 21 Feb 2025 11:28:42 -0500 Subject: [PATCH 07/29] dep: update to Tailwind CSS v4.0.7 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.7 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88ffb80..3e1f177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ * Update to [Tailwind CSS v4.0.7](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.7) @flavorjones +## v4.0.7 + +* Update to [Tailwind CSS v4.0.7](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.7) @flavorjones + + ## v4.0.6 * Update to [Tailwind CSS v4.0.6](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.6) @flavorjones From a48089698da9940811dff7447454fffbc6a7262a Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 21 Feb 2025 12:06:03 -0500 Subject: [PATCH 08/29] revert changelog duplicate --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e1f177..88ffb80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,6 @@ * Update to [Tailwind CSS v4.0.7](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.7) @flavorjones -## v4.0.7 - -* Update to [Tailwind CSS v4.0.7](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.7) @flavorjones - - ## v4.0.6 * Update to [Tailwind CSS v4.0.6](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.6) @flavorjones From edb537e710b4d642a4e89ac3324833cccc96e693 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 21 Feb 2025 12:08:35 -0500 Subject: [PATCH 09/29] dep: update to Tailwind CSS v4.0.8 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.8 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88ffb80..be73dda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.0.8 + +* Update to [Tailwind CSS v4.0.8](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.8) @flavorjones + + ## v4.0.7 * Update to [Tailwind CSS v4.0.7](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.7) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 58a2710..048da30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.7) + tailwindcss-ruby (4.0.8) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 5c430fe..f5511da 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.7" + VERSION = "v4.0.8" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index a5afece..b37673b 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.7" + VERSION = "4.0.8" end end From 761426efbc2343b64a533a87b5e7c02ca257eccd Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Tue, 25 Feb 2025 16:27:05 -0500 Subject: [PATCH 10/29] dep: update to Tailwind CSS v4.0.9 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.9 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be73dda..0ad0742 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.0.9 + +* Update to [Tailwind CSS v4.0.9](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.9) @flavorjones + + ## v4.0.8 * Update to [Tailwind CSS v4.0.8](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.8) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 048da30..df52d36 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.8) + tailwindcss-ruby (4.0.9) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index f5511da..0dad824 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.8" + VERSION = "v4.0.9" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index b37673b..e86ecba 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.8" + VERSION = "4.0.9" end end From 0a988f9a43dbd074e5ac25037ae4af180ddaa031 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 7 Mar 2025 15:04:23 -0500 Subject: [PATCH 11/29] dep: update to Tailwind CSS v4.0.12 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.12 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ad0742..2728969 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.0.12 + +* Update to [Tailwind CSS v4.0.12](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.12) @flavorjones + + ## v4.0.9 * Update to [Tailwind CSS v4.0.9](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.9) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index df52d36..d05286b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.9) + tailwindcss-ruby (4.0.12) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 0dad824..ec0a5ac 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.9" + VERSION = "v4.0.12" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index e86ecba..9a1c65b 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.9" + VERSION = "4.0.12" end end From 909fb103b2307b4718b466dc50d180dab2c10b17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Mar 2025 15:50:20 +0000 Subject: [PATCH 12/29] build(deps): bump json from 2.10.1 to 2.10.2 Bumps [json](https://github.com/ruby/json) from 2.10.1 to 2.10.2. - [Release notes](https://github.com/ruby/json/releases) - [Changelog](https://github.com/ruby/json/blob/master/CHANGES.md) - [Commits](https://github.com/ruby/json/compare/v2.10.1...v2.10.2) --- updated-dependencies: - dependency-name: json dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d05286b..8dee885 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - json (2.10.1) + json (2.10.2) language_server-protocol (3.17.0.4) lint_roller (1.1.0) minitest (5.25.4) From 64bdebe2f0202b24adfaf10178f2000a07c28bd5 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 14 Mar 2025 12:55:11 -0400 Subject: [PATCH 13/29] dep: update to Tailwind CSS v4.0.14 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.14 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2728969..2eb179f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.0.14 + +* Update to [Tailwind CSS v4.0.14](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.14) @flavorjones + + ## v4.0.12 * Update to [Tailwind CSS v4.0.12](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.12) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 8dee885..6f51029 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.12) + tailwindcss-ruby (4.0.14) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index ec0a5ac..4c81d84 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.12" + VERSION = "v4.0.14" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index 9a1c65b..5743e68 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.12" + VERSION = "4.0.14" end end From 3ac96b145162b9af3b36fcb2810c22d854095b14 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sat, 15 Mar 2025 12:24:34 -0400 Subject: [PATCH 14/29] doc: update README with tailwind cli v4 help output [skip ci] --- README.md | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 65a256b..debfdce 100644 --- a/README.md +++ b/README.md @@ -93,28 +93,20 @@ $ bundle exec which tailwindcss # run the actual executable through the shim $ bundle exec tailwindcss --help -["/path/to/installs/ruby/3.3.5/lib/ruby/gems/3.3.0/gems/tailwindcss-ruby-0.1.0-x86_64-linux/exe/x86_64-linux/tailwindcss", "--help"] - -tailwindcss v3.4.3 +["/path/to/installs/installs/ruby/3.4.2/lib/ruby/gems/3.4.0/gems/tailwindcss-ruby-4.0.12-x86_64-linux-gnu/exe/x86_64-linux-gnu/tailwindcss", "--help"] +≈ tailwindcss v4.0.12 Usage: - tailwindcss [--input input.css] [--output output.css] [--watch] [options...] - tailwindcss init [--full] [--postcss] [options...] - -Commands: - init [options] + tailwindcss [--input input.css] [--output output.css] [--watch] [options…] Options: - -i, --input Input file - -o, --output Output file - -w, --watch Watch for changes and rebuild as needed - -p, --poll Use polling instead of filesystem events when watching - --content Content paths to use for removing unused classes - --postcss Load custom PostCSS configuration - -m, --minify Minify the output - -c, --config Path to a custom config file - --no-autoprefixer Disable autoprefixer - -h, --help Display usage information + -i, --input ··········· Input file + -o, --output ·········· Output file [default: `-`] + -w, --watch ··········· Watch for changes and rebuild as needed + -m, --minify ·········· Optimize and minify the output + --optimize ········ Optimize the output without minifying + --cwd ············· The current working directory [default: `.`] + -h, --help ············ Display usage information ``` From b7627a5baf024d9aab28d7eea4b86be21cbadab0 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 23 Mar 2025 14:52:55 -0400 Subject: [PATCH 15/29] dep: update to Tailwind CSS v4.0.15 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.15 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2eb179f..1c65824 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.0.15 + +* Update to [Tailwind CSS v4.0.15](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.15) @flavorjones + + ## v4.0.14 * Update to [Tailwind CSS v4.0.14](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.14) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 6f51029..7e58ca6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.14) + tailwindcss-ruby (4.0.15) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 4c81d84..4e31202 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.14" + VERSION = "v4.0.15" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index 5743e68..7536e56 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.14" + VERSION = "4.0.15" end end From eb982c232d576b025758f227b93e806a40383b24 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 23 Mar 2025 15:25:53 -0400 Subject: [PATCH 16/29] ci: unify installation testing into a single matrix which is a prefactor to re-using that flow in an automated release pipeline --- .github/workflows/gem-install.yml | 165 +++++++++--------------------- 1 file changed, 46 insertions(+), 119 deletions(-) diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml index 981194c..561f22d 100644 --- a/.github/workflows/gem-install.yml +++ b/.github/workflows/gem-install.yml @@ -17,19 +17,20 @@ on: jobs: package: + name: "package (${{ matrix.platform }})" strategy: fail-fast: false matrix: platform: - "ruby" - - "x64-mingw32" + - "aarch64-linux-gnu" + - "aarch64-linux-musl" + - "arm64-darwin" - "x64-mingw-ucrt" + - "x64-mingw32" - "x86_64-darwin" - - "arm64-darwin" - "x86_64-linux-gnu" - "x86_64-linux-musl" - - "aarch64-linux-gnu" - - "aarch64-linux-musl" runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -47,6 +48,7 @@ jobs: retention-days: 1 vanilla-install: + name: "install (ruby)" needs: ["package"] runs-on: ubuntu-latest steps: @@ -60,127 +62,52 @@ jobs: - run: "gem install pkg/tailwindcss-ruby-*.gem" - run: "tailwindcss 2>&1 | fgrep 'ERROR: Cannot find the tailwindcss executable'" - linux-x86_64-gnu-install: - needs: ["package"] - runs-on: ubuntu-latest - steps: - - uses: ruby/setup-ruby@v1 - with: - ruby-version: "3.2" - - uses: actions/download-artifact@v4 - with: - name: gem-x86_64-linux-gnu - path: pkg - - run: "gem install pkg/tailwindcss-ruby-*.gem" - - run: "tailwindcss --help" - - linux-x86_64-musl-install: - needs: ["package"] - runs-on: ubuntu-latest - steps: - - uses: actions/download-artifact@v4 - with: - name: gem-x86_64-linux-musl - path: pkg - - run: | - docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \ - ruby:3.2-alpine \ - sh -c " - apk add build-base - gem install pkg/tailwindcss-ruby-*.gem - tailwindcss --help - " - - linux-aarch64-gnu-install: - needs: ["package"] - runs-on: ubuntu-latest - steps: - - uses: ruby/setup-ruby@v1 - with: - ruby-version: "3.2" - - uses: actions/download-artifact@v4 - with: - name: gem-aarch64-linux-gnu - path: pkg - - run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \ - --platform=linux/arm64/v8 ruby:3.2 \ - sh -c " - gem install pkg/tailwindcss-ruby-*.gem - tailwindcss --help - " - - linux-aarch64-musl-install: - needs: ["package"] - runs-on: ubuntu-latest + install-matrix: + name: "install (${{ matrix.platform }})" + needs: [ "package" ] + strategy: + fail-fast: false + matrix: + ruby: [ "3.4" ] + platform: + - "aarch64-linux-gnu" + - "aarch64-linux-musl" + - "arm64-darwin" + - "x64-mingw-ucrt" + # - "x64-mingw32" # because it's on a different version of ruby, we just add it in an "include" below + - "x86_64-darwin" + - "x86_64-linux-gnu" + - "x86_64-linux-musl" + include: + - { platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64/v8" } + - { platform: aarch64-linux-musl, docker_tag: "-alpine", docker_platform: "--platform=linux/arm64/v8", bootstrap: "apk add build-base &&" } + - { platform: arm64-darwin, runs_on: macos-14 } + - { platform: x64-mingw-ucrt, runs_on: windows-latest } + - { platform: x64-mingw32, runs_on: windows-latest, ruby: "3.0" } + - { platform: x86_64-darwin, runs_on: macos-13 } + - { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" } + runs-on: ${{ matrix.runs_on || 'ubuntu-latest' }} steps: - uses: actions/download-artifact@v4 with: - name: gem-aarch64-linux-musl + name: gem-${{ matrix.platform }} path: pkg - - run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + - if: ${{ matrix.runs_on }} + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - if: ${{ matrix.runs_on }} + run: "gem install pkg/tailwindcss-ruby-*.gem" + - if: ${{ matrix.runs_on }} + run: "tailwindcss --help" + - if: ${{ (! matrix.runs_on) && matrix.docker_platform }} + run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + - if: ${{ ! matrix.runs_on }} + run: | docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \ - --platform=linux/arm64/v8 ruby:3.2-alpine \ + ${{ matrix.docker_platform }} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \ sh -c " - apk add build-base + ${{ matrix.bootstrap }} gem install pkg/tailwindcss-ruby-*.gem tailwindcss --help " - - darwin-x86_64-install: - needs: ["package"] - runs-on: macos-13 - steps: - - uses: ruby/setup-ruby@v1 - with: - ruby-version: "3.2" - - uses: actions/download-artifact@v4 - with: - name: gem-x86_64-darwin - path: pkg - - run: "gem install pkg/tailwindcss-ruby-*.gem" - - run: "tailwindcss --help" - - darwin-arm64-install: - needs: ["package"] - runs-on: macos-14 - steps: - - uses: ruby/setup-ruby@v1 - with: - ruby-version: "3.2" - - uses: actions/download-artifact@v4 - with: - name: gem-arm64-darwin - path: pkg - - run: "gem install pkg/tailwindcss-ruby-*.gem" - - run: "tailwindcss --help" - - windows-install: - needs: ["package"] - runs-on: windows-latest - steps: - - uses: ruby/setup-ruby@v1 - with: - ruby-version: "3.0" - - uses: actions/download-artifact@v4 - with: - name: gem-x64-mingw32 - path: pkg - - run: "gem install pkg/tailwindcss-ruby-*.gem" - - run: "tailwindcss --help" - - windows-ucrt-install: - needs: ["package"] - runs-on: windows-2022 - steps: - - uses: ruby/setup-ruby@v1 - with: - ruby-version: "3.2" - - uses: actions/download-artifact@v4 - with: - name: gem-x64-mingw-ucrt - path: pkg - - run: "gem install pkg/tailwindcss-ruby-*.gem" - - run: "tailwindcss --help" From cc4d0337b224921dae1c6cac394512b9cd8245f3 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 23 Mar 2025 16:03:49 -0400 Subject: [PATCH 17/29] ci: add Ruby 3.4 to the matrix --- .github/workflows/downstream.yml | 6 +++--- .github/workflows/main.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 853598e..474c838 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -27,15 +27,15 @@ jobs: - url: https://github.com/rails/tailwindcss-rails name: rails-unit command: "bin/test" - ruby: "3.3" + ruby: "3.4" - url: https://github.com/rails/tailwindcss-rails name: rails-install command: "env TAILWINDCSSOPTS=--path=../../.. test/integration/user_install_test.sh" - ruby: "3.3" + ruby: "3.4" - url: https://github.com/rails/tailwindcss-rails name: rails-upgrade command: "env TAILWINDCSSOPTS=--path=../../.. test/integration/user_upgrade_test.sh" - ruby: "3.3" + ruby: "3.4" runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 943726e..0a3e0a8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.0", "3.1", "3.2", "3.3", "head"] + ruby: ["3.0", "3.1", "3.2", "3.3", "3.4", "head"] steps: - uses: actions/checkout@v4 - run: rm Gemfile.lock From c36ab70bcf0ac06e0bd1d7a647f3089bfdc32fe2 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 23 Mar 2025 16:06:03 -0400 Subject: [PATCH 18/29] ci: Merge packaging workflow into main.yml --- .github/workflows/gem-install.yml | 113 ------------------------------ .github/workflows/main.yml | 99 +++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 114 deletions(-) delete mode 100644 .github/workflows/gem-install.yml diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml deleted file mode 100644 index 561f22d..0000000 --- a/.github/workflows/gem-install.yml +++ /dev/null @@ -1,113 +0,0 @@ -name: packaging -concurrency: - group: "${{github.workflow}}-${{github.ref}}" - cancel-in-progress: true -on: - workflow_dispatch: - push: - branches: - - main - - v4.x - tags: - - v*.*.* - pull_request: - types: [opened, synchronize] - branches: - - '*' - -jobs: - package: - name: "package (${{ matrix.platform }})" - strategy: - fail-fast: false - matrix: - platform: - - "ruby" - - "aarch64-linux-gnu" - - "aarch64-linux-musl" - - "arm64-darwin" - - "x64-mingw-ucrt" - - "x64-mingw32" - - "x86_64-darwin" - - "x86_64-linux-gnu" - - "x86_64-linux-musl" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - run: rm Gemfile.lock - - uses: ruby/setup-ruby@v1 - with: - ruby-version: "3.2" - bundler: latest - bundler-cache: true - - run: "bundle exec rake gem:${{matrix.platform}}" - - uses: actions/upload-artifact@v4 - with: - name: gem-${{matrix.platform}} - path: pkg - retention-days: 1 - - vanilla-install: - name: "install (ruby)" - needs: ["package"] - runs-on: ubuntu-latest - steps: - - uses: ruby/setup-ruby@v1 - with: - ruby-version: "3.2" - - uses: actions/download-artifact@v4 - with: - name: gem-ruby - path: pkg - - run: "gem install pkg/tailwindcss-ruby-*.gem" - - run: "tailwindcss 2>&1 | fgrep 'ERROR: Cannot find the tailwindcss executable'" - - install-matrix: - name: "install (${{ matrix.platform }})" - needs: [ "package" ] - strategy: - fail-fast: false - matrix: - ruby: [ "3.4" ] - platform: - - "aarch64-linux-gnu" - - "aarch64-linux-musl" - - "arm64-darwin" - - "x64-mingw-ucrt" - # - "x64-mingw32" # because it's on a different version of ruby, we just add it in an "include" below - - "x86_64-darwin" - - "x86_64-linux-gnu" - - "x86_64-linux-musl" - include: - - { platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64/v8" } - - { platform: aarch64-linux-musl, docker_tag: "-alpine", docker_platform: "--platform=linux/arm64/v8", bootstrap: "apk add build-base &&" } - - { platform: arm64-darwin, runs_on: macos-14 } - - { platform: x64-mingw-ucrt, runs_on: windows-latest } - - { platform: x64-mingw32, runs_on: windows-latest, ruby: "3.0" } - - { platform: x86_64-darwin, runs_on: macos-13 } - - { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" } - runs-on: ${{ matrix.runs_on || 'ubuntu-latest' }} - steps: - - uses: actions/download-artifact@v4 - with: - name: gem-${{ matrix.platform }} - path: pkg - - if: ${{ matrix.runs_on }} - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - if: ${{ matrix.runs_on }} - run: "gem install pkg/tailwindcss-ruby-*.gem" - - if: ${{ matrix.runs_on }} - run: "tailwindcss --help" - - if: ${{ (! matrix.runs_on) && matrix.docker_platform }} - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - if: ${{ ! matrix.runs_on }} - run: | - docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \ - ${{ matrix.docker_platform }} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \ - sh -c " - ${{ matrix.bootstrap }} - gem install pkg/tailwindcss-ruby-*.gem - tailwindcss --help - " diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a3e0a8..68948dd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ on: - '*' jobs: - build: + test: runs-on: ubuntu-latest strategy: fail-fast: false @@ -32,3 +32,100 @@ jobs: bundler-cache: true - name: Run tests run: bundle exec rake test + + package: + needs: [ "test" ] + name: "package (${{ matrix.platform }})" + strategy: + fail-fast: false + matrix: + platform: + - "ruby" + - "aarch64-linux-gnu" + - "aarch64-linux-musl" + - "arm64-darwin" + - "x64-mingw-ucrt" + - "x64-mingw32" + - "x86_64-darwin" + - "x86_64-linux-gnu" + - "x86_64-linux-musl" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - run: rm Gemfile.lock + - uses: ruby/setup-ruby@v1 + with: + ruby-version: "3.2" + bundler: latest + bundler-cache: true + - run: "bundle exec rake gem:${{matrix.platform}}" + - uses: actions/upload-artifact@v4 + with: + name: gem-${{matrix.platform}} + path: pkg + retention-days: 1 + + install-ruby: + name: "install (ruby)" + needs: [ "package" ] + runs-on: ubuntu-latest + steps: + - uses: ruby/setup-ruby@v1 + with: + ruby-version: "3.2" + - uses: actions/download-artifact@v4 + with: + name: gem-ruby + path: pkg + - run: "gem install pkg/tailwindcss-ruby-*.gem" + - run: "tailwindcss 2>&1 | fgrep 'ERROR: Cannot find the tailwindcss executable'" + + install-native: + name: "install (${{ matrix.platform }})" + needs: [ "package" ] + strategy: + fail-fast: false + matrix: + ruby: [ "3.4" ] + platform: + - "aarch64-linux-gnu" + - "aarch64-linux-musl" + - "arm64-darwin" + - "x64-mingw-ucrt" + # - "x64-mingw32" # because it's on a different version of ruby, we just add it in an "include" below + - "x86_64-darwin" + - "x86_64-linux-gnu" + - "x86_64-linux-musl" + include: + - { platform: aarch64-linux-gnu, docker_platform: "--platform=linux/arm64/v8" } + - { platform: aarch64-linux-musl, docker_tag: "-alpine", docker_platform: "--platform=linux/arm64/v8", bootstrap: "apk add build-base &&" } + - { platform: arm64-darwin, runs_on: macos-14 } + - { platform: x64-mingw-ucrt, runs_on: windows-latest } + - { platform: x64-mingw32, runs_on: windows-latest, ruby: "3.0" } + - { platform: x86_64-darwin, runs_on: macos-13 } + - { platform: x86_64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add build-base &&" } + runs-on: ${{ matrix.runs_on || 'ubuntu-latest' }} + steps: + - uses: actions/download-artifact@v4 + with: + name: gem-${{ matrix.platform }} + path: pkg + - if: ${{ matrix.runs_on }} + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - if: ${{ matrix.runs_on }} + run: "gem install pkg/tailwindcss-ruby-*.gem" + - if: ${{ matrix.runs_on }} + run: "tailwindcss --help" + - if: ${{ (! matrix.runs_on) && matrix.docker_platform }} + run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + - if: ${{ ! matrix.runs_on }} + run: | + docker run --rm -v $PWD:/tailwindcss-ruby -w /tailwindcss-ruby \ + ${{ matrix.docker_platform }} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \ + sh -c " + ${{ matrix.bootstrap }} + gem install pkg/tailwindcss-ruby-*.gem + tailwindcss --help + " From 6e405d9db17f171594fc05ead922bf43e5208f34 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 23 Mar 2025 16:06:31 -0400 Subject: [PATCH 19/29] ci: rename main.yml to ci.yml --- .github/workflows/{main.yml => ci.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{main.yml => ci.yml} (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/ci.yml similarity index 100% rename from .github/workflows/main.yml rename to .github/workflows/ci.yml From ccedcecb9800badf6a186677ebef67ea718cc1d6 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 23 Mar 2025 16:28:49 -0400 Subject: [PATCH 20/29] Renamed branches, see #73 --- .github/workflows/ci.yml | 1 - .github/workflows/downstream.yml | 1 - bin/bump-upstream | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68948dd..03ae872 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,6 @@ on: push: branches: - main - - v4* tags: - v*.*.* pull_request: diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml index 474c838..573bf98 100644 --- a/.github/workflows/downstream.yml +++ b/.github/workflows/downstream.yml @@ -9,7 +9,6 @@ on: push: branches: - main - - v4.x tags: - v*.*.* pull_request: diff --git a/bin/bump-upstream b/bin/bump-upstream index 78a78b4..cb698e0 100755 --- a/bin/bump-upstream +++ b/bin/bump-upstream @@ -38,9 +38,9 @@ if [[ -n "$($git_cmd status --porcelain --untracked-files=no)" ]]; then fi if [[ $upstream_tag =~ ^v4 ]] ; then - base_branch="v4.x" -elif [[ $upstream_tag =~ ^v3 ]] ; then base_branch="main" +elif [[ $upstream_tag =~ ^v3 ]] ; then + base_branch="v3.x" else fail "Whoa! A new major version? Need to update the ${0} script." fi From 4469c3dd06acb9cb950c5f685e30212bf75555df Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Tue, 25 Mar 2025 11:30:30 -0400 Subject: [PATCH 21/29] dep: update to Tailwind CSS v4.0.16 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.16 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c65824..2e47d82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.0.16 + +* Update to [Tailwind CSS v4.0.16](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.16) @flavorjones + + ## v4.0.15 * Update to [Tailwind CSS v4.0.15](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.15) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 7e58ca6..1e87ce9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.15) + tailwindcss-ruby (4.0.16) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 4e31202..105ed34 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.15" + VERSION = "v4.0.16" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index 7536e56..794e99f 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.15" + VERSION = "4.0.16" end end From 4261b036ef8aa68d3caf432aa6577449b4d01874 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Wed, 26 Mar 2025 09:15:16 -0400 Subject: [PATCH 22/29] dep: update to Tailwind CSS v4.0.17 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.17 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e47d82..80f68de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.0.17 + +* Update to [Tailwind CSS v4.0.17](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.17) @flavorjones + + ## v4.0.16 * Update to [Tailwind CSS v4.0.16](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.16) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 1e87ce9..9a6c87d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.16) + tailwindcss-ruby (4.0.17) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 105ed34..a818610 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.16" + VERSION = "v4.0.17" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index 794e99f..391d021 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.16" + VERSION = "4.0.17" end end From 38c0c01aa86e684e7187d5d1c2865e9b32a19bda Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sat, 5 Apr 2025 12:54:38 -0400 Subject: [PATCH 23/29] dep: update to Tailwind CSS v4.1.3 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.3 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80f68de..7a70b4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.1.3 + +* Update to [Tailwind CSS v4.1.3](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.3) @flavorjones + + ## v4.0.17 * Update to [Tailwind CSS v4.0.17](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.0.17) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 9a6c87d..b87685c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.0.17) + tailwindcss-ruby (4.1.3) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index a818610..fd26657 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.0.17" + VERSION = "v4.1.3" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index 391d021..e5ff2d8 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.0.17" + VERSION = "4.1.3" end end From e60604e6647ae49e501638301a1260414e7ab3ce Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 20 Apr 2025 10:41:28 -0400 Subject: [PATCH 24/29] dep: update to Tailwind CSS v4.1.4 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.4 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a70b4a..89e1e20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.1.4 + +* Update to [Tailwind CSS v4.1.4](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.4) @flavorjones + + ## v4.1.3 * Update to [Tailwind CSS v4.1.3](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.3) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index b87685c..d0761b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.1.3) + tailwindcss-ruby (4.1.4) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index fd26657..51f5353 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.1.3" + VERSION = "v4.1.4" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index e5ff2d8..df006b5 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.1.3" + VERSION = "4.1.4" end end From ead8606ce63822be0b4e1738146fd910289875b0 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 2 May 2025 15:05:07 -0400 Subject: [PATCH 25/29] dep: update to Tailwind CSS v4.1.5 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.5 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89e1e20..7719360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.1.5 + +* Update to [Tailwind CSS v4.1.5](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.5) @flavorjones + + ## v4.1.4 * Update to [Tailwind CSS v4.1.4](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.4) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index d0761b3..d7e2ff0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.1.4) + tailwindcss-ruby (4.1.5) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 51f5353..45755ac 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.1.4" + VERSION = "v4.1.5" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index df006b5..21b1836 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.1.4" + VERSION = "4.1.5" end end From af438b358105e6913dca78323d95a68f565a8bb0 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sat, 10 May 2025 14:09:18 -0400 Subject: [PATCH 26/29] dep: update to Tailwind CSS v4.1.6 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.6 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7719360..d146867 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.1.6 + +* Update to [Tailwind CSS v4.1.6](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.6) @flavorjones + + ## v4.1.5 * Update to [Tailwind CSS v4.1.5](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.5) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index d7e2ff0..7f010f1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.1.5) + tailwindcss-ruby (4.1.6) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 45755ac..a13fb16 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.1.5" + VERSION = "v4.1.6" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index 21b1836..aa8515e 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.1.5" + VERSION = "4.1.6" end end From b71f753eff608f9b9f69915596d6e67dcd4d1926 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 15 May 2025 12:32:47 -0400 Subject: [PATCH 27/29] dep: update to Tailwind CSS v4.1.7 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.7 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d146867..a751cd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.1.7 + +* Update to [Tailwind CSS v4.1.7](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.7) @flavorjones + + ## v4.1.6 * Update to [Tailwind CSS v4.1.6](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.6) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index 7f010f1..fc4eced 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.1.6) + tailwindcss-ruby (4.1.7) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index a13fb16..0e1427c 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.1.6" + VERSION = "v4.1.7" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index aa8515e..21a399f 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.1.6" + VERSION = "4.1.7" end end From 1a3e1f0a46dee4316d066352fa008dc72e8ded51 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 29 May 2025 11:25:38 -0400 Subject: [PATCH 28/29] dep: update to Tailwind CSS v4.1.8 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.8 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a751cd7..354d40a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.1.8 + +* Update to [Tailwind CSS v4.1.8](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.8) @flavorjones + + ## v4.1.7 * Update to [Tailwind CSS v4.1.7](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.7) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index fc4eced..db7a499 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.1.7) + tailwindcss-ruby (4.1.8) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 0e1427c..868b596 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.1.7" + VERSION = "v4.1.8" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index 21a399f..3a9e190 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.1.7" + VERSION = "4.1.8" end end From 28da4d9d1aee3f4fb264040842eb516a71c630a0 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sun, 15 Jun 2025 10:28:24 -0400 Subject: [PATCH 29/29] dep: update to Tailwind CSS v4.1.10 https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.10 --- CHANGELOG.md | 5 +++++ Gemfile.lock | 2 +- lib/tailwindcss/ruby/upstream.rb | 2 +- lib/tailwindcss/ruby/version.rb | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 354d40a..f1d3ab9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # tailwindcss-ruby changelog +## v4.1.10 + +* Update to [Tailwind CSS v4.1.10](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.10) @flavorjones + + ## v4.1.8 * Update to [Tailwind CSS v4.1.8](https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.8) @flavorjones diff --git a/Gemfile.lock b/Gemfile.lock index db7a499..3b2130c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-ruby (4.1.8) + tailwindcss-ruby (4.1.10) GEM remote: https://rubygems.org/ diff --git a/lib/tailwindcss/ruby/upstream.rb b/lib/tailwindcss/ruby/upstream.rb index 868b596..58eb733 100644 --- a/lib/tailwindcss/ruby/upstream.rb +++ b/lib/tailwindcss/ruby/upstream.rb @@ -1,7 +1,7 @@ module Tailwindcss module Ruby module Upstream - VERSION = "v4.1.8" + VERSION = "v4.1.10" # rubygems platform name => upstream release filename NATIVE_PLATFORMS = { diff --git a/lib/tailwindcss/ruby/version.rb b/lib/tailwindcss/ruby/version.rb index 3a9e190..f59d115 100644 --- a/lib/tailwindcss/ruby/version.rb +++ b/lib/tailwindcss/ruby/version.rb @@ -2,6 +2,6 @@ module Tailwindcss module Ruby - VERSION = "4.1.8" + VERSION = "4.1.10" end end