vite_rails 1.0.4 → 1.0.9

data/test/rake_tasks_test.rb

@@ -5,37 +5,23 @@ require 'test_helper'
 class RakeTasksTest < Minitest::Test
   def test_rake_tasks
     output = Dir.chdir(test_app_path) { `rake -T` }
-    assert_includes output, 'vite_rails'
-    assert_includes output, 'vite:check_binstubs'
-    assert_includes output, 'vite:check_node'
-    assert_includes output, 'vite:check_yarn'
+    assert_includes output, 'vite:build'
     assert_includes output, 'vite:clean'
     assert_includes output, 'vite:clobber'
-    assert_includes output, 'vite:compile'
     assert_includes output, 'vite:install'
+    assert_includes output, 'vite:install_dependencies'
     assert_includes output, 'vite:verify_install'
   end
 
   def test_rake_task_vite_check_binstubs
-    output = Dir.chdir(test_app_path) { `rake vite:check_binstubs 2>&1` }
+    output = Dir.chdir(test_app_path) { `rake vite:verify_install 2>&1` }
     refute_includes output, 'vite binstub not found.'
   end
 
-  def test_check_node_version
-    output = Dir.chdir(test_app_path) { `rake vite:check_node 2>&1` }
-    refute_includes output, 'ViteRails requires Node.js'
-  end
-
-  def test_check_yarn_version
-    output = Dir.chdir(test_app_path) { `rake vite:check_yarn 2>&1` }
-    refute_includes output, 'Yarn not installed'
-    refute_includes output, 'ViteRails requires Yarn'
-  end
-
   def test_rake_vite_install_dependencies_in_non_production_environments
     assert_includes test_app_dev_dependencies, 'right-pad'
 
-    ViteRails.with_node_env('test') do
+    ViteRails.commands.send(:with_node_env, 'test') do
       Dir.chdir(test_app_path) do
         `bundle exec rake vite:install_dependencies`
       end
@@ -46,7 +32,7 @@ class RakeTasksTest < Minitest::Test
   end
 
   def test_rake_vite_install_dependencies_in_production_environment
-    ViteRails.with_node_env('production') do
+    ViteRails.commands.send(:with_node_env, 'production') do
       Dir.chdir(test_app_path) do
         `bundle exec rake vite:install_dependencies`
       end

data/test/runner_test.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class RunnerTest < ViteRails::Test
+  def test_dev_server_command
+    assert_run_command(flags: ['--mode', 'production'])
+  end
+
+  def test_dev_server_command_via_yarn
+    assert_run_command(flags: ['--mode', 'production'], use_yarn: true)
+  end
+
+  def test_dev_server_command_with_argument
+    assert_run_command('--quiet', flags: ['--mode', 'production'])
+  end
+
+  def test_build_command
+    assert_run_command('build', flags: ['--mode', 'production'])
+  end
+
+  def test_build_command_via_yarn
+    assert_run_command('build', flags: ['--mode', 'production'], use_yarn: true)
+  end
+
+  def test_build_command_with_argument
+    with_rails_env('development') do
+      assert_run_command('build', '--emptyOutDir', flags: ['--mode', 'development'])
+    end
+  end
+end

data/test/test_app/app/frontend/entrypoints/application.js

@@ -0,0 +1,2 @@
+/* eslint no-console:0 */
+console.log('Hello World from ViteRails')

data/test/test_app/config/vite.json

@@ -10,11 +10,9 @@
     "publicOutputDir": "vite-test"
   },
   "production": {
-    "autoBuild": false,
     "publicOutputDir": "vite-production"
   },
   "staging": {
-    "autoBuild": false,
     "publicOutputDir": "vite-staging"
   }
 }

data/test/test_app/config/vite_additional_paths.json

@@ -0,0 +1,5 @@
+{
+  "all": {
+    "watchAdditionalPaths": ["config/*"]
+  }
+}

data/test/test_app/config/vite_public_dir.json

@@ -0,0 +1,5 @@
+{
+  "all": {
+    "publicDir": "../public"
+  }
+}

data/test/test_app/public/vite-production/manifest.json

@@ -0,0 +1,22 @@
+{
+  "application.js": {
+    "file": "assets/application.a0ba047e.js",
+    "imports": [
+      "assets/example_import.8e1fddc0.js"
+    ]
+  },
+  "example_import.js": {
+    "file": "assets/example_import.8e1fddc0.js",
+    "imports": []
+  },
+  "colored.js": {
+    "file": "assets/colored.1173bfe0.js",
+    "imports": []
+  },
+  "application.css": {
+    "file": "assets/application.cccfef34.css"
+  },
+  "colored.css": {
+    "file": "assets/colored.84277fd6.css"
+  }
+}

data/test/test_helper.rb

@@ -1,34 +1,68 @@
 # frozen_string_literal: true
 
