use ViewComponent 4.0.0.alpha6 (#3556)

Author: joelhawksley

.changeset/angry-panthers-lay.md

@@ -0,0 +1,6 @@
+---
+"@primer/view-components": patch
+---
+
+use ViewComponent 4.0.0.alpha6 and lookbook 2.3.11
+

Gemfile

@@ -33,8 +33,12 @@ gem "puma", "~> 6.6.0"
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.4.2", require: false
 
-gem "lookbook", "~> 2.3.9"
-gem "view_component", path: ENV["VIEW_COMPONENT_PATH"] if ENV["VIEW_COMPONENT_PATH"]
+gem "lookbook", "~> 2.3.11"
+if ENV["VIEW_COMPONENT_PATH"]
+  gem "view_component", path: ENV["VIEW_COMPONENT_PATH"]
+else
+  gem "view_component", "4.0.0.alpha6"
+end
 
 gem "kramdown", "~> 2.5"
 gem "sourcemap", "~> 0.1"

Gemfile.lock

@@ -126,7 +126,7 @@ GEM
     loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lookbook (2.3.9)
+    lookbook (2.3.11)
       activemodel
       css_parser
       htmlbeautifier (~> 1.3)
@@ -282,7 +282,7 @@ GEM
     unicode-emoji (4.0.4)
     uri (1.0.3)
     useragent (0.16.11)
-    view_component (4.0.0.alpha5)
+    view_component (4.0.0.alpha6)
       activesupport (>= 7.1.0, < 8.1)
       concurrent-ruby (~> 1)
     vite_rails (3.0.19)
@@ -328,7 +328,7 @@ DEPENDENCIES
   erblint-github (~> 1.0.1)
   kramdown (~> 2.5)
   listen (~> 3.9)
-  lookbook (~> 2.3.9)
+  lookbook (~> 2.3.11)
   matrix (~> 0.4.2)
   mocha
   primer_view_components!
@@ -349,6 +349,7 @@ DEPENDENCIES
   sprockets-rails
   thor
   timecop
+  view_component (= 4.0.0.alpha6)
   vite_rails (~> 3.0)
   webmock
   yard (~> 0.9.37)

demo/Gemfile

@@ -37,8 +37,8 @@ gem "puma", "~> 6.6.0"
 gem "bootsnap", ">= 1.4.2", require: false
 
 gem "primer_view_components", path: "../"
-gem "view_component", '>= 3.11.0'
-gem "lookbook", "~> 2.3.9" unless rails_version.to_f < 7
+gem "view_component", "4.0.0.alpha6"
+gem "lookbook", "~> 2.3.11" unless rails_version.to_f < 7
 
 gem "vite_rails", "~> 3.0"
 gem "cssbundling-rails", "~> 1.4"

demo/Gemfile.lock

@@ -209,7 +209,7 @@ GEM
     loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lookbook (2.3.9)
+    lookbook (2.3.11)
       activemodel
       css_parser
       htmlbeautifier (~> 1.3)
@@ -346,10 +346,9 @@ GEM
       railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    view_component (3.23.2)
-      activesupport (>= 5.2.0, < 8.1)
+    view_component (4.0.0.alpha6)
+      activesupport (>= 7.1.0, < 8.1)
       concurrent-ruby (~> 1)
-      method_source (~> 1.0)
     vite_rails (3.0.19)
       railties (>= 5.1, < 9)
       vite_ruby (~> 3.0, >= 3.2.2)
@@ -389,7 +388,7 @@ DEPENDENCIES
   kuby-core (~> 0.20)
   kuby-kind (~> 0.2)
   listen
-  lookbook (~> 2.3.9)
+  lookbook (~> 2.3.11)
   primer_view_components!
   pry-byebug
   puma (~> 6.6.0)
@@ -402,7 +401,7 @@ DEPENDENCIES
   sprockets-rails
   stimulus-rails
   turbo-rails
-  view_component (>= 3.11.0)
+  view_component (= 4.0.0.alpha6)
   vite_rails (~> 3.0)
 
 BUNDLED WITH

demo/config/application.rb

@@ -30,10 +30,11 @@ class Application < Rails::Application
     config.active_support.to_time_preserves_timezone = :zone
 
     # Initialize configuration defaults for originally generated Rails version.
-    config.view_component.default_preview_layout = "component_preview"
+    config.view_component.previews.default_layout = "component_preview"
+    config.view_component.previews.enabled = true
+    config.view_component.previews.controller = "PreviewController"
+    config.view_component.previews.paths << Rails.root.join("..", "previews")
     config.view_component.show_previews = true
-    config.view_component.preview_controller = "PreviewController"
-    config.view_component.preview_paths << Rails.root.join("..", "previews")
 
     config.autoload_paths << Rails.root.join("..", "test", "test_helpers", "components")
 

demo/config/environments/production.rb

@@ -101,5 +101,5 @@
   # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
 
   # Use a custom preview route because of how routes are configured in prod (see routes.rb)
-  config.view_component.preview_route = "/view-components/rails-app/previews"
+  config.view_component.previews.route = "/view-components/rails-app/previews"
 end

demo/config/environments/test.rb

@@ -47,7 +47,7 @@
   config.primer_view_components.raise_on_invalid_options = true
 
   config.autoload_paths << Rails.root.join("..", "test", "forms")
-  config.view_component.preview_paths << Rails.root.join("..", "test", "previews")
+  config.view_component.previews.paths << Rails.root.join("..", "test", "previews")
 
   if ENV.fetch("VC_COMPAT_PATCH_ENABLED", "false") == "true"
     config.view_component.capture_compatibility_patch_enabled = true

test/performance/bench_octicons.rb

@@ -17,7 +17,7 @@ def setup
   def bench_allocations_without_cache
     Primer::Beta::Octicon.new(**@options)
     Primer::Octicon::Cache.clear!
-    assert_allocations "3.4" => 26, "3.3" => 30, "3.2" => 30, "3.1" => 28, "3.0" => 28 do
+    assert_allocations "3.4" => 26, "3.3" => 26, "3.2" => 26, "3.1" => 28, "3.0" => 28 do
       Primer::Beta::Octicon.new(**@options)
     end
   ensure
@@ -26,7 +26,7 @@ def bench_allocations_without_cache
 
   def bench_allocations_with_cache
     Primer::Octicon::Cache.preload!
-    assert_allocations "3.4" => 10, "3.3" => 14, "3.2" => 14, "3.1" => 11, "3.0" => 11 do
+    assert_allocations "3.4" => 10, "3.3" => 10, "3.2" => 10, "3.1" => 11, "3.0" => 11 do
       Primer::Beta::Octicon.new(**@options)
     end
   end