Stop depending on @_context.target

Author: joeldrapper

lib/phlex/rails/helper_macros.rb

@@ -16,12 +16,7 @@ def #{method_name}(*args, **kwargs, &block)
 					helpers.#{method_name}(*args, **kwargs)
 				end
 
-				case output
-				when ActiveSupport::SafeBuffer
-					@_context.target << output
-				end
-
-				nil
+				raw(output)
 			end
 		RUBY
 	end
@@ -63,12 +58,7 @@ def #{method_name}(*args, **kwargs)
 					helpers.#{method_name}(*args, **kwargs)
 				end
 
-				case output
-				when ActiveSupport::SafeBuffer
-					@_context.target << output
-				end
-
-				nil
+				raw(output)
 			end
 		RUBY
 	end

lib/phlex/rails/helpers/tag.rb

@@ -10,7 +10,7 @@ def tag(...)
 
 		case result
 		when ActiveSupport::SafeBuffer
-			@_context.target << result
+			@_context.buffer << result
 		when ActionView::Helpers::TagHelper::TagBuilder
 			Phlex::Rails::Buffered.new(
 				result,

lib/phlex/rails/sgml.rb

@@ -32,27 +32,27 @@ def render(*args, **kwargs, &block)
 						partial = kwargs.delete(:partial)
 
 						if partial # this is a hack to get around https://github.com/rails/rails/issues/51015
-							@_context.target << @_view_context.render(partial, **kwargs) do |*yielded_args|
-								capture(*yielded_args, &block)
-							end
-
-							return nil
+							return raw(
+								@_view_context.render(partial, **kwargs) do |*yielded_args|
+									capture(*yielded_args, &block)
+								end,
+							)
 						end
 					end
 
-					if block
-						@_context.target << @_view_context.render(*args, **kwargs) do |*yielded_args|
+					output = if block
+						@_view_context.render(*args, **kwargs) do |*yielded_args|
 							if yielded_args.length == 1 && defined?(ViewComponent::Base) && ViewComponent::Base === yielded_args[0]
 								capture(Phlex::Rails::Buffered.new(yielded_args[0], view: self), &block)
 							else
 								capture(*yielded_args, &block)
 							end
 						end
 					else
-						@_context.target << @_view_context.render(*args, **kwargs)
+						@_view_context.render(*args, **kwargs)
 					end
 
-					nil
+					raw(output)
 				end
 
 				def render_in(view_context, &erb)