vite_ruby 3.0.5 → 4.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6279172f955f9ca8f6a545a9c48835978d6b3329d9a19cbfe58333d8938a49aa
-  data.tar.gz: 866f2cb6d3525a5e0f2b96e302d21919c5d32938e03bf8e03de9cdfe9126603b
+  metadata.gz: 3e369fc30038cbf7475208298ccc3eebbcec6ad98100b785d6303b766afc3aad
+  data.tar.gz: '0811dc3a900d49b9b0b3c406b32b96e852d5a367dce1c96924b6b0a936fddc39'
 SHA512:
-  metadata.gz: e281804897b5a583ee7f3b3e76d3ac4c36df10de19c5d14fc56bf09bd12537704acf50bd95f937e4f0fe17c10c78e1c5d131112e29ba1d5e45a0dfbb32d7f3bd
-  data.tar.gz: a7c8e59b77ce3ce3b1de7e98198da7a367140f8844411dcb1048faeaa3dd680f32c7fda1b5d60e4c2c0c637a9a196b36ce9528ef4f0108e6683fc1b2b0bcb007
+  metadata.gz: ef190e8c53cf93255f56a69fa7db7fe684f1fc4924b21aca81d9d2160ec117accf643771a5692bf58225884958fa06fc3b1e713241eaa6f2f223b8fca35e216a
+  data.tar.gz: 22b63dc5256c147ddf084f0324f2e6a236b86b654e6cd63e99da2608c6869290aa80885b8d9c61f8c7056df449464cb24831717de5e1a0857b5cf28af303700c

data/CHANGELOG.md

@@ -1,3 +1,39 @@
+# [](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.0.8...vite_ruby@) (2022-01-18)
+
+
+### Features
+
+* **experimental:** add support for Subresource Integrity via vite-plugin-manifest-sri ([0b3142c](https://github.com/ElMassimo/vite_ruby/commit/0b3142cd9d569a5f56821f53cdade337779bb0c1))
+
+
+
+## [3.0.8](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.0.7...vite_ruby@3.0.8) (2022-01-18)
+
+
+### Bug Fixes
+
+* remove .DS_Store from installation .gitignore ([#178](https://github.com/ElMassimo/vite_ruby/issues/178)) ([5a0931d](https://github.com/ElMassimo/vite_ruby/commit/5a0931d63318ab5b1bf9ead680540c015afd471a))
+
+
+
+## [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)
 
 

data/lib/vite_ruby/cli/install.rb

@@ -95,8 +95,9 @@ private
       /public/vite-dev
       /public/vite-test
       node_modules
+      # Vite uses dotenv and suggests to ignore local-only env files. See
+      # https://vitejs.dev/guide/env-and-mode.html#env-files
       *.local
-      .DS_Store
     GITIGNORE
   end
 

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

@@ -22,16 +22,15 @@ class ViteRuby::Manifest
     lookup!(name, **options).fetch('file')
   end
 
-  # Public: Returns scripts, imported modules, and stylesheets for the specified
+  # Public: Returns entries, imported modules, and stylesheets for the specified
   # entrypoint files.
   def resolve_entries(*names, **options)
     entries = names.map { |name| lookup!(name, **options) }
-    script_paths = entries.map { |entry| entry.fetch('file') }
 
     imports = dev_server_running? ? [] : entries.flat_map { |entry| entry['imports'] }.compact.uniq
     {
-      scripts: script_paths,
-      imports: imports.map { |entry| entry.fetch('file') }.uniq,
+      main: entries.map(&TO_ENTRY),
+      imports: imports.map(&TO_ENTRY).uniq,
       stylesheets: dev_server_running? ? [] : (entries + imports).flat_map { |entry| entry['css'] }.compact.uniq,
     }
   end
@@ -63,6 +62,9 @@ class ViteRuby::Manifest
 
 protected
 
+  # Internal: Returns a [src, attrs] entry.
+  TO_ENTRY = ->(entry) { [entry.fetch('file'), entry.slice('integrity').symbolize_keys] }
+
   # Internal: Strict version of lookup.
   #
   # Returns a relative path for the asset, or raises an error if not found.

data/lib/vite_ruby/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class ViteRuby
-  VERSION = '3.0.5'
+  VERSION = '4.0.0.alpha1'
 
   # 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

@@ -122,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.5
+  version: 4.0.0.alpha1
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-01-18 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.5/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@3.0.5/vite_ruby/CHANGELOG.md
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@4.0.0.alpha1/vite_ruby
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@4.0.0.alpha1/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: []
@@ -215,11 +215,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Use Vite in Ruby and bring joy to your JavaScript experience