vite_ruby 1.2.12 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c773a06d1ae5abbf91dd4e08eaed27f23ea436277c9ca6515e727b1f36492ed7
-  data.tar.gz: a11954fbfd1392bd2a3c8b070c9d53218294f51edcabc0f69aa743a6aee6cf40
+  metadata.gz: f702f993fc5df33d479953322735001bfb90e05854e8818f968739a957c61671
+  data.tar.gz: c6b6a5df4d3c589cc83d62d1356d1a8a13389911a8e18d90c4b1baae8cab27cd
 SHA512:
-  metadata.gz: 604ef82de1451193428702a7d6aa12a1eabbb0f9dcaecc0090960dd96236510a78f23db60a23d5a5c31a077be9342eeda2781394a03bf05e07eea47f89ea788b
-  data.tar.gz: de661b6146515a32168c3fc0ea8f9d41b91e7ac1ee3f6cf4d4e5743c4d0426381b16d23fd2d986ccf769d86c47003500cd2c5777b56874ebc7b48c25b7a1cb7f
+  metadata.gz: ff157c02f679fff7590cf7b9786f91ca9e2db5698d13e8cd472a3bed51178bc61c8355753206770d7098303fd48b204600d69e1f230321cfe32e26c4c3b759b5
+  data.tar.gz: 953ddd4dfdcc310831dd1bbbbd92b0603df85b3301f9b376a1fd2e3c56bbfa00ead841a647368e1cc34a3d0e13985967cd51c23064323d629624d57dcaffbbf2

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## <small>1.2.17 (2021-07-12)</small>
+
+* 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)
+
+
+
+## <small>1.2.16 (2021-07-07)</small>
+
+* feat: Enable usage in engines by using `run` from the current instance ([023a61d](https://github.com/ElMassimo/vite_ruby/commit/023a61d))
+
+
+
+## [1.2.15](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.14...vite_ruby@1.2.15) (2021-07-01)
+
+
+
+## [1.2.14](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.13...vite_ruby@1.2.14) (2021-07-01)
+
+
+### Features
+
+* Add support for Jekyll installer ([7b942ec](https://github.com/ElMassimo/vite_ruby/commit/7b942ec745eb28092d684056b02df675ad6ececa))
+
+
+
+## [1.2.13](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.12...vite_ruby@1.2.13) (2021-06-30)
+
+
+### Features
+
+* Improve the error message when npm packages are missing ([9159557](https://github.com/ElMassimo/vite_ruby/commit/9159557e5152547554cfe519fae8dbefe26686fb))
+
+
+
 ## [1.2.12](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.11...vite_ruby@1.2.12) (2021-06-08)
 
 

data/lib/vite_ruby.rb

@@ -18,28 +18,28 @@ class ViteRuby
   ENV_PREFIX = 'VITE_RUBY'
 
   # Internal: Versions used by default when running `vite install`.
-  DEFAULT_VITE_VERSION = '^2.2.3'
-  DEFAULT_PLUGIN_VERSION = '^2.0.2'
-
-  # Internal: Ruby Frameworks that have a companion library for Vite Ruby.
-  SUPPORTED_FRAMEWORKS = %w[rails hanami roda padrino sinatra].freeze
+  DEFAULT_VITE_VERSION = '^2.3.8'
+  DEFAULT_PLUGIN_VERSION = '^2.0.4'
+
+  # Internal: Companion libraries for Vite Ruby, and their target framework.
+  COMPANION_LIBRARIES = {
+    'vite_rails' => 'rails',
+    'vite_hanami' => 'hanami',
+    'vite_roda' => 'roda',
+    'vite_padrino' => 'padrino',
+    'vite_sinatra' => 'sinatra',
+    'jekyll-vite' => 'jekyll',
+    'vite_rails_legacy' => 'rails',
+  }
 
   class << self
     extend Forwardable
 
-    def_delegators :instance, :config, :commands, :run_proxy?
+    def_delegators :instance, :config, :commands, :env, :run, :run_proxy?
     def_delegators :config, :mode
 
     def instance
-      @instance ||= ViteRuby.new
-    end
-
-    # Public: Additional environment variables to pass to Vite.
-    #
-    # Example:
-    #   ViteRuby.env['VITE_RUBY_CONFIG_PATH'] = 'config/alternate_vite.json'
-    def env
-      @env ||= load_env_variables
+      @instance ||= new
     end
 
     # Internal: Refreshes the manifest.
@@ -52,28 +52,16 @@ class ViteRuby
       load File.expand_path('tasks/vite.rake', __dir__)
     end
 
-    # Internal: Executes the vite binary.
-    def run(argv, **options)
-      ViteRuby::Runner.new(instance).run(argv, **options)
-    end
-
-    # Internal: Refreshes the config after setting the env vars.
-    def reload_with(env_vars)
-      env.update(env_vars)
-      @instance = nil
-      config
-    end
-
-    # Internal: Allows to obtain any env variables for configuration options.
-    def load_env_variables
-      ENV.select { |key, _| key.start_with?(ENV_PREFIX) }
+    # Internal: Creates a new instance with the specified options.
+    def reload_with(**config_options)
+      @instance = new(**config_options)
     end
 
     # Internal: Detects if the application has installed a framework-specific
     # variant of Vite Ruby.
     def framework_libraries
-      SUPPORTED_FRAMEWORKS.map { |framework|
-        if library = (Gem.loaded_specs["vite_#{ framework }"] || Gem.loaded_specs["vite_#{ framework }_legacy"])
+      COMPANION_LIBRARIES.map { |name, framework|
+        if library = Gem.loaded_specs[name]
           [framework, library]
         end
       }.compact
@@ -82,6 +70,10 @@ class ViteRuby
 
   attr_writer :logger
 
+  def initialize(**config_options)
+    @config_options = config_options
+  end
+
   def logger
     @logger ||= Logger.new($stdout)
   end
@@ -99,6 +91,14 @@ class ViteRuby
     @running_at = false
   end
 
+  # Public: Additional environment variables to pass to Vite.
+  #
+  # Example:
+  #   ViteRuby.env['VITE_RUBY_CONFIG_PATH'] = 'config/alternate_vite.json'
+  def env
+    @env ||= ENV.select { |key, _| key.start_with?(ENV_PREFIX) }
+  end
+
   # Public: The proxy for assets should only run in development mode.
   def run_proxy?
     config.mode == 'development'
@@ -107,6 +107,11 @@ class ViteRuby
     false
   end
 
+  # Internal: Executes the vite binary.
+  def run(argv, **options)
+    (@runner ||= ViteRuby::Runner.new(self)).run(argv, **options)
+  end
+
   # Public: Keeps track of watched files and triggers builds as needed.
   def builder
     @builder ||= ViteRuby::Builder.new(self)
@@ -119,7 +124,7 @@ class ViteRuby
 
   # Public: Current instance configuration for Vite.
   def config
-    @config ||= ViteRuby::Config.resolve_config
+    @config ||= ViteRuby::Config.resolve_config(**@config_options)
   end
 
   # Public: Enables looking up assets managed by Vite using name and type.

data/lib/vite_ruby/builder.rb

@@ -33,7 +33,7 @@ private
 
   extend Forwardable
 
-  def_delegators :@vite_ruby, :config, :logger
+  def_delegators :@vite_ruby, :config, :logger, :run
 
   # Internal: Reads metadata recorded on the last build, if it exists.
   def last_build_attrs
@@ -69,7 +69,7 @@ private
   def build_with_vite(*args)
     logger.info 'Building with Vite ⚡️'
 
-    stdout, stderr, status = ViteRuby.run(['build', *args])
+    stdout, stderr, status = run(['build', *args])
     log_build_result(stdout, stderr.to_s, status)
 
     status.success?

data/lib/vite_ruby/cli/install.rb

@@ -28,6 +28,14 @@ class ViteRuby::CLI::Install < Dry::CLI::Command
 
 protected
 
+  # Internal: The JS packages that should be added to the app.
+  def js_dependencies
+    [
+      "vite@#{ ViteRuby::DEFAULT_VITE_VERSION }",
+      "vite-plugin-ruby@#{ ViteRuby::DEFAULT_PLUGIN_VERSION }",
+    ]
+  end
+
   # Internal: Setup for a plain Rack application.
   def setup_app_files
     copy_template 'config/vite.json', to: config.config_path
@@ -64,7 +72,7 @@ private
   def create_configuration_files
     copy_template 'config/vite.config.ts', to: root.join('vite.config.ts')
     setup_app_files
-    ViteRuby.reload_with('VITE_RUBY_CONFIG_PATH' => config.config_path)
+    ViteRuby.reload_with(config_path: config.config_path)
   end
 
   # Internal: Installs vite and vite-plugin-ruby at the project level.
@@ -73,7 +81,7 @@ private
     write(package_json, '{}') unless package_json.exist?
 
     Dir.chdir(root) do
-      deps = "vite@#{ ViteRuby::DEFAULT_VITE_VERSION } vite-plugin-ruby@#{ ViteRuby::DEFAULT_PLUGIN_VERSION }"
+      deps = js_dependencies.join(' ')
       _, stderr, status = ViteRuby::IO.capture("npx --package @antfu/ni -- ni -D #{ deps }", stdin_data: "\n")
       _, stderr, = ViteRuby::IO.capture("yarn add -D #{ deps }") unless status.success?
       say("Could not install JS dependencies.\n", stderr) unless stderr.to_s.empty?
@@ -117,5 +125,5 @@ end
 
 # NOTE: This allows framework-specific variants to extend the installation.
 ViteRuby.framework_libraries.each do |_framework, library|
-  require "#{ library.name }/installation"
+  require "#{ library.name.tr('-', '/') }/installation"
 end

data/lib/vite_ruby/dev_server_proxy.rb

@@ -33,7 +33,7 @@ private
     uri = env.fetch('REQUEST_URI') { [env['PATH_INFO'], env['QUERY_STRING']].reject { |str| str.to_s.strip.empty? }.join('?') }
       .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)\w+)\.css$/, '\1') # Rails' stylesheet_link_tag 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
 

data/lib/vite_ruby/missing_executable_error.rb

@@ -4,7 +4,7 @@
 class ViteRuby::MissingExecutableError < ViteRuby::Error
   def initialize(error = nil)
     super <<~MSG
-      ❌ The vite binary is not available. Have you installed Vite?
+      ❌ The vite binary is not available. Have you installed the npm packages?
 
       :troubleshooting:
       #{ error }

data/lib/vite_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ViteRuby
-  VERSION = '1.2.12'
+  VERSION = '1.2.17'
 end

metadata

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