turbo-rails 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e401e540c8c64780f9984ed0d5120511777c47ca3b5d4c023f980469e10085e8
-  data.tar.gz: 44d76bd4452ec01a2580d58e828616f2b634d8cb29a4470f082dd1c4ece899b5
+  metadata.gz: 2608402a944433e82b78b6aed5ac64e54579566e23a5a3b1a6837a695c7031ff
+  data.tar.gz: b342da8a4a13bc4b9fbbec5ee1a06afff0db881e3ab4103adba4c47188dd351a
 SHA512:
-  metadata.gz: 5ff10bfdaecd3c50008a3f9ac63976be979b5a1208c0f2cf39b786889156bdaef33e863ad5e6cdb45e2cf2e61acb8672e42a177326d8b0155e7da7d0bd559006
-  data.tar.gz: 77413a732f4014a257f724c117d47b07ebb3190dc70802348462a9bcd19c6a525e9d18a22c5342bab6f74b70f0f461b871e4c92a5650b5ec10ced95304c6e472
+  metadata.gz: 9183cb91a6ce9b2bc0b401ec35b7a3ff835b30d2732c96c6ab8db6ef23a3276e80e08ade5648ceb118c00a8cb5b2b07bb87e6ac8451224bf72885d12fcde2204
+  data.tar.gz: 0665d67d6cb734a670c12412588e23359a63204a72d92fce01a940e19b34e3e8a4217acf42e88b61d60b0700b6bc36ed2fba3e533140ea69503a7a047597fea0

data/lib/install/turbo_with_asset_pipeline.rb

@@ -1,8 +1,27 @@
-APP_JS_ROOT = Rails.root.join("app/assets/javascripts")
+APP_JS_PATH = Rails.root.join("app/javascript/application.js")
 CABLE_CONFIG_PATH = Rails.root.join("config/cable.yml")
+IMPORTMAP_PATH = Rails.root.join("config/importmap.rb")
 
-say "Import turbo-rails in existing app/assets/javascripts/application.js"
-append_to_file APP_JS_ROOT.join("application.js"), %(import "@hotwired/turbo-rails"\n)
+if APP_JS_PATH.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 @hotwire/turbo-rails in your application.js.
+  INSTRUCTIONS
+end
+
+if IMPORTMAP_PATH.exist?
+  say "Pin @hotwired/turbo-rails in config/importmap.rb"
+  insert_into_file \
+    IMPORTMAP_PATH.to_s, 
+    %(  pin "@hotwired/turbo-rails", to: "turbo.js"\n\n),
+    after: "Rails.application.config.importmap.draw do\n"
+else
+  say <<~INSTRUCTIONS, :red
+    You must add @hotwire/turbo-rails to your importmap to reference them via ESM.
+  INSTRUCTIONS
+end
 
 if CABLE_CONFIG_PATH.exist?
   say "Enable redis in bundle"

data/lib/install/turbo_with_webpacker.rb

@@ -1,20 +1,10 @@
-# Some Rails versions use commonJS(require) others use ESM(import).
-TURBOLINKS_REGEX = /(import .* from "turbolinks".*\n|require\("turbolinks"\).*\n)/.freeze
-ACTIVE_STORAGE_REGEX = /(import.*ActiveStorage|require.*@rails\/activestorage.*)/.freeze
-CABLE_CONFIG_PATH = Rails.root.join("config/cable.yml")
-
-abort "❌ Webpacker not found. Exiting." unless defined?(Webpacker::Engine)
+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"
-insert_into_file "#{Webpacker.config.source_entry_path}/application.js", "import \"@hotwired/turbo-rails\"\n", before: ACTIVE_STORAGE_REGEX
 
-say "Remove Turbolinks"
-run "#{RbConfig.ruby} bin/bundle remove turbolinks"
-run "#{RbConfig.ruby} bin/bundle", capture: true
-run "#{RbConfig.ruby} bin/yarn remove turbolinks"
-gsub_file "#{Webpacker.config.source_entry_path}/application.js", TURBOLINKS_REGEX, ''
-gsub_file "#{Webpacker.config.source_entry_path}/application.js", /Turbolinks.start.*\n/, ''
+CABLE_CONFIG_PATH = Rails.root.join("config/cable.yml")
 
 if CABLE_CONFIG_PATH.exist?
   say "Enable redis in bundle"

data/lib/turbo/engine.rb

@@ -26,12 +26,6 @@ module Turbo
       end
     end
 
-    initializer "turbo.importmap" do
-      if Rails.application.config.respond_to?(:importmap)
-        Rails.application.config.importmap.pin "@hotwired/turbo-rails", to: "turbo.js"
-      end
-    end
-
     initializer "turbo.helpers", before: :load_config_initializers do
       ActiveSupport.on_load(:action_controller_base) do
         include Turbo::Streams::TurboStreamsTagBuilder, Turbo::Frames::FrameRequest, Turbo::Native::Navigation

data/lib/turbo/version.rb

@@ -1,3 +1,3 @@
 module Turbo
-  VERSION = "0.7.2"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Sam Stephenson
 - Javan Mahkmali
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-14 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -26,7 +26,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-description:
+description: 
 email: david@loudthinking.com
 executables: []
 extensions: []
@@ -67,7 +67,7 @@ homepage: https://github.com/hotwired/turbo-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: The speed of a single-page web application without having to write any JavaScript.
 test_files: []