vite_ruby 3.0.3 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23aa04b92951f5416f6c6efdab61f834a69893c5890196181ed3533e3495a1dc
-  data.tar.gz: bc3926785ea462a5f3ac9bb3fa216d2c74eb7997b30ee8be6aeb5191de43a4c4
+  metadata.gz: 2fa78fa55a3f2e8d6607fa60c7070562fe0d4781457d186426c1de8618d5d38f
+  data.tar.gz: 354e7680dc0b7dd4931052d656bb20daa302d6f3763c3f2a02e11ff9cea533df
 SHA512:
-  metadata.gz: afa2927630c8005cd0510cac26355379870ef0b5c6df0058e4ea337cdd0b0b077c2d847dafb73832fc2290a567fe82dbb955adbf4aa3e5865bc3db80e561a337
-  data.tar.gz: 118cadf8125ef8759fa7251fe8cef36429c498b3ec802d0862e66a716576e7ec5caf7c46e99e49d58f7ed78479ddd740d58df6f3bb0b5028ffe9028c3042ad79
+  metadata.gz: 1da507b4e87c31d1a12fca3d2306db2bfc37067246104ea664a4220d650aee95b571e152a9ec08f9ecad84c5d721690a7faeb7e03c144246c13646c42754a13d
+  data.tar.gz: 688961190326cac3ea2da957534efa6b8425aade5b3d3ba9948ae685ed86324298acca0aea6293cc015b48765dda0f093a7d868d1478708a346be7a6b384ea04

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+## [3.0.7](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.0.6...vite_ruby@3.0.7) (2021-12-27)
+
+
+
+## [3.0.6](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.0.5...vite_ruby@3.0.6) (2021-12-24)
+
+
+### Bug Fixes
+
+* allow providing an empty public output dir (close [#161](https://github.com/ElMassimo/vite_ruby/issues/161)) ([#164](https://github.com/ElMassimo/vite_ruby/issues/164)) ([ef48c9b](https://github.com/ElMassimo/vite_ruby/commit/ef48c9b39084a96364a783fa670bd6ec68dfa289))
+
+
+### Features
+
+* support ruby config file for advanced configuration (close [#162](https://github.com/ElMassimo/vite_ruby/issues/162)) ([34e63fd](https://github.com/ElMassimo/vite_ruby/commit/34e63fdd546078dfc94f2c546b096aa296a47d37))
+
+
+
+## [3.0.5](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.0.4...vite_ruby@3.0.5) (2021-12-17)
+
+
+### Bug Fixes
+
+* ensure vite_plugin_legacy is upgraded by the upgrade command ([2f9437d](https://github.com/ElMassimo/vite_ruby/commit/2f9437d248e27aa03b5b8a1df3e3d6a52c791cd1))
+
+
+
+## [3.0.4](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.0.3...vite_ruby@3.0.4) (2021-12-17)
+
+### BREAKING CHANGES
+
+* if using `vite_plugin_legacy`, make sure to upgrade to 3.0.1
+
+### Bug Fixes
+
+* handle new virtual legacy-polyfill name ([#157](https://github.com/ElMassimo/vite_ruby/issues/157)) ([a34e77f](https://github.com/ElMassimo/vite_ruby/commit/a34e77f3b342c9171adc50adfd5220b57bddb961))
+
+
 ## [3.0.3](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.0.2...vite_ruby@3.0.3) (2021-12-09)
 
 

data/lib/vite_ruby/config.rb

@@ -43,6 +43,12 @@ class ViteRuby::Config
     root.join(source_code_dir)
   end
 
+  # Public: Loads an optional config/vite.rb file that can modify ViteRuby.env
+  def load_ruby_config
+    rb_config_path = File.expand_path(config_path.sub(/.json$/, '.rb'), root)
+    load rb_config_path if File.exist?(rb_config_path)
+  end
+
   # Public: Sets additional environment variables for vite-plugin-ruby.
   def to_env
     CONFIGURABLE_WITH_ENV.each_with_object({}) do |option, env|
@@ -59,7 +65,7 @@ class ViteRuby::Config
         dir.start_with?('~/') || dir.start_with?(source_code_dir)
       },
       "#{ source_code_dir }/**/*",
-      config_path,
+      config_path.sub(/.json$/, '.{rb,json}'),
       *DEFAULT_WATCHED_PATHS,
     ].freeze
   end

data/lib/vite_ruby/dev_server_proxy.rb

@@ -31,10 +31,14 @@ private
 
   def rewrite_uri_for_vite(env)
     uri = env.fetch('REQUEST_URI') { [env['PATH_INFO'], env['QUERY_STRING']].reject { |str| str.to_s.strip.empty? }.join('?') }
+    env['PATH_INFO'], env['QUERY_STRING'] = (env['REQUEST_URI'] = normalize_uri(uri)).split('?')
+  end
+
+  def normalize_uri(uri)
+    uri
       .sub(HOST_WITH_PORT_REGEX, '/') # Hanami adds the host and port.
       .sub('.ts.js', '.ts') # Hanami's javascript helper always adds the extension.
       .sub(/(\.(?!min|module)\w+)\.css$/, '\1') # Rails' stylesheet_link_tag always adds the extension.
-    env['PATH_INFO'], env['QUERY_STRING'] = (env['REQUEST_URI'] = uri).split('?')
   end
 
   def forward_to_vite_dev_server(env)
@@ -49,7 +53,7 @@ private
   end
 
   def vite_should_handle?(env)
-    path = env['PATH_INFO']
+    path = normalize_uri(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 file_in_vite_root?(path) # Fallback if Vite can serve the file
@@ -61,6 +65,6 @@ private
   end
 
   def vite_asset_url_prefix
-    @vite_asset_url_prefix ||= "/#{ config.public_output_dir }/"
+    @vite_asset_url_prefix ||= config.public_output_dir.empty? ? "\0" : "/#{ config.public_output_dir }/"
   end
 end

data/lib/vite_ruby/manifest.rb

@@ -147,9 +147,10 @@ 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)
+    return resolve_virtual_entry(name) if type == :virtual
 
-    raise ArgumentError, "Asset names can not be relative. Found: #{ name }" if name.start_with?('.') && !name.include?('legacy-polyfills')
+    name = with_file_extension(name.to_s, type)
+    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) }
@@ -171,6 +172,11 @@ private
     end
   end
 
+  # Internal: Resolves a virtual entry by walking all the manifest keys.
+  def resolve_virtual_entry(name)
+    manifest.keys.find { |file| file.include?(name) } || name
+  end
+
   # Internal: Adds a file extension to the file name, unless it already has one.
   def with_file_extension(name, entry_type)
     if File.extname(name).empty? && (ext = extension_for_type(entry_type))

data/lib/vite_ruby/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class ViteRuby
-  VERSION = '3.0.3'
+  VERSION = '3.0.7'
 
   # Internal: Versions used by default when running `vite install`.
-  DEFAULT_VITE_VERSION = '^2.6.13'
-  DEFAULT_PLUGIN_VERSION = '^3.0.2'
+  DEFAULT_VITE_VERSION = '^2.7.7'
+  DEFAULT_PLUGIN_VERSION = '^3.0.5'
 end

data/lib/vite_ruby.rb

@@ -27,6 +27,7 @@ class ViteRuby
     'vite_padrino' => 'padrino',
     'jekyll-vite' => 'jekyll',
     'vite_rails_legacy' => 'rails',
+    'vite_plugin_legacy' => 'rack',
   }
 
   class << self
@@ -121,7 +122,12 @@ class ViteRuby
 
   # Public: Current instance configuration for Vite.
   def config
-    @config ||= ViteRuby::Config.resolve_config(**@config_options)
+    unless defined?(@config)
+      @config = ViteRuby::Config.resolve_config(**@config_options)
+      @config.load_ruby_config
+    end
+
+    @config
   end
 
   # Public: Enables looking up assets managed by Vite using name and type.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.7
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -201,8 +201,8 @@ homepage: https://github.com/ElMassimo/vite_ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@3.0.3/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@3.0.3/vite_ruby/CHANGELOG.md
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@3.0.7/vite_ruby
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@3.0.7/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: []