vite_rails 1.0.8 → 1.0.9

data/test/dev_server_test.rb

@@ -6,34 +6,4 @@ class DevServerTest < ViteRails::Test
   def test_running?
     refute ViteRails.dev_server.running?
   end
-
-  def test_host
-    with_rails_env('development') do
-      assert_equal ViteRails.config.host, 'localhost'
-    end
-  end
-
-  def test_port
-    with_rails_env('development') do
-      assert_equal ViteRails.config.port, 3035
-    end
-  end
-
-  def test_https?
-    with_rails_env('development') do
-      assert_equal ViteRails.config.https, false
-    end
-  end
-
-  def test_protocol
-    with_rails_env('development') do
-      assert_equal ViteRails.config.protocol, 'http'
-    end
-  end
-
-  def test_host_with_port
-    with_rails_env('development') do
-      assert_equal ViteRails.config.host_with_port, 'localhost:3035'
-    end
-  end
 end

data/test/engine_rake_tasks_test.rb

@@ -4,39 +4,77 @@ require 'test_helper'
 
 class EngineRakeTasksTest < Minitest::Test
   def setup
-    remove_vite_binstubs
+    remove_vite_files
   end
 
   def teardown
-    remove_vite_binstubs
+    remove_vite_files
   end
 
-  def test_task_mounted
-    output = Dir.chdir(mounted_app_path) { `rake -T` }
+  def test_tasks_mounted
+    output = within_mounted_app { `bundle exec rake -T` }
     assert_includes output, 'app:vite'
   end
 
-  def test_binstubs
-    Dir.chdir(mounted_app_path) { `bundle exec rake app:vite:binstubs` }
-    vite_binstub_paths.each { |path| assert File.exist?(path) }
+  def test_rake_tasks
+    within_mounted_app { `bundle exec rake app:vite:binstubs` }
+    assert vite_binstub_path.exist?
+
+    within_mounted_app { `bundle exec rake app:vite:install` }
+    assert vite_config_ts_path.exist?
+    assert app_frontend_dir.exist?
+
+    within_mounted_app { `bundle exec rake app:vite:build` }
+    assert app_public_dir.exist?
+    assert app_public_dir.join('manifest.json').exist?
+    assert app_public_dir.join('assets').exist?
+
+    within_mounted_app { `bundle exec rake app:vite:clean` }
+    assert app_public_dir.join('manifest.json').exist? # Still fresh
+
+    within_mounted_app { `bundle exec rake app:vite:clean[0,0]` }
+    refute app_public_dir.join('manifest.json').exist?
+
+    within_mounted_app { `bundle exec rake app:vite:clobber` }
+    refute app_public_dir.exist?
+  rescue Minitest::Assertion => error
+    raise error unless Rails.gem_version >= Gem::Version.new('6.1.0')
   end
 
 private
 
+  def within_mounted_app
+    Dir.chdir(mounted_app_path) { yield }
+  end
+
   def mounted_app_path
-    File.expand_path('mounted_app', __dir__)
+    Pathname.new(File.expand_path(__dir__)).join('mounted_app')
+  end
+
+  def root_dir
+    mounted_app_path.join('test/dummy')
+  end
+
+  def vite_binstub_path
+    root_dir.join('bin/vite')
+  end
+
+  def vite_config_ts_path
+    root_dir.join('vite.config.ts')
+  end
+
+  def app_frontend_dir
+    root_dir.join('app/frontend')
   end
 
-  def vite_binstub_paths
-    [
-      "#{ mounted_app_path }/test/dummy/bin/vite",
-      "#{ mounted_app_path }/test/dummy/bin/vite-dev-server",
-    ]
+  def app_public_dir
+    root_dir.join('public/vite-dev')
   end
 
