From 5672b930f4c9581bec2ca1bcd6e41b34c978f62c Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Mon, 26 Jul 2021 20:48:11 -0300 Subject: [PATCH 01/11] Yarn v3 for stable webpacker 5.x --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 87c4f0270..6a2588aeb 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ ], "engines": { "node": ">=10.17.0", - "yarn": ">=1 <3" + "yarn": ">=1 <4" }, "dependencies": { "@babel/core": "^7.14.3", From d4ef57dabbd68f5501d68155e7487a7104f09b8b Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Mon, 26 Jul 2021 20:52:36 -0300 Subject: [PATCH 02/11] Update Gemfile-rails-edge --- gemfiles/Gemfile-rails-edge | 1 - 1 file changed, 1 deletion(-) diff --git a/gemfiles/Gemfile-rails-edge b/gemfiles/Gemfile-rails-edge index 9b5c32d7e..c04923436 100644 --- a/gemfiles/Gemfile-rails-edge +++ b/gemfiles/Gemfile-rails-edge @@ -3,7 +3,6 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec path: "../" - gem "rails", github: "rails/rails" gem "arel", github: "rails/arel" gem "rake", ">= 11.1" From ea131c90687d58498a3d665971b74d3e03641bb6 Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Mon, 26 Jul 2021 21:10:37 -0300 Subject: [PATCH 03/11] Update Gemfile-rails-edge --- gemfiles/Gemfile-rails-edge | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gemfiles/Gemfile-rails-edge b/gemfiles/Gemfile-rails-edge index c04923436..c096ad2d7 100644 --- a/gemfiles/Gemfile-rails-edge +++ b/gemfiles/Gemfile-rails-edge @@ -3,7 +3,8 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec path: "../" -gem "rails", github: "rails/rails" + +gem "rails", github: "rails/rails", branch: "main" gem "arel", github: "rails/arel" gem "rake", ">= 11.1" gem "rack-proxy", require: false From 736cf2066559da4ea9d5f76f2469debfe6df1e9f Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Mon, 26 Jul 2021 21:12:37 -0300 Subject: [PATCH 04/11] Update ruby.yml --- .github/workflows/ruby.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 2ec02de4e..01c38d528 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -29,14 +29,6 @@ jobs: gemfile: gemfiles/Gemfile-rails.6.0.x experimental: [false] include: - - ruby: 2.5 - os: ubuntu-latest - gemfile: gemfiles/Gemfile-rails-edge - experimental: true - - ruby: 2.6 - os: ubuntu-latest - gemfile: gemfiles/Gemfile-rails-edge - experimental: true - ruby: 2.7 os: ubuntu-latest gemfile: gemfiles/Gemfile-rails-edge From 9801d4cde2942d2c5de0d371e9babba14aa5b887 Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Mon, 26 Jul 2021 21:17:02 -0300 Subject: [PATCH 05/11] Update helper_test.rb --- test/helper_test.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/helper_test.rb b/test/helper_test.rb index d2eca7d1b..3b44a7b81 100644 --- a/test/helper_test.rb +++ b/test/helper_test.rb @@ -118,28 +118,28 @@ def test_preload_pack_asset def test_stylesheet_pack_tag_split_chunks assert_equal \ - %(\n) + - %(\n) + - %(), + %(\n) + + %(\n) + + %(), stylesheet_packs_with_chunks_tag("application", "hello_stimulus") end def test_stylesheet_pack_tag assert_equal \ - %(), + %(), stylesheet_pack_tag("bootstrap.css") end def test_stylesheet_pack_tag_symbol assert_equal \ - %(), + %(), stylesheet_pack_tag(:bootstrap) end def test_stylesheet_pack_tag_splat assert_equal \ - %(\n) + - %(), + %(\n) + + %(), stylesheet_pack_tag("bootstrap.css", "application.css", media: "all") end end From 81dc763f3ae2b920aa6e84902b2bddd6c5475a3c Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Mon, 26 Jul 2021 21:22:42 -0300 Subject: [PATCH 06/11] Update helper_test.rb --- test/helper_test.rb | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/test/helper_test.rb b/test/helper_test.rb index 3b44a7b81..6792f4f2a 100644 --- a/test/helper_test.rb +++ b/test/helper_test.rb @@ -117,29 +117,41 @@ def test_preload_pack_asset end def test_stylesheet_pack_tag_split_chunks - assert_equal \ - %(\n) + + assert_equal stylesheet_packs_with_chunks_tag("application", "hello_stimulus").in?([ + %(\n) + %(\n) + %(), - stylesheet_packs_with_chunks_tag("application", "hello_stimulus") + + %(\n) + + %(\n) + + %(), + ]), + true end def test_stylesheet_pack_tag - assert_equal \ + assert_equal stylesheet_pack_tag("bootstrap.css").in?([ %(), - stylesheet_pack_tag("bootstrap.css") + + %(), + ]), true end def test_stylesheet_pack_tag_symbol - assert_equal \ + assert_equal stylesheet_pack_tag(:bootstrap).in?([ %(), - stylesheet_pack_tag(:bootstrap) + + %(), + ]), true end def test_stylesheet_pack_tag_splat - assert_equal \ + assert_equal stylesheet_pack_tag("bootstrap.css", "application.css", media: "all").in?([ %(\n) + %(), - stylesheet_pack_tag("bootstrap.css", "application.css", media: "all") + + %(\n) + + %(), + ]), true end end From d6d82aa4f401540907f74c4fc9838f3573e779fb Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Mon, 26 Jul 2021 21:23:52 -0300 Subject: [PATCH 07/11] Update helper_test.rb --- test/helper_test.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/helper_test.rb b/test/helper_test.rb index 6792f4f2a..116127e71 100644 --- a/test/helper_test.rb +++ b/test/helper_test.rb @@ -121,7 +121,7 @@ def test_stylesheet_pack_tag_split_chunks %(\n) + %(\n) + %(), - + %(\n) + %(\n) + %(), @@ -132,7 +132,7 @@ def test_stylesheet_pack_tag_split_chunks def test_stylesheet_pack_tag assert_equal stylesheet_pack_tag("bootstrap.css").in?([ %(), - + %(), ]), true end @@ -140,7 +140,7 @@ def test_stylesheet_pack_tag def test_stylesheet_pack_tag_symbol assert_equal stylesheet_pack_tag(:bootstrap).in?([ %(), - + %(), ]), true end @@ -149,7 +149,7 @@ def test_stylesheet_pack_tag_splat assert_equal stylesheet_pack_tag("bootstrap.css", "application.css", media: "all").in?([ %(\n) + %(), - + %(\n) + %(), ]), true From 29d26e60c8e93b9041c56d12fd91dc4b965d6b32 Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Tue, 27 Jul 2021 10:01:49 -0300 Subject: [PATCH 08/11] Update check_yarn.rake --- lib/tasks/webpacker/check_yarn.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/webpacker/check_yarn.rake b/lib/tasks/webpacker/check_yarn.rake index 3fc514ace..4b799e7e3 100644 --- a/lib/tasks/webpacker/check_yarn.rake +++ b/lib/tasks/webpacker/check_yarn.rake @@ -9,7 +9,7 @@ namespace :webpacker do pkg_path = Pathname.new("#{__dir__}/../../../package.json").realpath yarn_range = JSON.parse(pkg_path.read)["engines"]["yarn"] is_valid = SemanticRange.satisfies?(yarn_version, yarn_range) rescue false - is_unsupported = SemanticRange.satisfies?(yarn_version, ">=3.0.0") rescue false + is_unsupported = SemanticRange.satisfies?(yarn_version, ">=4.0.0") rescue false unless is_valid $stderr.puts "Webpacker requires Yarn \"#{yarn_range}\" and you are using #{yarn_version}" From 565ccc21931f14cb6f1883295c3979543c538c39 Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Wed, 11 Aug 2021 17:18:14 -0300 Subject: [PATCH 09/11] Update ruby.yml --- .github/workflows/ruby.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 01c38d528..2ec02de4e 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -29,6 +29,14 @@ jobs: gemfile: gemfiles/Gemfile-rails.6.0.x experimental: [false] include: + - ruby: 2.5 + os: ubuntu-latest + gemfile: gemfiles/Gemfile-rails-edge + experimental: true + - ruby: 2.6 + os: ubuntu-latest + gemfile: gemfiles/Gemfile-rails-edge + experimental: true - ruby: 2.7 os: ubuntu-latest gemfile: gemfiles/Gemfile-rails-edge From de55be50ef7fcea9ad94ddb2fcc6c38075de70e0 Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Wed, 11 Aug 2021 17:18:31 -0300 Subject: [PATCH 10/11] Update Gemfile-rails-edge --- gemfiles/Gemfile-rails-edge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/Gemfile-rails-edge b/gemfiles/Gemfile-rails-edge index c096ad2d7..9b5c32d7e 100644 --- a/gemfiles/Gemfile-rails-edge +++ b/gemfiles/Gemfile-rails-edge @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec path: "../" -gem "rails", github: "rails/rails", branch: "main" +gem "rails", github: "rails/rails" gem "arel", github: "rails/arel" gem "rake", ">= 11.1" gem "rack-proxy", require: false From 3608edecd68667bf8d3f4e7b339c822fbe0caf4d Mon Sep 17 00:00:00 2001 From: Pedro Furtado Date: Wed, 11 Aug 2021 17:18:58 -0300 Subject: [PATCH 11/11] Update helper_test.rb --- test/helper_test.rb | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/test/helper_test.rb b/test/helper_test.rb index 116127e71..d2eca7d1b 100644 --- a/test/helper_test.rb +++ b/test/helper_test.rb @@ -117,41 +117,29 @@ def test_preload_pack_asset end def test_stylesheet_pack_tag_split_chunks - assert_equal stylesheet_packs_with_chunks_tag("application", "hello_stimulus").in?([ - %(\n) + - %(\n) + - %(), - - %(\n) + + assert_equal \ + %(\n) + %(\n) + %(), - ]), - true + stylesheet_packs_with_chunks_tag("application", "hello_stimulus") end def test_stylesheet_pack_tag - assert_equal stylesheet_pack_tag("bootstrap.css").in?([ - %(), - + assert_equal \ %(), - ]), true + stylesheet_pack_tag("bootstrap.css") end def test_stylesheet_pack_tag_symbol - assert_equal stylesheet_pack_tag(:bootstrap).in?([ - %(), - + assert_equal \ %(), - ]), true + stylesheet_pack_tag(:bootstrap) end def test_stylesheet_pack_tag_splat - assert_equal stylesheet_pack_tag("bootstrap.css", "application.css", media: "all").in?([ - %(\n) + - %(), - + assert_equal \ %(\n) + %(), - ]), true + stylesheet_pack_tag("bootstrap.css", "application.css", media: "all") end end