aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavan Makhmali <javan@javan.us>2019-01-17 10:39:25 -0500
committerJavan Makhmali <javan@javan.us>2019-01-17 10:42:09 -0500
commit11b73c40c289b03226da5d3f5a8d71b009390dbd (patch)
tree63c31e5e40759532f6866a5c70f3dbccafa9b5c9
parent05350eda9b3f6689374a20711c946f530a8bbd6d (diff)
downloadrails-11b73c40c289b03226da5d3f5a8d71b009390dbd.tar.gz
rails-11b73c40c289b03226da5d3f5a8d71b009390dbd.tar.bz2
rails-11b73c40c289b03226da5d3f5a8d71b009390dbd.zip
Make trix a peer dependency of actiontext since it’s not used directly
-rw-r--r--actiontext/app/javascript/actiontext/index.js1
-rw-r--r--actiontext/package.json4
2 files changed, 3 insertions, 2 deletions
diff --git a/actiontext/app/javascript/actiontext/index.js b/actiontext/app/javascript/actiontext/index.js
index c149eda952..0e9251018a 100644
--- a/actiontext/app/javascript/actiontext/index.js
+++ b/actiontext/app/javascript/actiontext/index.js
@@ -1,4 +1,3 @@
-import * as Trix from "trix"
import { AttachmentUpload } from "./attachment_upload"
addEventListener("trix-attachment-add", event => {
diff --git a/actiontext/package.json b/actiontext/package.json
index ec8f35fd3c..ee4666b85c 100644
--- a/actiontext/package.json
+++ b/actiontext/package.json
@@ -21,7 +21,9 @@
],
"license": "MIT",
"dependencies": {
- "trix": "^1.0.0",
"@rails/activestorage": "^6.0.0-alpha"
+ },
+ "peerDependencies": {
+ "trix": "^1.0.0"
}
}