svelte-on-rails 17.2.1 → 17.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab21618d8973a0b128edacf93c95ddb985775e4bb8992ff781634022d2ff9070
-  data.tar.gz: 41b0fe17fe87d022293a7b615694b4503da5aaa7fd106f636ca9af7c8cb7cbc5
+  metadata.gz: c3646c78da723067d4830cb5dd02799f60f10f318c4dc3653bde1b80a3583ba5
+  data.tar.gz: c73628ac8e9a70a4cfa71f75595dd93b0edd7605073b5536bdfc94c2f0764adc
 SHA512:
-  metadata.gz: f9cbb3b3b6b00adcf99da46dcb17577b07426d057bd0842b56a40efaee1624d3aa6f791be43d54b011125fd6608763a864a37f3dd05f8638e6694be8f5a4dfd5
-  data.tar.gz: f8730040b07355e1b3792f655bf5f83a55fe9a5990fdfee700c272d657fa1c3485ca88be83f8680e30d168c662d20f6ea4ae17e027a0898e26356e66143bd286
+  metadata.gz: fcaa45d6f41ec1d6947b96b0194e8b5a8ec08e6633b74d65ea0a15e58531c179a579b1b1962dba29977ba4600fe90a52be561688330c50f3ef6529429d216841
+  data.tar.gz: 82bf85e61916bd4cb37d2cf03487783a26f9b880b50d9beaaad1993cfe420bfa3292c5adb620a762a9b10c4107d748f99f2685af07e428ce36c21aeb9b05d166

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

@@ -93,7 +93,7 @@ module SvelteOnRails
         vite = @npm_utils.inspect_package('vite')
         vite_plugin_svelte = @npm_utils.inspect_package('@sveltejs/vite-plugin-svelte')
 
-        if svelte && vite && vite_plugin_svelte
+        if svelte && vite && vite_plugin_svelte && !@installation_type == :force
           if @package_set
             say "Packages are already installed but force to #{@package_set}", :yellow
           else
@@ -102,12 +102,6 @@ module SvelteOnRails
           end
         end
 
-        always_required_packages = [
-          '@csedl/svelte-on-rails@latest',
-          'typescript@latest',
-          '@types/node@latest'
-        ]
-
         candidate_sets = [
           {
             key: :minimal,
@@ -149,34 +143,44 @@ module SvelteOnRails
 
         # 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
@@ -192,22 +196,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 unless @installation_type == :careful
-            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.1
+  version: 17.2.3
 platform: ruby
 authors:
 - Christian Sedlmair