vite_ruby 2.0.0.beta.2 → 2.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f6ca7bd5b83588c6e0118597ba98d5477979d10348ae86a757f25942f179286
-  data.tar.gz: aa1dd99bd6e495e77ab56376a6b5ae691490c26114d1c707cc6dc14c293e11f4
+  metadata.gz: '0058a6fc7f925f10e97f390c028abbbecc2c4c9cc5e27f214cbcba826c42fe69'
+  data.tar.gz: ebc2076502683d817f99c284fc2f6ec7adfa75dfd41f8f623a72e221cd56da5a
 SHA512:
-  metadata.gz: 47e230e531f02ff5d1a5f8ed3467d1d15aede112cf3dfad4bd993b4870819969434da21d65a93427428ca5683c5fb4aa5b4f64d0c0dd9f9736752b2291b3990c
-  data.tar.gz: 13c81b2beee62dec05099f673585af7cdce73cd96e9191e7083f3e55f50a5ee4d9c15ef4f58938305cc9d74726f4f7d17c301170cb0a2415f74ee4a0a28abd7e
+  metadata.gz: 728652c1e4f0884bde8a1823f9a70ffdf12ce509fdb8f7ae898133d8f9084cbcc1a0204da38212c8281f02e4e77f0ec8a481c85ce7e3f74be189965d34fbe791
+  data.tar.gz: 6ed6080dcb36974a061d974188ede76c700b27e97a63ec5b357225acbd04dc5f555a13bc45f4790c73d9daba20c104181583f3a650a0fd7da6dc544c4b680b10

data/lib/vite_ruby.rb

@@ -13,14 +13,12 @@ loader.inflector.inflect('cli' => 'CLI')
 loader.inflector.inflect('io' => 'IO')
 loader.setup
 
+require 'vite_ruby/version'
+
 class ViteRuby
   # Internal: Prefix used for environment variables that modify the configuration.
   ENV_PREFIX = 'VITE_RUBY'
 
