Merge branch 'main' into 42994-add-support-for-postgresql-certs-on-db-tasks

Author: guilleiguaran

.gitignore

@@ -2,7 +2,6 @@
 # Check out https://help.github.com/articles/ignoring-files for how to set that up.
 
 .Gemfile
-.byebug_history
 .ruby-version
 /*/doc/
 /*/test/tmp/

.rubocop.yml

@@ -143,6 +143,9 @@ Style/DefWithParentheses:
 Style/MethodDefParentheses:
   Enabled: true
 
+Style/ExplicitBlockArgument:
+  Enabled: true
+
 Style/FrozenStringLiteralComment:
   Enabled: true
   EnforcedStyle: always

Gemfile

@@ -15,8 +15,10 @@ gem "selenium-webdriver", ">= 4.0.0.alpha7"
 gem "rack-cache", "~> 1.2"
 gem "stimulus-rails"
 gem "turbo-rails"
-gem "webpacker", "~> 6.0.0.rc.5", require: ENV["SKIP_REQUIRE_WEBPACKER"] != "true"
+gem "jsbundling-rails"
+gem "cssbundling-rails"
 gem "importmap-rails"
+gem "tailwindcss-rails"
 # require: false so bcrypt is loaded only when has_secure_password is used.
 # This is to avoid Active Model (and by extension the entire framework)
 # being dependent on a binary library.
@@ -117,7 +119,7 @@ group :test do
 
   platforms :mri do
     gem "stackprof"
-    gem "byebug"
+    gem "debug", ">= 1.0.0", require: false
   end
 
   gem "benchmark-ips"

Gemfile.lock

@@ -81,7 +81,6 @@ PATH
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.5.0.beta2)
     rails (7.0.0.alpha)
       actioncable (= 7.0.0.alpha)
       actionmailbox (= 7.0.0.alpha)
@@ -103,6 +102,7 @@ PATH
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
+      zeitwerk (~> 2.5.0.beta3)
 
 GEM
   remote: https://rubygems.org/
@@ -164,7 +164,6 @@ GEM
     bunny (2.18.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
-    byebug (11.1.3)
     capybara (3.35.3)
       addressable
       mini_mime (>= 0.1.3)
@@ -184,10 +183,15 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
+    cssbundling-rails (0.1.0)
+      rails (>= 6.0.0)
     curses (1.4.2)
     daemons (1.4.0)
     dalli (2.7.11)
     dante (0.2.0)
+    debug (1.0.0)
+      irb
+      reline (>= 0.2.7)
     declarative (0.0.20)
     delayed_job (4.1.9)
       activesupport (>= 3.0, < 6.2)
@@ -286,9 +290,14 @@ GEM
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    importmap-rails (0.3.4)
+    importmap-rails (0.5.1)
       rails (>= 6.0.0)
+    io-console (0.5.9)
+    irb (1.3.7)
+      reline (>= 0.2.7)
     jmespath (1.4.0)
+    jsbundling-rails (0.1.0)
+      rails (>= 6.0.0)
     json (2.5.1)
     jwt (2.2.3)
     kindlerb (1.2.0)
@@ -354,8 +363,6 @@ GEM
       rack (>= 0.4)
     rack-protection (2.1.0)
       rack
-    rack-proxy (0.7.0)
-      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -375,6 +382,8 @@ GEM
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
     regexp_parser (2.1.1)
+    reline (0.2.7)
+      io-console (~> 0.5)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -428,7 +437,6 @@ GEM
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2)
       rubyzip (>= 1.2.2)
-    semantic_range (3.0.0)
     sequel (5.45.0)
     serverengine (2.0.7)
       sigdump (~> 0.2.2)
@@ -467,10 +475,12 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
     stackprof (0.2.17)
-    stimulus-rails (0.3.9)
+    stimulus-rails (0.4.2)
       rails (>= 6.0.0)
     sucker_punch (3.0.1)
       concurrent-ruby (~> 1.0)
+    tailwindcss-rails (0.4.3)
+      rails (>= 6.0.0)
     terser (1.1.4)
       execjs (>= 0.3.0, < 3)
     thin (1.8.1)
@@ -480,7 +490,7 @@ GEM
     thor (1.1.0)
     tilt (2.0.10)
     trailblazer-option (0.1.1)
