vite_ruby 2.0.0.beta.3 → 3.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db7a467c6b97a89c6704a7f94ff6c20b4b1bb39bd49fbb5d5f0fd67ea754fbdb
-  data.tar.gz: edffb992d9fda5dc7993d620037ba2866b3f1ec8bf1561b4ed4e0a420646c6fb
+  metadata.gz: 0dd16ba0c6a663008ac6fdf8679db418557dd9a6930dd3e5ef3df70a0e6ac326
+  data.tar.gz: 960ce8db783f8305d8fa5ff41330226ac44e0cfc0feb702a30400c60d4910d08
 SHA512:
-  metadata.gz: f2d8967f4ec47d49e4e829dfdf8aa8a087e576852fbdbe1343e1117f5397348ac40220bed5071715619a4395ea8bfc5521df58000d187e68eee69e021ddb23c5
-  data.tar.gz: f08b6882162c082006f4de9a3e105de5ffe9a2c55a53ffb9ec8c1659963c135c4657d7acf964df6a1e2bf521af6a2bfabbfbbde1e53d579f0620b418813eae9f
+  metadata.gz: 7f9e9b3727563b7a8c2c81fababf599a0c4158ee3d2e06c2fd16a4643cea8a461f178425d0f044ba467000e468642e3932873f18ac3866cd09f02a7c201c9392
+  data.tar.gz: abcd610257b8edaa0b1d8849d35750ad399b250178bcf1f501935e373b85b02465b247ca43918186f20ed37bf8e33bef29852cfa1af9a716c18b089db8de497e

data/lib/vite_ruby.rb

@@ -13,21 +13,17 @@ 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.3'
-
   # Internal: Companion libraries for Vite Ruby, and their target framework.
   COMPANION_LIBRARIES = {
     'vite_rails' => 'rails',
     'vite_hanami' => 'hanami',
-    'vite_roda' => 'roda',
     'vite_padrino' => 'padrino',
-    'vite_sinatra' => 'sinatra',
     'jekyll-vite' => 'jekyll',
     'vite_rails_legacy' => 'rails',
   }

data/lib/vite_ruby/build.rb

@@ -3,16 +3,22 @@
 require 'time'
 
 # Internal: Value object with information about the last build.
-ViteRuby::Build = Struct.new(:success, :timestamp, :digest, :current_digest) do
+ViteRuby::Build = Struct.new(:success, :timestamp, :vite_ruby, :digest, :current_digest) do
   # Internal: Combines information from a previous build with the current digest.
   def self.from_previous(attrs, current_digest)
-    new(attrs['success'], attrs['timestamp'] || 'never', attrs['digest'] || 'none', current_digest)
+    new(
+      attrs['success'],
+      attrs['timestamp'] || 'never',
+      attrs['vite_ruby'] || 'unknown',
+      attrs['digest'] || 'none',
+      current_digest,
+    )
   end
 
   # Internal: A build is considered stale when watched files have changed since
   # the last build, or when a certain time has ellapsed in case of failure.
   def stale?
-    digest != current_digest || retry_failed?
+    digest != current_digest || retry_failed? || vite_ruby != ViteRuby::VERSION
   end
 
   # Internal: A build is considered fresh if watched files have not changed, or
@@ -31,7 +37,12 @@ ViteRuby::Build = Struct.new(:success, :timestamp, :digest, :current_digest) do
 
   # Internal: Returns a new build with the specified result.
   def with_result(success)
-    self.class.new(success, Time.now.strftime('%F %T'), current_digest)
+    self.class.new(
+      success,
+      Time.now.strftime('%F %T'),
+      ViteRuby::VERSION,
+      current_digest,
+    )
   end
 
   # Internal: Returns a JSON string with the metadata of the build.

data/lib/vite_ruby/builder.rb

@@ -96,13 +96,15 @@ private
     [
       *config.watch_additional_paths,
       "#{ config.source_code_dir }/**/*",
-      'yarn.lock',
       'package-lock.json',
-      'pnpm-lock.yaml',
       'package.json',
-      'vite.config.ts',
+      'pnpm-lock.yaml',
+      'postcss.config.js',
+      'tailwind.config.js',
       'vite.config.js',
+      'vite.config.ts',
       'windi.config.ts',
+      'yarn.lock',
       config.config_path,
     ].freeze
   end

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/file_utils.rb

@@ -24,7 +24,7 @@ module ViteRuby::CLI::FileUtils
     # @api private
     def cp(source, destination)
       mkdir_p(destination)
-      FileUtils.cp(source, destination)
+      FileUtils.cp(source, destination) unless File.exist?(destination)
     end
 
     # Adds a new line at the bottom of the file.
@@ -32,10 +32,10 @@ module ViteRuby::CLI::FileUtils
     # @since 1.2.11
     # @api private
     def append(path, contents)
-      mkdir_p(path)
+      content = read_lines(path)
+      return if content.join.include?(contents)
 
-      content = File.readlines(path)
-      content << "\n" unless content.last.end_with?("\n")
+      content << "\n" unless content.last&.end_with?("\n")
       content << "#{ contents }\n"
 
       write(path, content)
@@ -46,7 +46,7 @@ module ViteRuby::CLI::FileUtils
     # @since 1.2.11
     # @api private
     def replace_first_line(path, target, replacement)
-      content = File.readlines(path)
+      content = read_lines(path)
       content[index(content, path, target)] = "#{ replacement }\n"
 
       write(path, content)
@@ -86,6 +86,11 @@ module ViteRuby::CLI::FileUtils
       Pathname.new(path).dirname.mkpath
     end
 
+    # Returns an array with lines in the specified file, empty if it doesn't exist.
+    def read_lines(path)
+      File.exist?(path) ? File.readlines(path) : []
+    end
+
     # @since 1.2.11
     # @api private
     def index(content, path, target)
@@ -103,7 +108,9 @@ module ViteRuby::CLI::FileUtils
     # @since 1.2.11
     # @api private
     def _inject_line_before(path, target, contents, finder)
-      content = File.readlines(path)
+      content = read_lines(path)
+      return if content.join.include?(contents)
+
       i = finder.call(content, path, target)
 
       content.insert(i, "#{ contents }\n")
@@ -113,7 +120,9 @@ module ViteRuby::CLI::FileUtils
     # @since 1.2.11
     # @api private
     def _inject_line_after(path, target, contents, finder)
-      content = File.readlines(path)
+      content = read_lines(path)
+      return if content.join.include?(contents)
+
       i = finder.call(content, path, target)
 
       content.insert(i + 1, "#{ contents }\n")

data/lib/vite_ruby/cli/install.rb

@@ -71,6 +71,7 @@ private
   # Internal: Creates the Vite and vite-plugin-ruby configuration files.
   def create_configuration_files
     copy_template 'config/vite.config.ts', to: root.join('vite.config.ts')
+    append root.join('Procfile.dev'), 'vite: bin/vite dev'
     setup_app_files
     ViteRuby.reload_with(config_path: config.config_path)
   end
@@ -79,13 +80,8 @@ private
   def install_js_dependencies
     package_json = root.join('package.json')
     write(package_json, '{}') unless package_json.exist?
-
-    Dir.chdir(root) do
-      deps = js_dependencies.join(' ')
-      _, stderr, status = ViteRuby::IO.capture("npx --package @antfu/ni -- ni -D #{ deps }", stdin_data: "\n")
-      _, stderr, = ViteRuby::IO.capture("yarn add -D #{ deps }") unless status.success?
-      say("Could not install JS dependencies.\n", stderr) unless stderr.to_s.empty?
-    end
+    deps = js_dependencies.join(' ')
+    run_with_capture("#{ npm_install } -D #{ deps }", stdin_data: "\n")
   end
 
   # Internal: Adds compilation output dirs to git ignore.
@@ -113,6 +109,21 @@ private
     $stdout.puts(*args)
   end
 
+  def run_with_capture(*args, **options)
+    Dir.chdir(root) do
+      _, stderr, status = ViteRuby::IO.capture(*args, **options)
+      say(stderr) unless status.success? || stderr.to_s.empty?
+    end
+  end
+
+  # Internal: Support all popular package managers.
+  def npm_install
+    return 'yarn add' if root.join('yarn.lock').exist?
+    return 'pnpm install' if root.join('pnpm-lock.yaml').exist?
+
+    'npm install'
+  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,11 @@
+# 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'
+    deps = js_dependencies.join(' ')
+    run_with_capture("#{ npm_install } -D #{ deps }")
+  end
+end

data/lib/vite_ruby/version.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
 class ViteRuby
-  VERSION = '2.0.0.beta.3'
+  VERSION = '3.0.0.beta.1'
+
+  # 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.3
+  version: 3.0.0.beta.1
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-12 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.3/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@2.0.0.beta.3/vite_ruby/CHANGELOG.md
-post_install_message:
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@3.0.0.beta.1/vite_ruby
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@3.0.0.beta.1/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