From 5b8962bfe6658bcc6244fc4096db92eaa25f368e Mon Sep 17 00:00:00 2001
From: Marlus Saraiva <marlus.saraiva@gmail.com>
Date: Wed, 3 Jan 2024 16:27:22 -0300
Subject: [PATCH 1/6] Fix Malformed HTML in rendered.js

---
 lib/surface/compiler/eex_engine.ex            | 22 ++++-
 test/mix/tasks/compile/surface_test.exs       |  2 +-
 test/surface/compiler_test.exs                | 91 +++++++++++++++++++
 .../components/live_file_input_test.exs       |  4 +
 4 files changed, 116 insertions(+), 3 deletions(-)

diff --git a/lib/surface/compiler/eex_engine.ex b/lib/surface/compiler/eex_engine.ex
index 1992473d3..8ec495668 100644
--- a/lib/surface/compiler/eex_engine.ex
+++ b/lib/surface/compiler/eex_engine.ex
@@ -7,6 +7,7 @@ defmodule Surface.Compiler.EExEngine do
   for information on this). Finally, it passes these tokens into the engine sequentially in the same
   manner as EEx.Compiler.compile/2
   """
+  alias Surface.Compiler.Helpers
   alias Surface.AST
   alias Surface.IOHelper
   alias Surface.Components.Context
@@ -27,7 +28,8 @@ defmodule Surface.Compiler.EExEngine do
       engine: opts[:engine] || @default_engine,
       depth: 0,
       context_vars: %{count: 0, changed: []},
-      scope: []
+      scope: [],
+      root_tag?: root_tag?(nodes)
     }
 
     nodes
@@ -40,6 +42,22 @@ defmodule Surface.Compiler.EExEngine do
     )
   end
 
+  defp root_tag?(nodes) do
+    Enum.reduce_while(nodes, false, fn
+      %AST.Tag{}, false ->
+        {:cont, true}
+
+      %AST.Tag{}, true ->
+        {:halt, false}
+
+      %AST.Literal{value: value}, acc ->
+        if Helpers.blank?(value), do: {:cont, acc}, else: {:halt, false}
+
+      _node, _acc ->
+        {:halt, false}
+    end)
+  end
+
   defp to_token_sequence(nodes) do
     nodes
     |> to_dynamic_nested_html()
@@ -48,7 +66,7 @@ defmodule Surface.Compiler.EExEngine do
   end
 
   defp generate_buffer([], buffer, state) do
-    ast = state.engine.handle_body(buffer, root: true)
+    ast = state.engine.handle_body(buffer, root: state.root_tag?)
 
     quote do
       require Phoenix.LiveView.TagEngine
diff --git a/test/mix/tasks/compile/surface_test.exs b/test/mix/tasks/compile/surface_test.exs
index aaf44b8b8..5e6141513 100644
--- a/test/mix/tasks/compile/surface_test.exs
+++ b/test/mix/tasks/compile/surface_test.exs
@@ -79,7 +79,7 @@ defmodule Mix.Tasks.Compile.SurfaceTest do
         assert {:ok, [^diagnostic]} = handle_diagnostics([diagnostic], [])
       end)
 
-    assert output =~ IO.ANSI.format([:yellow, "warning:"]) |> IO.iodata_to_binary()
+    assert output =~ IO.ANSI.format([:yellow, "warning: "]) |> IO.iodata_to_binary()
     assert output =~ "test warning\n  file.ex:1: (file)\n\n"
   end
 
diff --git a/test/surface/compiler_test.exs b/test/surface/compiler_test.exs
index a49affb82..3b83aae9d 100644
--- a/test/surface/compiler_test.exs
+++ b/test/surface/compiler_test.exs
@@ -1,6 +1,10 @@
 defmodule Surface.CompilerTest do
   use ExUnit.Case
 
+  import Surface, only: [sigil_F: 2]
+  import Phoenix.Component, only: [sigil_H: 2]
+  alias Phoenix.LiveView.Rendered
+
   defmodule Macro do
     use Surface.MacroComponent
 
@@ -93,6 +97,93 @@ defmodule Surface.CompilerTest do
     end
   end
 
+  defp func(assigns) do
+    ~F[hello]
+  end
+
+  describe "set the root field for the %Phoenix.LiveView.Rendered{} struct" do
+    test "set it to `true` if the there's only a single root tag node" do
+      assigns = %{}
+
+      assert %Rendered{root: true} = ~H[<div/>]
+      assert %Rendered{root: true} = ~F[<div/>]
+      assert %Rendered{root: true} = ~H[<div><span>text</span></div>]
+      assert %Rendered{root: true} = ~F[<div><span>text</span></div>]
+      assert %Rendered{root: true} = ~H[<div><.func/></div>]
+      assert %Rendered{root: true} = ~F[<div><.func/></div>]
+      assert %Rendered{root: true} = ~H[<div><%= "text" %></div>]
+      assert %Rendered{root: true} = ~F[<div>{"text"}</div>]
+
+      assert %Rendered{root: true} = ~H[ <div>text</div> ]
+      assert %Rendered{root: true} = ~F[ <div>text</div> ]
+
+      assert %Rendered{root: true} = ~H"""
+             <div>text</div>
+             """
+
+      assert %Rendered{root: true} = ~F"""
+             <div>text</div>
+             """
+    end
+
+    test "set it to `false` if the root tag is translated/wrapped into an expression e.g. using `:for` or `:if`" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[<div :if={true}/>]
+      assert %Rendered{root: false} = ~F[<div :if={true}/>]
+      assert %Rendered{root: false} = ~H(<div :for={_ <- []}/>)
+      assert %Rendered{root: false} = ~F(<div :for={_ <- []}/>)
+    end
+
+    test "set it to `false` if it's a text node" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[text]
+      assert %Rendered{root: false} = ~F[text]
+    end
+
+    test "set it to `false` if it's an expression" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[<%= "text" %>]
+      assert %Rendered{root: false} = ~F[{"text"}]
+    end
+
+    test "set it to `false` if it's a component" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[<.func/>]
+      assert %Rendered{root: false} = ~F[<.func/>]
+    end
+
+    test "set it to `false` if there are multiple nodes" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[<div/><div/>]
+      assert %Rendered{root: false} = ~F[<div/><div/>]
+
+      assert %Rendered{root: false} = ~H[text<div/>]
+      assert %Rendered{root: false} = ~F[text<div/>]
+
+      assert %Rendered{root: false} = ~H[<div/>text]
+      assert %Rendered{root: false} = ~F[<div/>text]
+
+      assert %Rendered{root: false} = ~H[<div/><%= "text" %>]
+      assert %Rendered{root: false} = ~F[<div/>{"text"}]
+
+      assert %Rendered{root: false} = ~H[<!-- comment --><div/>]
+      assert %Rendered{root: false} = ~F[<!-- comment --><div/>]
+
+      assert %Rendered{root: false} = ~H[<div/><!-- comment -->]
+      assert %Rendered{root: false} = ~F[<div/><!-- comment -->]
+
+      # Private comments are excluded from the AST.
+      # And since they are not available in ~H, we don't assert against it.
+      assert %Rendered{root: true} = ~F[{!-- comment --}<div/>]
+      assert %Rendered{root: true} = ~F[<div/>{!-- comment --}]
+    end
+  end
+
   test "show public comments" do
     code = """
     <br>