+require 'simplecov'
+SimpleCov.start {
+  add_filter '/test/'
+}
+
 require 'minitest/autorun'
 require 'rails'
 require 'rails/test_help'
-require 'byebug'
+require 'pry-byebug'
 
 require_relative 'test_app/config/environment'
 
 Rails.env = 'production'
 
-ViteRails.instance = ::ViteRails.new
+ViteRails.instance = ViteRails.new
 
-class ViteRails::Test < Minitest::Test
-private
-
-  def reloaded_config
-    ViteRails.instance.instance_variable_set(:@config, nil)
-    ViteRails.instance.instance_variable_set(:@dev_server, nil)
-    ViteRails.env = {}
-    ViteRails.config
-    ViteRails.dev_server
+module ViteRailsTestHelpers
+  def refresh_config(env_variables = ViteRails.load_env_variables)
+    ViteRails.env = env_variables
+    (ViteRails.instance = ViteRails.new).config
   end
 
   def with_rails_env(env)
     original = Rails.env
     Rails.env = ActiveSupport::StringInquirer.new(env)
-    reloaded_config
-    yield
+    yield(refresh_config)
   ensure
     Rails.env = ActiveSupport::StringInquirer.new(original)
-    reloaded_config
+    refresh_config
+  end
+
+  def test_app_path
+    File.expand_path('test_app', __dir__)
+  end
+
+  def with_dev_server_running(&block)
+    ViteRails.instance.stub(:dev_server_running?, true, &block)
+  end
+end
+
+class ViteRails::Test < Minitest::Test
+  include ViteRailsTestHelpers
+
+private
+
+  def assert_run_command(*argv, use_yarn: false, flags: [])
+    command = use_yarn ? %w[yarn vite] : ["#{ test_app_path }/node_modules/.bin/vite"]
+    cwd = Dir.pwd
+    Dir.chdir(test_app_path)
+
+    klass = ViteRails::Runner
+    instance = klass.new(argv)
+    mock = Minitest::Mock.new
+    mock.expect(:call, nil, [ViteRails.env, *command, *argv, *flags])
+
+    klass.stub(:new, instance) do
+      instance.stub(:executable_exists?, !use_yarn) do
+        Kernel.stub(:exec, mock) { ViteRails.run(argv) }
+      end
+    end
+
+    mock.verify
+  ensure
+    Dir.chdir(cwd)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vite_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Máximo Mussini
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -147,9 +147,9 @@ files:
 - package.json
 - package/default.vite.json
 - test/builder_test.rb
-- test/command_test.rb
+- test/commands_test.rb
 - test/configuration_test.rb
-- test/dev_server_runner_test.rb
+- test/dev_server_proxy_test.rb
 - test/dev_server_test.rb
 - test/engine_rake_tasks_test.rb
 - test/helper_test.rb
@@ -164,30 +164,29 @@ files:
 - test/mounted_app/test/dummy/config/environment.rb
 - test/mounted_app/test/dummy/config/vite.json
 - test/mounted_app/test/dummy/package.json
+- test/mounted_app/test/dummy/yarn.lock
 - test/rake_tasks_test.rb
+- test/runner_test.rb
 - test/test_app/Rakefile
-- test/test_app/app/javascript/entrypoints/application.js
-- test/test_app/app/javascript/entrypoints/multi_entry.css
-- test/test_app/app/javascript/entrypoints/multi_entry.js
+- test/test_app/app/frontend/entrypoints/application.js
 - test/test_app/bin/vite
 - test/test_app/config.ru
 - test/test_app/config/application.rb
 - test/test_app/config/environment.rb
 - test/test_app/config/vite.json
-- test/test_app/config/vite_public_root.yml
+- test/test_app/config/vite_additional_paths.json
+- test/test_app/config/vite_public_dir.json
 - test/test_app/package.json
-- test/test_app/public/vite/manifest.json
+- test/test_app/public/vite-production/manifest.json
 - test/test_app/some.config.js
 - test/test_app/yarn.lock
 - test/test_helper.rb
-- test/vite_runner_test.rb
-- test/webpacker_test.rb
 homepage: https://github.com/ElMassimo/vite_rails
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/ElMassimo/vite_rails/tree/v1.0.4
-  changelog_uri: https://github.com/ElMassimo/vite_rails/blob/v1.0.4/CHANGELOG.md
+  source_code_uri: https://github.com/ElMassimo/vite_rails/tree/v1.0.9
+  changelog_uri: https://github.com/ElMassimo/vite_rails/blob/v1.0.9/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -196,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -209,9 +208,9 @@ specification_version: 4
 summary: Use Vite in Rails and bring joy to your JavaScript experience
 test_files:
 - test/builder_test.rb
-- test/command_test.rb
+- test/commands_test.rb
 - test/configuration_test.rb
