vite_ruby 1.2.6 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25d6f543baa813ce51efadb33c24e701832a892ff73d3091b72978a7937b020c
-  data.tar.gz: cc3135c8be27c94e4f52ea679ba6ef41d2063af64cf6eb7a1bb4e662260e6171
+  metadata.gz: d4580c673ebdae305421db8a2ccc22fd8683302d22c24db85f63d4c2f6638400
+  data.tar.gz: 52ea04d44b7f05c734a6011d4e66408135922e6fd0410cbc5d15a1b68c82140a
 SHA512:
-  metadata.gz: ea9e613b7b58f625b2c0f014f51b07652da52405308a4d07f5ad481d9d94e39c19ef20ef8feac6d8457277fc09fdb920bac6de2d1b3e99b934ca9715a1e06fd7
-  data.tar.gz: 2c5d0955a5651ea278bbe6fca0dd6905770709959776ad867c679e0c65e7304d8c7b9d7becf739226825223b8ed0e319461c5e1768d7acef4a2249ef2c34204d
+  metadata.gz: 389377989a3dd2db2188c05814a26526ee3fab5647863d7ab42df5dceef737c9f63c9ed71bee59339662338f16c7594bdeaea8ebd4cfd043de2d3a9297194b3e
+  data.tar.gz: 75345348dfef36343eb44150d1162725f58171cd9e6a24d6eb6f3bfd29ce4861d74910ffb140ed2f0fef106df839097a17e569610321cd939fce1be2a05da2ba

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+## [1.2.11](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.10...vite_ruby@1.2.11) (2021-05-10)
+
+
+
+## [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)
 
 

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

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/build.rb

@@ -1,25 +1,13 @@
 # frozen_string_literal: true
 
-class ViteRuby::CLI::Build < Dry::CLI::Command
-  CURRENT_ENV = ENV['RACK_ENV'] || ENV['RAILS_ENV']
+class ViteRuby::CLI::Build < ViteRuby::CLI::Vite
   DEFAULT_ENV = CURRENT_ENV || 'production'
 
-  def self.shared_options
-    option(:mode, default: self::DEFAULT_ENV, values: %w[development production test], aliases: ['m'], desc: 'The build mode for Vite')
-    option(:clobber, desc: 'Clear cache and previous builds', type: :boolean, aliases: %w[clean clear])
-    option(:debug, desc: 'Run Vite in verbose mode, printing all debugging output', aliases: ['verbose'], type: :boolean)
-    option(:inspect, desc: 'Run Vite in a debugging session with node --inspect-brk', aliases: ['inspect-brk'], type: :boolean)
-    option(:trace_deprecation, desc: 'Run Vite in debugging mode with node --trace-deprecation', aliases: ['trace-deprecation'], type: :boolean)
-  end
-
   desc 'Bundle all entrypoints using Vite.'
   shared_options
   option(:force, desc: 'Force the build even if assets have not changed', type: :boolean)
 
-  def call(mode:, args: [], clobber: false, **boolean_opts)
-    ViteRuby.env['VITE_RUBY_MODE'] = mode
-    ViteRuby.commands.clobber if clobber
-    boolean_opts.map { |name, value| args << "--#{ name }" if value }
-    block_given? ? yield(args) : ViteRuby.commands.build_from_task(*args)
+  def call(**options)
+    super { |args| ViteRuby.commands.build_from_task(*args) }
   end
 end

data/lib/vite_ruby/cli/dev.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class ViteRuby::CLI::Dev < ViteRuby::CLI::Build
+class ViteRuby::CLI::Dev < ViteRuby::CLI::Vite
   DEFAULT_ENV = CURRENT_ENV || 'development'
 
   desc 'Start the Vite development server.'
@@ -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/file_utils.rb

@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require 'pathname'
+require 'fileutils'
+
+# NOTE: Extracted from dry-cli version 0.6.0, which later removed this file as
+# it was refactored and extracted into the more complete (and complex) dry-files.
+module ViteRuby::CLI::FileUtils
+  class << self
+    # Creates a new file or rewrites the contents of an existing file.
+    #
+    # @since 1.2.11
+    # @api private
+    def write(path, *content)
+      mkdir_p(path)
+      File.open(path, File::CREAT | File::WRONLY | File::TRUNC) do |file|
+        file.write(Array(content).flatten.join)
+      end
+    end
+
+    # Copies source into destination.
+    #
+    # @since 1.2.11
+    # @api private
+    def cp(source, destination)
+      mkdir_p(destination)
+      FileUtils.cp(source, destination)
+    end
+
+    # Adds a new line at the bottom of the file.
+    #
+    # @since 1.2.11
+    # @api private
+    def append(path, contents)
+      mkdir_p(path)
+
+      content = File.readlines(path)
+      content << "\n" unless content.last.end_with?("\n")
+      content << "#{ contents }\n"
+
+      write(path, content)
+    end
+
+    # Replace first line in `path` that contains `target` with `replacement`.
+    #
+    # @since 1.2.11
+    # @api private
+    def replace_first_line(path, target, replacement)
+      content = File.readlines(path)
+      content[index(content, path, target)] = "#{ replacement }\n"
+
+      write(path, content)
+    end
+
+    # Inject `contents` in `path` before `target`.
+    #
+    # @since 1.2.11
+    # @api private
+    def inject_line_before(path, target, contents)
+      _inject_line_before(path, target, contents, method(:index))
+    end
+
+    # Inject `contents` in `path` after `target`.
+    #
+    # @since 1.2.11
+    # @api private
+    def inject_line_after(path, target, contents)
+      _inject_line_after(path, target, contents, method(:index))
+    end
+
+    # Inject `contents` in `path` after last `target`.
+    #
+    # @since 1.2.11
+    # @api private
+    def inject_line_after_last(path, target, contents)
+      _inject_line_after(path, target, contents, method(:rindex))
+    end
+
+  private
+
+    # Creates all parent directories for the given file path.
+    #
+    # @since 1.2.11
+    # @api private
+    def mkdir_p(path)
+      Pathname.new(path).dirname.mkpath
+    end
+
+    # @since 1.2.11
+    # @api private
+    def index(content, path, target)
+      content.index { |line| line.include?(target) } ||
+        raise(ArgumentError, "Cannot find `#{ target }' inside `#{ path }'.")
+    end
+
+    # @since 1.2.11
+    # @api private
+    def rindex(content, path, target)
+      content.rindex { |line| line.include?(target) } ||
+        raise(ArgumentError, "Cannot find `#{ target }' inside `#{ path }'.")
+    end
+
+    # @since 1.2.11
+    # @api private
+    def _inject_line_before(path, target, contents, finder)
+      content = File.readlines(path)
+      i = finder.call(content, path, target)
+
+      content.insert(i, "#{ contents }\n")
+      write(path, content)
+    end
+
+    # @since 1.2.11
+    # @api private
+    def _inject_line_after(path, target, contents, finder)
+      content = File.readlines(path)
+      i = finder.call(content, path, target)
+
+      content.insert(i + 1, "#{ contents }\n")
+      write(path, content)
+    end
+  end
+end

data/lib/vite_ruby/cli/install.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-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.'
@@ -50,9 +48,9 @@ private
 
   def_delegators 'ViteRuby', :config
 
-  %i[append cp inject_line_after inject_line_after_last inject_line_before write].each do |util|
+  %i[append cp inject_line_after inject_line_after_last inject_line_before replace_first_line write].each do |util|
     define_method(util) { |*args|
-      Dry::CLI::Utils::Files.send(util, *args) rescue nil
+      ViteRuby::CLI::FileUtils.send(util, *args) rescue nil
     }
   end
 
@@ -73,11 +71,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/cli/vite.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class ViteRuby::CLI::Vite < Dry::CLI::Command
+  CURRENT_ENV = ENV['RACK_ENV'] || ENV['RAILS_ENV']
+
+  def self.shared_options
+    option(:mode, default: self::DEFAULT_ENV, values: %w[development production test], aliases: ['m'], desc: 'The build mode for Vite')
+    option(:clobber, desc: 'Clear cache and previous builds', type: :boolean, aliases: %w[clean clear])
+    option(:debug, desc: 'Run Vite in verbose mode, printing all debugging output', aliases: ['verbose'], type: :boolean)
+    option(:inspect, desc: 'Run Vite in a debugging session with node --inspect-brk', aliases: ['inspect-brk'], type: :boolean)
+    option(:trace_deprecation, desc: 'Run Vite in debugging mode with node --trace-deprecation', aliases: ['trace-deprecation'], type: :boolean)
+  end
+
+  def call(mode:, args: [], clobber: false, **boolean_opts)
+    ViteRuby.env['VITE_RUBY_MODE'] = mode
+    ViteRuby.commands.clobber if clobber
+    boolean_opts.map { |name, value| args << "--#{ name }" if value }
+    yield(args)
+  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.6'
+  VERSION = '1.2.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.11
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-26 00:00:00.000000000 Z
+date: 2021-05-10 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.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rack-proxy
   requirement: !ruby/object:Gem::Requirement
@@ -219,12 +219,15 @@ files:
 - lib/vite_ruby/cli/build.rb
 - lib/vite_ruby/cli/clobber.rb
 - lib/vite_ruby/cli/dev.rb
+- lib/vite_ruby/cli/file_utils.rb
 - lib/vite_ruby/cli/install.rb
 - lib/vite_ruby/cli/version.rb
+- lib/vite_ruby/cli/vite.rb
 - lib/vite_ruby/commands.rb
 - 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 +240,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.6/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@1.2.6/vite_ruby/CHANGELOG.md
+  source_code_uri: https://github.com/ElMassimo/vite_ruby/tree/vite_ruby@1.2.11/vite_ruby
+  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@1.2.11/vite_ruby/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: