vite_ruby 1.2.10 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 434e2c4bccc4557134c3ef317342b499cb57a70e3f441778d6fd94d4c2debf8b
-  data.tar.gz: 0456b70d36df278b46ded52dab70c3f098c9b31aa072b9d0cddd96652546e386
+  metadata.gz: 2cc7ebe04b31db44eb45cc8c61275d09035b9496e2bb9b818909d101088b304f
+  data.tar.gz: e5318e9fc71a89e68e707e0edf2a679b31163566f7a61478cf95b18698289b54
 SHA512:
-  metadata.gz: 46d5df8aee43d5c3965bc58a479b76e332ca2f025159a06371b10163ec127d9cf37a5f696165ef06b62ca35f5d9d93cf5df14256b83dba902387b2dfa5931a17
-  data.tar.gz: 40900cb76780ddc98239d39b40d1633ec0593b9e7040d9c5ca5a4d99aab91a54a17313ce681b4aae457b1c762809c74eaf87ab88a12b56c5c44525a930239053
+  metadata.gz: f187d6b794b600e55ca88d1068900afdddd14652bd2b65661ce0478ed01a296c81348cea83d7a8a049a500107be431d0c6d22c781f9be9062bfe085090295ea9
+  data.tar.gz: df568548b57a23881f41c54388c41c46cb3da6f174463adc26e82c5998f9f76e552c3dfbd5b361345469b65ef03dbd465ed49297fa1c09c0f0783c16db6a3f1a

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+## [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)
+
+
+### Features
+
+* Support Ruby 2.4 ([#87](https://github.com/ElMassimo/vite_ruby/issues/87)) ([8fc4d49](https://github.com/ElMassimo/vite_ruby/commit/8fc4d49c82817623df81d6f9f94654ea726eb050))
+
+
+
+## [1.2.11](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.10...vite_ruby@1.2.11) (2021-05-10)
+
+### Refactor
+
+* Upgrade to dry-cli 0.7 while avoiding dependency on `dry-files` ([f5b87e](https://github.com/ElMassimo/vite_ruby/commit/f5b87e69790e48397d15e609b44118e399c9493d))
+
+
 ## [1.2.10](https://github.com/ElMassimo/vite_ruby/compare/vite_ruby@1.2.9...vite_ruby@1.2.10) (2021-05-09)
 
 

data/lib/vite_ruby.rb

@@ -18,11 +18,19 @@ 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
@@ -72,8 +80,8 @@ class ViteRuby
     # 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 }"]
+      COMPANION_LIBRARIES.map { |name, framework|
+        if library = Gem.loaded_specs[name]
           [framework, library]
         end
       }.compact

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.'

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,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'dry/cli/utils/files'
 require 'stringio'
 
 class ViteRuby::CLI::Install < Dry::CLI::Command
@@ -29,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
@@ -49,9 +56,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
 
@@ -74,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?
@@ -118,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/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/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.10'
+  VERSION = '1.2.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.15
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-07-01 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.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rack-proxy
   requirement: !ruby/object:Gem::Requirement
@@ -142,48 +142,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -219,8 +177,10 @@ 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
@@ -238,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.10/vite_ruby
-  changelog_uri: https://github.com/ElMassimo/vite_ruby/blob/vite_ruby@1.2.10/vite_ruby/CHANGELOG.md
+  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
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -248,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="