Merge PR #40722

Closes #40722.
rails · Dec 8, 2020 · b087511 · b087511
1 parent 188fb07
commit b087511
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake
@@ -8,7 +8,15 @@ namespace :yarn do
     node_env = ENV.fetch("NODE_ENV") do
       valid_node_envs.include?(Rails.env) ? Rails.env : "production"
     end
-    system({ "NODE_ENV" => node_env }, "#{Rails.root}/bin/yarn install --no-progress --frozen-lockfile")
+
+    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