vite_ruby 1.2.15 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cc7ebe04b31db44eb45cc8c61275d09035b9496e2bb9b818909d101088b304f
-  data.tar.gz: e5318e9fc71a89e68e707e0edf2a679b31163566f7a61478cf95b18698289b54
+  metadata.gz: 9c040d1223758720987dc50a487c8cb2cbf07dba6b9bfb5a8a56b883931615d8
+  data.tar.gz: a6d9fcf29261cab2f4411830378e7b9658264450ff45feb736db5858cd8db7be
 SHA512:
-  metadata.gz: f187d6b794b600e55ca88d1068900afdddd14652bd2b65661ce0478ed01a296c81348cea83d7a8a049a500107be431d0c6d22c781f9be9062bfe085090295ea9
-  data.tar.gz: df568548b57a23881f41c54388c41c46cb3da6f174463adc26e82c5998f9f76e552c3dfbd5b361345469b65ef03dbd465ed49297fa1c09c0f0783c16db6a3f1a
+  metadata.gz: 13b6146ffcea5681a48c377bdabc798016c95ec595448274eb7deb1d64296244969f47c0f8cd4a5da9cde158dfaca746b07e4dee60feb153809b2b420e62fa6a
+  data.tar.gz: 684bf03f8e55ff25def1f3d051a3e2111644bc1b080a1faa2a2dbc0c85a925a771a2a6979e7068d9b35736fa155703ef0f851cb56e477999897e9bd3fd8c8697

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## <small>1.2.18 (2021-07-19)</small>
+
+* 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)
+
+
+
+## [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)
+
+
+
+## [1.2.16](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.15...vite_ruby@1.2.16) (2021-07-07)
+
+* 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)
 
 

data/lib/vite_ruby.rb

@@ -35,19 +35,11 @@ class ViteRuby
   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.
@@ -60,21 +52,9 @@ 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
@@ -90,6 +70,10 @@ class ViteRuby
 
   attr_writer :logger
 
+  def initialize(**config_options)
+    @config_options = config_options
+  end
+
   def logger
     @logger ||= Logger.new($stdout)
   end
@@ -107,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'
@@ -115,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)
@@ -127,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

@@ -72,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.

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
 
@@ -49,12 +49,16 @@ private
   end
 
   def vite_should_handle?(env)
-    path, query, referer = env['PATH_INFO'], env['QUERY_STRING'], env['HTTP_REFERER']
+    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 query&.start_with?('t=') # Hot Reload for a stylesheet
-    return true if query&.start_with?('import&') # Hot Reload for an imported entrypoint
-    return true if referer && URI.parse(referer).path.start_with?(vite_asset_url_prefix) # Entry imported from another entry.
+    return true if vite_entrypoint?(path) # HMR for entrypoint stylesheets and imports does not include the prefix
+  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?
   end
 
   def vite_asset_url_prefix

data/lib/vite_ruby/version.rb

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

metadata

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