mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
execute yarn executable using current ruby interpreter
This change is required to support windows. It explicitly runs the bin/yarn file using the ruby executable that's running the rake task.
This commit is contained in:
parent
e2e34eaf85
commit
5c8805034f
1 changed files with 2 additions and 2 deletions
|
@ -10,13 +10,13 @@ namespace :yarn do
|
||||||
end
|
end
|
||||||
|
|
||||||
yarn_flags =
|
yarn_flags =
|
||||||
if `"#{Rails.root}/bin/yarn" --version`.start_with?("1")
|
if `#{RbConfig.ruby} "#{Rails.root}/bin/yarn" --version`.start_with?("1")
|
||||||
"--no-progress --frozen-lockfile"
|
"--no-progress --frozen-lockfile"
|
||||||
else
|
else
|
||||||
"--immutable"
|
"--immutable"
|
||||||
end
|
end
|
||||||
|
|
||||||
system({ "NODE_ENV" => node_env }, "\"#{Rails.root}/bin/yarn\" install #{yarn_flags}")
|
system({ "NODE_ENV" => node_env }, "#{RbConfig.ruby} \"#{Rails.root}/bin/yarn\" install #{yarn_flags}")
|
||||||
rescue Errno::ENOENT
|
rescue Errno::ENOENT
|
||||||
$stderr.puts "bin/yarn was not found."
|
$stderr.puts "bin/yarn was not found."
|
||||||
$stderr.puts "Please run `bundle exec rails app:update:bin` to create it."
|
$stderr.puts "Please run `bundle exec rails app:update:bin` to create it."
|
||||||
|
|
Loading…
Reference in a new issue