svelte-on-rails 17.2.2 → 17.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70e08415bf5e97d6c2e699732dfbf7eed1786ea048bcd1d1dfc270c9efb0ca66
-  data.tar.gz: 046e91b485de6bdef1f8b40c15d4d3aea40f4f4ba31f6766e73b9da91b71fd39
+  metadata.gz: 71dde680681ad196d29e079cdc24d784fea2a5e910ff05bfca97c2b0ff77f9a4
+  data.tar.gz: 5582a99e4104a01ab951e9c07fc4e30864ba428f9793ef4eeeb64bfff701bf37
 SHA512:
-  metadata.gz: 64a9ec0fe3b58cc8e428f442e43a215c878e2b02202e0d76ee163c3c90a8022bc618a0866a692b66c9574911ec3c2e6a13c53767e0a84311bc3b0a3a02a68fca
-  data.tar.gz: 1b9201b4eb287cf2b3f7f22204b61b1d50584912854a80da0a869a7681b698644d684b90f1a1fec71330c843b13858491b5b924c62dbb0ad893c6e1cd14b78ef
+  metadata.gz: 49bccd39476d531c43dd8295ed83c9900bbd8032dc73c32960046eaeb357e0e9242f1eeddb5c90a097f763be8782c6bc9b1184ea312eae067bdb62fc3bfe1bd2
+  data.tar.gz: dc279a3b11158bad2b754d31e389778795cbe6740ece18c0385d9020b040c52f3766f9bebdc4594ffbec2bccd9279ce7d2a322409a3ad22ed39437cc20525c63

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

@@ -102,75 +102,89 @@ module SvelteOnRails
           end
         end
 
+        # Candidate sets:
+        # The most critical point is passing the installation of the vite-plugin-svelte.
+        # So, we always have it after Vite and Svelte.
+
         candidate_sets = [
           {
             key: :minimal,
             title: 'Install missing packages only',
             set: [
+              'typescript@latest',
+              '@types/node@latest',
               ('svelte@latest' unless svelte),
               ('vite@latest' unless vite),
               ('@sveltejs/vite-plugin-svelte@latest' unless vite_plugin_svelte),
               '@csedl/svelte-on-rails@latest',
-              'typescript@latest',
-              '@types/node@latest'
             ].compact
           },
           {
             key: :latest,
             title: 'Force latest package versions',
             set: [
+              'typescript@latest',
+              '@types/node@latest',
               'svelte@latest',
               'vite@latest',
               '@sveltejs/vite-plugin-svelte@latest',
               '@csedl/svelte-on-rails@latest',
-              'typescript@latest',
-              '@types/node@latest'
             ]
           },
           {
             key: :pinned,
             title: 'Use pinned compatible versions',
             set: [
+              'typescript@~6.0.2',
+              '@types/node@~25.6.0',
               'svelte@~5.55.4',
               'vite@~8.0.8',
               '@sveltejs/vite-plugin-svelte@~7.0.0',
               '@csedl/svelte-on-rails@latest',
-              'typescript@~6.0.2',
-              '@types/node@~25.6.0'
             ]
           }
         ]
 
         # test install
 
+        dependencies_checked = false
         failed_packages = []
-        puts "[Sandbox test] Running dependency checks in a isolated Sandbox within App-root/tmp"
         set_keys = candidate_sets.map { |s| s[:key] }
         if @package_set && !set_keys.include?(@package_set)
           raise Thor::Error, "Invalid value for --package-set option: #{@package_set}, valid options are: #{set_keys.join(', ')}"
         end
         index = 0
+        unless @package_set && @installation_type == :force
+          puts "[Sandbox test] Running dependency checks in a isolated Sandbox within App-root/tmp"
+        end
         passing_set = candidate_sets.find do |set_to_try|
           title_suffix = (index == 0) ? ' (default)' : " (FALLBACK)"
           index += 1
-          next if @package_set && set_to_try[:key] != @package_set
-          r = SvelteOnRails::Installer::NpmSandbox.dry_run(
-            set_to_try[:set],
-            project_root: Rails.root.to_s,
-            sandboxes_root: @sandboxes_dir,
-            title: set_to_try[:title] + title_suffix
-          )
-          @tmpdirs.push(r[:tmpdir])
-          if r[:success] || @package_set && set_to_try[:key] == @package_set
+          if @package_set && set_to_try[:key] != @package_set
+            next
+          elsif @package_set && set_to_try[:key] == @package_set && @installation_type == :force
             true
           else
-            failed_packages.push(set_to_try)
-            false
+
+            r = SvelteOnRails::Installer::NpmSandbox.dry_run(
+              set_to_try[:set],
+              project_root: Rails.root.to_s,
+              sandboxes_root: @sandboxes_dir,
+              title: set_to_try[:title] + title_suffix
+            )
+            @tmpdirs.push(r[:tmpdir])
+            if r[:success] || @package_set && set_to_try[:key] == @package_set
+              dependencies_checked = true
+              true
+            else
+              failed_packages.push(set_to_try)
+              false
+            end
           end
         end
 
         if passing_set.present?
-          say "✓ Dependency check passed", :green
+          say "✓ Dependency check passed", :green if dependencies_checked
         else
           say '-' * 80
           say "ERROR: Unable to fix dependency issues", :red
@@ -186,22 +200,17 @@ module SvelteOnRails
 
         # prompt developer
 
-        if passing_set.any?
-          say "Ready to install:", :yellow unless svelte
-          say " • " + passing_set[:set].join("\n • "), :yellow if passing_set.any?
+        say "Using Package-set: #{passing_set[:title]}", :yellow if passing_set.present?
+        if passing_set.any? && @installation_type != :force
+          say "Ready to install:", :yellow
           loop do
-            break if @installation_type == :force
-            if !svelte || @package_set
-              say "Continue? (Y/n)", :yellow
-              input = STDIN.gets
-              answer = input.strip.downcase
-              if answer == "n" || answer == "no"
-                say "Installation aborted.", :red
-                exit(0)
-              elsif answer == "y" || answer == "yes"
-                break
-              end
-            else
+            say "Continue? (Y/n)", :yellow
+            input = STDIN.gets
+            answer = input.strip.downcase
+            if answer == "n" || answer == "no"
+              say "Installation aborted.", :red
+              exit(0)
+            elsif answer == "y" || answer == "yes"
               break
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 17.2.2
+  version: 17.2.4
 platform: ruby
 authors:
 - Christian Sedlmair