Merge pull request #2085 from ViewComponent/v4

v4.0.0.rc1 release

Author: joelhawksley

.erb-lint.yml

@@ -0,0 +1,18 @@
+---
+EnableDefaultLinters: true
+exclude:
+  - '**/vendor/**/*'
+linters:
+  ErbSafety:
+    enabled: true
+  FinalNewline:
+    enabled: true
+  Rubocop:
+    enabled: true
+    rubocop_config:
+      inherit_from:
+        - .rubocop.yml
+      Layout/InitialIndentation:
+        Enabled: false
+      Layout/TrailingEmptyLines:
+        Enabled: false

.erb_lint.yml

@@ -23,60 +23,20 @@ jobs:
         bundle exec appraisal rails-8.0 rake partial_benchmark
         bundle exec appraisal rails-8.0 rake translatable_benchmark
   test:
-    name: test (${{ matrix.rails_version }}, ${{ matrix.ruby_version }}, ${{ matrix.mode }})
+    name: test (Rails ${{ matrix.rails_version }}, Ruby ${{ matrix.ruby_version }})
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - ruby_version: "3.0"
-            rails_version: "6.1"
-            mode: "capture_patch_enabled"
-          - ruby_version: "3.0"
-            rails_version: "6.1"
-            mode: "capture_patch_disabled"
-          - ruby_version: "3.1"
-            rails_version: "7.0"
-            mode: "capture_patch_enabled"
-          - ruby_version: "3.1"
-            rails_version: "7.0"
-            mode: "capture_patch_disabled"
           - ruby_version: "3.2"
             rails_version: "7.1"
-            mode: "capture_patch_enabled"
-          - ruby_version: "3.2"
-            rails_version: "7.1"
-            mode: "capture_patch_disabled"
-          - ruby_version: "3.3"
-            rails_version: "7.2"
-            mode: "capture_patch_disabled"
           - ruby_version: "3.3"
             rails_version: "7.2"
-            mode: "capture_patch_enabled"
-          - ruby_version: "3.3"
-            rails_version: "8.0"
-            mode: "capture_patch_disabled"
-          - ruby_version: "3.3"
-            rails_version: "8.0"
-            mode: "capture_patch_enabled"
-          - ruby_version: "3.4"
-            rails_version: "8.0"
-            mode: "capture_patch_disabled"
           - ruby_version: "3.4"
             rails_version: "8.0"
-            mode: "capture_patch_enabled"
-          - ruby_version: "3.4"
-            rails_version: "main"
-            mode: "capture_patch_disabled"
-          - ruby_version: "3.4"
-            rails_version: "main"
-            mode: "capture_patch_enabled"
-          - ruby_version: "3.5"
-            rails_version: "8.0"
-            mode: "capture_patch_disabled"
-          - ruby_version: "3.5"
-            rails_version: "8.0"
-            mode: "capture_patch_enabled"
+          # - ruby_version: "head"
+          #   rails_version: "main"
     env:
       BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails_version }}.gemfile
     steps:
@@ -87,17 +47,13 @@ jobs:
         ruby-version: ${{ matrix.ruby_version }}
         bundler-cache: true
     - name: Build and test with Rake
-      # Code-reloading isn't compatible with simplecov, so we need to run once
-      # to collect coverage, and again to test reloads.
       run: |
-        bundle exec appraisal rails-${{ matrix.rails_version }} bundle
-        MEASURE_COVERAGE=true bundle exec appraisal rails-${{ matrix.rails_version }} rake
-        ENABLE_RELOADING=true bundle exec appraisal rails-${{ matrix.rails_version }} rake
+        bundle exec appraisal rails-${{ matrix.rails_version }} bundle --quiet
+        MEASURE_COVERAGE=true bundle exec appraisal rails-${{ matrix.rails_version }} rake all_tests
       env:
         RAISE_ON_WARNING: 1
         RAILS_VERSION: ${{ matrix.rails_version }}
         RUBY_VERSION: ${{ matrix.ruby_version }}
-        CAPTURE_PATCH_ENABLED: ${{ matrix.mode == 'capture_patch_enabled' && 'true' || 'false' }}
     - name: Upload coverage results
       uses: actions/[email protected]
       if: always()
@@ -113,6 +69,7 @@ jobs:
       with:
         repository: 'primer/view_components'
         path: 'primer_view_components'
+        ref: '20250603-vc-compat'
     - uses: actions/[email protected]
       with:
         path: 'view_component'
@@ -132,10 +89,10 @@ jobs:
         cd primer_view_components
         npm ci
         cd demo && npm ci && cd ..
-        bundle && bundle exec rake
+        bundle --quiet && bundle exec rake
       env:
         VIEW_COMPONENT_PATH: ../view_component
