Skip to content

Commit

Permalink
Merge pull request #406 from rails/flavorjones-extract-tailwindcss-ruby
Browse files Browse the repository at this point in the history
Extract tailwindcss packaging into an external gem, `tailwindcss-ruby`
  • Loading branch information
flavorjones authored Oct 2, 2024
2 parents 97dce5f + 5562096 commit 1b9c443
Show file tree
Hide file tree
Showing 17 changed files with 118 additions and 707 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "head"]
ruby: ["3.1", "3.2", "3.3", "head"]
steps:
- uses: actions/checkout@v4
- run: rm Gemfile.lock
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{matrix.ruby}}
rubygems: "3.4.22" # last version to support Ruby 2.7
bundler: latest
bundler-cache: true
- name: Run tests
Expand Down
153 changes: 0 additions & 153 deletions .github/workflows/gem-install.yml

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@
*.gem
.idea/
**/tmp/
/exe/*/tailwindcss
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## next / unreleased

### Notable changes

* The upstream `tailwindcss` executable has been extracted from this gem into a new dependency, `tailwindcss-ruby`.

In advance of the upcoming TailwindCSS v4 release, we are decoupling the `tailwindcss` executable
from the Rails integration. This will allow users to upgrade TailwindCSS at a time of their
choosing, and allow early adopters to start using the beta releases.


## v2.7.7 / 2024-10-02

* Proactively support changes to Rails's authentication templates shipping in Rails 8.0.0.beta2 (which is not yet released). (#407, #408) @seanpdoyle @flavorjones
Expand Down
11 changes: 1 addition & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,14 @@ gem "tailwindcss-rails", path: "/path/to/tailwindcss-rails"
```


## Updating to the latest upstream tailwindcss version

Update `lib/tailwindcss/upstream.rb` with the upstream version.

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.

## Cutting a release of tailwindcss-rails

- bump the version
- [ ] update `lib/tailwindcss/version.rb`
- [ ] update `CHANGELOG.md`
- [ ] commit and create a git tag
- build the native gems:
- [ ] `bundle exec rake clobber` to clean up possibly-old tailwindcss executables
- [ ] `bundle exec rake package`
- push
- [ ] `for g in pkg/*.gem ; do gem push $g ; done`
- [ ] `gem push pkg/*.gem`
- [ ] `git push && git push --tags`
- announce
- [ ] create a release at https://github.com/rails/tailwindcss-rails/releases
35 changes: 23 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ PATH
specs:
tailwindcss-rails (2.7.7)
railties (>= 7.0.0)
tailwindcss-ruby

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -59,13 +60,13 @@ GEM
erubi (1.13.0)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.14.0)
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
logger (1.6.0)
logger (1.6.1)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -75,9 +76,8 @@ GEM
net-pop
net-smtp
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.25.1)
net-imap (0.4.14)
net-imap (0.4.16)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -86,11 +86,14 @@ GEM
timeout
net-smtp (0.5.0)
net-protocol
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
nokogiri (1.16.7-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.7-arm-linux)
racc (~> 1.4)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86-linux)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
Expand Down Expand Up @@ -124,21 +127,29 @@ GEM
rake (13.2.1)
rdoc (6.7.0)
psych (>= 4.0.0)
reline (0.5.9)
reline (0.5.10)
io-console (~> 0.5)
securerandom (0.3.1)
stringio (3.1.1)
thor (1.3.1)
tailwindcss-ruby (3.4.13)
tailwindcss-ruby (3.4.13-aarch64-linux)
tailwindcss-ruby (3.4.13-arm-linux)
tailwindcss-ruby (3.4.13-arm64-darwin)
tailwindcss-ruby (3.4.13-x86_64-darwin)
tailwindcss-ruby (3.4.13-x86_64-linux)
thor (1.3.2)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
useragent (0.16.10)
webrick (1.8.2)
zeitwerk (2.6.17)
zeitwerk (2.6.18)

PLATFORMS
aarch64-linux
arm-linux
arm64-darwin
ruby
x86-linux
x86_64-darwin
x86_64-linux

Expand All @@ -148,4 +159,4 @@ DEPENDENCIES
tailwindcss-rails!

BUNDLED WITH
2.5.4
2.5.20
26 changes: 0 additions & 26 deletions LICENSE-DEPENDENCIES

This file was deleted.

Loading

0 comments on commit 1b9c443

Please sign in to comment.