From e9c3f80d957bbe6442a63e10c19dad18edd97d15 Mon Sep 17 00:00:00 2001 From: Olivier Lacan Date: Mon, 29 Apr 2024 02:13:47 -0700 Subject: [PATCH 01/11] Increase form input field border contrast The contrast provided by the border-gray-200 Tailwind utility class is very poor. It's nearly impossible to distinguish the edges of an input field on a white background. That's not a great default experience for Rails scaffolds. With a slight bump to border-gray-400, things are much easier to distinguish. --- .../tailwindcss/scaffold/templates/_form.html.erb.tt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/generators/tailwindcss/scaffold/templates/_form.html.erb.tt b/lib/generators/tailwindcss/scaffold/templates/_form.html.erb.tt index adbd5b7e..5ee5ecf0 100644 --- a/lib/generators/tailwindcss/scaffold/templates/_form.html.erb.tt +++ b/lib/generators/tailwindcss/scaffold/templates/_form.html.erb.tt @@ -15,23 +15,23 @@
<% if attribute.password_digest? -%> <%%= form.label :password %> - <%%= form.password_field :password, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %> + <%%= form.password_field :password, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %>
<%%= form.label :password_confirmation %> - <%%= form.password_field :password_confirmation, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %> + <%%= form.password_field :password_confirmation, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %> <% elsif attribute.attachments? -%> <%%= form.label :<%= attribute.column_name %> %> - <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %> + <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %> <% else -%> <%%= form.label :<%= attribute.column_name %> %> <% if attribute.field_type == :text_area -%> - <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, rows: 4, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %> + <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, rows: 4, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %> <% elsif attribute.field_type == :check_box -%> <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, class: "block mt-2 h-5 w-5" %> <% else -%> - <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, class: "block shadow rounded-md border border-gray-200 outline-none px-3 py-2 mt-2 w-full" %> + <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, class: "block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full" %> <% end -%> <% end -%>
From 6208f900c02e6cb565428bdaa03be442fbdbbae0 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Tue, 30 Apr 2024 11:23:00 -0400 Subject: [PATCH 02/11] dev: get dependabot updates for gems and github actions --- dependabot.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 dependabot.yml diff --git a/dependabot.yml b/dependabot.yml new file mode 100644 index 00000000..01d8316b --- /dev/null +++ b/dependabot.yml @@ -0,0 +1,13 @@ +version: 2 +updates: + - package-ecosystem: "bundler" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + groups: + github-actions: + applies-to: version-updates From 5a5e39506e695aa97203fe917dc8ee820cc6f25f Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Tue, 30 Apr 2024 11:26:49 -0400 Subject: [PATCH 03/11] fix location of dependabot.yml --- dependabot.yml => .github/dependabot.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename dependabot.yml => .github/dependabot.yml (100%) diff --git a/dependabot.yml b/.github/dependabot.yml similarity index 100% rename from dependabot.yml rename to .github/dependabot.yml From a64b7a4c6542f3ddaf385beae010481596a03549 Mon Sep 17 00:00:00 2001 From: Kingsley Chijioke Date: Mon, 29 Apr 2024 19:37:57 +0100 Subject: [PATCH 04/11] generator: sync erb template This updates the erb template to be in sync with the template in rails/rails --- CHANGELOG.md | 5 +++++ .../tailwindcss/scaffold/templates/edit.html.erb.tt | 2 +- .../tailwindcss/scaffold/templates/index.html.erb.tt | 9 ++++++++- .../tailwindcss/scaffold/templates/partial.html.erb.tt | 5 ----- .../tailwindcss/scaffold/templates/show.html.erb.tt | 6 +++--- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02a804bd..2722f5f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## unreleased + +* Bring the scaffold templates up to date with rails/rails as much as possible without breaking 6.1 compatibility. (#357) @kinsomicrote + + ## v2.5.0 / 2024-04-27 * Remove the `@tailwindcss/aspect-ratio` plugin from the `tailwind.config.js` that gets installed by the generator. This plugin was originally a polyfill until Safari 15 was released (in Fall 2021), and so is beyond its useful lifetime for anyone not targetting ancient browsers. (#344) @flavorjones @searls diff --git a/lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt b/lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt index 34756518..a1e3772b 100644 --- a/lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt +++ b/lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt @@ -3,6 +3,6 @@ <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %> - <%%= link_to "Show this <%= human_name.downcase %>", @<%= singular_table_name %>, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> + <%%= link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> diff --git a/lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt b/lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt index c29d5e6e..f0a4bb9d 100644 --- a/lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt +++ b/lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt @@ -3,12 +3,19 @@

