inertia_rails-contrib 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9bf363cb43e7bd6c98bcd4ca6b3538e09927f61f5687553c44a3df5a347c3e1
-  data.tar.gz: 31345ef902abb988dc50540f5bfc110fa392b94cb0a7d82c10dfa6a36cd4ca96
+  metadata.gz: 1e6c5bccb1afe9ba7ccd8366ea492d47c947ec2c5787ca63b871f7303ea1c598
+  data.tar.gz: 3a6eeaabc968804dfc1d2cab8e9a5064332c7e96a6d480e0ae1d34fa4fd5b967
 SHA512:
-  metadata.gz: bc56d3c96c345caafbdafbf8b46c9b2d6b58d3f710f032a3127a2954df38f2453824c61d585959e751d97724b0d9612c884b3fedabacb1fded37c8b45c14e0bd
-  data.tar.gz: 5af321921aad351f9be524c9d533c44c5db0d359b0646e8b48abba9581e8803e7ab15eb7e8a82d7c3bf39e8065e0f987ad13735ae64731976b8f70c4a8c68310
+  metadata.gz: 4e275e6b29e124aeb22edf64f676112af27e037b720aafc7e22ea70eddd965491447fbb3a1e40f5f78c6117764c5327e5e809616c66f5603f7f787f9f4f54123
+  data.tar.gz: b419a7c886222c86ee2893c3741e1a6dbea59b47144723c7f187bb1ce386edbd551ad6df68eac99368db80566cd75f64256be087a04375ec6447b8f3b83dac46

data/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [0.2.1] - 2024-08-11
+
+Added:
+
+- Support `pnpm` package manager ([@skryukov])
+- New `--verbose` option for the installation generator ([@skryukov])
+
+Fixed:
+
+- Support installation alongside Webpacker ([@skryukov])
+
 ## [0.2.0] - 2024-08-10
 
 Added:
@@ -32,7 +43,8 @@ Added:
 [@iurev]: https://github.com/iurev
 [@skryukov]: https://github.com/skryukov
 
-[Unreleased]: https://github.com/skryukov/inertia_rails-contrib/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/skryukov/inertia_rails-contrib/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/skryukov/inertia_rails-contrib/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/skryukov/inertia_rails-contrib/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/skryukov/inertia_rails-contrib/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/skryukov/inertia_rails-contrib/commits/v0.1.0

data/lib/generators/inertia/install/helpers.rb

@@ -3,7 +3,13 @@ module Inertia
     module Helpers
       ### FS Helpers
       def js_destination_path
-        defined?(ViteRuby) ? ViteRuby.config.source_code_dir : "app/frontend"
+        return ViteRuby.config.source_code_dir if defined?(ViteRuby)
+        if file?("config/vite.json")
+          source_code_dir = JSON.parse(File.read(file_path("config/vite.json"))).dig("all", "sourceCodeDir")
+          return source_code_dir if source_code_dir
+        end
+
+        "app/frontend"
       end
 
       def js_destination_root

data/lib/generators/inertia/install/install_generator.rb

@@ -18,7 +18,7 @@ module Inertia
         enum: FRAMEWORKS.keys,
         default: nil
 
-      class_option :package_manager, type: :string, default: nil, enum: %w[npm yarn bun],
+      class_option :package_manager, type: :string, default: nil, enum: %w[npm yarn bun pnpm],
         desc: "The package manager you want to use to install Inertia's npm packages"
 
       class_option :interactive, type: :boolean, default: true,
@@ -31,6 +31,9 @@ module Inertia
       class_option :example_page, type: :boolean, default: true,
         desc: "Whether to add an example Inertia page"
 
+      class_option :verbose, type: :boolean, default: false,
+        desc: "Run the generator in verbose mode"
+
       remove_class_option :skip_namespace, :skip_collision_check
 
       def install
@@ -46,7 +49,7 @@ module Inertia
 
         say "Copying bin/dev"
         copy_file "#{__dir__}/templates/dev", "bin/dev"
-        chmod "bin/dev", 0o755, verbose: false
+        chmod "bin/dev", 0o755, verbose: verbose?
 
         say "Inertia's Rails adapter successfully installed", :green
       end
@@ -132,14 +135,14 @@ module Inertia
 
         in_root do
           Bundler.with_original_env do
-            if (capture = run("bundle add vite_rails", capture: true))
+            if (capture = run("bundle add vite_rails", capture: !verbose?))
               say "Vite Rails gem successfully installed", :green
             else
               say capture
               say_error "Failed to install Vite Rails gem", :red
               exit(false)
             end
-            if (capture = run("bundle exec vite install", capture: true))
+            if (capture = run("bundle exec vite install", capture: !verbose?))
               say "Vite Rails successfully installed", :green
             else
               say capture
@@ -155,12 +158,22 @@ module Inertia
 
         if package_manager.nil?
           say_status "Could not find a package.json file to install Inertia to.", nil
+        elsif gem_installed?("webpacker") || gem_installed?("shakapacker")
+          say "Webpacker or Shakapacker is installed.", :yellow
+          say "Vite Ruby can work alongside Webpacker or Shakapacker, but it might cause issues.", :yellow
+          say "Please see the Vite Ruby documentation for the migration guide:", :yellow
+          say "https://vite-ruby.netlify.app/guide/migration.html#webpacker-%F0%9F%93%A6", :yellow
         else
-          say_status "Could not find a Vite configuration files (`config/vite.json` & `vite.config.{ts,js,mjs,cjs}`).", nil
+          say_status "Could not find a Vite configuration files (`config/vite.json` & `vite.config.{ts,js,mjs,cjs,mts,cts}`).", nil
         end
         false
       end
 
+      def gem_installed?(name)
+        regex = /^[^#]*gem\s+['"]#{name}['"]/
+        File.read(file_path("Gemfile")).match?(regex)
+      end
+
       def application_layout
         @application_layout ||= Pathname.new(file_path("app/views/layouts/application.html.erb"))
       end
@@ -175,7 +188,7 @@ module Inertia
 
       def add_packages(*packages)
         in_root do
-          run "#{package_manager} add #{packages.join(" ")} --silent"
+          run "#{package_manager} add #{packages.join(" ")} #{verbose? ? "" : "--silent"}"
         end
       end
 
@@ -184,15 +197,17 @@ module Inertia
 
         if file?("package-lock.json")
           "npm"
-        elsif file?("bun.config.js") || file?("bun.lockb")
+        elsif file?("bun.lockb")
           "bun"
+        elsif file?("pnpm-lock.yaml")
+          "pnpm"
         else
           "yarn"
         end
       end
 
       def vite_config_path
-        @vite_config_path ||= Dir.glob(file_path("vite.config.{ts,js,mjs,cjs}")).first
+        @vite_config_path ||= Dir.glob(file_path("vite.config.{ts,js,mjs,cjs,mts,cts}")).first
       end
 
       def install_vite?
@@ -207,6 +222,10 @@ module Inertia
         @install_tailwind = options[:install_tailwind] || yes?("Would you like to install Tailwind CSS? (y/n)", :green)
       end
 
+      def verbose?
+        options[:verbose]
+      end
+
       def framework
         @framework ||= options[:framework] || ask("What framework do you want to use with Inertia?", :green, limited_to: FRAMEWORKS.keys, default: "react")
       end

data/lib/inertia_rails_contrib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InertiaRailsContrib
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails-contrib
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Svyatoslav Kryukov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-10 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties