vite_ruby 3.3.4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579d77a9b6f100195112e6ee0fc66d445f35aca1d079c24c9548ea6b708af472
-  data.tar.gz: 13b18e4418675330c2d974b41a56b4dac97a4b4f3f10cffb1216d9370b386a52
+  metadata.gz: 6024067932bb5062002e46418a1861eb4193916c7454e24245fe3cf83c56795d
+  data.tar.gz: cfc52727b1e4cde4936254cd0025d97942e3b636c5647742dc1c809fb3a9bba4
 SHA512:
-  metadata.gz: cf5e33d054b13211aeccbcccd96c2c03e8bae08c56c5ad52ffbac39a045b423a393b5e80fec15a7ad56929d4f8db09230b7d71260bd7fd0dd05478b0db661b54
-  data.tar.gz: 334056f48cbf9799e3522aaf575e657b6f7c6b7d825adf59ed602a45d1654d5d97a362b80aec578a836b4bd6ad084b740c4822ba1d99dab1c6ef2ce8a1343f2d
+  metadata.gz: 489c44241c90ac71fd978a8142554581505e05acce6268a062738a4f1f9c5e88a2cca39778459cea3e7e79d5116bc7f8ea1b4455f65fe9d436a15164ab5704cc
+  data.tar.gz: 2425fb29d5151d56f2774c435eb2a5b636c765e229aff3a99936300453ec77c281fdac8c85c6885d1cc3ce900a470f3b58cb6135f0a51124ef34c965282d9b38

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [3.5.0](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.4.0...vite_ruby@3.5.0) (2023-11-16)
+
+
+### Bug Fixes
+
+* prevent clean from deleting assets referenced in the manifests ([8a581c1](https://github.com/ElMassimo/vite_ruby/commit/8a581c15ff480049bbb14dab1b5a3497308521b5))
+
+
+### Features
+
+* use vite 5 in new installations ([f063f28](https://github.com/ElMassimo/vite_ruby/commit/f063f283f939d15b3c48c1a9b6efcd589fafbaf1))
+
+
+
+# [3.4.0](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.3.4...vite_ruby@3.4.0) (2023-11-16)
+
+
+### Bug Fixes
+
+* **breaking:** check for any existing manifest path before cleaning ([c450483](https://github.com/ElMassimo/vite_ruby/commit/c4504839e11006d50d6503288469cb3de0c6a9cd))
+
+
+### Features
+
+* add support for vite 5, which changed default manifest path ([818132a](https://github.com/ElMassimo/vite_ruby/commit/818132a07af3f17ba27ae09c44fcd59029064238))
+
+
+
 ## [3.3.4](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@3.3.3...vite_ruby@3.3.4) (2023-06-27)
 
 

data/lib/vite_ruby/commands.rb

@@ -50,7 +50,7 @@ class ViteRuby::Commands
 
     versions
       .each_with_index
-      .drop_while { |(mtime, _), index|
+      .drop_while { |(mtime, _files), index|
         max_age = [0, Time.now - Time.at(mtime)].max
         max_age < age_in_seconds || index < keep_up_to
       }
@@ -131,7 +131,7 @@ private
   def_delegators :@vite_ruby, :config, :builder, :manifest, :logger, :logger=
 
   def may_clean?
-    config.build_output_dir.exist? && config.manifest_path.exist?
+    config.build_output_dir.exist? && config.manifest_paths.any?
   end
 
   def clean_files(files)
@@ -143,14 +143,16 @@ private
 
   def versions
     all_files = Dir.glob("#{ config.build_output_dir }/**/*")
-    entries = all_files - config.manifest_paths - current_version_files
+    entries = all_files - config.manifest_paths - files_referenced_in_manifests
     entries.reject { |file| File.directory?(file) }
       .group_by { |file| File.mtime(file).utc.to_i }
       .sort.reverse
   end
 
-  def current_version_files
-    Dir.glob(manifest.refresh.values.map { |value| config.build_output_dir.join("#{ value['file'] }*") })
+  def files_referenced_in_manifests
+    config.manifest_paths.flat_map { |path|
+      JSON.parse(path.read).map { |_, entry| entry['file'] }
+    }.compact.uniq.map { |path| config.build_output_dir.join(path).to_s }
   end
 
   def with_node_env(env)

data/lib/vite_ruby/config.rb

@@ -17,19 +17,24 @@ class ViteRuby::Config
     "#{ host }:#{ port }"
   end
 
-  # Internal: Path where Vite outputs the manifest file.
-  def manifest_path
-    build_output_dir.join('manifest.json')
-  end
-
-  # Internal: Path where vite-plugin-ruby outputs the assets manifest file.
-  def assets_manifest_path
-    build_output_dir.join('manifest-assets.json')
+  # Internal: Path to the manifest files generated by Vite and vite-plugin-ruby.
+  def known_manifest_paths
+    [
+      # NOTE: Generated by Vite when `manifest: true`, which vite-plugin-ruby enables.
+      'manifest.json',
+      # NOTE: Path where vite-plugin-ruby outputs the assets manifest file.
+      'manifest-assets.json',
+    ].flat_map { |path|
+      [
+        build_output_dir.join(".vite/#{ path }"), # Vite 5 onwards
+        build_output_dir.join(path), # Vite 4 and below
+      ]
+    }
   end
 
   # Internal: Path to the manifest files generated by Vite and vite-plugin-ruby.
   def manifest_paths
-    [manifest_path, assets_manifest_path].select(&:exist?)
+    known_manifest_paths.select(&:exist?)
   end
 
   # Public: The directory where Vite will store the built assets.

data/lib/vite_ruby/missing_entrypoint_error.rb

@@ -11,12 +11,13 @@ class ViteRuby::MissingEntrypointError < ViteRuby::Error
   def initialize(info)
     @info = info
     super <<~MSG
-      Vite Ruby can't find #{ file_name } in #{ config.manifest_path.relative_path_from(config.root) } or #{ config.assets_manifest_path.relative_path_from(config.root) }.
+      Vite Ruby can't find #{ file_name } in the manifests.
 
       Possible causes:
       #{ possible_causes(last_build) }
       :troubleshooting:
-      #{ "\nContent in your manifests:\n#{ JSON.pretty_generate(manifest) }\n" if last_build.success }
+      #{ "Manifest files found:\n#{ config.manifest_paths.map { |path| "  #{ path.relative_path_from(config.root) }" }.join("\n") }\n" if last_build.success }
+      #{ "Content in your manifests:\n#{ JSON.pretty_generate(manifest) }\n" if last_build.success }
       #{ "Last build in #{ config.mode } mode:\n#{ last_build.to_json }\n" if last_build.success }
     MSG
   end

data/lib/vite_ruby/version.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 class ViteRuby
-  VERSION = '3.3.4'
+  VERSION = '3.5.0'
 
   # Internal: Versions used by default when running `vite install`.
-  DEFAULT_VITE_VERSION = '^4.3.0'
-  DEFAULT_PLUGIN_VERSION = '^3.2.0'
+  DEFAULT_VITE_VERSION = '^5.0.0'
+  DEFAULT_PLUGIN_VERSION = '^5.0.0'
 end

metadata

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