-- test/dev_server_runner_test.rb
+- test/dev_server_proxy_test.rb
 - test/dev_server_test.rb
 - test/engine_rake_tasks_test.rb
 - test/helper_test.rb
@@ -226,21 +225,20 @@ test_files:
 - test/mounted_app/test/dummy/config/environment.rb
 - test/mounted_app/test/dummy/config/vite.json
 - test/mounted_app/test/dummy/package.json
+- test/mounted_app/test/dummy/yarn.lock
 - test/rake_tasks_test.rb
+- test/runner_test.rb
 - test/test_app/Rakefile
-- test/test_app/app/javascript/entrypoints/application.js
-- test/test_app/app/javascript/entrypoints/multi_entry.css
-- test/test_app/app/javascript/entrypoints/multi_entry.js
+- test/test_app/app/frontend/entrypoints/application.js
 - test/test_app/bin/vite
 - test/test_app/config.ru
 - test/test_app/config/application.rb
 - test/test_app/config/environment.rb
 - test/test_app/config/vite.json
-- test/test_app/config/vite_public_root.yml
+- test/test_app/config/vite_additional_paths.json
+- test/test_app/config/vite_public_dir.json
 - test/test_app/package.json
-- test/test_app/public/vite/manifest.json
+- test/test_app/public/vite-production/manifest.json
 - test/test_app/some.config.js
 - test/test_app/yarn.lock
 - test/test_helper.rb
-- test/vite_runner_test.rb
-- test/webpacker_test.rb

data/test/command_test.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class CommandTest < Minitest::Test
-  def test_compile_command_returns_success_status_when_stale
-    ViteRails.builder.stub :stale?, true do
-      ViteRails.builder.stub :run_vite, true do
-        assert_equal true, ViteRails.commands.compile
-      end
-    end
-  end
-
-  def test_compile_command_returns_success_status_when_fresh
-    ViteRails.builder.stub :stale?, false do
-      ViteRails.builder.stub :run_vite, true do
-        assert_equal true, ViteRails.commands.compile
-      end
-    end
-  end
-
-  def test_compile_command_returns_failure_status_when_stale
-    ViteRails.builder.stub :stale?, true do
-      ViteRails.builder.stub :run_vite, false do
-        assert_equal false, ViteRails.commands.compile
-      end
-    end
-  end
-
-  def test_clean_command_works_with_nested_hashes_and_without_any_compiled_files
-    File.stub :delete, true do
-      assert ViteRails.commands.clean
-    end
-  end
-end

data/test/dev_server_runner_test.rb

@@ -1,83 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class DevServerRunnerTest < ViteRails::Test
-  def setup
-    @original_node_env, ENV['NODE_ENV'] = ENV['NODE_ENV'], 'development'
-    @original_rails_env, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], 'development'
-  end
-
-  def teardown
-    ENV['NODE_ENV'] = @original_node_env
-    ENV['RAILS_ENV'] = @original_rails_env
-  end
-
-  def test_run_cmd_via_node_modules
-    cmd = ["#{ test_app_path }/node_modules/.bin/vite", '--mode', 'development']
-
-    verify_command(cmd, use_node_modules: true)
-  end
-
-  def test_run_cmd_via_yarn
-    cmd = ['yarn', 'vite', '--mode', 'development']
-
-    verify_command(cmd, use_node_modules: false)
-  end
-
-  def test_run_cmd_argv
-    cmd = ["#{ test_app_path }/node_modules/.bin/vite", '--quiet', '--mode', 'development']
-
-    verify_command(cmd, argv: ['--quiet'])
-  end
-
-  def test_run_cmd_argv_with_https
-    cmd = ["#{ test_app_path }/node_modules/.bin/vite", '--https', '--mode', 'development']
-
-    dev_server = ViteRails::DevServer.new({})
-    def dev_server.host
-      'localhost'
-    end
-
-    def dev_server.port
-      '3035'
-    end
-
-    def dev_server.pretty?
-      false
-    end
-
-    def dev_server.https?
-      true
-    end
-    ViteRails::DevServer.stub(:new, dev_server) do
-      verify_command(cmd, argv: ['--https'])
-    end
-  end
-
-private
-
-  def test_app_path
-    File.expand_path('test_app', __dir__)
-  end
-
-  def verify_command(cmd, use_node_modules: true, argv: [])
-    cwd = Dir.pwd
-    Dir.chdir(test_app_path)
-
-    klass = ViteRails::Runner
-    instance = klass.new(argv)
-    mock = Minitest::Mock.new
-    mock.expect(:call, nil, [ViteRails.env, *cmd])
-
-    klass.stub(:new, instance) do
-      instance.stub(:executable_exists?, use_node_modules) do
-        Kernel.stub(:exec, mock) { ViteRails.run(argv) }
-      end
-    end
-
-    mock.verify
-  ensure
-    Dir.chdir(cwd)
-  end
-end