-    turbo-rails (0.7.4)
+    turbo-rails (0.7.11)
       rails (>= 6.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -501,19 +511,14 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webpacker (6.0.0.rc.5)
-      activesupport (>= 5.2)
-      rack-proxy (>= 0.6.1)
-      railties (>= 5.2)
-      semantic_range (>= 2.3.0)
     webrick (1.7.0)
     websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.5.0.beta2)
+    zeitwerk (2.5.0.beta3)
 
 PLATFORMS
   ruby
@@ -533,16 +538,18 @@ DEPENDENCIES
   benchmark-ips
   blade
   bootsnap (>= 1.4.4)
-  byebug
   capybara (>= 3.26)
   connection_pool
+  cssbundling-rails
   dalli
+  debug (>= 1.0.0)
   delayed_job
   delayed_job_active_record
   google-cloud-storage (~> 1.11)
   hiredis
   image_processing (~> 1.2)
   importmap-rails
+  jsbundling-rails
   json (>= 2.0.0)
   kindlerb (~> 1.2.0)
   libxml-ruby
@@ -583,14 +590,14 @@ DEPENDENCIES
   stackprof
   stimulus-rails
   sucker_punch
+  tailwindcss-rails
   terser (>= 1.1.4)
   turbo-rails
   tzinfo-data
   w3c_validators (~> 1.3.6)
   wdm (>= 0.1.0)
   webdrivers
   webmock
-  webpacker (~> 6.0.0.rc.5)
   webrick
   websocket-client-simple!
 

RELEASING_RAILS.md

@@ -49,12 +49,12 @@ give them a heads up that Rails will be released soonish.
 This is only required for major and minor releases, bugfix releases aren't a
 big enough deal, and are supposed to be backward compatible.
 
-Send an email just giving a heads up about the upcoming release to these
+Send a message just giving a heads up about the upcoming release to these
 lists:
 
 * [email protected]
 * [email protected]
