3 files changed, 4 insertions, 35 deletions
diff --git a/railties/lib/rails/tasks/annotations.rake b/railties/lib/rails/tasks/annotations.rake
index 93bc66e2db..60bcdc5e1b 100644
--- a/railties/lib/rails/tasks/annotations.rake
+++ b/railties/lib/rails/tasks/annotations.rake
@@ -4,19 +4,19 @@ require "rails/source_annotation_extractor"
 
 desc "Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)"
 task :notes do
-  SourceAnnotationExtractor.enumerate "OPTIMIZE|FIXME|TODO", tag: true
+  Rails::SourceAnnotationExtractor.enumerate "OPTIMIZE|FIXME|TODO", tag: true
 end
 
 namespace :notes do
   ["OPTIMIZE", "FIXME", "TODO"].each do |annotation|
     # desc "Enumerate all #{annotation} annotations"
     task annotation.downcase.intern do
-      SourceAnnotationExtractor.enumerate annotation
+      Rails::SourceAnnotationExtractor.enumerate annotation
     end
   end
 
   desc "Enumerate a custom annotation, specify with ANNOTATION=CUSTOM"
   task :custom do
-    SourceAnnotationExtractor.enumerate ENV["ANNOTATION"]
+    Rails::SourceAnnotationExtractor.enumerate ENV["ANNOTATION"]
   end
 end
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
deleted file mode 100644
index 403286d280..0000000000
--- a/railties/lib/rails/tasks/routes.rake
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require "optparse"
-
-desc "Print out all defined routes in match order, with names. Target specific controller with -c option, or grep routes using -g option"
-task routes: :environment do
-  all_routes = Rails.application.routes.routes
-  require "action_dispatch/routing/inspector"
-  inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
-
-  routes_filter = nil
-
-  OptionParser.new do |opts|
-    opts.banner = "Usage: rails routes [options]"
-
-    Rake.application.standard_rake_options.each { |args| opts.on(*args) }
-
-    opts.on("-c CONTROLLER") do |controller|
-      routes_filter = { controller: controller }
-    end
-
-    opts.on("-g PATTERN") do |pattern|
-      routes_filter = pattern
-    end
-
-  end.parse!(ARGV.reject { |x| x == "routes" })
-
-  puts inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, routes_filter)
-
-  exit 0 # ensure extra arguments aren't interpreted as Rake tasks
-end
diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake
index 48da7ffc51..10703a1808 100644
--- a/railties/lib/rails/tasks/yarn.rake
+++ b/railties/lib/rails/tasks/yarn.rake
@@ -3,7 +3,7 @@
 namespace :yarn do
   desc "Install all JavaScript dependencies as specified via Yarn"
   task :install do
-    system("./bin/yarn install --no-progress --production")
+    system("./bin/yarn install --no-progress --frozen-lockfile --production")
   end
 end