From efa89e5b241962e2523e25e70ac4663e886ac1f4 Mon Sep 17 00:00:00 2001
From: Chris Bandy <bandy.chris@gmail.com>
Date: Fri, 4 Jan 2019 11:54:47 -0600
Subject: Respect Rails.env when running `rails yarn:install`

When no environment variables are set the expectation is that we are in
development.
---
 railties/lib/rails/tasks/yarn.rake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake
index 4fb8586b69..48a8d8e143 100644
--- a/railties/lib/rails/tasks/yarn.rake
+++ b/railties/lib/rails/tasks/yarn.rake
@@ -6,8 +6,7 @@ namespace :yarn do
     # Install only production deps when for not usual envs.
     valid_node_envs = %w[test development production]
     node_env = ENV.fetch("NODE_ENV") do
-      rails_env = ENV["RAILS_ENV"]
-      valid_node_envs.include?(rails_env) ? rails_env : "production"
+      valid_node_envs.include?(Rails.env) ? Rails.env : "production"
     end
     system({ "NODE_ENV" => node_env }, "#{Rails.root}/bin/yarn install --no-progress --frozen-lockfile")
   end
-- 
cgit v1.2.3