Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7b0a316f
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
7b0a316f
编写于
5月 08, 2018
作者:
T
Tsukuru Tanimichi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't generate yarn's contents in `app:update` task if it's skipped
上级
bfe4248c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
3 deletion
+25
-3
railties/CHANGELOG.md
railties/CHANGELOG.md
+2
-0
railties/lib/rails/app_updater.rb
railties/lib/rails/app_updater.rb
+1
-0
railties/lib/rails/generators/rails/app/app_generator.rb
railties/lib/rails/generators/rails/app/app_generator.rb
+1
-3
railties/test/generators/app_generator_test.rb
railties/test/generators/app_generator_test.rb
+21
-0
未找到文件。
railties/CHANGELOG.md
浏览文件 @
7b0a316f
...
...
@@ -4,6 +4,8 @@
Skip `config/spring.rb` when spring isn't loaded.
Skip yarn's contents when yarn integration isn't used.
*Tsukuru Tanimichi*
*
Make the master.key file read-only for the owner upon generation on
...
...
railties/lib/rails/app_updater.rb
浏览文件 @
7b0a316f
...
...
@@ -21,6 +21,7 @@ def app_generator
private
def
generator_options
options
=
{
api:
!!
Rails
.
application
.
config
.
api_only
,
update:
true
}
options
[
:skip_yarn
]
=
!
File
.
exist?
(
Rails
.
root
.
join
(
"bin"
,
"yarn"
))
options
[
:skip_active_record
]
=
!
defined?
(
ActiveRecord
::
Railtie
)
options
[
:skip_active_storage
]
=
!
defined?
(
ActiveStorage
::
Engine
)
||
!
defined?
(
ActiveRecord
::
Railtie
)
options
[
:skip_action_mailer
]
=
!
defined?
(
ActionMailer
::
Railtie
)
...
...
railties/lib/rails/generators/rails/app/app_generator.rb
浏览文件 @
7b0a316f
...
...
@@ -95,11 +95,9 @@ def bin
end
def
bin_when_updating
bin_yarn_exist
=
File
.
exist?
(
"bin/yarn"
)
bin
if
options
[
:
api
]
&&
!
bin_yarn_exist
if
options
[
:
skip_yarn
]
remove_file
"bin/yarn"
end
end
...
...
railties/test/generators/app_generator_test.rb
浏览文件 @
7b0a316f
...
...
@@ -296,6 +296,27 @@ def test_app_update_does_not_remove_rack_cors_if_already_present
end
end
def
test_app_update_does_not_generate_yarn_contents_when_bin_yarn_is_not_used
app_root
=
File
.
join
(
destination_root
,
"myapp"
)
run_generator
[
app_root
,
"--skip-yarn"
]
stub_rails_application
(
app_root
)
do
generator
=
Rails
::
Generators
::
AppGenerator
.
new
[
"rails"
],
{
update:
true
,
skip_yarn:
true
},
{
destination_root:
app_root
,
shell:
@shell
}
generator
.
send
(
:app_const
)
quietly
{
generator
.
send
(
:update_bin_files
)
}
assert_no_file
"
#{
app_root
}
/bin/yarn"
assert_file
"
#{
app_root
}
/bin/setup"
do
|
content
|
assert_no_match
(
/system\('bin\/yarn'\)/
,
content
)
end
assert_file
"
#{
app_root
}
/bin/update"
do
|
content
|
assert_no_match
(
/system\('bin\/yarn'\)/
,
content
)
end
end
end
def
test_app_update_does_not_generate_assets_initializer_when_skip_sprockets_is_given
app_root
=
File
.
join
(
destination_root
,
"myapp"
)
run_generator
[
app_root
,
"--skip-sprockets"
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录