diff options
| author | Javan Makhmali <javan@javan.us> | 2019-01-10 11:50:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 11:50:32 -0500 |
| commit | 2163762c3cd7cb58223f882405ed3c6dcfb6a2cd (patch) | |
| tree | 567546bda56ed0be9b3408ec10ead32adc62e43a /actiontext/lib/templates | |
| parent | 9edc84cdfa8908a436901d85309cadf65d457d8f (diff) | |
| parent | 86b489e3d6a9efbefbc62e8531d0f5850934d4e1 (diff) | |
| download | rails-2163762c3cd7cb58223f882405ed3c6dcfb6a2cd.tar.gz rails-2163762c3cd7cb58223f882405ed3c6dcfb6a2cd.tar.bz2 rails-2163762c3cd7cb58223f882405ed3c6dcfb6a2cd.zip | |
Merge pull request #34905 from javan/move-npm-packages-to-rails-scope
Move all npm packages to @rails scope
Diffstat (limited to 'actiontext/lib/templates')
| -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 dc549a8af3..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.exist?(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 |