vite_ruby 1.2.5 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf73b3471127a2ca30bb94a9db5eadde2674289194dbe605ae01c3dc9bee817
-  data.tar.gz: 93312a90a04807cb3f683f9435fddd399ffdfeda7dff31b9316c9977fb1b7a22
+  metadata.gz: 434e2c4bccc4557134c3ef317342b499cb57a70e3f441778d6fd94d4c2debf8b
+  data.tar.gz: 0456b70d36df278b46ded52dab70c3f098c9b31aa072b9d0cddd96652546e386
 SHA512:
-  metadata.gz: 789ff6d9d918b741f1430e802ea7fed4404ae3e216748d26b48f48c6a3d41976197f00a7e2ed3878b88d819fb2b812bef14099f753d884e02c6f0ea8acc5b315
-  data.tar.gz: 58044eba7336765db7a63bfa871f0c7ede9b28ef8ebf66708eb9c8c669abb7ca24f9855878af55fe02afd3e5d5126e1f49e5ef7e4feeaf8229984f59445c38d1
+  metadata.gz: 46d5df8aee43d5c3965bc58a479b76e332ca2f025159a06371b10163ec127d9cf37a5f696165ef06b62ca35f5d9d93cf5df14256b83dba902387b2dfa5931a17
+  data.tar.gz: 40900cb76780ddc98239d39b40d1633ec0593b9e7040d9c5ca5a4d99aab91a54a17313ce681b4aae457b1c762809c74eaf87ab88a12b56c5c44525a930239053

data/CHANGELOG.md