-        RAILS_VERSION: '7.1.1'
+        RAILS_VERSION: '7.1.5'
         PARALLEL_WORKERS: '1'
   coverage:
     needs: test

.github/workflows/ci.yml

@@ -74,12 +74,12 @@ jobs:
     - uses: actions/cache@v4
       with:
         path: vendor/bundle
-        key: gems-build-rails-7.1-ruby-3.2-${{ hashFiles('**/Gemfile.lock') }}
+        key: gems-build-rails-8-ruby-3.2-${{ hashFiles('**/Gemfile.lock') }}
     - name: Lint with Rubocop and ERB Lint
       run: |
         bundle config path vendor/bundle
         bundle update
         bundle exec standardrb -r "rubocop-md"
-        bundle exec erblint **/*.html.erb
+        bundle exec erb_lint --lint-all
       env:
-        RAILS_VERSION: '~> 7.1.0'
+        RAILS_VERSION: '~> 8'

.github/workflows/lint.yml

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .ruby-version
+.DS_Store
 /.config
 /coverage/assets
 /coverage/index.html

.gitignore

@@ -1,6 +1,6 @@
-ruby_version: 2.5
 require:
   - standard
-  - "rubocop-md"
+plugins:
+  - rubocop-md
 inherit_gem:
   standard: config/base.yml

.rubocop.yml

@@ -1,3 +1,3 @@
-ruby_version: 2.5
+ruby_version: 3.2
 ignore:
   - 'docs/CHANGELOG.md' # Rubocop doesn't like our indenting of code examples

.standard.yml

@@ -1,46 +1,26 @@
 # frozen_string_literal: true
 
-appraise "rails-6.1" do
-  gem "rails", "~> 6.1"
-  gem "tailwindcss-rails", "~> 2.0"
-  gem "sprockets-rails", "~> 3.4.2"
-  gem "concurrent-ruby", "1.3.4"
-
-  # Required for Ruby 3.1.0
-  gem "net-smtp", require: false
-  gem "net-imap", require: false
-  gem "net-pop", require: false
-  gem "turbo-rails", "~> 1"
-end
-
-appraise "rails-7.0" do
-  gem "rails", "~> 7.0"
-  gem "tailwindcss-rails", "~> 2.0"
-  gem "turbo-rails", "~> 1"
-  gem "sprockets-rails", "~> 3.4.2"
-end
-
 appraise "rails-7.1" do
   gem "rails", "~> 7.1"
-  gem "tailwindcss-rails", "~> 2.0"
+  gem "tailwindcss-rails", "~> 2"
   gem "turbo-rails", "~> 1"
-  gem "sprockets-rails", "~> 3.4.2"
 end
 
 appraise "rails-7.2" do
   gem "rails", "~> 7.2"
-  gem "tailwindcss-rails", "~> 2.0"
-  gem "sprockets-rails", "~> 3.4.2"
+  gem "tailwindcss-rails", "~> 2"
+  gem "turbo-rails", "~> 2"
 end
 
 appraise "rails-8.0" do
   gem "rails", "~> 8.0"
-  gem "tailwindcss-rails", "~> 2.0"
-  gem "propshaft", "~> 1.1.0"
+  gem "tailwindcss-rails", "~> 2"
+  gem "turbo-rails", "~> 2"
 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.0"
-  gem "turbo-rails", "~> 1"
+  gem "tailwindcss-rails", "~> 2"
+  gem "turbo-rails", "~> 2"
 end

Appraisals

@@ -4,7 +4,42 @@ source "https://rubygems.org"
 gemspec
 
 rails_version = (ENV["RAILS_VERSION"] || "~> 8").to_s
+
 gem "rails", (rails_version == "main") ? {git: "https://github.com/rails/rails", ref: "main"} : rails_version
 
 ruby_version = (ENV["RUBY_VERSION"] || "~> 3.4").to_s
 ruby ruby_version
+
+group :development, :test do
+  gem "allocation_stats"
+  gem "appraisal", "~> 2"
+  gem "benchmark-ips", "~> 2"
+  gem "better_html"
+  gem "bundler", "~> 2"
+  gem "capybara", "~> 3"
+  gem "cuprite"
+  gem "dry-initializer", require: true
+  gem "erb_lint"
+  gem "haml", "~> 6"
+  gem "jbuilder", "~> 2"
+  gem "m", "~> 1"
+  gem "method_source", "~> 1"
+  gem "minitest", "~> 5"
+  gem "propshaft", "~> 1"
+  gem "puma", "~> 6"
+  gem "rake", "~> 13"
+  gem "rails-dom-testing", "~> 2.3.0"
+  gem "redis"
+  gem "rspec-rails", "~> 7"
+  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 "turbo-rails"
+  gem "warning"
+  gem "yard-activesupport-concern", "< 1"
+  gem "yard", "< 1"
+end