vite_ruby 1.2.18 → 2.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c040d1223758720987dc50a487c8cb2cbf07dba6b9bfb5a8a56b883931615d8
-  data.tar.gz: a6d9fcf29261cab2f4411830378e7b9658264450ff45feb736db5858cd8db7be
+  metadata.gz: db7a467c6b97a89c6704a7f94ff6c20b4b1bb39bd49fbb5d5f0fd67ea754fbdb
+  data.tar.gz: edffb992d9fda5dc7993d620037ba2866b3f1ec8bf1561b4ed4e0a420646c6fb
 SHA512:
-  metadata.gz: 13b6146ffcea5681a48c377bdabc798016c95ec595448274eb7deb1d64296244969f47c0f8cd4a5da9cde158dfaca746b07e4dee60feb153809b2b420e62fa6a
-  data.tar.gz: 684bf03f8e55ff25def1f3d051a3e2111644bc1b080a1faa2a2dbc0c85a925a771a2a6979e7068d9b35736fa155703ef0f851cb56e477999897e9bd3fd8c8697
+  metadata.gz: f2d8967f4ec47d49e4e829dfdf8aa8a087e576852fbdbe1343e1117f5397348ac40220bed5071715619a4395ea8bfc5521df58000d187e68eee69e021ddb23c5
+  data.tar.gz: f08b6882162c082006f4de9a3e105de5ffe9a2c55a53ffb9ec8c1659963c135c4657d7acf964df6a1e2bf521af6a2bfabbfbbde1e53d579f0620b418813eae9f

data/CHANGELOG.md

@@ -1,10 +1,16 @@
-## <small>1.2.18 (2021-07-19)</small>
+## [1.2.20](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.18...vite_ruby@1.2.20) (2021-07-30)
 