@@ -1,3 +1,48 @@
+## [1.2.10](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.9...vite_ruby@1.2.10) (2021-05-09)
+
+
+### Bug Fixes
+
+* Lock dry-cli to 0.6 since 0.7 has breaking changes (close [#76](https://github.com/ElMassimo/vite_ruby/issues/76)) ([9883458](https://github.com/ElMassimo/vite_ruby/commit/9883458443cb0047cd4cceaf02de2a86066d624e))
+
+
+
+## [1.2.9](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.8...vite_ruby@1.2.9) (2021-05-04)
+
+
+### Bug Fixes
+
+* Stream output during installation and don't skip installation of npm packages when no lockfile is detected ([#73](https://github.com/ElMassimo/vite_ruby/issues/73)) ([028a5ba](https://github.com/ElMassimo/vite_ruby/commit/028a5bae359085a36aa942d2ad63c23616a00ffb))
+
+
+
+## [1.2.8](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.7...vite_ruby@1.2.8) (2021-04-29)
+
+
+### Bug Fixes
+
+* Don't modify url for minified css when proxying a request ([#71](https://github.com/ElMassimo/vite_ruby/issues/71)) ([d30a577](https://github.com/ElMassimo/vite_ruby/commit/d30a577a8436c4987d7c2e08e7eae68e589eb2a7))
+
+
+
+## [1.2.7](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.6...vite_ruby@1.2.7) (2021-04-28)
+
+
+### Bug Fixes
+
+* Support Rails 5.1 by avoiding [incorrectly monkeypatched](https://github.com//github.com/rails/rails/blob/5-1-stable/activesupport/lib/active_support/core_ext/array/prepend_and_append.rb/issues/L2-L3) `Array#append` ([1b59551](https://github.com/ElMassimo/vite_ruby/commit/1b5955170b33a528a2b13d7e7e308e8493d97a91))
+
+
+
+## [1.2.6](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.5...vite_ruby@1.2.6) (2021-04-26)
+
+
+### Bug Fixes
+
+* Update installation to use the latest version of the plugin ([#67](https://github.com/ElMassimo/vite_ruby/issues/67)) ([7e10636](https://github.com/ElMassimo/vite_ruby/commit/7e10636f5396f496bd099a03e069cf8572b9585b))
+
+
+
 ## [1.2.5](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.4...vite_ruby@1.2.5) (2021-04-21)
 
 

data/lib/vite_ruby.rb

@@ -10,6 +10,7 @@ loader.ignore("#{ __dir__ }/install")
 loader.ignore("#{ __dir__ }/tasks")
 loader.ignore("#{ __dir__ }/exe")
 loader.inflector.inflect('cli' => 'CLI')
+loader.inflector.inflect('io' => 'IO')
 loader.setup
 
 class ViteRuby
@@ -17,8 +18,8 @@ class ViteRuby
   ENV_PREFIX = 'VITE_RUBY'
 
   # Internal: Versions used by default when running `vite install`.
-  DEFAULT_VITE_VERSION = '^2.0.3'
-  DEFAULT_PLUGIN_VERSION = '^1.0.13'
+  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

data/lib/vite_ruby/builder.rb

@@ -69,7 +69,7 @@ private
   def build_with_vite(*args)
     logger.info 'Building with Vite ⚡️'
 
-    stdout, stderr, status = ViteRuby.run(['build', *args], capture: true)
+    stdout, stderr, status = ViteRuby.run(['build', *args])
     log_build_result(stdout, stderr.to_s, status)
 
     status.success?

data/lib/vite_ruby/cli/dev.rb

@@ -8,6 +8,6 @@ class ViteRuby::CLI::Dev < ViteRuby::CLI::Build
   option(:force, desc: 'Force Vite to re-bundle dependencies', type: :boolean)
 
   def call(**options)
-    super { |args| ViteRuby.run(args) }
+    super { |args| ViteRuby.run(args, exec: true) }
   end
 end

data/lib/vite_ruby/cli/install.rb

@@ -2,7 +2,6 @@
 
 require 'dry/cli/utils/files'
 require 'stringio'
-require 'open3'
 
 class ViteRuby::CLI::Install < Dry::CLI::Command
   desc 'Performs the initial configuration setup to get started with Vite Ruby.'
@@ -73,11 +72,12 @@ private
   def install_js_dependencies
     package_json = root.join('package.json')
     write(package_json, '{}') unless package_json.exist?
+
     Dir.chdir(root) do
       deps = "vite@#{ ViteRuby::DEFAULT_VITE_VERSION } vite-plugin-ruby@#{ ViteRuby::DEFAULT_PLUGIN_VERSION }"
-      stdout, stderr, status = Open3.capture3({}, "npx --yes --package @antfu/ni -- ni -D #{ deps }")
-      stdout, stderr, = Open3.capture3({}, "yarn add -D #{ deps }") unless status.success?
-      say(stdout, "\n", stderr)
+      _, 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?
     end
   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(/(\.\w+)\.css$/, '\1') # Rails' stylesheet_link_tag always adds the extension.
+      .sub(/(\.(?!min)\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/io.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+# Public: Builds on top of Ruby I/O open3 providing a friendlier experience.
+module ViteRuby::IO
+  class << self
+    # Internal: A modified version of capture3 that can continuosly print stdout.
+    # NOTE: Streaming output provides a better UX when running bin/vite build.
+    def capture(*cmd, with_output: $stdout.method(:puts), stdin_data: '', **opts)
+      return Open3.capture3(*cmd, **opts) unless with_output
+
+      Open3.popen3(*cmd, **opts) { |stdin, stdout, stderr, wait_threads|
+        stdin << stdin_data
+        stdin.close
+        out = Thread.new { read_lines(stdout, &with_output) }
+        err = Thread.new { stderr.read }
+        [out.value, err.value, wait_threads.value]
+      }
+    end
+
+    # Internal: Reads and yield every line in the stream. Returns the full content.
+    def read_lines(io)
+      buffer = +''
+      while line = io.gets
+        buffer << line
+        yield line
+      end
+      buffer
+    end
+  end
+end

data/lib/vite_ruby/runner.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'open3'
-
 # Public: Executes Vite commands, providing conveniences for debugging.
 class ViteRuby::Runner
   def initialize(vite_ruby)
@@ -9,10 +7,13 @@ class ViteRuby::Runner
   end
 
   # Public: Executes Vite with the specified arguments.
-  def run(argv, capture: false)
+  def run(argv, exec: false)
     Dir.chdir(config.root) {
       cmd = command_for(argv)
-      capture ? capture3_with_output(*cmd, chdir: config.root) : Kernel.exec(*cmd)
+      return Kernel.exec(*cmd) if exec
+
+      log_or_noop = ->(line) { logger.info('vite') { line } } unless config.hide_build_console_output
+      ViteRuby::IO.capture(*cmd, chdir: config.root, with_output: log_or_noop)
     }
   rescue Errno::ENOENT => error
     raise ViteRuby::MissingExecutableError, error
@@ -28,11 +29,11 @@ private
   def command_for(args)
     [config.to_env].tap do |cmd|
       args = args.clone
-      cmd.append('node', '--inspect-brk') if args.delete('--inspect')
-      cmd.append('node', '--trace-deprecation') if args.delete('--trace_deprecation')
-      cmd.append(vite_executable)
-      cmd.append(*args)
-      cmd.append('--mode', config.mode) unless args.include?('--mode') || args.include?('-m')
+      cmd.push('node', '--inspect-brk') if args.delete('--inspect')
+      cmd.push('node', '--trace-deprecation') if args.delete('--trace_deprecation')
+      cmd.push(vite_executable)
+      cmd.push(*args)
+      cmd.push('--mode', config.mode) unless args.include?('--mode') || args.include?('-m')
     end
   end
 
@@ -41,26 +42,4 @@ private
     bin_path = config.vite_bin_path
     File.exist?(bin_path) ? bin_path : "#{ `npm bin`.chomp }/vite"
   end
-
-  # Internal: A modified version of capture3 that continuosly prints stdout.
-  # NOTE: This improves the experience of running bin/vite build.
-  def capture3_with_output(*cmd, **opts)
-    return Open3.capture3(*cmd, opts) if config.hide_build_console_output
-
-    Open3.popen3(*cmd, opts) { |_stdin, stdout, stderr, wait_threads|
-      out = Thread.new { read_lines(stdout) { |l| logger.info('vite') { l } } }
-      err = Thread.new { stderr.read }
-      [out.value, err.value, wait_threads.value]
-    }
-  end
-
-  # Internal: Reads and yield every line in the stream. Returns the full content.
-  def read_lines(io)
-    buffer = +''
-    while line = io.gets
-      buffer << line
-      yield line
-    end
-    buffer
-  end
 end

data/lib/vite_ruby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.10
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rack-proxy
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +225,7 @@ files:
 - lib/vite_ruby/config.rb
 - lib/vite_ruby/dev_server_proxy.rb
 - lib/vite_ruby/error.rb
+- lib/vite_ruby/io.rb
 - lib/vite_ruby/manifest.rb
 - lib/vite_ruby/missing_entrypoint_error.rb
 - lib/vite_ruby/missing_executable_error.rb
@@ -237,8 +238,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.5/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@1.2.5/vite_ruby/CHANGELOG.md
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@1.2.10/vite_ruby
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@1.2.10/vite_ruby/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: