vite_ruby 2.0.0.beta.4 → 3.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4958a06ce37c85ac97dda22ba69f7e65b4c75e0398bd65c3889821b766d9bf76
-  data.tar.gz: 3bd1b130ff9ddb0ae9a2e8108b2263922b9eba12493acaa7a40d87335ceddeaf
+  metadata.gz: 0b5eacc1f40e589613a5804a54aaf8f09a6b4000da7e8bd3ce05ae225fb76dc3
+  data.tar.gz: 6dc5725316ed7aa13b5ca4531ea2ca2fd999c6fbe0d33770a9cbf7d479128b76
 SHA512:
-  metadata.gz: db3357ac2c2290bc2002434b4391bff4cc0690b84ce151aa70c48f7e3b10ab7cdc46f6b90b485685fbc47e9208a243dfa896b9679301f18c9bd75589d21425b5
-  data.tar.gz: 4097a262af50ccec4e3b802d0e77e387eb22ca065036dc207583b2e4ea423902447ad056ba0d06081c85a71022922f240d03c76d11a912e5bd2b21f055d03d62
+  metadata.gz: c7c69993fb89ad7cd0d6f6a50d2a3a0bfe828c4be21875eb7c16c9f18cee13a15a7a7055876cb5b382c9db2c9f4f2b25a2e7178089374505bae7865265efb213
+  data.tar.gz: 10f64b31dbd0120e00661a30350668b8a622b79111f575d244bf2f5c55ec0cba28e3269cccec7337244154b434188c290889f88a5874168aab6637f0000cfd28

data/default.vite.json

@@ -1,5 +1,5 @@
 {
-  "additionalInputGlobs": ["{assets,fonts,icons,images}/**/*"],
+  "additionalEntrypoints": ["~/{assets,fonts,icons,images}/**/*"],
   "assetHost": null,
   "assetsDir": "assets",
   "autoBuild": false,

data/lib/vite_ruby.rb

@@ -13,6 +13,8 @@ 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'
@@ -21,9 +23,7 @@ class ViteRuby
   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

@@ -57,7 +57,7 @@ private
   # changes, and skip Vite builds if no files have changed.
   def watched_files_digest
     Dir.chdir File.expand_path(config.root) do
-      files = Dir[*watched_paths].reject { |f| File.directory?(f) }
+      files = Dir[*config.watched_paths].reject { |f| File.directory?(f) }
       file_ids = files.sort.map { |f| "#{ File.basename(f) }/#{ Digest::SHA1.file(f).hexdigest }" }
       Digest::SHA1.hexdigest(file_ids.join('/'))
     end
@@ -88,22 +88,4 @@ private
       logger.error '❌ Check that vite and vite-plugin-ruby are in devDependencies and have been installed. ' if stderr.include?('ERR! canceled')
     end
   end
-
-  # Internal: Files and directories that should be watched for changes.
-  #
-  # NOTE: You can specify additional ones in vite.json using "watchAdditionalPaths": [...]
-  def watched_paths
-    [
-      *config.watch_additional_paths,
-      "#{ config.source_code_dir }/**/*",
-      'yarn.lock',
-      'package-lock.json',
-      'pnpm-lock.yaml',
-      'package.json',
-      'vite.config.ts',
-      'vite.config.js',
-      'windi.config.ts',
-      config.config_path,
-    ].freeze
-  end
 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/commands.rb

@@ -108,6 +108,8 @@ class ViteRuby::Commands
       packages = `npm ls vite vite-plugin-ruby`
       packages_msg = packages.include?('vite@') ? "installed packages:\n#{ packages }" : '❌ Check that vite and vite-plugin-ruby have been added as development dependencies and installed.'
       $stdout.puts packages_msg
+
+      ViteRuby::CompatibilityCheck.verify_plugin_version(config.root)
     end
   end
 

data/lib/vite_ruby/compatibility_check.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'json'
+
+# Internal: Verifies that the installed vite-plugin-ruby version is compatible
+# with the current version of vite_ruby.
+#
+# This helps to prevent more subtle runtime errors if there is a mismatch in the
+# manifest schema.
+module ViteRuby::CompatibilityCheck
+  class << self
+    # Public: Attempt to verify that the vite-plugin-ruby version is compatible.
+    def verify_plugin_version(root)
+      package = JSON.parse(root.join('package.json').read) rescue {}
+      requirement = package.dig('devDependencies', 'vite-plugin-ruby') ||
+                    package.dig('dependencies', 'vite-plugin-ruby')
+
+      raise_unless_satisfied(requirement, ViteRuby::DEFAULT_PLUGIN_VERSION)
+    end
+
+    # Internal: Notifies the user of a possible incompatible plugin.
+    def raise_unless_satisfied(npm_req, ruby_req)
+      unless compatible_plugin?(npm_req, ruby_req)
+        raise ArgumentError, <<~ERROR
+          vite-plugin-ruby@#{ npm_req } might not be compatible with vite_ruby-#{ ViteRuby::VERSION }
+
+          You may disable this check if needed: https://vite-ruby.netlify.app/config/#skipCompatibilityCheck
+
+          You may upgrade both by running:
+
+              bundle exec vite upgrade
+        ERROR
+      end
+    end
+
+    # Internal: Returns true unless the check is performed and does not meet the
+    # requirement.
+    def compatible_plugin?(npm_req, ruby_req)
+      npm_req, ruby_req = [npm_req, ruby_req]
+        .map { |req| Gem::Requirement.new(req.sub('^', '~>')) }
+
+      current_version = npm_req.requirements.first.second
+
+      ruby_req.satisfied_by?(current_version)
+    rescue StandardError
+      true
+    end
+  end
+end

data/lib/vite_ruby/config.rb

@@ -52,6 +52,18 @@ class ViteRuby::Config
     end.merge(ViteRuby.env)
   end
 
+  # Internal: Files and directories that should be watched for changes.
+  def watched_paths
+    [
+      *(watch_additional_paths + additional_entrypoints).reject { |dir|
+        dir.start_with?('~/') || dir.start_with?(source_code_dir)
+      },
+      "#{ source_code_dir }/**/*",
+      config_path,
+      *DEFAULT_WATCHED_PATHS,
+    ].freeze
+  end
+
 private
 
   # Internal: Coerces all the configuration values, in case they were passed
@@ -61,7 +73,7 @@ private
     config['port'] = config['port'].to_i
     config['root'] = Pathname.new(config['root'])
     config['build_cache_dir'] = config['root'].join(config['build_cache_dir'])
-    coerce_booleans(config, 'auto_build', 'hide_build_console_output', 'https')
+    coerce_booleans(config, 'auto_build', 'hide_build_console_output', 'https', 'skip_compatibility_check')
   end
 
   # Internal: Coerces configuration options to boolean.
@@ -71,6 +83,7 @@ private
 
   def initialize(attrs)
     @config = attrs.tap { |config| coerce_values(config) }.freeze
+    ViteRuby::CompatibilityCheck.verify_plugin_version(root) unless skip_compatibility_check
   end
 
   class << self
@@ -143,10 +156,23 @@ private
   DEFAULT_CONFIG = load_json("#{ __dir__ }/../../default.vite.json").freeze
 
   # Internal: Configuration options that can not be provided as env vars.
-  NOT_CONFIGURABLE_WITH_ENV = %w[additional_input_globs watch_additional_paths].freeze
+  NOT_CONFIGURABLE_WITH_ENV = %w[additional_entrypoints watch_additional_paths].freeze
 
   # Internal: Configuration options that can be provided as env vars.
-  CONFIGURABLE_WITH_ENV = (DEFAULT_CONFIG.keys + %w[mode root] - NOT_CONFIGURABLE_WITH_ENV).freeze
+  CONFIGURABLE_WITH_ENV = (DEFAULT_CONFIG.keys + %w[mode root skip_compatibility_check] - NOT_CONFIGURABLE_WITH_ENV).freeze
+
+  # Internal: If any of these files is modified the build won't be skipped.
+  DEFAULT_WATCHED_PATHS = %w[
+    package-lock.json
+    package.json
+    pnpm-lock.yaml
+    postcss.config.js
+    tailwind.config.js
+    vite.config.js
+    vite.config.ts
+    windi.config.ts
+    yarn.lock
+  ].freeze
 
 public
 

data/lib/vite_ruby/manifest.rb

@@ -85,6 +85,9 @@ protected
 
 private
 
+  # Internal: The prefix used by Vite.js to request files with an absolute path.
+  FS_PREFIX = '/@fs/'
+
   extend Forwardable
 
   def_delegators :@vite_ruby, :config, :builder, :dev_server_running?
@@ -135,7 +138,9 @@ private
   def resolve_references(manifest)
     manifest.each_value do |entry|
       entry['file'] = prefix_vite_asset(entry['file'])
-      entry['css'] = entry['css'].map { |path| prefix_vite_asset(path) } if entry['css']
+      %w[css assets].each do |key|
+        entry[key] = entry[key].map { |path| prefix_vite_asset(path) } if entry[key]
+      end
       entry['imports']&.map! { |name| manifest.fetch(name) }
     end
   end
@@ -143,14 +148,19 @@ private
   # Internal: Resolves the manifest entry name for the specified resource.
   def resolve_entry_name(name, type: nil)
     name = with_file_extension(name.to_s, type)
-    name = name[1..-1] if name.start_with?('/')
 
-    # Prefix scripts and stylesheets with the entrypoints dir.
-    if (type || File.dirname(name) == '.') && !name.start_with?(config.entrypoints_dir)
-      File.join(config.entrypoints_dir, name)
-    else
-      name
-    end
+    raise ArgumentError, "Asset names can not be relative. Found: #{ name }" if name.start_with?('.')
+
+    # Explicit path, relative to the source_code_dir.
+    name.sub(%r{^~/(.+)$}) { return Regexp.last_match(1) }
+
+    # Explicit path, relative to the project root.
+    name.sub(%r{^/(.+)$}) {
+      return dev_server_running? ? File.join(FS_PREFIX, config.root, Regexp.last_match(1)) : Regexp.last_match(1)
+    }
+
+    # Sugar: Prefix with the entrypoints dir if the path is not nested.
+    name.include?('/') ? name : File.join(config.entrypoints_dir, name)
   end
 
   # Internal: Adds a file extension to the file name, unless it already has one.

data/lib/vite_ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.4
+  version: 3.0.0.beta.2
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -179,9 +179,12 @@ 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
+- lib/vite_ruby/compatibility_check.rb
 - lib/vite_ruby/config.rb
 - lib/vite_ruby/dev_server_proxy.rb
 - lib/vite_ruby/error.rb
@@ -198,12 +201,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.4/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@2.0.0.beta.4/vite_ruby/CHANGELOG.md
-post_install_message: |-
-  Thanks for installing Vite Ruby!
-
-  When upgrading, please verify package.json to ensure you have installed the recommended versions of vite (^2.5.0-beta.2) and vite-plugin-ruby (^3.0.0-beta.3).
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@3.0.0.beta.2/vite_ruby
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@3.0.0.beta.2/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