-* rubyonrails-core@googlegroups.com
+* [rubyonrails-core](https://discuss.rubyonrails.org/c/rubyonrails-core)
 
 Implementors will love you and help you.
 
@@ -135,8 +135,8 @@ Write a release announcement that includes the version, changes, and links to
 GitHub where people can find the specific commit list. Here are the mailing
 lists where you should announce:
 
-* rubyonrails-core@googlegroups.com
-* rubyonrails-talk@googlegroups.com
+* [rubyonrails-core](https://discuss.rubyonrails.org/c/rubyonrails-core)
+* [rubyonrails-talk](https://discuss.rubyonrails.org/c/rubyonrails-talk)
 * [email protected]
 
 Use Markdown format for your announcement. Remember to ask people to report

actioncable/lib/action_cable/connection/tagged_logger_proxy.rb

@@ -18,10 +18,10 @@ def add_tags(*tags)
         @tags = @tags.uniq
       end
 
-      def tag(logger)
+      def tag(logger, &block)
         if logger.respond_to?(:tagged)
           current_tags = tags - logger.formatter.current_tags
-          logger.tagged(*current_tags) { yield }
+          logger.tagged(*current_tags, &block)
         else
           yield
         end

actioncable/lib/action_cable/server/worker.rb

@@ -36,12 +36,10 @@ def stopping?
         @executor.shuttingdown?
       end
 
-      def work(connection)
+      def work(connection, &block)
         self.connection = connection
 
-        run_callbacks :work do
-          yield
-        end
+        run_callbacks :work, &block
       ensure
         self.connection = nil
       end

actioncable/lib/action_cable/server/worker/active_record_connection_management.rb

@@ -12,8 +12,8 @@ module ActiveRecordConnectionManagement
           end
         end
 
-        def with_database_connections
-          connection.logger.tag(ActiveRecord::Base.logger) { yield }
+        def with_database_connections(&block)
+          connection.logger.tag(ActiveRecord::Base.logger, &block)
         end
       end
     end

actioncable/lib/rails/generators/channel/channel_generator.rb

@@ -13,51 +13,98 @@ class ChannelGenerator < NamedBase
 
       hook_for :test_framework
 
-      def create_channel_file
-        template "channel.rb", File.join("app/channels", class_path, "#{file_name}_channel.rb")
-
-        if options[:assets]
-          if behavior == :invoke
-            if defined?(Webpacker::Engine)
-              template "javascript/index.js", "#{Webpacker.config.source_path}/channels/index.js"
-              template "javascript/consumer.js", "#{Webpacker.config.source_path}/channels/consumer.js"
-            else
-              template "javascript/consumer.js", "app/javascript/channels/consumer.js"
-            end
-          end
+      def create_channel_files
+        create_shared_channel_files
+        create_channel_file
 
-          if defined?(Webpacker::Engine)
-            js_template "javascript/channel", File.join(Webpacker.config.source_path, "channels", class_path, "#{file_name}_channel")
-          else
-            channel_js_path = File.join("app/javascript/channels", class_path, "#{file_name}_channel")
-            js_template "javascript/channel", channel_js_path
-            gsub_file "#{channel_js_path}.js", /\.\/consumer/, "channels/consumer"
+        if using_javascript?
+          if first_setup_required?
+            create_shared_channel_javascript_files
+            import_channels_in_javascript_entrypoint
 
-            append_to_file "app/javascript/application.js", %(\nimport "channels/#{file_name}_channel"\n)
+            if using_importmap?
+              pin_javascript_dependencies
+            elsif using_node?
+              install_javascript_dependencies
+            end
           end
-        end
 
-        generate_application_cable_files
+          create_channel_javascript_file
+          import_channel_in_javascript_entrypoint
+        end
       end
 
       private
+        def create_shared_channel_files
+          return if behavior != :invoke
+
+          copy_file "#{__dir__}/templates/application_cable/channel.rb",
+            "app/channels/application_cable/channel.rb"
+          copy_file "#{__dir__}/templates/application_cable/connection.rb",
+            "app/channels/application_cable/connection.rb"
+        end
+
+        def create_channel_file
+          template "channel.rb",
+            File.join("app/channels", class_path, "#{file_name}_channel.rb")
+        end
+
+        def create_shared_channel_javascript_files
+          template "javascript/index.js", "app/javascript/channels/index.js"
+          template "javascript/consumer.js", "app/javascript/channels/consumer.js"
+        end
+
+        def create_channel_javascript_file
+          channel_js_path = File.join("app/javascript/channels", class_path, "#{file_name}_channel")
+          js_template "javascript/channel", channel_js_path
+          gsub_file "#{channel_js_path}.js", /\.\/consumer/, "channels/consumer" unless using_node?
+        end
+
+        def import_channels_in_javascript_entrypoint
+          append_to_file "app/javascript/application.js",
+            using_node? ? %(import "./channels"\n) : %(import "channels"\n)
+        end
+
+        def import_channel_in_javascript_entrypoint
+          append_to_file "app/javascript/channels/index.js",
+            using_node? ? %(import "./#{file_name}_channel"\n) : %(import "channels/#{file_name}_channel"\n)
+        end
+
+        def install_javascript_dependencies
+          say "Installing JavaScript dependencies", :green
+          run "yarn add @rails/actioncable"
+        end
+
+        def pin_javascript_dependencies
+          append_to_file "config/importmap.rb", <<-RUBY
+pin "@rails/actioncable", to: "actioncable.esm.js"
+pin_all_from "app/javascript/channels", under: "channels"
+          RUBY
+        end
+
+
         def file_name
           @_file_name ||= super.sub(/_channel\z/i, "")
         end
 
-        # FIXME: Change these files to symlinks once RubyGems 2.5.0 is required.
-        def generate_application_cable_files
-          return if behavior != :invoke
+        def first_setup_required?
+          !root.join("app/javascript/channels/index.js").exist?
+        end
 
-          files = [
-            "application_cable/channel.rb",
-            "application_cable/connection.rb"
-          ]
+        def using_javascript?
+          @using_javascript ||= options[:assets] && root.join("app/javascript").exist?
+        end
 
-          files.each do |name|
-            path = File.join("app/channels/", name)
-            template(name, path) if !File.exist?(path)
-          end
+        def using_node?
+          @using_node ||= root.join("package.json").exist?
+        end
+
+        def using_importmap?
+          @using_importmap ||= root.join("config/importmap.rb").exist?
+        end
+
+        def root
+          @root ||= Pathname(destination_root)
         end
     end
   end