From c689263e2bc5f24d99835ab38eb688ab4a1c2e35 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Tue, 1 Mar 2022 15:14:24 +0900 Subject: [PATCH 1/2] Bump jsbindling-rails and cssbundling-rails When both jsbundling-rails v1.0.1 and cssbundling-rails v1.1.0 are used at the same time, thor shows the prompt to replace `bin/dev` or not. jsbundling-rails v1.0.2 addresses this issue. https://github.com/rails/jsbundling-rails/releases/tag/v1.0.2 https://github.com/rails/jsbundling-rails/pull/95 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2f2ab24980..d68dd0ae3c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,7 +188,7 @@ GEM crack (0.4.5) rexml crass (1.0.6) - cssbundling-rails (1.0.0) + cssbundling-rails (1.1.0) railties (>= 6.0.0) curses (1.4.3) daemons (1.4.1) @@ -309,7 +309,7 @@ GEM irb (1.4.1) reline (>= 0.3.0) jmespath (1.4.0) - jsbundling-rails (1.0.0) + jsbundling-rails (1.0.2) railties (>= 6.0.0) json (2.6.1) jwt (2.3.0) From a51e77053c653fc7ff03b33e79341cccf2d3ef09 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Tue, 1 Mar 2022 13:45:12 +0900 Subject: [PATCH 2/2] Revert "Skip apparently-troublesome test on CI for now" This reverts commit bdb0610c108f10c15b41ed0f0115e38feecfa7be. --- railties/test/generators/app_generator_test.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 467687f30a..257b1c1dca 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -774,8 +774,6 @@ class AppGeneratorTest < Rails::Generators::TestCase end def test_css_option_with_cssbundling_gem - skip if ENV["CI"] - run_generator [destination_root, "--css", "postcss", "--no-skip-bundle"] assert_gem "cssbundling-rails" assert_file "app/assets/stylesheets/application.postcss.css"