diff --git a/test/surface/components/live_file_input_test.exs b/test/surface/components/live_file_input_test.exs
index 9cf71fb45..62e28db14 100644
--- a/test/surface/components/live_file_input_test.exs
+++ b/test/surface/components/live_file_input_test.exs
@@ -16,7 +16,9 @@ defmodule Surface.Components.LiveFileInputTest do
 
     def render(assigns) do
       ~F"""
+      <div>
         <LiveFileInput upload={@uploads.avatar} class={"test_class", disabled_test: true} opts={"data-test": "test-data", name: "a name?"} values={a: "one", b: :two, c: 3} />
+      </div>
       """
     end
   end
@@ -34,7 +36,9 @@ defmodule Surface.Components.LiveFileInputTest do
 
     def render(assigns) do
       ~F"""
+      <div>
         <LiveFileInput upload={@uploads.avatar} />
+      </div>
       """
     end
   end

From 4f8d84db0b7957a47dceb23dbb9e686da4c6f20f Mon Sep 17 00:00:00 2001
From: Marlus Saraiva <marlus.saraiva@gmail.com>
Date: Wed, 3 Jan 2024 19:33:38 -0300
Subject: [PATCH 2/6] Fix error when passing special chars as literals inside
 an expression

---
 lib/surface/type_handler.ex                 |  7 ++++-
 test/surface/integrations/html_tag_test.exs | 29 ++++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/surface/type_handler.ex b/lib/surface/type_handler.ex
index e0a598d62..fdd7f9dd1 100644
--- a/lib/surface/type_handler.ex
+++ b/lib/surface/type_handler.ex
@@ -177,7 +177,12 @@ defmodule Surface.TypeHandler do
         {:ok, [~S( ), to_string(name)]}
 
       {:ok, val} ->
-        {:ok, Phoenix.HTML.attributes_escape([{name, val}])}
+        attr_value =
+          [{name, val}]
+          |> Phoenix.HTML.attributes_escape()
+          |> Phoenix.HTML.safe_to_string()
+
+        {:ok, attr_value}
 
       {:error, message} ->
         {:error, message}
diff --git a/test/surface/integrations/html_tag_test.exs b/test/surface/integrations/html_tag_test.exs
index 1003ef4e9..b7dc66ab2 100644
--- a/test/surface/integrations/html_tag_test.exs
+++ b/test/surface/integrations/html_tag_test.exs
@@ -143,6 +143,19 @@ defmodule HtmlTagTest do
              """
     end
 
+    test "as expression with a literal string, encode HTML entities" do
+      html =
+        render_surface do
+          ~F"""
+          <div title={"> 123"}/>
+          """
+        end
+
+      assert html =~ """
+             <div title="&gt; 123"></div>
+             """
+    end
+
     test "without a value" do
       html =
         render_surface do
@@ -283,10 +296,20 @@ defmodule HtmlTagTest do
              """
     end
 
-    test "as string literal, it's translated directly to static html" do
-      %Rendered{static: static} = eval(~S[<div class="myclass" id={"123"}/>], __ENV__)
+    test "as string literal, translate directly to static html, without encoding" do
+      %Rendered{static: static} = eval(~S{<div class="[&:nth-child(2)]:p-4"></div>}, __ENV__)
+
+      assert static == [~S{<div class="[&:nth-child(2)]:p-4"></div>}]
+    end
+
+    test "as expression with a literal string, translate and encode directly to static html" do
+      code = """
+      <div class={"[&:nth-child(2)]:p-4"}/>\
+      """
+
+      %Rendered{static: static} = eval(code, __ENV__)
 
-      assert static == [~S(<div class="myclass"), "></div>"]
+      assert static == [~S{<div class="[&amp;:nth-child(2)]:p-4"></div>}]
     end
 
     test "css class with keyword list notation" do

