Merge branch 'main' into copilot/add-event-emission-for-view-file

Author: joelhawksley

Gemfile

@@ -27,7 +27,7 @@ group :development, :test do
   gem "method_source", "~> 1"
   gem "minitest", "~> 6"
   gem "minitest-mock"
-  gem "nokogiri", "1.19.1"
+  gem "nokogiri", "1.19.2"
   gem "propshaft", "~> 1"
   gem "puma", ">= 6"
   gem "rake", "~> 13"

Gemfile.lock

@@ -14,6 +14,14 @@ nav_order: 6
 
     *GitHub Copilot*
 
+* Replace deprecated `require_dependency` with `require` in preview loading.
+
+    *GitHub Copilot*
+
+* Return `html_safe` empty string from `render_in` when `render?` is false.
+
+    *Copilot*
+
 ## 4.5.0
 
 * Fix initialization ordering issue causing missing asset errors in Sprockets.

docs/CHANGELOG.md

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.0.4.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -10,23 +10,23 @@ GEM
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    base64 (0.2.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     colorator (1.1.0)
     commonmarker (0.23.11)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     csv (3.3.5)
     dnsruby (1.73.1)
       base64 (>= 0.2)
@@ -106,7 +106,7 @@ GEM
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     jekyll (3.10.0)
       addressable (~> 2.4)
@@ -218,7 +218,7 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    json (2.18.1)
+    json (2.19.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -234,7 +234,7 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.25.5)
+    minitest (5.27.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
     nokogiri (1.19.1)

docs/Gemfile.lock

@@ -160,7 +160,7 @@ def render_in(view_context, &block)
 
         value
       else
-        ""
+        "".html_safe
       end
     ensure
       view_context.instance_variable_set(:@virtual_path, @old_virtual_path)

lib/view_component/base.rb

@@ -95,7 +95,7 @@ def preview_example_template_path(example)
       # @private
       def __vc_load_previews
         Array(preview_paths).each do |preview_path|
-          Dir["#{preview_path}/**/*preview.rb"].sort.each { |file| require_dependency file }
+          Dir["#{preview_path}/**/*preview.rb"].sort.each { |file| require file }
         end
       end
 

lib/view_component/preview.rb

@@ -877,6 +877,12 @@ def test_does_not_render_passed_in_content_if_render_is_false
     assert total < 1
   end
 
+  def test_render_in_returns_html_safe_string_when_render_is_false
+    render_inline(ConditionalRenderComponent.new(should_render: false))
+
+    assert_predicate @rendered_content, :html_safe?
+  end
+
   def test_collection_parameter_does_not_require_compile
     dynamic_component =
       Class.new(ViewComponent::Base) do