vite_ruby 1.2.18.pre.rc1 → 2.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf73135bcdc5fca1765711184c1c25f6d9605e99659b963f832eada7a14f3000
-  data.tar.gz: 9d231937d47c050a96be530d99cb80c4568b196f8242f0c52e803cf55f8bfb52
+  metadata.gz: 8f6ca7bd5b83588c6e0118597ba98d5477979d10348ae86a757f25942f179286
+  data.tar.gz: aa1dd99bd6e495e77ab56376a6b5ae691490c26114d1c707cc6dc14c293e11f4
 SHA512:
-  metadata.gz: 92062092819c7df51342d4d3fa9ac345e89c151553e2c7c0a3193a957f53964aef9c84f4dd837abea9b7b805bd65c26a28f0b4a2fc464ff99b75601845263271
-  data.tar.gz: 1ede81f69afd524fa0f9fe03b944427b92ed93b111bac5a0d0b953dc630e8c9b6a74c85b4e0d1a6119275a9088b79bc38dd35608d79ed5a938f2d9bf2173c3f6
+  metadata.gz: 47e230e531f02ff5d1a5f8ed3467d1d15aede112cf3dfad4bd993b4870819969434da21d65a93427428ca5683c5fb4aa5b4f64d0c0dd9f9736752b2291b3990c
+  data.tar.gz: 13c81b2beee62dec05099f673585af7cdce73cd96e9191e7083f3e55f50a5ee4d9c15ef4f58938305cc9d74726f4f7d17c301170cb0a2415f74ee4a0a28abd7e

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.2.20](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.18...vite_ruby@1.2.20) (2021-07-30)
+
+
+### 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)
 
 * fix: Proxy CSS Modules requests to Vite.js with the correct extension (close #98) ([8976872](https://github.com/ElMassimo/vite_ruby/commit/8976872)), closes [#98](https://github.com/ElMassimo/vite_ruby/issues/98)

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.1'
 
   # 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

@@ -138,7 +138,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

@@ -58,7 +58,7 @@ private
   # Internal: We want to avoid checking the filesystem if possible
   def vite_entrypoint?(path)
     path.include?('.') &&
-      config.resolved_entrypoints_dir.join(path.delete_prefix('/')).file?
+      config.resolved_entrypoints_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-rc1'
+  VERSION = '2.0.0.beta.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.18.pre.rc1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-08-11 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-rc1/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@1.2.18-rc1/vite_ruby/CHANGELOG.md
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@2.0.0.beta.2/vite_ruby
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@2.0.0.beta.2/vite_ruby/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: