diff options
author | Aaron Patterson <tenderlove@github.com> | 2019-01-11 11:21:53 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-11 11:21:53 -0800 |
commit | 74bef0970fff60eaf5faefde30a23f3c36c0b3ee (patch) | |
tree | 628b6013130e0d2868b2afbac3f00f24629dbb9c /actiontext/lib | |
parent | 1e923b498492424ae627d7a2c61339148f887503 (diff) | |
parent | 3a1b2a21965c0cd7bcccff586ce04b029eb4c359 (diff) | |
download | rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.gz rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.tar.bz2 rails-74bef0970fff60eaf5faefde30a23f3c36c0b3ee.zip |
Merge branch 'master' into ac_params_exists
Diffstat (limited to 'actiontext/lib')
-rw-r--r-- | actiontext/lib/templates/installer.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/actiontext/lib/templates/installer.rb b/actiontext/lib/templates/installer.rb index ee5a5af75b..e7c6c2623e 100644 --- a/actiontext/lib/templates/installer.rb +++ b/actiontext/lib/templates/installer.rb @@ -8,15 +8,14 @@ say "Copying blob rendering partial to app/views/active_storage/blobs/_blob.html copy_file "#{__dir__}/../../app/views/active_storage/blobs/_blob.html.erb", "app/views/active_storage/blobs/_blob.html.erb" -# FIXME: Replace with release version on release say "Installing JavaScript dependency" -run "yarn add https://github.com/rails/actiontext" +run "yarn add @rails/actiontext" APPLICATION_PACK_PATH = "app/javascript/packs/application.js" -if File.exists?(APPLICATION_PACK_PATH) && File.read(APPLICATION_PACK_PATH) !~ /import "actiontext"/ +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 "actiontext" +import "@rails/actiontext" EOS end |