<%%= notice %>

<%% end %> + <%% content_for :title, "<%= human_name.pluralize %>" %> +

<%= human_name.pluralize %>

<%%= link_to "New <%= human_name.downcase %>", new_<%= singular_route_name %>_path, class: "rounded-lg py-3 px-5 bg-blue-600 text-white block font-medium" %>
- <%%= render @<%= plural_table_name %> %> + <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %> + <%%= render <%= singular_table_name %> %> +

+ <%%= link_to "Show this <%= human_name.downcase %>", <%= singular_name %>, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> +

+ <%% end %>
diff --git a/lib/generators/tailwindcss/scaffold/templates/partial.html.erb.tt b/lib/generators/tailwindcss/scaffold/templates/partial.html.erb.tt index 60a0de20..e1a45470 100644 --- a/lib/generators/tailwindcss/scaffold/templates/partial.html.erb.tt +++ b/lib/generators/tailwindcss/scaffold/templates/partial.html.erb.tt @@ -14,9 +14,4 @@

<% end -%> - <%% if action_name != "show" %> - <%%= link_to "Show this <%= human_name.downcase %>", <%= singular_name %>, class: "rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> - <%%= link_to "Edit this <%= human_name.downcase %>", edit_<%= singular_name %>_path(<%= singular_name %>), class: "rounded-lg py-3 ml-2 px-5 bg-gray-100 inline-block font-medium" %> -
- <%% end %> diff --git a/lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt b/lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt index c386118c..fafb05a7 100644 --- a/lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt +++ b/lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt @@ -6,10 +6,10 @@ <%%= render @<%= singular_table_name %> %> - <%%= link_to "Edit this <%= singular_table_name %>", edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> + <%%= link_to "Edit this <%= human_name.downcase %>", edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> + <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
- <%%= button_to "Destroy this <%= singular_table_name %>", <%= singular_table_name %>_path(@<%= singular_table_name %>), method: :delete, class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 font-medium" %> + <%%= button_to "Destroy this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, method: :delete, class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 font-medium" %>
- <%%= link_to "Back to <%= plural_table_name %>", <%= index_helper %>_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> From d896e9523cc8ebf58e56e40edf7540270e1fc6f1 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Wed, 1 May 2024 09:32:12 -0400 Subject: [PATCH 05/11] dev: remove attempt at dependabot grouping --- .github/dependabot.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 01d8316b..403b3087 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,6 +8,3 @@ updates: directory: "/" schedule: interval: "weekly" - groups: - github-actions: - applies-to: version-updates From 95ffac7ea1d0a9ef7d8edac38358a3352650b11d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 13:33:05 +0000 Subject: [PATCH 06/11] build(deps): bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/gem-install.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml index d2babe6a..f0b5d516 100644 --- a/.github/workflows/gem-install.yml +++ b/.github/workflows/gem-install.yml @@ -43,7 +43,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: "3.2" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: gem-ruby path: pkg @@ -57,7 +57,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: "3.2" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: gem-x86_64-linux path: pkg @@ -70,7 +70,7 @@ jobs: container: image: ruby:3.2-alpine steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: gem-x86_64-linux path: pkg @@ -83,7 +83,7 @@ jobs: needs: ["package"] runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: gem-arm-linux path: pkg @@ -103,7 +103,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: "3.2" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: gem-x86_64-darwin path: pkg @@ -117,7 +117,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: "3.2" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: gem-arm64-darwin path: pkg @@ -131,7 +131,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: "3.0" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: gem-x64-mingw32 path: pkg @@ -145,7 +145,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: ruby-version: "3.2" - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: gem-x64-mingw-ucrt path: pkg From 1fc0541e57227f970690845ee518c9126c73a538 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Tue, 30 Apr 2024 11:13:57 -0400 Subject: [PATCH 07/11] dep: drop support for Rails 6.0 which reached EOL 11 months ago, in June 2023 --- CHANGELOG.md | 1 + Gemfile | 2 +- Gemfile.lock | 9 ++++----- tailwindcss-rails.gemspec | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2722f5f3..6e9718e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## unreleased * Bring the scaffold templates up to date with rails/rails as much as possible without breaking 6.1 compatibility. (#357) @kinsomicrote +* Drop support for Rails 6.0, which reached end-of-life in June 2023. ## v2.5.0 / 2024-04-27 diff --git a/Gemfile b/Gemfile index cf00e45c..7a21e102 100644 --- a/Gemfile +++ b/Gemfile @@ -5,5 +5,5 @@ gemspec gem "debug", ">= 1.0.0" group :test do - gem "actionmailer", ">= 6.0.0" + gem "actionmailer", ">= 6.1.0" end diff --git a/Gemfile.lock b/Gemfile.lock index c3fe8c8a..75b24379 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ PATH remote: . specs: - tailwindcss-rails (2.4.1) - railties (>= 6.0.0) + tailwindcss-rails (2.5.0) + railties (>= 6.1.0) GEM remote: https://rubygems.org/ @@ -82,7 +82,6 @@ GEM date net-protocol net-pop (0.1.2) - net-protocol net-protocol (0.2.2) timeout net-smtp (0.5.0) @@ -125,7 +124,7 @@ GEM rake (13.2.1) rdoc (6.6.3.1) psych (>= 4.0.0) - reline (0.5.3) + reline (0.5.4) io-console (~> 0.5) stringio (3.1.0) thor (1.3.1) @@ -142,7 +141,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - actionmailer (>= 6.0.0) + actionmailer (>= 6.1.0) debug (>= 1.0.0) tailwindcss-rails! diff --git a/tailwindcss-rails.gemspec b/tailwindcss-rails.gemspec index 02c10fb5..237161ff 100644 --- a/tailwindcss-rails.gemspec +++ b/tailwindcss-rails.gemspec @@ -20,5 +20,5 @@ Gem::Specification.new do |spec| spec.bindir = "exe" spec.executables << "tailwindcss" - spec.add_dependency "railties", ">= 6.0.0" + spec.add_dependency "railties", ">= 6.1.0" end From 1c7e4dc2db2cedf9fefa5c0b78fba700b2ddcaed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 13:33:02 +0000 Subject: [PATCH 08/11] build(deps): bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/gem-install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gem-install.yml b/.github/workflows/gem-install.yml index f0b5d516..eb1300d6 100644 --- a/.github/workflows/gem-install.yml +++ b/.github/workflows/gem-install.yml @@ -30,7 +30,7 @@ jobs: bundler: latest bundler-cache: true - run: "bundle exec rake gem:${{matrix.platform}}" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: gem-${{matrix.platform}} path: pkg From 94128542a7d918116ab56e5be1f8fc9d7c18da7f Mon Sep 17 00:00:00 2001 From: Kingsley Chijioke Date: Mon, 29 Apr 2024 19:37:57 +0100 Subject: [PATCH 09/11] generator: sync erb template to use Rails 7.0 APIs This updates the erb template to be in sync with the template in rails/rails --- lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt | 2 +- lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt | 2 +- lib/generators/tailwindcss/scaffold/templates/new.html.erb.tt | 2 +- lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt b/lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt index a1e3772b..fab779d1 100644 --- a/lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt +++ b/lib/generators/tailwindcss/scaffold/templates/edit.html.erb.tt @@ -4,5 +4,5 @@ <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %> <%%= link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> - <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> + <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %>, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> diff --git a/lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt b/lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt index f0a4bb9d..65cf06b5 100644 --- a/lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt +++ b/lib/generators/tailwindcss/scaffold/templates/index.html.erb.tt @@ -14,7 +14,7 @@ <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %> <%%= render <%= singular_table_name %> %>

