Prepare v4.0

phoenixframework · Oct 28, 2023 · 0be2c6f · 0be2c6f
1 parent ec3764e
commit 0be2c6f
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 4,441 deletions.
diff --git a/README.md b/README.md
@@ -2,11 +2,13 @@
 
 [![Build Status](https://github.com/phoenixframework/phoenix_html/workflows/Tests/badge.svg)](https://github.com/phoenixframework/phoenix_html/actions?query=workflow%3ATests)
 
-Collection of helpers to generate and manipulate HTML contents.
+The default building blocks for working with HTML safely in Phoenix.
 
-Although this project was originally extracted from Phoenix,
-it does not depend on Phoenix and can be used with any Plug
-application (or even without Plug).
+This library provides three main functionalities:
+
+  * HTML safety
+  * Form abstractions
+  * A tiny JavaScript library to enhance applications
 
 See the [docs](https://hexdocs.pm/phoenix_html/) for more information.
 

diff --git a/lib/phoenix_html.ex b/lib/phoenix_html.ex
@@ -6,7 +6,7 @@ defmodule Phoenix.HTML do
   This library provides three main functionalities:
 
     * HTML safety
-    * Form handling (with CSRF protection)
+    * Form abstractions
     * A tiny JavaScript library to enhance applications
 
   ## HTML safety
@@ -74,15 +74,19 @@ defmodule Phoenix.HTML do
   """
 
   @doc false
-  # TODO: Deprecate me
   defmacro __using__(_) do
-    quote do
-      import Phoenix.HTML
-      import Phoenix.HTML.Form
-      import Phoenix.HTML.Link
-      import Phoenix.HTML.Tag, except: [attributes_escape: 1]
-      import Phoenix.HTML.Format
-    end
+    raise """
+    use Phoenix.HTML is no longer supported in v4.0.
+
+    To keep compatibility with previous versions, \
+    add {:phoenix_html_helpers, "~> 1.0"} to your mix.exs deps
+    and then, instead of "use Phoenix.HTML", you might:
+
+        import Phoenix.HTML
+        import Phoenix.HTML.Form
+        use PhoenixHTMLHelpers
+
+    """
   end
 
   @typedoc "Guaranteed to be safe"
@@ -91,36 +95,6 @@ defmodule Phoenix.HTML do
   @typedoc "May be safe or unsafe (i.e. it needs to be converted)"
   @type unsafe :: Phoenix.HTML.Safe.t()
 
-  @doc false
-  @deprecated "use the ~H sigil instead"
-  defmacro sigil_e(expr, opts) do
-    handle_sigil(expr, opts, __CALLER__)
-  end
-
-  @doc false
-  @deprecated "use the ~H sigil instead"
-  defmacro sigil_E(expr, opts) do
-    handle_sigil(expr, opts, __CALLER__)
-  end
-
-  defp handle_sigil({:<<>>, meta, [expr]}, [], caller) do
-    options = [
-      engine: Phoenix.HTML.Engine,
-      file: caller.file,
-      line: caller.line + 1,
-      indentation: meta[:indentation] || 0
-    ]
-
-    EEx.compile_string(expr, options)
-  end
-
-  defp handle_sigil(_, _, _) do
-    raise ArgumentError,
-          "interpolation not allowed in ~e sigil. " <>
-            "Remove the interpolation, use <%= %> to insert values, " <>
-            "or use ~E to show the interpolation literally"
-  end
-
   @doc """
   Marks the given content as raw.