svelte-on-rails 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fae4c4bf2119aa220d24e012f464136310c2409da41c1c13efd28dfc66c6221
-  data.tar.gz: 931d743b51f07cb28581c93f347499cca8ca4fdf31d6a8c0ac078c90f4446e11
+  metadata.gz: 4002f622be27b2cee89f360cb18d02f063f4918208ecf433aeb85eee3e1b8ad3
+  data.tar.gz: f91206ad19b1e982f583300036c00ae5061a2096cf6bf20ce4eaea9de2ca989f
 SHA512:
-  metadata.gz: 0cfc39709d7a9e4936aacba08b80d8f159146c8a58a08fe4d760bd75b311339608514fc480bf240044f872255cc3dd081fa5c6c8f5e5b787255613b70c70267f
-  data.tar.gz: 5b9931cd49aa1115078f8406a85e3b6c28fe3645b9414ed42ace6bc3ac561c74936b04b355ad5e68d9701c55fd3fb219bb73915e5bab819415235a73c512f8c0
+  metadata.gz: f90f6082c7c97d672ca15c4c8d8c5c0576edb253ca35d02ca5857227365ccf52b1c4947aa28479aefd36351496a427a02976f0395e98ef63076b1d8a609c25c7
+  data.tar.gz: afbd7c72cd186de0451e26f0216dcd310d92d277ec5bc7072bb1e61c67fcd483265cf5c598e5edeb99bc3afb392f66873c26aedd43753e2d365459c4223e3c3f

data/README.md