-  def remove_vite_binstubs
-    vite_binstub_paths.each do |path|
-      File.delete(path) if File.exist?(path)
-    end
+  def remove_vite_files
+    vite_binstub_path.delete if vite_binstub_path.exist?
+    vite_config_ts_path.delete if vite_config_ts_path.exist?
+    app_frontend_dir.rmtree if app_frontend_dir.exist?
+    app_public_dir.rmtree if app_public_dir.exist?
   end
 end

data/test/helper_test.rb

@@ -3,6 +3,8 @@
 require 'test_helper'
 
 class HelperTest < ActionView::TestCase
+  include ViteRailsTestHelpers
+
   tests ViteRails::Helper
 
   attr_reader :request
@@ -17,122 +19,52 @@ class HelperTest < ActionView::TestCase
     end.new
   end
 
-  def test_asset_pack_path
-    assert_equal '/packs/bootstrap-300631c4f0e0f9c865bc.js', asset_pack_path('bootstrap.js')
-    assert_equal '/packs/bootstrap-c38deda30895059837cf.css', asset_pack_path('bootstrap.css')
-  end
-
-  def test_asset_pack_url
-    assert_equal 'https://example.com/packs/bootstrap-300631c4f0e0f9c865bc.js', asset_pack_url('bootstrap.js')
-    assert_equal 'https://example.com/packs/bootstrap-c38deda30895059837cf.css', asset_pack_url('bootstrap.css')
+  def test_vite_client_tag
+    assert_nil vite_client_tag
+    with_dev_server_running {
+      assert_equal '<script src="/@vite/client" type="module"></script>', vite_client_tag
+    }
   end
 
-  def test_image_pack_path
-    assert_equal '/packs/application-k344a6d59eef8632c9d1.png', image_pack_path('application.png')
-    assert_equal '/packs/media/images/image-c38deda30895059837cf.jpg', image_pack_path('image.jpg')
-    assert_equal '/packs/media/images/image-c38deda30895059837cf.jpg', image_pack_path('media/images/image.jpg')
-    assert_equal '/packs/media/images/nested/image-c38deda30895059837cf.jpg', image_pack_path('nested/image.jpg')
-    assert_equal '/packs/media/images/nested/image-c38deda30895059837cf.jpg', image_pack_path('media/images/nested/image.jpg')
+  def test_vite_asset_path
+    assert_equal '/vite-production/assets/colored.1173bfe0.js', vite_asset_path('colored.js')
+    assert_equal '/vite-production/assets/colored.84277fd6.css', vite_asset_path('colored.css')
+    with_dev_server_running {
+      assert_equal '/vite-production/colored.js', vite_asset_path('colored.js')
+      assert_equal '/vite-production/colored.css', vite_asset_path('colored.css')
+    }
   end
 
-  def test_image_pack_url
-    assert_equal 'https://example.com/packs/application-k344a6d59eef8632c9d1.png', image_pack_url('application.png')
-    assert_equal 'https://example.com/packs/media/images/image-c38deda30895059837cf.jpg', image_pack_url('image.jpg')
-    assert_equal 'https://example.com/packs/media/images/image-c38deda30895059837cf.jpg', image_pack_url('media/images/image.jpg')
-    assert_equal 'https://example.com/packs/media/images/nested/image-c38deda30895059837cf.jpg', image_pack_url('nested/image.jpg')
-    assert_equal 'https://example.com/packs/media/images/nested/image-c38deda30895059837cf.jpg', image_pack_url('media/images/nested/image.jpg')
-  end
+  def test_vite_stylesheet_tag
+    assert_equal %(<link rel="stylesheet" media="screen" href="/vite-production/assets/colored.84277fd6.css" />),
+      vite_stylesheet_tag('colored')
 