-* chore: Avoid inline regex in dev server proxy ([77728aa](https://github.com/ElMassimo/vite_ruby/commit/77728aa))
-* test: Update after experimental proxy changes ([1d2e3c7](https://github.com/ElMassimo/vite_ruby/commit/1d2e3c7))
-* release: vite_ruby@1.2.18-rc1 ([be92933](https://github.com/ElMassimo/vite_ruby/commit/be92933))
-* fix: Proxy entrypoint HMR requests only after verifying the file exists (close #102) ([67c22ec](https://github.com/ElMassimo/vite_ruby/commit/67c22ec)), closes [#102](https://github.com/ElMassimo/vite_ruby/issues/102)
 
+### Features
+
+* use `asset_host` for Vite client if set during development ([89a338c](https://github.com/ElMassimo/vite_ruby/commit/89a338c2f23e6b43af9dadfd937fe29c82a08b10))
+* Watch Windi CSS config file by default if it exists ([842c5eb](https://github.com/ElMassimo/vite_ruby/commit/842c5eb46cd12887f28ed62cb656d81645c7239c))
+
+
+
+## [1.2.18](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.17...vite_ruby@1.2.18) (2021-07-19)
+
+* fix: Proxy entrypoint HMR requests only after verifying the file exists (close #102) ([67c22ec](https://github.com/ElMassimo/vite_ruby/commit/67c22ec)), closes [#102](https://github.com/ElMassimo/vite_ruby/issues/102)
 
 
 ## [1.2.17](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.16...vite_ruby@1.2.17) (2021-07-12)

data/default.vite.json

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

data/lib/vite_ruby.rb

@@ -18,8 +18,8 @@ class ViteRuby
   ENV_PREFIX = 'VITE_RUBY'
 
   # Internal: Versions used by default when running `vite install`.
-  DEFAULT_VITE_VERSION = '^2.3.8'
-  DEFAULT_PLUGIN_VERSION = '^2.0.4'
+  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 = {

data/lib/vite_ruby/builder.rb

@@ -102,6 +102,7 @@ private
       'package.json',
       'vite.config.ts',
       'vite.config.js',
+      'windi.config.ts',
       config.config_path,
     ].freeze
   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|
@@ -138,7 +143,7 @@ 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[watch_additional_paths].freeze
+  NOT_CONFIGURABLE_WITH_ENV = %w[additional_input_globs 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

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

@@ -43,7 +43,7 @@ class ViteRuby::Manifest
 
   # Public: The path from where the browser can download the Vite HMR client.
   def vite_client_src
-    prefix_vite_asset('@vite/client') if dev_server_running?
+    prefix_asset_with_host('@vite/client') if dev_server_running?
   end
 
   # Public: The content of the preamble needed by the React Refresh plugin.
@@ -51,7 +51,7 @@ class ViteRuby::Manifest
     if dev_server_running?
       <<~REACT_REFRESH
         <script type="module">
-          import RefreshRuntime from '#{ prefix_vite_asset('@react-refresh') }'
+          import RefreshRuntime from '#{ prefix_asset_with_host('@react-refresh') }'
           RefreshRuntime.injectIntoGlobalHook(window)
           window.$RefreshReg$ = () => {}
           window.$RefreshSig$ = () => (type) => type
@@ -66,8 +66,8 @@ protected
   # Internal: Strict version of lookup.
   #
   # Returns a relative path for the asset, or raises an error if not found.
-  def lookup!(*args, **options)
-    lookup(*args, **options) || missing_entry_error(*args, **options)
+  def lookup!(name, **options)
+    lookup(name, **options) || missing_entry_error(name, **options)
   end
 
   # Internal: Computes the path for a given Vite asset using manifest.json.
@@ -77,10 +77,10 @@ protected
   # Example:
   #   manifest.lookup('calendar.js')
   #   => { "file" => "/vite/assets/calendar-1016838bab065ae1e122.js", "imports" => [] }
-  def lookup(name, type: nil)
+  def lookup(name, **options)
     @build_mutex.synchronize { builder.build } if should_build?
 
-    find_manifest_entry(with_file_extension(name, type))
+    find_manifest_entry resolve_entry_name(name, **options)
   end
 
 private
@@ -98,9 +98,9 @@ private
   # Internal: Finds the specified entry in the manifest.
   def find_manifest_entry(name)
     if dev_server_running?
-      { 'file' => prefix_vite_asset(name.to_s) }
+      { 'file' => prefix_vite_asset(name) }
     else
-      manifest[name.to_s]
+      manifest[name]
     end
   end
 
@@ -125,6 +125,12 @@ private
     File.join("/#{ config.public_output_dir }", path)
   end
 
+  # Internal: Prefixes an asset with the `asset_host` for tags that do not use
+  # the framework tag helpers.
+  def prefix_asset_with_host(path)
+    File.join(config.asset_host || '/', config.public_output_dir, path)
+  end
+
   # Internal: Resolves the paths that reference a manifest entry.
   def resolve_references(manifest)
     manifest.each_value do |entry|
@@ -134,12 +140,26 @@ private
     end
   end
 
+  # 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
+  end
+
   # Internal: Adds a file extension to the file name, unless it already has one.
   def with_file_extension(name, entry_type)
-    return name unless File.extname(name.to_s).empty?
-
-    extension = extension_for_type(entry_type)
-    extension ? "#{ name }.#{ extension }" : name
+    if File.extname(name).empty? && (ext = extension_for_type(entry_type))
+      "#{ name }.#{ ext }"
+    else
+      name
+    end
   end
 
   # Internal: Allows to receive :javascript and :stylesheet as :type in helpers.
@@ -153,9 +173,9 @@ private
   end
 
   # Internal: Raises a detailed message when an entry is missing in the manifest.
-  def missing_entry_error(name, type: nil, **_options)
+  def missing_entry_error(name, **options)
     raise ViteRuby::MissingEntrypointError, OpenStruct.new(
-      file_name: with_file_extension(name, type),
+      file_name: resolve_entry_name(name, **options),
       last_build: builder.last_build_metadata,
       manifest: @manifest,
       config: config,

data/lib/vite_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ViteRuby
-  VERSION = '1.2.18'
+  VERSION = '2.0.0.beta.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.18
+  version: 2.0.0.beta.3
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -198,8 +198,8 @@ homepage: https://github.com/ElMassimo/vite_ruby
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@1.2.18/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@1.2.18/vite_ruby/CHANGELOG.md
+  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:
 rdoc_options: []
 require_paths:
@@ -211,9 +211,9 @@ 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
 signing_key: