railties 6.1.0 → 6.1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1adfe379d94049a35a1306f22a5d1368e3b88455d57bb1e4764b845f7ec7e0c5
-  data.tar.gz: 1ff026a5d1cc46e2cb543b15568fb2f12915d468a3c3723efd2daa18d70fc04a
+  metadata.gz: 5aec339306019871f8653723de4632456dd76486a889edd0622d1609610a668c
+  data.tar.gz: d10197f3a4d4d5ed980f06da505c316aa60b397da3edc5328ad5f6a0d6db4b59
 SHA512:
-  metadata.gz: 1b297610d901f515027eb7bb31b3bf912437ccc0643276ba5b166216fe41f8f6e74b42783002d8bd1a904fa512b18ffbcb258375d019299918a21c5b6c220cf6
-  data.tar.gz: 9b1c0e55db347c811b93edb2e68dee00b99cd476e917de5e138c09faa4eaaaa1df3a374bc54b09934895c22993080e327d530129ba4163f209cd42d438deaabe
+  metadata.gz: 7d6653e07db48e2e36736216556a43e522d172b620bcf13d7096eab91d56d720bffa09af64365831bab53279993e0d530884470d5e6d61213f73c02cff1bbfbc
+  data.tar.gz: 761d0f69dd0509c7649a4370ebfeb74d29d84b18ba52ed90cc09f656b7cfca095e7443f0444733f38af6f24346437b7498b1139cac79300ff853ef9a15ed1583

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## Rails 6.1.3.1 (March 26, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.3 (February 17, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.2.1 (February 10, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.2 (February 09, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.1 (January 07, 2021) ##
+
+*   Allow spaces in path to Yarn binstub and only run on precompile if needed.
+
+    *Markus Doits*
+
+*   Populate ARGV for app template.
+
+    Fixes #40945.
+
+    *Jonathan Hefner*
+
+
 ## Rails 6.1.0 (December 09, 2020) ##
 
 *   Added `Railtie#server` hook called when Rails starts a server.

data/README.rdoc

@@ -17,7 +17,7 @@ The latest version of Railties can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/railties
+* https://github.com/rails/rails/tree/main/railties
 
 == License
 

data/lib/rails/api/task.rb

@@ -189,7 +189,7 @@ module Rails
 
     class EdgeTask < RepoTask
       def rails_version
-        "master@#{`git rev-parse HEAD`[0, 7]}"
+        "main@#{`git rev-parse HEAD`[0, 7]}"
       end
     end
 

data/lib/rails/application/configuration.rb

@@ -183,6 +183,7 @@ module Rails
 
           if respond_to?(:action_view)
             action_view.form_with_generates_remote_forms = false
+            action_view.preload_links_header = true
           end
 
           if respond_to?(:active_storage)

data/lib/rails/commands/notes/notes_command.rb

@@ -5,7 +5,7 @@ require "rails/source_annotation_extractor"
 module Rails
   module Command
     class NotesCommand < Base # :nodoc:
-      class_option :annotations, aliases: "-a", desc: "Filter by specific annotations, e.g. Foobar TODO", type: :array, default: Rails::SourceAnnotationExtractor::Annotation.tags
+      class_option :annotations, aliases: "-a", desc: "Filter by specific annotations, e.g. Foobar TODO", type: :array
 
       def perform(*)
         require_application_and_environment!
@@ -15,7 +15,7 @@ module Rails
 
       private
         def display_annotations
-          annotations = options[:annotations]
+          annotations = options[:annotations] || Rails::SourceAnnotationExtractor::Annotation.tags
           tag = (annotations.length > 1)
 
           Rails::SourceAnnotationExtractor.enumerate annotations.join("|"), tag: tag, dirs: directories

data/lib/rails/gem_version.rb

@@ -9,8 +9,8 @@ module Rails
   module VERSION
     MAJOR = 6
     MINOR = 1
-    TINY  = 0
-    PRE   = nil
+    TINY  = 3
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/app_base.rb

@@ -98,7 +98,7 @@ module Rails
                                            desc: "Set up the #{name} with Gemfile pointing to Rails repository"
 
         class_option :master,              type: :boolean, default: false,
-                                           desc: "Set up the #{name} with Gemfile pointing to Rails repository master branch"
+                                           desc: "Set up the #{name} with Gemfile pointing to Rails repository main branch"
 
         class_option :rc,                  type: :string, default: nil,
                                            desc: "Path to file containing extra configuration options for rails command"
@@ -110,8 +110,9 @@ module Rails
                                            desc: "Show this help message and quit"
       end
 
-      def initialize(*args)
-        @gem_filter    = lambda { |gem| true }
+      def initialize(positional_argv, option_argv, *)
+        @argv = [*positional_argv, *option_argv]
+        @gem_filter = lambda { |gem| true }
         @extra_entries = []
         super
       end
@@ -172,9 +173,14 @@ module Rails
       end
 
       def apply_rails_template # :doc:
+        original_argv = ARGV.dup
+        ARGV.replace(@argv)
+
         apply rails_template if rails_template
       rescue Thor::Error, LoadError, Errno::ENOENT => e
         raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
+      ensure
+        ARGV.replace(original_argv)
       end
 
       def set_default_accessors! # :doc:
@@ -295,16 +301,16 @@ module Rails
           ]
         elsif options.edge?
           [
-            GemfileEntry.github("rails", "rails/rails")
+            GemfileEntry.github("rails", "rails/rails", "6-1-stable")
           ]
         elsif options.master?
           [
-            GemfileEntry.github("rails", "rails/rails", "master")
+            GemfileEntry.github("rails", "rails/rails", "main")
           ]
         else
           [GemfileEntry.version("rails",
                             rails_version_specifier,
-                            "Bundle edge Rails instead: gem 'rails', github: 'rails/rails'")]
+                            "Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'")]
         end
       end
 
