Skip to content

Commit 1b9c443

Browse files
authored
Merge pull request #406 from rails/flavorjones-extract-tailwindcss-ruby
Extract tailwindcss packaging into an external gem, `tailwindcss-ruby`
2 parents 97dce5f + 5562096 commit 1b9c443

File tree

17 files changed

+118
-707
lines changed

17 files changed

+118
-707
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "head"]
23+
ruby: ["3.1", "3.2", "3.3", "head"]
2424
steps:
2525
- uses: actions/checkout@v4
2626
- run: rm Gemfile.lock
2727
- uses: ruby/setup-ruby@v1
2828
with:
2929
ruby-version: ${{matrix.ruby}}
30-
rubygems: "3.4.22" # last version to support Ruby 2.7
3130
bundler: latest
3231
bundler-cache: true
3332
- name: Run tests

.github/workflows/gem-install.yml

Lines changed: 0 additions & 153 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@
1313
*.gem
1414
.idea/
1515
**/tmp/
16-
/exe/*/tailwindcss

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## next / unreleased
2+
3+
### Notable changes
4+
5+
* The upstream `tailwindcss` executable has been extracted from this gem into a new dependency, `tailwindcss-ruby`.
6+
7+
In advance of the upcoming TailwindCSS v4 release, we are decoupling the `tailwindcss` executable
8+
from the Rails integration. This will allow users to upgrade TailwindCSS at a time of their
9+
choosing, and allow early adopters to start using the beta releases.
10+
11+
112
## v2.7.7 / 2024-10-02
213

314
* Proactively support changes to Rails's authentication templates shipping in Rails 8.0.0.beta2 (which is not yet released). (#407, #408) @seanpdoyle @flavorjones

CONTRIBUTING.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,14 @@ gem "tailwindcss-rails", path: "/path/to/tailwindcss-rails"
2323
```
2424

2525

26-
## Updating to the latest upstream tailwindcss version
27-
28-
Update `lib/tailwindcss/upstream.rb` with the upstream version.
29-
30-
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.
31-
3226
## Cutting a release of tailwindcss-rails
3327

3428
- bump the version
3529
- [ ] update `lib/tailwindcss/version.rb`
3630
- [ ] update `CHANGELOG.md`
3731
- [ ] commit and create a git tag
38-
- build the native gems:
39-
- [ ] `bundle exec rake clobber` to clean up possibly-old tailwindcss executables
40-
- [ ] `bundle exec rake package`
4132
- push
42-
- [ ] `for g in pkg/*.gem ; do gem push $g ; done`
33+
- [ ] `gem push pkg/*.gem`
4334
- [ ] `git push && git push --tags`
4435
- announce
4536
- [ ] create a release at https://github.com/rails/tailwindcss-rails/releases

Gemfile.lock

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ PATH
33
specs:
44
tailwindcss-rails (2.7.7)
55
railties (>= 7.0.0)
6+
tailwindcss-ruby
67

78
GEM
89
remote: https://rubygems.org/
@@ -59,13 +60,13 @@ GEM
5960
erubi (1.13.0)
6061
globalid (1.2.1)
6162
activesupport (>= 6.1)
62-
i18n (1.14.5)
63+
i18n (1.14.6)
6364
concurrent-ruby (~> 1.0)
6465
io-console (0.7.2)
65-
irb (1.14.0)
66+
irb (1.14.1)
6667
rdoc (>= 4.0.0)
6768
reline (>= 0.4.2)
68-
logger (1.6.0)
69+
logger (1.6.1)
6970
loofah (2.22.0)
7071
crass (~> 1.0.2)
7172
nokogiri (>= 1.12.0)
@@ -75,9 +76,8 @@ GEM
7576
net-pop
7677
net-smtp
7778
mini_mime (1.1.5)
78-
mini_portile2 (2.8.7)
7979
minitest (5.25.1)
80-
net-imap (0.4.14)
80+
net-imap (0.4.16)
8181
date
8282
net-protocol
8383
net-pop (0.1.2)
@@ -86,11 +86,14 @@ GEM
8686
timeout
8787
net-smtp (0.5.0)
8888
net-protocol
89-
nokogiri (1.16.7)
90-
mini_portile2 (~> 2.8.2)
89+
nokogiri (1.16.7-aarch64-linux)
90+
racc (~> 1.4)
91+
nokogiri (1.16.7-arm-linux)
9192
racc (~> 1.4)
9293
nokogiri (1.16.7-arm64-darwin)
9394
racc (~> 1.4)
95+
nokogiri (1.16.7-x86-linux)
96+
racc (~> 1.4)
9497
nokogiri (1.16.7-x86_64-darwin)
9598
racc (~> 1.4)
9699
nokogiri (1.16.7-x86_64-linux)
@@ -124,21 +127,29 @@ GEM
124127
rake (13.2.1)
125128
rdoc (6.7.0)
126129
psych (>= 4.0.0)
127-
reline (0.5.9)
130+
reline (0.5.10)
128131
io-console (~> 0.5)
129132
securerandom (0.3.1)
130133
stringio (3.1.1)
131-
thor (1.3.1)
134+
tailwindcss-ruby (3.4.13)
135+
tailwindcss-ruby (3.4.13-aarch64-linux)
136+
tailwindcss-ruby (3.4.13-arm-linux)
137+
tailwindcss-ruby (3.4.13-arm64-darwin)
138+
tailwindcss-ruby (3.4.13-x86_64-darwin)
139+
tailwindcss-ruby (3.4.13-x86_64-linux)
140+
thor (1.3.2)
132141
timeout (0.4.1)
133142
tzinfo (2.0.6)
134143
concurrent-ruby (~> 1.0)
135144
useragent (0.16.10)
136145
webrick (1.8.2)
137-
zeitwerk (2.6.17)
146+
zeitwerk (2.6.18)
138147

139148
PLATFORMS
149+
aarch64-linux
150+
arm-linux
140151
arm64-darwin
141-
ruby
152+
x86-linux
142153
x86_64-darwin
143154
x86_64-linux
144155

@@ -148,4 +159,4 @@ DEPENDENCIES
148159
tailwindcss-rails!
149160

150161
BUNDLED WITH
151-
2.5.4
162+
2.5.20

LICENSE-DEPENDENCIES

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)