1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
Description: Use system yarnpkg instead of yarn
In Debian, yarn is packaged as "yarnpkg".
.
This patch will replace all the "bin/yarn" usages to "bin/yarnpkg".
Author: Jongmin Kim <jmkim@pukyong.ac.kr>
Forwarded: no
Last-Update: 2019-06-21
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -191,7 +191,7 @@
%w(app/assets
app/helpers
app/views/layouts/application.html.erb
- bin/yarn
+ bin/yarnpkg
config/initializers/assets.rb
config/initializers/content_security_policy.rb
config/initializers/permissions_policy.rb
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -531,7 +531,7 @@
end
def dockerfile_yarn_version
- using_node? and `yarn --version`[/\d+\.\d+\.\d+/]
+ using_node? and `yarnpkg --version`[/\d+\.\d+\.\d+/]
rescue
"latest"
end
|