-  def test_image_pack_tag
-    assert_equal \
-      '<img alt="Edit Entry" src="/packs/application-k344a6d59eef8632c9d1.png" width="16" height="10" />',
-      image_pack_tag('application.png', size: '16x10', alt: 'Edit Entry')
-    assert_equal \
-      '<img alt="Edit Entry" src="/packs/media/images/image-c38deda30895059837cf.jpg" width="16" height="10" />',
-      image_pack_tag('image.jpg', size: '16x10', alt: 'Edit Entry')
-    assert_equal \
-      '<img alt="Edit Entry" src="/packs/media/images/image-c38deda30895059837cf.jpg" width="16" height="10" />',
-      image_pack_tag('media/images/image.jpg', size: '16x10', alt: 'Edit Entry')
-    assert_equal \
-      '<img alt="Edit Entry" src="/packs/media/images/nested/image-c38deda30895059837cf.jpg" width="16" height="10" />',
-      image_pack_tag('nested/image.jpg', size: '16x10', alt: 'Edit Entry')
-    assert_equal \
-      '<img alt="Edit Entry" src="/packs/media/images/nested/image-c38deda30895059837cf.jpg" width="16" height="10" />',
-      image_pack_tag('media/images/nested/image.jpg', size: '16x10', alt: 'Edit Entry')
-    assert_equal \
-      '<img srcset="/packs/media/images/image-2x-7cca48e6cae66ec07b8e.jpg 2x" src="/packs/media/images/image-c38deda30895059837cf.jpg" />',
-      image_pack_tag('media/images/image.jpg', srcset: { 'media/images/image-2x.jpg' => '2x' })
-  end
+    assert_equal vite_stylesheet_tag('colored'), vite_stylesheet_tag('colored.css')
 
-  def test_favicon_pack_tag
-    assert_equal \
-      '<link rel="apple-touch-icon" type="image/png" href="/packs/application-k344a6d59eef8632c9d1.png" />',
-      favicon_pack_tag('application.png', rel: 'apple-touch-icon', type: 'image/png')
-    assert_equal \
-      '<link rel="apple-touch-icon" type="image/png" href="/packs/media/images/mb-icon-c38deda30895059837cf.png" />',
-      favicon_pack_tag('mb-icon.png', rel: 'apple-touch-icon', type: 'image/png')
-    assert_equal \
-      '<link rel="apple-touch-icon" type="image/png" href="/packs/media/images/mb-icon-c38deda30895059837cf.png" />',
-      favicon_pack_tag('media/images/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png')
-    assert_equal \
-      '<link rel="apple-touch-icon" type="image/png" href="/packs/media/images/nested/mb-icon-c38deda30895059837cf.png" />',
-      favicon_pack_tag('nested/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png')
-    assert_equal \
-      '<link rel="apple-touch-icon" type="image/png" href="/packs/media/images/nested/mb-icon-c38deda30895059837cf.png" />',
-      favicon_pack_tag('media/images/nested/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png')
-  end
+    with_dev_server_running {
+      assert_equal %(<link rel="stylesheet" media="screen" href="/vite-production/colored.css" />),
+        vite_stylesheet_tag('colored')
 
-  def test_javascript_pack_tag
-    assert_equal \
-      %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js"></script>),
-      javascript_pack_tag('bootstrap.js')
+      assert_equal vite_stylesheet_tag('colored'), vite_stylesheet_tag('colored.css')
+    }
   end
 
-  def test_javascript_pack_tag_symbol
-    assert_equal \
-      %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js"></script>),
-      javascript_pack_tag(:bootstrap)
-  end
+  def test_vite_javascript_tag
+    assert_equal [
+      %(<script src="/vite-production/assets/application.a0ba047e.js" crossorigin="anonymous" type="module"></script>),
+      %(<link rel="preload" href="/vite-production/assets/example_import.8e1fddc0.js" as="script" type="text/javascript" crossorigin="anonymous">),
+      %(<link rel="stylesheet" media="screen" href="/vite-production/assets/application.cccfef34.css" />),
+    ].join, vite_javascript_tag('application')
 
