Merge main

Author: camertron

.github/workflows/ci.yml

@@ -96,7 +96,7 @@ jobs:
         bundle --quiet && bundle exec rake
       env:
         VIEW_COMPONENT_PATH: ../view_component
-        RAILS_VERSION: '7.1.5'
+        RAILS_VERSION: '8.0.2'
         PARALLEL_WORKERS: '1'
   coverage:
     needs: test

.gitignore

@@ -45,5 +45,4 @@ build-iPhoneSimulator/
 /replicate-bug
 
 # Appraisal
-/gemfiles/*.gemfile.lock
 /gemfiles/.bundle/

Appraisals

@@ -1,26 +1,44 @@
 # frozen_string_literal: true
 
 appraise "rails-7.1" do
-  gem "rails", "~> 7.1"
-  gem "tailwindcss-rails", "~> 2"
-  gem "turbo-rails", "~> 1"
+  ruby "~> 3.2.0"
+
+  gem "rails", "~> 7.1.0"
+
+  group :development, :test do
+    gem "turbo-rails", "~> 1"
+    gem "rspec-rails", "~> 7"
+  end
 end
 
 appraise "rails-7.2" do
-  gem "rails", "~> 7.2"
-  gem "tailwindcss-rails", "~> 2"
-  gem "turbo-rails", "~> 2"
+  ruby "~> 3.3.0"
+
+  gem "rails", "~> 7.2.0"
+
+  group :development, :test do
+    gem "turbo-rails", "~> 2"
+    gem "rspec-rails", "~> 7"
+  end
 end
 
 appraise "rails-8.0" do
-  gem "rails", "~> 8.0"
-  gem "tailwindcss-rails", "~> 2"
-  gem "turbo-rails", "~> 2"
+  ruby "~> 3.4.0"
+
+  gem "rails", "~> 8.0.0"
+
+  group :development, :test do
+    gem "turbo-rails", "~> 2"
+    gem "rspec-rails", "~> 8"
+  end
 end
 
 appraise "rails-main" do
   gem "rack", git: "https://github.com/rack/rack", ref: "8a4475a9f416a72e5b02bd7817e4a8ed684f29b0"
   gem "rails", github: "rails/rails", branch: "main"
-  gem "tailwindcss-rails", "~> 2"
-  gem "turbo-rails", "~> 2"
+
+  group :development, :test do
+    gem "turbo-rails", "~> 2"
+    gem "rspec-rails", "~> 8"
+  end
 end

Gemfile

@@ -30,14 +30,15 @@ group :development, :test do
   gem "rake", "~> 13"
   gem "rails-dom-testing", "~> 2.3.0"
   gem "redis"
-  gem "rspec-rails", "~> 8"
+  gem "rspec-rails"
   gem "rubocop-md", "~> 2"
   gem "selenium-webdriver", "~> 4"
   gem "simplecov-console", "< 1"
   gem "simplecov", "< 1"
   gem "slim", "~> 5"
   gem "sprockets-rails", "~> 3"
   gem "standard", "~> 1"
+  gem "tailwindcss-rails", "~> 2"
   gem "turbo-rails"
   gem "warning"
   gem "yard-activesupport-concern", "< 1"

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    view_component (4.0.0)
+    view_component (4.0.1)
       activesupport (>= 7.1.0, < 8.1)
       concurrent-ruby (~> 1)
 
@@ -213,7 +213,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (6.6.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.1.16)
@@ -348,6 +348,10 @@ GEM
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.25.0)
     stringio (3.1.7)
+    tailwindcss-rails (2.1.0)
+      railties (>= 6.0.0)
+    tailwindcss-rails (2.1.0-arm64-darwin)
+      railties (>= 6.0.0)
     temple (0.10.3)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
@@ -409,14 +413,15 @@ DEPENDENCIES
   rails-dom-testing (~> 2.3.0)
   rake (~> 13)
   redis
-  rspec-rails (~> 8)
+  rspec-rails
   rubocop-md (~> 2)
   selenium-webdriver (~> 4)
   simplecov (< 1)
   simplecov-console (< 1)
   slim (~> 5)
   sprockets-rails (~> 3)
   standard (~> 1)
+  tailwindcss-rails (~> 2)
   turbo-rails
   view_component!
   warning

docs/CHANGELOG.md

@@ -10,10 +10,18 @@ nav_order: 6
 
 ## main
 
+## 4.0.1
+
 * Setup Trusted Publishing to RubyGems to improve software supply chain safety.
 
     *Hans Lemuet*
 
+* Conditionally add the `ViewComponent::Base#format` method back for Rails 7.1 only.
+* Compute and check lockfiles into source control.
+* Constrain Rails versions in gemfiles to only allow the patch version to vary, eg. `~> 7.1.0` instead of `~> 7.1`.
+
+    *Cameron Dutro*
+
 * Share the view context in tests to prevent out-of-order rendering issues for certain advanced use-cases, eg. testing instances of Rails' `FormBuilder`.
 
     *Cameron Dutro*
@@ -45,11 +53,10 @@ Please report any issues at [https://github.com/ViewComponent/view_component/iss
 
 ### Breaking changes (dev/test)
 
-* Rename `config.generate.component_parent_class` to `config.generate.parent_class`.
-* Remove `config.test_controller` in favor of `vc_test_controller_class` test helper method.
-* `config.component_parent_class` is now `config.generate.component_parent_class`, moving the generator-specific option to the generator configuration namespace.
+* Remove `config.view_component.test_controller` in favor of `vc_test_controller_class` test helper method.
+* `config.view_component.component_parent_class` is now `config.view_component.generate.parent_class`, moving the generator-specific option to the generator configuration namespace.
+* `config.view_component.view_component_path` is now `config.view_component.generate.path`, as components have long since been able to exist in any directory.
 * Move previews-related configuration (`enabled`, `route`, `paths`, `default_layout`, `controller`) to under `previews` namespace.
-* `config.view_component_path` is now `config.generate.path`, as components have long since been able to exist in any directory.
 * `--inline` generator option now generates inline template. Use `--call` to generate `#call` method.
 * Remove broken integration with `rails stats` that ignored components outside of `app/components`.
 * Remove `preview_source` functionality. Consider using [Lookbook](https://lookbook.build/) instead.
@@ -74,7 +81,7 @@ Please report any issues at [https://github.com/ViewComponent/view_component/iss
 ### Bug fixes
 
 * Fix bug where virtual path wasn't reset, breaking translations outside of components.
-* Fix bug where `config.previews.enabled` didn't function properly in production environments.
+* Fix bug where `config.view_component.previews.enabled` didn't function properly in production environments.
 * Fix bug in `SlotableDefault` where default couldn't be overridden when content was passed as a block.
 * Fix bug where request-aware helpers didn't work outside of the request context.
 * `ViewComponentsSystemTestController` shouldn't be useable outside of test environment
@@ -89,7 +96,7 @@ Please report any issues at [https://github.com/ViewComponent/view_component/iss
 * Update documentation on performance to reflect more representative benchmark showing 2-3x speed increase over partials.
 * Add documentation note about instrumentation negatively affecting performance.
 * Remove unnecessary ENABLE_RELOADING test suite flag.
-* `config.previews.default_layout` should default to nil.
+* `config.view_component.previews.default_layout` should default to nil.
 * Add test coverage for uncovered code.
 * Test against `turbo-rails` `v2` and `rspec-rails` `v7`.
 

docs/_data/library.yml

@@ -1 +1 @@
-version: 4.0.0
+version: 4.0.1

gemfiles/rails_7.1.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 7.1"
-gem "tailwindcss-rails", "~> 2"
-gem "turbo-rails", "~> 1"
+ruby "~> 3.2.0"
+
+gem "rails", "~> 7.1.0"
 
 group :development, :test do
   gem "allocation_stats"
@@ -34,6 +34,8 @@ group :development, :test do
   gem "slim", "~> 5"
   gem "sprockets-rails", "~> 3"
   gem "standard", "~> 1"
+  gem "tailwindcss-rails", "~> 2"
+  gem "turbo-rails", "~> 1"
   gem "warning"
   gem "yard-activesupport-concern", "< 1"
   gem "yard", "< 1"