@@ -423,11 +429,19 @@ module Rails
       end
 
       def run_webpack
-        if webpack_install?
-          rails_command "webpacker:install"
-          if options[:webpack] && options[:webpack] != "webpack"
-            rails_command "webpacker:install:#{options[:webpack]}"
-          end
+        return unless webpack_install?
+
+        unless bundle_install?
+          say <<~EXPLAIN
+            Skipping `rails webpacker:install` because `bundle install` was skipped.
+            To complete setup, you must run `bundle install` followed by `rails webpacker:install`.
+          EXPLAIN
+          return
+        end
+
+        rails_command "webpacker:install"
+        if options[:webpack] && options[:webpack] != "webpack"
+          rails_command "webpacker:install:#{options[:webpack]}"
         end
       end
 

data/lib/rails/generators/rails/app/app_generator.rb

@@ -104,9 +104,7 @@ module Rails
     end
 
     def yarn_when_updating
-      return if File.exist?("bin/yarn")
-
-      template "bin/yarn" do |content|
+      template "bin/yarn", force: true do |content|
         "#{shebang}\n" + content
       end
 

data/lib/rails/generators/rails/app/templates/bin/spring.tt

@@ -1,9 +1,13 @@
 if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
-  # Load Spring without loading other gems in the Gemfile, for speed.
+  gem "bundler"
   require "bundler"
-  Bundler.locked_gems.specs.find { |spec| spec.name == "spring" }&.tap do |spring|
+
+  # Load Spring without loading other gems in the Gemfile, for speed.
+  Bundler.locked_gems&.specs&.find { |spec| spec.name == "spring" }&.tap do |spring|
     Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
     gem "spring", spring.version
     require "spring/binstub"
+  rescue Gem::LoadError
+    # Ignore when Spring is not installed.
   end
 end

data/lib/rails/generators/rails/app/templates/bin/yarn.tt

@@ -1,15 +1,13 @@
-require 'pathname'
-
 APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
-  executable_path = ENV["PATH"].split(File::PATH_SEPARATOR).find do |path|
-    normalized_path = File.expand_path(path)
-
-    normalized_path != __dir__ && File.executable?(Pathname.new(normalized_path).join('yarn'))
-  end
+  yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
+    select { |dir| File.expand_path(dir) != __dir__ }.
+    product(["yarn", "yarn.cmd", "yarn.ps1"]).
+    map { |dir, file| File.expand_path(file, dir) }.
+    find { |file| File.executable?(file) }
 
-  if executable_path
-    exec File.expand_path(Pathname.new(executable_path).join('yarn')), *ARGV
+  if yarn
+    exec yarn, *ARGV
   else
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"

data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_1.rb.tt

@@ -61,3 +61,7 @@
 
 # Set the default queue name for the mail deliver job to the queue adapter default.
 # Rails.application.config.action_mailer.deliver_later_queue_name = nil
+
+# Generate a `Link` header that gives a hint to modern browsers about
+# preloading assets when using `javascript_include_tag` and `stylesheet_link_tag`.
+# Rails.application.config.action_view.preload_links_header = true

data/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -103,6 +103,7 @@ task default: :test
       opts = options.transform_keys(&:to_sym).except(*DUMMY_IGNORE_OPTIONS)
       opts[:force] = force
       opts[:skip_bundle] = true
+      opts[:skip_spring] = true
       opts[:skip_listen] = true
       opts[:skip_git] = true
       opts[:skip_turbolinks] = true

data/lib/rails/railtie.rb

@@ -120,11 +120,11 @@ module Rails
   # this less confusing for everyone.
   # It can be used like this:
   #
-  # class MyRailtie < Rails::Railtie
-  #   server do
-  #     WebpackServer.start
+  #   class MyRailtie < Rails::Railtie
+  #     server do
+  #       WebpackServer.start
+  #     end
   #   end
-  # end
   #
   # == Application and Engine
   #

data/lib/rails/source_annotation_extractor.rb

@@ -72,7 +72,7 @@ module Rails
     #
     # See <tt>#find_in</tt> for a list of file extensions that will be taken into account.
     #
-    # This class method is the single entry point for the `rails notes` command.
+    # This class method is the single entry point for the <tt>rails notes</tt> command.
     def self.enumerate(tag = nil, options = {})
       tag ||= Annotation.tags.join("|")
       extractor = new(tag)

data/lib/rails/tasks/yarn.rake

@@ -10,17 +10,21 @@ namespace :yarn do
     end
 
     yarn_flags =
-      if `#{Rails.root}/bin/yarn --version`.start_with?("1")
+      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}")
+    system({ "NODE_ENV" => node_env }, "\"#{Rails.root}/bin/yarn\" install #{yarn_flags}")
+  rescue Errno::ENOENT
+    $stderr.puts "bin/yarn was not found."
+    $stderr.puts "Please run `bundle exec rails app:update:bin` to create it."
+    exit 1
   end
 end
 
 # Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
-if Rake::Task.task_defined?("assets:precompile")
+if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn"))
   Rake::Task["assets:precompile"].enhance [ "yarn:install" ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.3.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.3.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.1.3.1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -426,10 +426,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.0/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.0/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.3.1/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.3.1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.0/railties
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.3.1/railties
 post_install_message: 
 rdoc_options:
 - "--exclude"
@@ -447,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.