From 8bf385037876dd389eb23f5813a69151c9089446 Mon Sep 17 00:00:00 2001 From: Markus Doits Date: Tue, 1 Dec 2020 21:43:35 +0100 Subject: [PATCH 1/2] check yarn version and run correct install command --- railties/lib/rails/tasks/yarn.rake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake index 48a8d8e143d55..975a28d988c85 100644 --- 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 From 18ce38dc57206d4e3872869fae0f5a2c1acf24d5 Mon Sep 17 00:00:00 2001 From: Markus Doits Date: Sun, 6 Dec 2020 16:45:38 +0100 Subject: [PATCH 2/2] add changelog entry --- railties/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 06d69fd023a5e..518fdd2c4bd4e 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +* Use correct install flags with Yarn 2. + + *Markus Doits* + * Removed manifest.js and application.css in app/assets folder when --skip-sprockets option passed as flag to rails.