@@ -79,8 +79,9 @@ If you have issues, please open one, and contributors are welcome!
 - turbo (recommended / [how to install turbo on rails](https://github.com/hotwired/turbo-rails?tab=readme-ov-file#installation))
 - if you use special packages (like pug) that requires commonjs, you may need
 - npm on latest versions
-- node installed. 
+- actual node installed. 
   - if `nvm` is installed it gets the path to the node-binary from there.
+    - When `.nvmrc` is present on projects root, it is respected
   - If node is not included on the PATH you can configure your node path by environment variable `SVELTE_ON_RAILS_NODE_BIN`
 
 ## Installation from cero ⚙️

data/lib/svelte-on-rails.rb

@@ -2,7 +2,6 @@ require "svelte_on_rails/configuration"
 require "svelte_on_rails/view_helpers"
 require "svelte_on_rails/renderer/renderer"
 require "svelte_on_rails/lib/utils"
-require "svelte_on_rails/lib/initializable"
 require "svelte_on_rails/railtie" if defined?(Rails)
 
 # installer

data/lib/svelte_on_rails/configuration.rb

@@ -108,14 +108,26 @@ module SvelteOnRails
                            n = ENV['SVELTE_ON_RAILS_NODE_BIN'] || 'node'
 
                            if n == 'node'
-
                              nvm_installed = false
                              nvm_dir = ENV['NVM_DIR'] || File.expand_path('~/.nvm')
                              nvm_installed ||= File.exist?("#{nvm_dir}/nvm.sh")
 
                              if nvm_installed
-                               # Use NVM_DIR if set, otherwise default to ~/.nvm
-                               command = "[ -s \"#{nvm_dir}/nvm.sh\" ] && . \"#{nvm_dir}/nvm.sh\" && nvm which current"
+                               # Check for .nvmrc in the project root
+                               project_root = rails_root || Dir.pwd
+                               nvmrc_path = File.join(project_root, '.nvmrc')
+                               use_nvmrc = File.exist?(nvmrc_path)
+
+                               if use_nvmrc
+                                 # Read the version from .nvmrc
+                                 node_version = File.read(nvmrc_path).strip
+                                 # Ensure NVM is sourced and use the version from .nvmrc
+                                 command = "[ -s \"#{nvm_dir}/nvm.sh\" ] && . \"#{nvm_dir}/nvm.sh\" && nvm use #{node_version} > /dev/null 2>&1 && nvm which #{node_version}"
+                               else
+                                 # Fallback to current NVM version
+                                 command = "[ -s \"#{nvm_dir}/nvm.sh\" ] && . \"#{nvm_dir}/nvm.sh\" && nvm which current"
+                               end
+
                                node_path, status = Open3.capture2("bash -lc '#{command}'")
 
                                # Only update n if the command succeeded and output is non-empty
@@ -125,12 +137,12 @@ module SvelteOnRails
 
                            # Validate node_bin
                            unless n && !n.empty? && system("#{n} --version > /dev/null 2>&1")
-                             raise "Node.js not found at '#{n || 'unknown'}'. Please configure SVELTE_ON_RAILS_NODE_BIN (e.g., to ~/.nvm/versions/node/vX.Y.Z/bin/node) or ensure 'node' is in the PATH. If using NVM, run `nvm alias default <version>` to set a default version."
+                             raise "Node.js not found at '#{n || 'unknown'}'. Please configure SVELTE_ON_RAILS_NODE_BIN (e.g., to ~/.nvm/versions/node/vX.Y.Z/bin/node) or ensure 'node' is in the PATH. If using NVM, run `nvm alias default <version>` to set a default version or ensure a valid .nvmrc file is present."
                            end
 
                            n
                          rescue StandardError => e
-                           raise "Failed to detect Node.js binary: «#{e.message}». Ensure Node.js is installed and accessible, or set SVELTE_ON_RAILS_NODE_BIN."
+                           raise "Failed to detect Node.js binary: «#{e.message}». Ensure Node.js is installed and accessible, or set SVELTE_ON_RAILS_NODE_BIN. If using .nvmrc, ensure the specified version is installed via NVM."
                          end
     end
 

data/lib/svelte_on_rails/lib/utils.rb

@@ -59,59 +59,55 @@ module SvelteOnRails
       def self.precompile(last_mtime = nil)
         config = SvelteOnRails::Configuration.instance
 
-        Dir.chdir(config.rails_root) do
+        # run build
 
-          # run build
+        cmd = "#{config.rails_root.join('node_modules', '.bin', 'vite')} build --config vite-ssr.config.ts"
 
-          cmd = "./node_modules/.bin/vite build --config vite-ssr.config.ts"
+        stdout, stderr, status = Open3.capture3(cmd)
 
-          stdout, stderr, status = Open3.capture3(cmd)
+        warnings = stderr.to_s.split("\n")
+        errors_matcher = Regexp.new('(Could not resolve|failed to resolve)')
+        error_lines = warnings.select { |e| e.match(errors_matcher) }
+        have_error = error_lines.present? || status.to_s.match(/exit 1/)
 
-          warnings = stderr.to_s.split("\n")
-          errors_matcher = Regexp.new('(Could not resolve|failed to resolve)')
-          error_lines = warnings.select { |e| e.match(errors_matcher) }
-          have_error = error_lines.present? || status.to_s.match(/exit 1/)
+        # error handling
 
-          # error handling
+        if stderr.present?
 
-          if stderr.present?
+          red_background = "\033[97;41m"
+          light_blue_background = "\033[30;106m"
+          clear_colors = "\033[0m"
 
-            red_background = "\033[97;41m"
-            light_blue_background = "\033[30;106m"
-            clear_colors = "\033[0m"
+          msg = "  +++  #{have_error ? 'ERROR' : 'WARNING'} compiling Svelte components#{have_error ? ' failed' : ''} («#{cmd}»)  +++  "
+          puts "#{have_error ? red_background : light_blue_background}#{msg}#{clear_colors}"
 
-            msg = "  +++  #{have_error ? 'ERROR' : 'WARNING'} compiling Svelte components#{have_error ? ' failed' : ''} («#{cmd}»)  +++  "
-            puts "#{have_error ? red_background : light_blue_background}#{msg}#{clear_colors}"
-
-            warnings.each do |e|
-              if e.match(errors_matcher)
-                red_font = "\033[31m"
-                puts "#{red_background}  #{clear_colors}#{red_font} #{e}#{clear_colors}"
-              else
-                puts "#{light_blue_background}  #{clear_colors}#{e}"
-              end
-            end
-
-            if have_error
-              puts "#{red_background}  +++  End of error message  +++  #{clear_colors}"
+          warnings.each do |e|
+            if e.match(errors_matcher)
+              red_font = "\033[31m"
+              puts "#{red_background}  #{clear_colors}#{red_font} #{e}#{clear_colors}"
             else
-              puts "#{light_blue_background}  +++  End of compiling warnings  +++  #{clear_colors}"
-            end
-            puts "#{have_error ? red_background : light_blue_background}  +++  Run «npm run build:ssr» on the console to see the original error message  +++  #{clear_colors}"
-
-            if have_error
-              cl_str = if error_lines.present?
-                         "#{error_lines.join("\n")}\n\n"
-                       end
-              raise "Svelte components compilation failed\n\n#{cl_str}Full message:\n+++\n#{stderr}+++\n\nYou can run «npm run build:ssr» on the console to see the original error message\n"
+              puts "#{light_blue_background}  #{clear_colors}#{e}"
             end
+          end
 
+          if have_error
+            puts "#{red_background}  +++  End of error message  +++  #{clear_colors}"
+          else
+            puts "#{light_blue_background}  +++  End of compiling warnings  +++  #{clear_colors}"
           end
+          puts "#{have_error ? red_background : light_blue_background}  +++  Run «npm run build:ssr» on the console to see the original error message  +++  #{clear_colors}"
 
-          puts stdout
+          if have_error
+            cl_str = if error_lines.present?
+                       "#{error_lines.join("\n")}\n\n"
+                     end
+            raise "Svelte components compilation failed\n\n#{cl_str}Full message:\n+++\n#{stderr}+++\n\nYou can run «npm run build:ssr» on the console to see the original error message\n"
+          end
 
         end
 
+        puts stdout
+
         unless Dir.exist?(config.ssr_dist_folder)
           raise "Could not find dist folder: #{config.ssr_dist_folder}"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Christian Sedlmair
@@ -41,7 +41,6 @@ files:
 - lib/svelte_on_rails/installer/utils.rb
 - lib/svelte_on_rails/installer/vite.rb
 - lib/svelte_on_rails/lib/development_utils.rb
-- lib/svelte_on_rails/lib/initializable.rb
 - lib/svelte_on_rails/lib/utils.rb
 - lib/svelte_on_rails/railtie.rb
 - lib/svelte_on_rails/renderer/render.js

data/lib/svelte_on_rails/lib/initializable.rb

@@ -1,17 +0,0 @@
-module SvelteOnRails
-
-  module Lib
-    module Initializable
-      def initialize(filename, base_path: SvelteOnRails::Configuration.instance.components_folder_full)
-
-        fn = (filename.match(/\.svelte$/) ? filename[0..-8] : filename)
-        @svelte_file = base_path + filename
-        @svelte_filename = filename
-        cnf = SvelteOnRails::Configuration.instance
-        cf = cnf.dist_folder + cnf.components_folder + fn
-        @compiled_file = cf.to_s
-
-      end
-    end
-  end
-end