-  def test_javascript_pack_tag_splat
-    assert_equal \
-      %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js" defer="defer"></script>\n) +
-      %(<script src="/packs/application-k344a6d59eef8632c9d1.js" defer="defer"></script>),
-      javascript_pack_tag('bootstrap.js', 'application.js', defer: true)
-  end
+    assert_equal vite_javascript_tag('application'), vite_javascript_tag('application.js')
+    assert_equal vite_javascript_tag('application'), vite_typescript_tag('application')
 
-  def test_javascript_pack_tag_split_chunks
-    assert_equal \
-      %(<script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js"></script>\n) +
-      %(<script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js"></script>\n) +
-      %(<script src="/packs/application-k344a6d59eef8632c9d1.js"></script>),
-      javascript_packs_with_chunks_tag('application')
-  end
-
-  def test_stylesheet_pack_tag_split_chunks
-    assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
-      %(<link rel="stylesheet" media="screen" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" />\n) +
-      %(<link rel="stylesheet" media="screen" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" />),
-      stylesheet_packs_with_chunks_tag('application', 'hello_stimulus')
-  end
-
-  def test_stylesheet_pack_tag
-    assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag('bootstrap.css')
-  end
-
-  def test_stylesheet_pack_tag_symbol
-    assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag(:bootstrap)
-  end
+    with_dev_server_running {
+      assert_equal %(<script src="/vite-production/application.js" crossorigin="anonymous" type="module"></script>),
+        vite_javascript_tag('application')
 
-  def test_stylesheet_pack_tag_splat
-    assert_equal \
-      %(<link rel="stylesheet" media="all" href="/packs/bootstrap-c38deda30895059837cf.css" />\n) +
-      %(<link rel="stylesheet" media="all" href="/packs/application-dd6b1cd38bfa093df600.css" />),
-      stylesheet_pack_tag('bootstrap.css', 'application.css', media: 'all')
+      assert_equal %(<script src="/vite-production/application.ts.js" crossorigin="anonymous" type="module"></script>),
+        vite_typescript_tag('application')
+    }
   end
 end

data/test/manifest_test.rb

@@ -2,7 +2,7 @@
 
 require 'test_helper'
 
-class ManifestTest < Minitest::Test
+class ManifestTest < ViteRails::Test
   def test_lookup_exception!
     asset_file = 'calendar.js'
 
@@ -10,7 +10,7 @@ class ManifestTest < Minitest::Test
       ViteRails.manifest.lookup!(asset_file)
     end
 
-    assert_match "ViteRails can't find #{ asset_file } in #{ manifest_path }", error.message
+    assert_match "Vite Rails can't find #{ asset_file } in #{ manifest_path }", error.message
   end
 
   def test_lookup_with_type_exception!
@@ -20,56 +20,60 @@ class ManifestTest < Minitest::Test
       ViteRails.manifest.lookup!(asset_file, type: :javascript)
     end
 
-    assert_match "ViteRails can't find #{ asset_file }.js in #{ manifest_path }", error.message
+    assert_match "Vite Rails can't find #{ asset_file }.js in #{ manifest_path }", error.message
   end
 
   def test_lookup_success!
-    assert_equal ViteRails.manifest.lookup!('bootstrap.js'), '/packs/bootstrap-300631c4f0e0f9c865bc.js'
+    entry = {
+      'file' => '/vite-production/assets/application.a0ba047e.js',
+      'imports' => [
+        '/vite-production/assets/example_import.8e1fddc0.js',
+      ],
+    }
+    assert_equal entry, ViteRails.manifest.lookup!('application.js', type: :javascript)
+    assert_equal entry, ViteRails.manifest.lookup!('application', type: :typescript)
   end
 
-  def test_lookup_nil
-    assert_nil ViteRails.manifest.lookup('foo.js')
+  def test_lookup_success_with_dev_server_running!
+    entry = { 'file' => '/vite-production/application.js' }
+    with_dev_server_running {
+      assert_equal entry, ViteRails.manifest.lookup!('application.js')
+    }
+    entry = { 'file' => '/vite-production/application.ts' }
+    with_dev_server_running {
+      assert_equal entry, ViteRails.manifest.lookup!('application', type: :typescript)
+    }
   end
 
-  def test_lookup_chunks_nil
-    assert_nil ViteRails.manifest.lookup_pack_with_chunks('foo.js')
+  def test_lookup_nil
+    assert_nil ViteRails.manifest.lookup('foo.js')
   end
 
   def test_lookup_success
-    assert_equal ViteRails.manifest.lookup('bootstrap.js'), '/packs/bootstrap-300631c4f0e0f9c865bc.js'
-  end
-
-  def test_lookup_entrypoint_exception!
-    asset_file = 'calendar'
-
-    error = assert_raises_manifest_missing_entry_error do
-      ViteRails.manifest.lookup_pack_with_chunks!(asset_file, type: :javascript)
-    end
-
-    assert_match "ViteRails can't find #{ asset_file }.js in #{ manifest_path }", error.message
+    entry = { 'file' => '/vite-production/assets/application.cccfef34.css', 'imports' => nil }
+    assert_equal entry, ViteRails.manifest.lookup('application.css')
+    assert_equal entry, ViteRails.manifest.lookup('application.css', type: :stylesheet)
+    assert_equal entry, ViteRails.manifest.lookup('application', type: :stylesheet)
   end
 
-  def test_lookup_entrypoint
-    application_entrypoints = [
-      '/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js',
-      '/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js',
-      '/packs/application-k344a6d59eef8632c9d1.js',
-    ]
-
-    assert_equal ViteRails.manifest.lookup_pack_with_chunks!('application', type: :javascript), application_entrypoints
+  def test_lookup_success_with_dev_server_running
+    entry = { 'file' => '/vite-production/application.css' }
+    with_dev_server_running {
+      assert_equal entry, ViteRails.manifest.lookup('application', type: :stylesheet)
+    }
   end
 
 private
 
   def assert_raises_manifest_missing_entry_error(&block)
     error = nil
-    ViteRails.config.stub :compile?, false do
+    ViteRails.config.stub :auto_build, false do
       error = assert_raises ViteRails::Manifest::MissingEntryError, &block
     end
     error
   end
 
   def manifest_path
-    File.expand_path File.join(File.dirname(__FILE__), 'test_app/public/packs', 'manifest.json').to_s
+    File.expand_path File.join(File.dirname(__FILE__), 'test_app/public/vite-production', 'manifest.json').to_s
   end
 end

data/test/mode_test.rb

@@ -3,19 +3,14 @@
 require 'test_helper'
 
 class ModeTest < ViteRails::Test
-  def test_current
-    assert_equal ViteRails.config.mode, Rails.env
+  def test_mode
+    assert_equal Rails.env, ViteRails.config.mode
+    assert_equal ViteRails.config.mode, ViteRails.mode
   end
 
-  def test_custom_without_config
-    with_rails_env('foo') do
-      assert_equal ViteRails.config.mode, 'production'
-    end
-  end
-
-  def test_custom_with_config
-    with_rails_env('staging') do
-      assert_equal ViteRails.config.mode, 'staging'
+  def test_mode_with_rails_env
+    with_rails_env('staging') do |config|
+      assert_equal 'staging', config.mode
     end
   end
 end

data/test/mounted_app/test/dummy/config/vite.json

@@ -1,20 +1,14 @@
 {
+  "all": {
+    "watchAdditionalPaths": []
+  },
   "development": {
     "autoBuild": true,
-    "port": "3535",
-    "https": true,
-    "publicOutputDir": "vite-development"
+    "publicOutputDir": "vite-dev",
+    "port": 3036
   },
   "test": {
     "autoBuild": true,
     "publicOutputDir": "vite-test"
-  },
-  "production": {
-    "autoBuild": false,
-    "publicOutputDir": "vite-production"
-  },
-  "staging": {
-    "autoBuild": false,
-    "publicOutputDir": "vite-staging"
   }
 }