From 0e32d0a75baca64fb20cd42b35e0f669f8e894a5 Mon Sep 17 00:00:00 2001
From: Doug W <harmon25@users.noreply.github.com>
Date: Fri, 5 Jan 2024 09:23:51 -0500
Subject: [PATCH 3/6] LiveView 0.20.2+ (#1)

* updates to lv 0.20.3
- adds `phoenix_html_helpers` for compatibility
- replaces uses of `Phoenix.HTML.Form` with `PhoenixHTMLHelpers.Form`
---
 lib/surface/component.ex                      |  2 +-
 lib/surface/components/form/checkbox.ex       |  4 ++--
 lib/surface/components/form/color_input.ex    |  4 ++--
 lib/surface/components/form/date_input.ex     |  4 ++--
 lib/surface/components/form/date_select.ex    |  4 ++--
 .../components/form/datetime_local_input.ex   |  4 ++--
 .../components/form/datetime_select.ex        |  4 ++--
 lib/surface/components/form/email_input.ex    |  4 ++--
 lib/surface/components/form/file_input.ex     |  2 +-
 lib/surface/components/form/hidden_input.ex   |  4 ++--
 .../components/form/multiple_select.ex        |  4 ++--
 lib/surface/components/form/number_input.ex   |  4 ++--
 .../components/form/options_for_select.ex     |  2 +-
 lib/surface/components/form/password_input.ex |  4 ++--
 lib/surface/components/form/radio_button.ex   |  4 ++--
 lib/surface/components/form/range_input.ex    |  4 ++--
 lib/surface/components/form/reset.ex          |  4 ++--
 lib/surface/components/form/search_input.ex   |  4 ++--
 lib/surface/components/form/select.ex         |  4 ++--
 .../components/form/telephone_input.ex        |  4 ++--
 lib/surface/components/form/text_input.ex     |  4 ++--
 lib/surface/components/form/textarea.ex       |  4 ++--
 lib/surface/components/form/time_input.ex     |  4 ++--
 lib/surface/components/form/time_select.ex    |  4 ++--
 lib/surface/components/form/url_input.ex      |  4 ++--
 lib/surface/live_component.ex                 |  3 ++-
 lib/surface/live_view.ex                      |  2 +-
 mix.exs                                       |  1 +
 mix.lock                                      | 21 ++++++++++---------
 test/surface/components/link_test.exs         |  2 +-
 30 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/lib/surface/component.ex b/lib/surface/component.ex
index cb4f03445..c6f680fe5 100644
--- a/lib/surface/component.ex
+++ b/lib/surface/component.ex
@@ -47,7 +47,7 @@ defmodule Surface.Component do
       use Surface.BaseComponent, type: unquote(__MODULE__)
 
       use Surface.API, include: [:prop, :slot, :data]
-      import Phoenix.HTML
+      import PhoenixHTMLHelpers
 
       @before_compile {Surface.BaseComponent, :__before_compile_init_slots__}
       @before_compile {unquote(__MODULE__), :__before_compile_handle_from_context__}
diff --git a/lib/surface/components/form/checkbox.ex b/lib/surface/components/form/checkbox.ex
index a880741aa..9845e0d18 100644
--- a/lib/surface/components/form/checkbox.ex
+++ b/lib/surface/components/form/checkbox.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.Checkbox do
   @moduledoc """
   Defines a checkbox.
 
-  Provides a wrapper for Phoenix.HTML.Form's `checkbox/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `checkbox/3` function.
 
   All options passed via `opts` will be sent to `checkbox/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.Checkbox do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [checkbox: 3]
+  import PhoenixHTMLHelpers.Form, only: [checkbox: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/color_input.ex b/lib/surface/components/form/color_input.ex
index d6016b77e..1bc11f5ea 100644
--- a/lib/surface/components/form/color_input.ex
+++ b/lib/surface/components/form/color_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.ColorInput do
   An input field that let the user specify a **color**, either with a
   text field or a color picker interface.
 
-  Provides a wrapper for Phoenix.HTML.Form's `color_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `color_input/3` function.
 
   All options passed via `opts` will be sent to `color_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.ColorInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [color_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [color_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/date_input.ex b/lib/surface/components/form/date_input.ex
index 583e93bcb..ffeaf5b18 100644
--- a/lib/surface/components/form/date_input.ex
+++ b/lib/surface/components/form/date_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.DateInput do
   An input field that let the user enter a **date**, either with a text field
   or a date picker interface.
 
-  Provides a wrapper for Phoenix.HTML.Form's `date_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `date_input/3` function.
 
   All options passed via `opts` will be sent to `date_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.DateInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [date_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [date_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/date_select.ex b/lib/surface/components/form/date_select.ex
index 49dddb58a..e66144116 100644
--- a/lib/surface/components/form/date_select.ex
+++ b/lib/surface/components/form/date_select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.DateSelect do
   @moduledoc """
   Generates select tags for date.
 
-  Provides a wrapper for Phoenix.HTML.Form's `date_select/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `date_select/3` function.
 
   All options passed via `opts` will be sent to `date_select/3`,
   `value`, `default`, `year`, `month`, `day` and `builder`
@@ -21,7 +21,7 @@ defmodule Surface.Components.Form.DateSelect do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [date_select: 3]
+  import PhoenixHTMLHelpers.Form, only: [date_select: 3]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/datetime_local_input.ex b/lib/surface/components/form/datetime_local_input.ex
index 2ae059940..5a2342d38 100644
--- a/lib/surface/components/form/datetime_local_input.ex
+++ b/lib/surface/components/form/datetime_local_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.DateTimeLocalInput do
   An input field that let the user enter both **date** and **time**, using a
   text field and a date picker interface.
 
-  Provides a wrapper for Phoenix.HTML.Form's `datetime_local_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `datetime_local_input/3` function.
 
   All options passed via `opts` will be sent to `datetime_local_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.DateTimeLocalInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [datetime_local_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [datetime_local_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/datetime_select.ex b/lib/surface/components/form/datetime_select.ex
index 65af7c5a5..dd2ca28b5 100644
--- a/lib/surface/components/form/datetime_select.ex
+++ b/lib/surface/components/form/datetime_select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.DateTimeSelect do
   @moduledoc """
   Generates select tags for datetime.
 
-  Provides a wrapper for Phoenix.HTML.Form's `datetime_select/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `datetime_select/3` function.
 
   All options passed via `opts` will be sent to `datetime_select/3`,
   `value`, `default`, `year`, `month`, `day`, `hour`, `minute`, `second` and `builder`
@@ -21,7 +21,7 @@ defmodule Surface.Components.Form.DateTimeSelect do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [datetime_select: 3]
+  import PhoenixHTMLHelpers.Form, only: [datetime_select: 3]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/email_input.ex b/lib/surface/components/form/email_input.ex
index dc1c62c61..7e8208f41 100644
--- a/lib/surface/components/form/email_input.ex
+++ b/lib/surface/components/form/email_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.EmailInput do
   @moduledoc """
   An input field that let the user enter one or multiple **e-mails**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `email_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `email_input/3` function.
 
   All options passed via `opts` will be sent to `email_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.EmailInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [email_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [email_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/file_input.ex b/lib/surface/components/form/file_input.ex
index b7f6aaa41..c3dd38942 100644
--- a/lib/surface/components/form/file_input.ex
+++ b/lib/surface/components/form/file_input.ex
@@ -19,7 +19,7 @@ defmodule Surface.Components.Form.FileInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [file_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [file_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/hidden_input.ex b/lib/surface/components/form/hidden_input.ex
index 1e2e7df84..5b6f752aa 100644
--- a/lib/surface/components/form/hidden_input.ex
+++ b/lib/surface/components/form/hidden_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.HiddenInput do
   @moduledoc """
   A **hidden** input field.
 
-  Provides a wrapper for Phoenix.HTML.Form's `hidden_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `hidden_input/3` function.
 
   All options passed via `opts` will be sent to `hidden_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.HiddenInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [hidden_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [hidden_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/multiple_select.ex b/lib/surface/components/form/multiple_select.ex
index eb0b9cfe7..e997fb6ee 100644
--- a/lib/surface/components/form/multiple_select.ex
+++ b/lib/surface/components/form/multiple_select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.MultipleSelect do
   @moduledoc """
   Defines a select.
 
-  Provides a wrapper for Phoenix.HTML.Form's `multiple_select/4` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `multiple_select/4` function.
 
   All options passed via `opts` will be sent to `multiple_select/4`, `class` can
   be set directly and will override anything in `opts`.
@@ -10,7 +10,7 @@ defmodule Surface.Components.Form.MultipleSelect do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [multiple_select: 4]
+  import PhoenixHTMLHelpers.Form, only: [multiple_select: 4]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/number_input.ex b/lib/surface/components/form/number_input.ex
index 12ce31489..d8e5f0ffd 100644
--- a/lib/surface/components/form/number_input.ex
+++ b/lib/surface/components/form/number_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.NumberInput do
   @moduledoc """
   An input field that let the user to enter a **number**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `number_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `number_input/3` function.
 
   All options passed via `opts` will be sent to `number_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.NumberInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [number_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [number_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/options_for_select.ex b/lib/surface/components/form/options_for_select.ex
index 0044c3b66..1c213beac 100644
--- a/lib/surface/components/form/options_for_select.ex
+++ b/lib/surface/components/form/options_for_select.ex
@@ -4,7 +4,7 @@ defmodule Surface.Components.Form.OptionsForSelect do
 
   This is useful when building the select by hand.
 
-  Provides a wrapper for Phoenix.HTML.Form's `options_for_select/2` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `options_for_select/2` function.
   """
 
   use Surface.Component
diff --git a/lib/surface/components/form/password_input.ex b/lib/surface/components/form/password_input.ex
index 44280bb94..63705fbc6 100644
--- a/lib/surface/components/form/password_input.ex
+++ b/lib/surface/components/form/password_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.PasswordInput do
   @moduledoc """
   An input field that let the user securely specify a **password**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `password_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `password_input/3` function.
 
   All options passed via `opts` will be sent to `password_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.PasswordInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [password_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [password_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/radio_button.ex b/lib/surface/components/form/radio_button.ex
index ac094d44f..6bf8427dc 100644
--- a/lib/surface/components/form/radio_button.ex
+++ b/lib/surface/components/form/radio_button.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.RadioButton do
   @moduledoc """
   Defines a radio button.
 
-  Provides a wrapper for Phoenix.HTML.Form's `radio_button/4` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `radio_button/4` function.
 
   All options passed via `opts` will be sent to `radio_button/4`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.RadioButton do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [radio_button: 4]
+  import PhoenixHTMLHelpers.Form, only: [radio_button: 4]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/range_input.ex b/lib/surface/components/form/range_input.ex
index c4dbad368..75241edd4 100644
--- a/lib/surface/components/form/range_input.ex
+++ b/lib/surface/components/form/range_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.RangeInput do
   An input field that let the user specify a numeric value in a given **range**,
   usually using a slider.
 
-  Provides a wrapper for Phoenix.HTML.Form's `range_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `range_input/3` function.
 
   All options passed via `opts` will be sent to `range_input/3`, `value`, `min`, `max`
   and `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.RangeInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [range_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [range_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/reset.ex b/lib/surface/components/form/reset.ex
index 7eeb29565..0d5eff7d5 100644
--- a/lib/surface/components/form/reset.ex
+++ b/lib/surface/components/form/reset.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.Reset do
   @moduledoc """
   Defines a reset button.
 
-  Provides a wrapper for Phoenix.HTML.Form's `reset/2` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `reset/2` function.
 
   All options passed via `opts` will be sent to `reset/2`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.Reset do
   use Surface.Component
   use Surface.Components.Events
 
-  import Phoenix.HTML.Form, only: [reset: 2]
+  import PhoenixHTMLHelpers.Form, only: [reset: 2]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/search_input.ex b/lib/surface/components/form/search_input.ex
index 3d40b681f..2e39fb373 100644
--- a/lib/surface/components/form/search_input.ex
+++ b/lib/surface/components/form/search_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.SearchInput do
   @moduledoc """
   An input field that let the user enter **search** queries.
 
-  Provides a wrapper for Phoenix.HTML.Form's `search_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `search_input/3` function.
 
   All options passed via `opts` will be sent to `search_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.SearchInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [search_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [search_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/select.ex b/lib/surface/components/form/select.ex
index 6752a39e2..b9abe6ad4 100644
--- a/lib/surface/components/form/select.ex
+++ b/lib/surface/components/form/select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.Select do
   @moduledoc """
   Defines a select.
 
-  Provides a wrapper for Phoenix.HTML.Form's `select/4` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `select/4` function.
 
   All options passed via `opts` will be sent to `select/4`, `class` can
   be set directly and will override anything in `opts`.
@@ -10,7 +10,7 @@ defmodule Surface.Components.Form.Select do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [select: 4]
+  import PhoenixHTMLHelpers.Form, only: [select: 4]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/telephone_input.ex b/lib/surface/components/form/telephone_input.ex
index 5d9635e49..468e7f4de 100644
--- a/lib/surface/components/form/telephone_input.ex
+++ b/lib/surface/components/form/telephone_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.TelephoneInput do
   @moduledoc """
   An input field that let the user enter a **telephone number**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `telephone_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `telephone_input/3` function.
 
   All options passed via `opts` will be sent to `telephone_input/3`, `value`,
   `pattern` and `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.TelephoneInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [telephone_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [telephone_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/text_input.ex b/lib/surface/components/form/text_input.ex
index eefdba89c..85cb14979 100644
--- a/lib/surface/components/form/text_input.ex
+++ b/lib/surface/components/form/text_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.TextInput do
   @moduledoc """
   An input field that let the user enter a **single-line text**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `text_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `text_input/3` function.
 
   All options passed via `opts` will be sent to `text_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.TextInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [text_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [text_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/textarea.ex b/lib/surface/components/form/textarea.ex
index 48e0d4f0d..e002f1ce4 100644
--- a/lib/surface/components/form/textarea.ex
+++ b/lib/surface/components/form/textarea.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.TextArea do
   @moduledoc """
   An input field that let the user enter a **multi-line** text.
 
-  Provides a wrapper for Phoenix.HTML.Form's `textarea/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `textarea/3` function.
 
   All options passed via `opts` will be sent to `textarea/3`. Explicitly
   defined properties like `value` and `class` can be set directly and will
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.TextArea do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [textarea: 3]
+  import PhoenixHTMLHelpers.Form, only: [textarea: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/time_input.ex b/lib/surface/components/form/time_input.ex
index 1ea5eb93e..8ff5689f3 100644
--- a/lib/surface/components/form/time_input.ex
+++ b/lib/surface/components/form/time_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.TimeInput do
   An input field that let the user enter a **time** (hours, minutes and
   optionally seconds).
 
-  Provides a wrapper for Phoenix.HTML.Form's `time_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `time_input/3` function.
 
   All options passed via `opts` will be sent to `time_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.TimeInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [time_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [time_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/time_select.ex b/lib/surface/components/form/time_select.ex
index 838c23cc9..e65d927c0 100644
--- a/lib/surface/components/form/time_select.ex
+++ b/lib/surface/components/form/time_select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.TimeSelect do
   @moduledoc """
   Generates select tags for time.
 
-  Provides a wrapper for Phoenix.HTML.Form's `time_select/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `time_select/3` function.
 
   All options passed via `opts` will be sent to `time_select/3`,
   `value`, `default`, `hour`, `minute`, `second` and `builder`
@@ -21,7 +21,7 @@ defmodule Surface.Components.Form.TimeSelect do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [time_select: 3]
+  import PhoenixHTMLHelpers.Form, only: [time_select: 3]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/url_input.ex b/lib/surface/components/form/url_input.ex
index 8221b4290..013f3a7d1 100644
--- a/lib/surface/components/form/url_input.ex
+++ b/lib/surface/components/form/url_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.UrlInput do
   @moduledoc """
   An input field that let the user enter a **URL**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `url_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `url_input/3` function.
 
   All options passed via `opts` will be sent to `url_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.UrlInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [url_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [url_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/live_component.ex b/lib/surface/live_component.ex
index bb49477cc..d5e3ba819 100644
--- a/lib/surface/live_component.ex
+++ b/lib/surface/live_component.ex
@@ -61,7 +61,8 @@ defmodule Surface.LiveComponent do
       @before_compile unquote(__MODULE__)
 
       use Surface.API, include: [:prop, :slot, :data]
-      import Phoenix.HTML
+      import PhoenixHTMLHelpers
+
 
       @before_compile {Surface.BaseComponent, :__before_compile_init_slots__}
 
diff --git a/lib/surface/live_view.ex b/lib/surface/live_view.ex
index c5bb4ee0e..bef7ddede 100644
--- a/lib/surface/live_view.ex
+++ b/lib/surface/live_view.ex
@@ -36,7 +36,7 @@ defmodule Surface.LiveView do
       use Surface.BaseComponent, type: unquote(__MODULE__)
 
       use Surface.API, include: [:prop, :data]
-      import Phoenix.HTML
+      import PhoenixHTMLHelpers
 
       alias Surface.Components.{Context, Raw}
       alias Surface.Components.Dynamic.Component
diff --git a/mix.exs b/mix.exs
index c1d21bf2f..ad1d181d2 100644
--- a/mix.exs
+++ b/mix.exs
@@ -34,6 +34,7 @@ defmodule Surface.MixProject do
     [
       {:jason, "~> 1.0"},
       {:phoenix_live_view, "~> 0.20.0"},
+      {:phoenix_html_helpers, "~> 1.0"},
       {:floki, "~> 0.25.0", only: :test},
       {:phoenix_ecto, "~> 4.0", only: :test},
       {:sourceror, "~> 0.12.0"},
diff --git a/mix.lock b/mix.lock
index 1f021b1e7..a67c56bfb 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,8 +1,8 @@
 %{
-  "castore": {:hex, :castore, "1.0.4", "ff4d0fb2e6411c0479b1d965a814ea6d00e51eb2f58697446e9c41a97d940b28", [:mix], [], "hexpm", "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"},
+  "castore": {:hex, :castore, "1.0.5", "9eeebb394cc9a0f3ae56b813459f990abb0a3dedee1be6b27fdb50301930502f", [:mix], [], "hexpm", "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"},
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
-  "ecto": {:hex, :ecto, "3.10.3", "eb2ae2eecd210b4eb8bece1217b297ad4ff824b4384c0e3fdd28aaf96edd6135", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"},
+  "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},
   "ex_doc": {:hex, :ex_doc, "0.31.0", "06eb1dfd787445d9cab9a45088405593dd3bb7fe99e097eaa71f37ba80c7a676", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "5350cafa6b7f77bdd107aa2199fe277acf29d739aba5aee7e865fc680c62a110"},
   "floki": {:hex, :floki, "0.25.0", "b1c9ddf5f32a3a90b43b76f3386ca054325dc2478af020e87b5111c19f2284ac", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "631f4e627c46d5ecd347df5a2accdaf0621c77c3693c5b75a8ad58e84c61f242"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
@@ -12,17 +12,18 @@
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.3", "d684f4bac8690e70b06eb52dad65d26de2eefa44cd19d64a8095e1417df7c8fd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9"},
   "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
-  "phoenix": {:hex, :phoenix, "1.7.9", "9a2b873e2cb3955efdd18ad050f1818af097fa3f5fc3a6aaba666da36bdd3f02", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "83e32da028272b4bfd076c61a964e6d2b9d988378df2f1276a0ed21b13b5e997"},
-  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
-  "phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.1", "92a37acf07afca67ac98bd326532ba8f44ad7d4bdf3e4361b03f7f02594e5ae9", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "be494fd1215052729298b0e97d5c2ce8e719c00854b82cd8cf15c1cd7fcf6294"},
+  "phoenix": {:hex, :phoenix, "1.7.10", "02189140a61b2ce85bb633a9b6fd02dff705a5f1596869547aeb2b2b95edd729", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"},
+  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"},
+  "phoenix_html": {:hex, :phoenix_html, "4.0.0", "4857ec2edaccd0934a923c2b0ba526c44a173c86b847e8db725172e9e51d11d6", [:mix], [], "hexpm", "cee794a052f243291d92fa3ccabcb4c29bb8d236f655fb03bcbdc3a8214b8d13"},
+  "phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.3", "8b6406bc0a451f295407d7acff7f234a6314be5bbe0b3f90ed82b07f50049878", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a8e4385e05618b424779f894ed2df97d3c7518b7285fcd11979077ae6226466b"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
-  "phoenix_template": {:hex, :phoenix_template, "1.0.3", "32de561eefcefa951aead30a1f94f1b5f0379bc9e340bb5c667f65f1edfa4326", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"},
-  "phx_new": {:hex, :phx_new, "1.7.9", "db6af02240548927abbcf12ede8707bea9662c6580d9341c6a5ec1dc877ef5ec", [:mix], [], "hexpm", "e6c5bab3dc5670a82221ef6556bb555f563d14026b9a690b8d90a0595400046f"},
-  "plug": {:hex, :plug, "1.15.1", "b7efd81c1a1286f13efb3f769de343236bd8b7d23b4a9f40d3002fc39ad8f74c", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "459497bd94d041d98d948054ec6c0b76feacd28eec38b219ca04c0de13c79d30"},
+  "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
+  "phx_new": {:hex, :phx_new, "1.7.10", "a261db57ac4eb668c8c64e86c64425976c4b254f1bda2179015e5f27768eaca5", [:mix], [], "hexpm", "3644322b5a32bfc48ce4b7dcd67c3afdb4dd64fab7a7a1492718da79ec3840c8"},
+  "plug": {:hex, :plug, "1.15.2", "94cf1fa375526f30ff8770837cb804798e0045fd97185f0bb9e5fcd858c792a3", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"},
   "plug_crypto": {:hex, :plug_crypto, "2.0.0", "77515cc10af06645abbfb5e6ad7a3e9714f805ae118fa1a70205f80d2d70fe73", [:mix], [], "hexpm", "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"},
   "sourceror": {:hex, :sourceror, "0.12.3", "a2ad3a1a4554b486d8a113ae7adad5646f938cad99bf8bfcef26dc0c88e8fade", [:mix], [], "hexpm", "4d4e78010ca046524e8194ffc4683422f34a96f6b82901abbb45acc79ace0316"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
-  "websock_adapter": {:hex, :websock_adapter, "0.5.4", "7af8408e7ed9d56578539594d1ee7d8461e2dd5c3f57b0f2a5352d610ddde757", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "d2c238c79c52cbe223fcdae22ca0bb5007a735b9e933870e241fce66afb4f4ab"},
+  "websock_adapter": {:hex, :websock_adapter, "0.5.5", "9dfeee8269b27e958a65b3e235b7e447769f66b5b5925385f5a569269164a210", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"},
 }
diff --git a/test/surface/components/link_test.exs b/test/surface/components/link_test.exs
index 11666721b..c71f14e1d 100644
--- a/test/surface/components/link_test.exs
+++ b/test/surface/components/link_test.exs
@@ -178,7 +178,7 @@ defmodule Surface.Components.LinkTest do
         render_surface do
           ~F"""
           <Link to="/hello">
-            {Phoenix.HTML.Tag.content_tag(:p, "world")}
+            {PhoenixHTMLHelpers.Tag.content_tag(:p, "world")}
           </Link>
           """
         end

From b4e570c75b61d68f1f42c5f3fd1cc4f0e4a7854b Mon Sep 17 00:00:00 2001
From: harmon25 <dougwright1@gmail.com>
Date: Mon, 22 Jan 2024 10:57:20 -0500
Subject: [PATCH 4/6] 'fixes' tests - updates deps

---
 mix.exs                                             |  2 +-
 mix.lock                                            |  6 +++---
 .../integrations/context_change_tracking_test.exs   | 13 +++++++------
 test/surface/live_view_test.exs                     |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mix.exs b/mix.exs
index a20848367..cac50f026 100644
--- a/mix.exs
+++ b/mix.exs
@@ -33,7 +33,7 @@ defmodule Surface.MixProject do
   defp deps do
     [
       {:jason, "~> 1.0"},
-      {:phoenix_live_view, "~> 0.20.0"},
+      {:phoenix_live_view, "~> 0.20.3"},
       {:phoenix_html_helpers, "~> 1.0"},
       {:floki, "~> 0.25.0", only: :test},
       {:phoenix_ecto, "~> 4.0", only: :test},
diff --git a/mix.lock b/mix.lock
index b5226bae9..80dbf1e7b 100644
--- a/mix.lock
+++ b/mix.lock
@@ -3,7 +3,7 @@
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
   "ecto": {:hex, :ecto, "3.11.1", "4b4972b717e7ca83d30121b12998f5fcdc62ba0ed4f20fd390f16f3270d85c3e", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"},
-  "ex_doc": {:hex, :ex_doc, "0.31.0", "06eb1dfd787445d9cab9a45088405593dd3bb7fe99e097eaa71f37ba80c7a676", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "5350cafa6b7f77bdd107aa2199fe277acf29d739aba5aee7e865fc680c62a110"},
+  "ex_doc": {:hex, :ex_doc, "0.31.1", "8a2355ac42b1cc7b2379da9e40243f2670143721dd50748bf6c3b1184dae2089", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "3178c3a407c557d8343479e1ff117a96fd31bafe52a039079593fb0524ef61b0"},
   "floki": {:hex, :floki, "0.25.0", "b1c9ddf5f32a3a90b43b76f3386ca054325dc2478af020e87b5111c19f2284ac", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "631f4e627c46d5ecd347df5a2accdaf0621c77c3693c5b75a8ad58e84c61f242"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
   "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
@@ -20,9 +20,9 @@
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
   "phx_new": {:hex, :phx_new, "1.7.10", "a261db57ac4eb668c8c64e86c64425976c4b254f1bda2179015e5f27768eaca5", [:mix], [], "hexpm", "3644322b5a32bfc48ce4b7dcd67c3afdb4dd64fab7a7a1492718da79ec3840c8"},
-  "plug": {:hex, :plug, "1.15.2", "94cf1fa375526f30ff8770837cb804798e0045fd97185f0bb9e5fcd858c792a3", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"},
+  "plug": {:hex, :plug, "1.15.3", "712976f504418f6dff0a3e554c40d705a9bcf89a7ccef92fc6a5ef8f16a30a97", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "cc4365a3c010a56af402e0809208873d113e9c38c401cabd88027ef4f5c01fd2"},
   "plug_crypto": {:hex, :plug_crypto, "2.0.0", "77515cc10af06645abbfb5e6ad7a3e9714f805ae118fa1a70205f80d2d70fe73", [:mix], [], "hexpm", "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"},
-  "sourceror": {:hex, :sourceror, "1.0.0", "51cc461384a4380a5582fd0cc81e4ea1f840da52c308a927b30857ee3a5dbc1f", [:mix], [], "hexpm", "1cada1f5c2301fb56ceb6f0fd7466f33f98f034a304a60d4c5555932c1943492"},
+  "sourceror": {:hex, :sourceror, "1.0.1", "ec2c41726d181adce888ac94b3f33b359a811b46e019c084509e02c70042e424", [:mix], [], "hexpm", "28225464ffd68bda1843c974f3ff7ccef35e29be09a65dfe8e3df3f7e3600c57"},
   "telemetry": {:hex, :telemetry, "1.2.1", "68fdfe8d8f05a8428483a97d7aab2f268aaff24b49e0f599faa091f1d4e7f61c", [:rebar3], [], "hexpm", "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"},
   "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
   "websock_adapter": {:hex, :websock_adapter, "0.5.5", "9dfeee8269b27e958a65b3e235b7e447769f66b5b5925385f5a569269164a210", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"},
diff --git a/test/surface/integrations/context_change_tracking_test.exs b/test/surface/integrations/context_change_tracking_test.exs
index ca07b99e3..b876b52c2 100644
--- a/test/surface/integrations/context_change_tracking_test.exs
+++ b/test/surface/integrations/context_change_tracking_test.exs
@@ -79,6 +79,8 @@ defmodule Surface.ContextChangeTrackingTest do
     {:ok, view, html} = live_isolated(build_conn(), View, session: %{"test_pid" => self()})
 
     assert html =~ "Count: 0"
+    assert_receive {:plug_conn, :sent}
+    assert_receive {_ref, {200, _, _}}
     assert_receive {:updated, "1"}
     assert_receive {:updated, "2"}
     assert_receive {:updated, "3"}
@@ -91,14 +93,13 @@ defmodule Surface.ContextChangeTrackingTest do
     assert html =~ "field value"
 
     # Component using context assigns should be updated
-    assert_receive {:updated, "1"}
-
+    # assert_receive {:updated, "1"}
+    refute_receive {:updated, "1"}
     # NOTE: Due to a limitation in LV's change tracking, this should
     # be kept commented until it's fixed/optimized.
     # See test/surface/integrations/lv_change_tracking_test.exs
-    #
-    # refute_receive {:updated, "2"}
-    # refute_receive {:updated, "3"}
-    # refute_receive {:updated, "4"}
+    refute_receive {:updated, "2"}
+    refute_receive {:updated, "3"}
+    refute_receive {:updated, "4"}
   end
 end
diff --git a/test/surface/live_view_test.exs b/test/surface/live_view_test.exs
index c788cc2b9..8960c4725 100644
--- a/test/surface/live_view_test.exs
+++ b/test/surface/live_view_test.exs
@@ -52,8 +52,8 @@ defmodule Surface.LiveView.LiveViewTest do
   test "forward props to the underlying live_render call", %{conn: conn} do
     {:ok, _view, html} = live_isolated(conn, LiveViewWithPropsView)
 
-    assert html =~ ~S(id="123")
-    assert html =~ ~S(<span class="lv")
+    assert html =~ ~S(<span id="123")
+    assert html =~ ~S(class="lv")
     assert html =~ "User id from session: USER_ID"
     assert html =~ ~S(data-phx-sticky="data-phx-sticky")
   end

From c07d65a46a724feb35ecac60442751ca644ce4f3 Mon Sep 17 00:00:00 2001
From: harmon25 <dougwright1@gmail.com>
Date: Mon, 22 Jan 2024 11:35:08 -0500
Subject: [PATCH 5/6] mix format

---
 lib/surface/live_component.ex | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/surface/live_component.ex b/lib/surface/live_component.ex
index d5e3ba819..4e0f6a149 100644
--- a/lib/surface/live_component.ex
+++ b/lib/surface/live_component.ex
@@ -63,7 +63,6 @@ defmodule Surface.LiveComponent do
       use Surface.API, include: [:prop, :slot, :data]
       import PhoenixHTMLHelpers
 
-
       @before_compile {Surface.BaseComponent, :__before_compile_init_slots__}
 
       alias Surface.Components.{Context, Raw}

From d170e31e5a2bb342d03d90f4c9b80665bbec7601 Mon Sep 17 00:00:00 2001
From: Tiago Moraes <tiagoefmoraes@gmail.com>
Date: Fri, 26 Jan 2024 13:02:31 -0300
Subject: [PATCH 6/6] Update phoenix_html to 4.0.0

---
 mix.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mix.lock b/mix.lock
index 6e74a1524..a7ed23a26 100644
--- a/mix.lock
+++ b/mix.lock
@@ -13,8 +13,9 @@
   "mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
   "phoenix": {:hex, :phoenix, "1.7.10", "02189140a61b2ce85bb633a9b6fd02dff705a5f1596869547aeb2b2b95edd729", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"},
-  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.2", "b21bd01fdeffcfe2fab49e4942aa938b6d3e89e93a480d4aee58085560a0bc0d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "70242edd4601d50b69273b057ecf7b684644c19ee750989fd555625ae4ce8f5d"},
-  "phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"},
+  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"},
+  "phoenix_html": {:hex, :phoenix_html, "4.0.0", "4857ec2edaccd0934a923c2b0ba526c44a173c86b847e8db725172e9e51d11d6", [:mix], [], "hexpm", "cee794a052f243291d92fa3ccabcb4c29bb8d236f655fb03bcbdc3a8214b8d13"},
+  "phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
   "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.3", "8b6406bc0a451f295407d7acff7f234a6314be5bbe0b3f90ed82b07f50049878", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a8e4385e05618b424779f894ed2df97d3c7518b7285fcd11979077ae6226466b"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},