turbo-rails 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41cfe42f850783258d151d4d6ed872633cbb2a7f2ba3c20ad434af326c65dd15
-  data.tar.gz: cff176c51977f6c1ba19c31eb36d97ea1958394e7fcde6a489f0d53ec9a74b3b
+  metadata.gz: 0fe3ad5cd094491982825ff80d21c619aab81bbcbe7e07168e467beeb3daa493
+  data.tar.gz: 757f2faa9d39389014fc277ef75d3c806c9864b1deb87f6efae5118c604cf89b
 SHA512:
-  metadata.gz: 6a8c79d8a32ce7a36aa3f289cd222600d3040bdd5cebaca4836c2fb659ac6e6d847ab02299290429b434a530b7397d9580628edaaba13b088e59c641174ab994
-  data.tar.gz: 58eea1099a495e6987a8197630b9c9e6386af8e2016d0cceb92555ca2ce5fba19e6f32eba2244a14751ef9879b92c6793fdc1e1dd6e0b639678ed4c757680a47
+  metadata.gz: e38bd507e3eaeeccd3e8e570e3341cdc8ae27074ba03d3e509605a13f3df4188bd54250bbbb8f6161e3d3e261e5ae6edd928d3fb2aac7fd8d9ede9e7c1810717
+  data.tar.gz: 77f0a351ce8ab0cca1bc69413a508d6d8b790f61e18623ae16aad7d929536baa4f8c75b6407e6752d5301d022f0b49472c4376506181d1ffd31ed91b033459a2

data/README.md

@@ -50,7 +50,7 @@ The JavaScript for Turbo can either be run through the asset pipeline, which is
 
 Running `turbo:install` will install through NPM if Webpacker is installed in the application. Otherwise the asset pipeline version is used. To use the asset pipeline version, you must have `importmap-rails` installed first and listed higher in the Gemfile.
 
-If you're using Webpack and need to use the cable consumer, you can import [`cable`](https://github.com/hotwired/turbo-rails/blob/main/app/javascript/turbo/cable.js) (`import { cable } from "@hotwired/turbo-rails"`), but ensure that your application actually *uses* the members it `import`s when using this style (see [turbo-rails#48](https://github.com/hotwired/turbo-rails/issues/48)).
+If you're using node and need to use the cable consumer, you can import [`cable`](https://github.com/hotwired/turbo-rails/blob/main/app/javascript/turbo/cable.js) (`import { cable } from "@hotwired/turbo-rails"`), but ensure that your application actually *uses* the members it `import`s when using this style (see [turbo-rails#48](https://github.com/hotwired/turbo-rails/issues/48)).
 
 The `Turbo` instance is automatically assigned to `window.Turbo` upon import:
 

data/lib/install/turbo_with_importmap.rb

@@ -0,0 +1,5 @@
+say "Import Turbo"
+append_to_file "app/javascript/application.js", %(import "@hotwired/turbo-rails"\n)
+
+say "Pin Turbo"
+append_to_file "config/importmap.rb", %(pin "@hotwired/turbo-rails", to: "turbo.js"\n)

data/lib/install/turbo_with_node.rb

@@ -0,0 +1,9 @@
+if (js_entrypoint_path = Rails.root.join("app/javascript/application.js")).exist?
+  say "Import Turbo"
+  append_to_file "app/javascript/application.js", %(import "@hotwired/turbo-rails"\n)
+else
+  say "You must import @hotwired/turbo-rails in your JavaScript entrypoint file", :red
+end
+
+say "Install Turbo"
+run "yarn add @hotwired/turbo-rails"

data/lib/tasks/turbo_tasks.rake

@@ -17,23 +17,25 @@ end
 namespace :turbo do
   desc "Install Turbo into the app"
   task :install do
-    if defined?(Webpacker::Engine)
-      Rake::Task["turbo:install:webpacker"].invoke
+    if Rails.root.join("config/importmap.rb").exist?
+      Rake::Task["turbo:install:importmap"].invoke
+    elsif Rails.root.join("package.json").exist?
+      Rake::Task["turbo:install:node"].invoke
     else
-      Rake::Task["turbo:install:asset_pipeline"].invoke
+      puts "You must either be running with node (package.json) or importmap-rails (config/importmap.rb) to use this gem."
     end
   end
 
   namespace :install do
     desc "Install Turbo into the app with asset pipeline"
-    task :asset_pipeline do
-      run_turbo_install_template "turbo_with_asset_pipeline"
+    task :importmap do
+      run_turbo_install_template "turbo_with_importmap"
       switch_on_redis_if_available
     end
 
     desc "Install Turbo into the app with webpacker"
-    task :webpacker do
-      run_turbo_install_template "turbo_with_webpacker"
+    task :node do
+      run_turbo_install_template "turbo_with_node"
       switch_on_redis_if_available
     end
 

data/lib/turbo/version.rb

@@ -1,3 +1,3 @@
 module Turbo
-  VERSION = "0.7.10"
+  VERSION = "0.7.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Sam Stephenson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,8 +57,8 @@ files:
 - app/models/turbo/streams/tag_builder.rb
 - config/routes.rb
 - lib/install/turbo_needs_redis.rb
-- lib/install/turbo_with_asset_pipeline.rb
-- lib/install/turbo_with_webpacker.rb
+- lib/install/turbo_with_importmap.rb
+- lib/install/turbo_with_node.rb
 - lib/tasks/turbo_tasks.rake
 - lib/turbo-rails.rb
 - lib/turbo/engine.rb

data/lib/install/turbo_with_asset_pipeline.rb

@@ -1,18 +0,0 @@
-if (app_js_path = Rails.root.join("app/javascript/application.js")).exist?
-  say "Import turbo-rails in existing app/javascript/application.js"
-  append_to_file app_js_path, %(import "@hotwired/turbo-rails"\n)
-else
-  say <<~INSTRUCTIONS, :red
-    You must import @hotwired/turbo-rails in your application.js.
-  INSTRUCTIONS
-end
-
-if (importmap_path = Rails.root.join("config/importmap.rb")).exist?
-  say "Pin @hotwired/turbo-rails in config/importmap.rb"
-  append_to_file importmap_path.to_s, %(pin "@hotwired/turbo-rails", to: "turbo.js"\n)
-else
-  say <<~INSTRUCTIONS, :red
-    You must add @hotwired/turbo-rails to your importmap to reference them via ESM.
-    Example: pin "@hotwired/turbo-rails", to: "turbo.js"
-  INSTRUCTIONS
-end

data/lib/install/turbo_with_webpacker.rb

@@ -1,5 +0,0 @@
-say "Appending Turbo setup code to #{Webpacker.config.source_entry_path}/application.js"
-append_to_file "#{Webpacker.config.source_entry_path}/application.js", %(\nimport "@hotwired/turbo-rails"\n)
-
-say "Install Turbo"
-run "yarn add @hotwired/turbo-rails"