-  # Internal: Versions used by default when running `vite install`.
-  DEFAULT_VITE_VERSION = '^2.5.0-beta.2'
-  DEFAULT_PLUGIN_VERSION = '^3.0.0-beta.1'
-
   # Internal: Companion libraries for Vite Ruby, and their target framework.
   COMPANION_LIBRARIES = {
     'vite_rails' => 'rails',

data/lib/vite_ruby/cli.rb

@@ -10,6 +10,8 @@ class ViteRuby::CLI
   register 'build', Build, aliases: ['b']
   register 'clobber', Clobber, aliases: %w[clean clear]
   register 'dev', Dev, aliases: %w[d serve]
-  register 'install', Install, aliases: %w[setup init]
+  register 'install', Install
   register 'version', Version, aliases: ['v', '-v', '--version', 'info']
+  register 'upgrade', Upgrade, aliases: ['update']
+  register 'upgrade_packages', UpgradePackages, aliases: ['update_packages']
 end

data/lib/vite_ruby/cli/install.rb

@@ -113,6 +113,11 @@ private
     $stdout.puts(*args)
   end
 
+  def run_with_capture(*args, **options)
+    _, stderr, status = ViteRuby::IO.capture(*args, **options)
+    say(err) unless status.success? || stderr.to_s.empty?
+  end
+
   # Internal: Avoid printing warning about missing vite.json, we will create one.
   def silent_warnings
     old_stderr = $stderr

data/lib/vite_ruby/cli/upgrade.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class ViteRuby::CLI::Upgrade < ViteRuby::CLI::Install
+  desc 'Updates Vite Ruby related gems and npm packages.'
+
+  def call(**)
+    upgrade_ruby_gems
+    upgrade_npm_packages
+  end
+
+protected
+
+  def upgrade_ruby_gems
+    say 'Updating gems'
+
+    libraries = ViteRuby.framework_libraries.map { |_f, library| library.name }
+
+    run_with_capture("bundle update #{ libraries.join(' ') }")
+  end
+
+  # NOTE: Spawn a new process so that it uses the updated vite_ruby.
+  def upgrade_npm_packages
+    Kernel.exec('bundle exec vite upgrade_packages')
+  end
+end

data/lib/vite_ruby/cli/upgrade_packages.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ViteRuby::CLI::UpgradePackages < ViteRuby::CLI::Install
+  desc 'Upgrades the npm packages to the recommended versions.'
+
+  def call(**)
+    say 'Upgrading npm packages'
+
+    Dir.chdir(root) do
+      deps = js_dependencies.join(' ')
+      run_with_capture("npx --package @antfu/ni -- ni -D #{ deps }")
+    end
+  end
+end

data/lib/vite_ruby/config.rb

@@ -30,7 +30,7 @@ class ViteRuby::Config
 
   # Public: The directory where the entries are located.
   def resolved_entrypoints_dir
-    root.join(source_code_dir, entrypoints_dir)
+    vite_root_dir.join(entrypoints_dir)
   end
 
   # Internal: The directory where Vite stores its processing cache.
@@ -38,6 +38,11 @@ class ViteRuby::Config
     root.join('node_modules/.vite')
   end
 
+  # Public: The directory that Vite uses as root.
+  def vite_root_dir
+    root.join(source_code_dir)
+  end
+
   # Public: Sets additional environment variables for vite-plugin-ruby.
   def to_env
     CONFIGURABLE_WITH_ENV.each_with_object({}) do |option, env|

data/lib/vite_ruby/dev_server_proxy.rb

@@ -52,13 +52,12 @@ private
     path = env['PATH_INFO']
     return true if path.start_with?(vite_asset_url_prefix) # Vite asset
     return true if path.start_with?(VITE_DEPENDENCY_PREFIX) # Packages and imports
-    return true if vite_entrypoint?(path) # HMR for entrypoint stylesheets and imports does not include the prefix
+    return true if file_in_vite_root?(path) # Fallback if Vite can serve the file
   end
 
-  # Internal: We want to avoid checking the filesystem if possible
-  def vite_entrypoint?(path)
-    path.include?('.') &&
-      config.resolved_entrypoints_dir.join(path.start_with?('/') ? path[1..-1] : path).file?
+  def file_in_vite_root?(path)
+    path.include?('.') && # Check for extension, avoid filesystem if possible.
+      config.vite_root_dir.join(path.start_with?('/') ? path[1..-1] : path).file?
   end
 
   def vite_asset_url_prefix

data/lib/vite_ruby/version.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
 class ViteRuby
-  VERSION = '2.0.0.beta.2'
+  VERSION = '2.0.0.beta.6'
+
+  # Internal: Versions used by default when running `vite install`.
+  DEFAULT_VITE_VERSION = '^2.5.0-beta.2'
+  DEFAULT_PLUGIN_VERSION = '^3.0.0-beta.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0.beta.6
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -179,6 +179,8 @@ files:
 - lib/vite_ruby/cli/dev.rb
 - lib/vite_ruby/cli/file_utils.rb
 - lib/vite_ruby/cli/install.rb
+- lib/vite_ruby/cli/upgrade.rb
+- lib/vite_ruby/cli/upgrade_packages.rb
 - lib/vite_ruby/cli/version.rb
 - lib/vite_ruby/cli/vite.rb
 - lib/vite_ruby/commands.rb
@@ -198,9 +200,10 @@ homepage: https://github.com/ElMassimo/vite_ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@2.0.0.beta.2/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@2.0.0.beta.2/vite_ruby/CHANGELOG.md
-post_install_message:
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@2.0.0.beta.6/vite_ruby
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@2.0.0.beta.6/vite_ruby/CHANGELOG.md
+post_install_message: "Thanks for installing Vite Ruby!\n\nIf you upgraded the gem
+  manually, please run:\n\tbundle exec vite upgrade"
 rdoc_options: []
 require_paths:
 - lib