- <%%= link_to "Show this <%= human_name.downcase %>", <%= singular_name %>, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> + <%%= link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(singular_table_name) %>, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>

<%% end %> diff --git a/lib/generators/tailwindcss/scaffold/templates/new.html.erb.tt b/lib/generators/tailwindcss/scaffold/templates/new.html.erb.tt index 61c0a450..665532e5 100644 --- a/lib/generators/tailwindcss/scaffold/templates/new.html.erb.tt +++ b/lib/generators/tailwindcss/scaffold/templates/new.html.erb.tt @@ -3,5 +3,5 @@ <%%= render "form", <%= singular_table_name %>: @<%= singular_table_name %> %> - <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> + <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %>, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> diff --git a/lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt b/lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt index fafb05a7..17d0febf 100644 --- a/lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt +++ b/lib/generators/tailwindcss/scaffold/templates/show.html.erb.tt @@ -6,7 +6,7 @@ <%%= render @<%= singular_table_name %> %> - <%%= link_to "Edit this <%= human_name.downcase %>", edit_<%= singular_table_name %>_path(@<%= singular_table_name %>), class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> + <%%= link_to "Edit this <%= human_name.downcase %>", <%= edit_helper(type: :path) %>, class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %> <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper %>_path, class: "ml-2 rounded-lg py-3 px-5 bg-gray-100 inline-block font-medium" %>
<%%= button_to "Destroy this <%= human_name.downcase %>", <%= model_resource_name(prefix: "@") %>, method: :delete, class: "mt-2 rounded-lg py-3 px-5 bg-gray-100 font-medium" %> From 3bf5cb93caa4de842ad4c40f5cd02d8cb05dd89c Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Wed, 1 May 2024 10:15:49 -0400 Subject: [PATCH 10/11] dep: drop feature and bugfix support for Rails 6.1 We will still provide security support for the previous minor release while Rails 6.1 is supported. --- .github/workflows/ci.yml | 18 ------------------ CHANGELOG.md | 3 ++- Gemfile | 2 +- Gemfile.lock | 4 ++-- tailwindcss-rails.gemspec | 2 +- 5 files changed, 6 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6af43c2a..db04fb3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,24 +33,6 @@ jobs: - name: Run tests run: bin/test - rails6: - 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 - - name: "Pin to Rails 6.1" - run: | - bundle remove actionmailer - bundle add actionmailer --version "~> 6.1" --skip-install - bundle add railties --version "~> 6.1" --skip-install - bundle install - - name: Run tests - run: bin/test - user-journey: strategy: fail-fast: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e9718e0..e0db08db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ ## unreleased -* Bring the scaffold templates up to date with rails/rails as much as possible without breaking 6.1 compatibility. (#357) @kinsomicrote +* Bring the scaffold templates up to date with rails/rails. (#357, #359) @kinsomicrote * Drop support for Rails 6.0, which reached end-of-life in June 2023. +* Drop feature and bug fix support for Rails 6.1. The previous minor release will still receive security support while Rails 6.1 is supported. ## v2.5.0 / 2024-04-27 diff --git a/Gemfile b/Gemfile index 7a21e102..46788894 100644 --- a/Gemfile +++ b/Gemfile @@ -5,5 +5,5 @@ gemspec gem "debug", ">= 1.0.0" group :test do - gem "actionmailer", ">= 6.1.0" + gem "actionmailer", ">= 7.0.0" end diff --git a/Gemfile.lock b/Gemfile.lock index 75b24379..0b99151e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: tailwindcss-rails (2.5.0) - railties (>= 6.1.0) + railties (>= 7.0.0) GEM remote: https://rubygems.org/ @@ -141,7 +141,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - actionmailer (>= 6.1.0) + actionmailer (>= 7.0.0) debug (>= 1.0.0) tailwindcss-rails! diff --git a/tailwindcss-rails.gemspec b/tailwindcss-rails.gemspec index 237161ff..7535ccc7 100644 --- a/tailwindcss-rails.gemspec +++ b/tailwindcss-rails.gemspec @@ -20,5 +20,5 @@ Gem::Specification.new do |spec| spec.bindir = "exe" spec.executables << "tailwindcss" - spec.add_dependency "railties", ">= 6.1.0" + spec.add_dependency "railties", ">= 7.0.0" end From ec2725789e062fc93df9c9a9d57acfe847187702 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Sat, 4 May 2024 13:23:56 -0400 Subject: [PATCH 11/11] version bump to v2.6.0 --- CHANGELOG.md | 7 ++++--- lib/tailwindcss/version.rb | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0db08db..90c49f9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ -## unreleased +## v2.6.0 / 2024-05-04 +* Increase form input field border contrast. (#356) @olivierlacan * Bring the scaffold templates up to date with rails/rails. (#357, #359) @kinsomicrote -* Drop support for Rails 6.0, which reached end-of-life in June 2023. -* Drop feature and bug fix support for Rails 6.1. The previous minor release will still receive security support while Rails 6.1 is supported. +* Drop support for Rails 6.0, which reached end-of-life in June 2023. (#358) @flavorjones +* Drop feature and bug fix support for Rails 6.1. The previous minor release will still receive security support while Rails 6.1 is supported. (#359) @flavorjones ## v2.5.0 / 2024-04-27 diff --git a/lib/tailwindcss/version.rb b/lib/tailwindcss/version.rb index 53892fe2..0775ed7e 100644 --- a/lib/tailwindcss/version.rb +++ b/lib/tailwindcss/version.rb @@ -1,3 +1,3 @@ module Tailwindcss - VERSION = "2.5.0" + VERSION = "2.6.0" end