6 files changed, 29 insertions, 19 deletions
diff --git a/railties/lib/rails/tasks/annotations.rake b/railties/lib/rails/tasks/annotations.rake
index 60bcdc5e1b..3a78de418a 100644
--- a/railties/lib/rails/tasks/annotations.rake
+++ b/railties/lib/rails/tasks/annotations.rake
@@ -2,21 +2,21 @@
 
 require "rails/source_annotation_extractor"
 
-desc "Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)"
-task :notes do
-  Rails::SourceAnnotationExtractor.enumerate "OPTIMIZE|FIXME|TODO", tag: true
+task notes: :environment do
+  Rails::SourceAnnotationExtractor::Annotation.notes_task_deprecation_warning
+  Rails::Command.invoke :notes
 end
 
 namespace :notes do
   ["OPTIMIZE", "FIXME", "TODO"].each do |annotation|
-    # desc "Enumerate all #{annotation} annotations"
-    task annotation.downcase.intern do
-      Rails::SourceAnnotationExtractor.enumerate annotation
+    task annotation.downcase.intern => :environment do
+      Rails::SourceAnnotationExtractor::Annotation.notes_task_deprecation_warning
+      Rails::Command.invoke :notes, ["--annotations", annotation]
     end
   end
 
-  desc "Enumerate a custom annotation, specify with ANNOTATION=CUSTOM"
-  task :custom do
-    Rails::SourceAnnotationExtractor.enumerate ENV["ANNOTATION"]
+  task custom: :environment do
+    Rails::SourceAnnotationExtractor::Annotation.notes_task_deprecation_warning
+    Rails::Command.invoke :notes, ["--annotations", ENV["ANNOTATION"]]
   end
 end
diff --git a/railties/lib/rails/tasks/dev.rake b/railties/lib/rails/tasks/dev.rake
index 5aea6f7dc5..716fb6a331 100644
--- a/railties/lib/rails/tasks/dev.rake
+++ b/railties/lib/rails/tasks/dev.rake
@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require "rails/dev_caching"
+require "rails/command"
+require "active_support/deprecation"
 
 namespace :dev do
-  desc "Toggle development mode caching on/off"
-  task :cache do
-    Rails::DevCaching.enable_by_file
+  task cache: :environment do
+    ActiveSupport::Deprecation.warn("Using `bin/rake dev:cache` is deprecated and will be removed in Rails 6.1. Use `bin/rails dev:cache` instead.\n")
+    Rails::Command.invoke "dev:cache"
   end
 end
diff --git a/railties/lib/rails/tasks/initializers.rake b/railties/lib/rails/tasks/initializers.rake
index ae85cb0f86..f108517d1d 100644
--- a/railties/lib/rails/tasks/initializers.rake
+++ b/railties/lib/rails/tasks/initializers.rake
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-desc "Print out all defined initializers in the order they are invoked by Rails."
+require "rails/command"
+require "active_support/deprecation"
+
 task initializers: :environment do
-  Rails.application.initializers.tsort_each do |initializer|
-    puts "#{initializer.context_class}.#{initializer.name}"
-  end
+  ActiveSupport::Deprecation.warn("Using `bin/rake initializers` is deprecated and will be removed in Rails 6.1. Use `bin/rails initializers` instead.\n")
+  Rails::Command.invoke "initializers"
 end
diff --git a/railties/lib/rails/tasks/log.rake b/railties/lib/rails/tasks/log.rake
index e219277d23..ec56957204 100644
--- a/railties/lib/rails/tasks/log.rake
+++ b/railties/lib/rails/tasks/log.rake
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 namespace :log do
-
   ##
   # Truncates all/specified log files
   # ENV['LOGS']
diff --git a/railties/lib/rails/tasks/routes.rake b/railties/lib/rails/tasks/routes.rake
new file mode 100644
index 0000000000..21ce900a8c
--- /dev/null
+++ b/railties/lib/rails/tasks/routes.rake
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rails/command"
+require "active_support/deprecation"
+
+task routes: :environment do
+  ActiveSupport::Deprecation.warn("Using `bin/rake routes` is deprecated and will be removed in Rails 6.1. Use `bin/rails routes` instead.\n")
+  Rails::Command.invoke "routes"
+end
diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake
index cf45a392e8..4fb8586b69 100644
--- a/railties/lib/rails/tasks/yarn.rake
+++ b/railties/lib/rails/tasks/yarn.rake
@@ -9,7 +9,7 @@ namespace :yarn do
       rails_env = ENV["RAILS_ENV"]
       valid_node_envs.include?(rails_env) ? rails_env : "production"
     end
-    system({ "NODE_ENV" => node_env }, "./bin/yarn install --no-progress --frozen-lockfile")
+    system({ "NODE_ENV" => node_env }, "#{Rails.root}/bin/yarn install --no-progress --frozen-lockfile")
   end
 end