RubyGems - railties - Versions diffs - 5.2.0 → 6.1.0 - Mend

railties 5.2.0 → 6.1.0

Files changed (234) hide show

data/lib/rails/tasks/yarn.rake CHANGED Viewed

@@ -3,7 +3,20 @@
 namespace :yarn do
   desc "Install all JavaScript dependencies as specified via Yarn"
   task :install do
-    system("./bin/yarn install --no-progress --production")
+    # Install only production deps when for not usual envs.
+    valid_node_envs = %w[test development production]
+    node_env = ENV.fetch("NODE_ENV") do
+      valid_node_envs.include?(Rails.env) ? Rails.env : "production"
+    end
+    yarn_flags =
+      if `#{Rails.root}/bin/yarn --version`.start_with?("1")
+        "--no-progress --frozen-lockfile"
+      else
+        "--immutable"
+      end
+    system({ "NODE_ENV" => node_env }, "#{Rails.root}/bin/yarn install #{yarn_flags}")
   end
 end

data/lib/rails/tasks/zeitwerk.rake ADDED Viewed

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+ensure_zeitwerk_mode = ->() do
+  unless Rails.autoloaders.zeitwerk_enabled?
+    abort "Please, enable :zeitwerk mode in config/application.rb and try again."
+  end
+end
+eager_load = ->() do
+  puts "Hold on, I am eager loading the application."
+  Zeitwerk::Loader.eager_load_all
+end
+report_not_checked = ->(not_checked) do
+  puts
+  puts <<~EOS
+    WARNING: The following directories will only be checked if you configure
+    them to be eager loaded:
+  EOS
+  puts
+  not_checked.each { |dir| puts "  #{dir}" }
+  puts
+  puts <<~EOS
+    You may verify them manually, or add them to config.eager_load_paths
+    in config/application.rb and run zeitwerk:check again.
+  EOS
+  puts
+end
+report = ->(not_checked) do
+  if not_checked.any?
+    report_not_checked[not_checked]
+    puts "Otherwise, all is good!"
+  else
+    puts "All is good!"
+  end
+end
+namespace :zeitwerk do
+  desc "Checks project structure for Zeitwerk compatibility"
+  task check: :environment do
+    ensure_zeitwerk_mode[]
+    begin
+      eager_load[]
+    rescue NameError => e
+      if e.message =~ /expected file .*? to define constant [\w:]+/
+        abort $&.sub(/expected file #{Regexp.escape(Rails.root.to_s)}./, "expected file ")
+      else
+        raise
+      end
+    end
+    require "active_support/core_ext/object/try"
+    eager_load_paths = Rails.configuration.eager_load_namespaces.map do |eln|
+      # Quick regression fix for 6.0.3 to support namespaces that do not have
+      # eager load paths, like the recently added i18n. I'll rewrite this task.
+      eln.try(:config).try(:eager_load_paths)
+    end.compact.flatten
+    not_checked = ActiveSupport::Dependencies.autoload_paths - eager_load_paths
+    not_checked.select! { |dir| Dir.exist?(dir) }
+    not_checked.reject! { |dir| Dir.empty?(dir) }
+    report[not_checked]
+  end
+end

data/lib/rails/tasks.rb CHANGED Viewed

@@ -4,17 +4,14 @@ require "rake"
 # Load Rails Rakefile extensions
 %w(
-  annotations
-  dev
   framework
-  initializers
   log
   middleware
   misc
   restart
-  routes
   tmp
   yarn
+  zeitwerk
 ).tap { |arr|
   arr << "statistics" if Rake.application.current_scope.empty?
 }.each do |task|

data/lib/rails/templates/rails/mailers/email.html.erb CHANGED Viewed

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html><head>
+<title><%= @page_title %></title>
 <meta name="viewport" content="width=device-width" />
 <style type="text/css">
   html, body, iframe {
@@ -98,7 +99,7 @@
     <dt>Format:</dt>
     <% if @email.multipart? %>
       <dd>
-        <select id="part" onchange="refreshBody();">
+        <select id="part" onchange="refreshBody(false);">
           <option <%= request.format == Mime[:html] ? 'selected' : '' %> value="<%= part_query('text/html') %>">View as HTML email</option>
           <option <%= request.format == Mime[:text] ? 'selected' : '' %> value="<%= part_query('text/plain') %>">View as plain-text email</option>
         </select>
@@ -110,7 +111,7 @@
     <% if I18n.available_locales.count > 1 %>
       <dt>Locale:</dt>
       <dd>
-        <select id="locale" onchange="refreshBody();">
+        <select id="locale" onchange="refreshBody(true);">
           <% I18n.available_locales.each do |locale| %>
             <option <%= I18n.locale == locale ? 'selected' : '' %> value="<%= locale_query(locale) %>"><%= locale %></option>
           <% end %>
@@ -130,7 +131,7 @@
 <% end %>
 <script>
-  function refreshBody() {
+  function refreshBody(reload) {
     var part_select = document.querySelector('select#part');
     var locale_select = document.querySelector('select#locale');
     var iframe = document.getElementsByName('messageBody')[0];
@@ -146,10 +147,13 @@
     }
     iframe.contentWindow.location = fresh_location;
-    if (history.replaceState) {
-      var url = location.pathname.replace(/\.(txt|html)$/, '');
-      var format = /html/.test(part_param) ? '.html' : '.txt';
-      var state_to_replace = locale_param ? (url + format + '?' + locale_param) : (url + format);
+    var url = location.pathname.replace(/\.(txt|html)$/, '');
+    var format = /html/.test(part_param) ? '.html' : '.txt';
+    var state_to_replace = locale_param ? (url + format + '?' + locale_param) : (url + format);
+    if (reload) {
+      location.href = state_to_replace;
+    } else if (history.replaceState) {
       window.history.replaceState({}, '', state_to_replace);
     }
   }