Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
69c963c2
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,发现更多精彩内容 >>
未验证
提交
69c963c2
编写于
1月 17, 2019
作者:
J
Javan Makhmali
提交者:
GitHub
1月 17, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #34958 from javan/actiontext/trix-as-peer
Declare Trix as peer dependency of Action Text's npm package
上级
2dee59fe
866da19f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
11 deletion
+23
-11
actiontext/app/javascript/actiontext/index.js
actiontext/app/javascript/actiontext/index.js
+0
-1
actiontext/lib/templates/installer.rb
actiontext/lib/templates/installer.rb
+20
-9
actiontext/package.json
actiontext/package.json
+3
-1
未找到文件。
actiontext/app/javascript/actiontext/index.js
浏览文件 @
69c963c2
import
*
as
Trix
from
"
trix
"
import
{
AttachmentUpload
}
from
"
./attachment_upload
"
addEventListener
(
"
trix-attachment-add
"
,
event
=>
{
...
...
actiontext/lib/templates/installer.rb
浏览文件 @
69c963c2
require
"pathname"
require
"json"
APPLICATION_PACK_PATH
=
Pathname
.
new
(
"app/javascript/packs/application.js"
)
JS_PACKAGE_PATH
=
Pathname
.
new
(
"
#{
__dir__
}
/../../package.json"
)
JS_PACKAGE
=
JSON
.
load
(
JS_PACKAGE_PATH
)
JS_DEPENDENCIES
=
JS_PACKAGE
[
"peerDependencies"
].
dup
.
merge
\
JS_PACKAGE
[
"name"
]
=>
"^
#{
JS_PACKAGE
[
"version"
]
}
"
say
"Copying actiontext.scss to app/assets/stylesheets"
copy_file
"
#{
__dir__
}
/actiontext.scss"
,
"app/assets/stylesheets/actiontext.scss"
...
...
@@ -8,14 +18,15 @@
copy_file
"
#{
__dir__
}
/../../app/views/active_storage/blobs/_blob.html.erb"
,
"app/views/active_storage/blobs/_blob.html.erb"
say
"Installing JavaScript dependency"
run
"yarn add @rails/actiontext"
APPLICATION_PACK_PATH
=
"app/javascript/packs/application.js"
say
"Installing JavaScript dependencies"
run
"yarn add
#{
JS_DEPENDENCIES
.
map
{
|
name
,
version
|
"
#{
name
}
@
#{
version
}
"
}
.join("
")}"
if
File
.
exist?
(
APPLICATION_PACK_PATH
)
&&
File
.
read
(
APPLICATION_PACK_PATH
)
!~
/import "@rails\/actiontext"/
say
"Adding import to default JavaScript pack"
append_to_file
APPLICATION_PACK_PATH
,
<<-
EOS
import "@rails/actiontext"
EOS
if
APPLICATION_PACK_PATH
.
exist?
JS_DEPENDENCIES
.
keys
.
each
do
|
name
|
line
=
%[require("#{name}")]
unless
APPLICATION_PACK_PATH
.
read
.
include?
line
say
"Adding
#{
name
}
to
#{
APPLICATION_PACK_PATH
}
"
append_to_file
APPLICATION_PACK_PATH
,
"
#{
line
}
\n
"
end
end
end
actiontext/package.json
浏览文件 @
69c963c2
...
...
@@ -21,7 +21,9 @@
],
"license"
:
"MIT"
,
"dependencies"
:
{
"trix"
:
"^1.0.0"
,
"@rails/activestorage"
:
"^6.0.0-alpha"
},
"peerDependencies"
:
{
"trix"
:
"^1.0.0"
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录