From e280c44bc0d1f85c026860cc3f2513a1ccadb2fc Mon Sep 17 00:00:00 2001 From: Steffen Deusch Date: Tue, 19 Nov 2024 18:38:29 +0100 Subject: [PATCH 1/2] Use makeup_lexers for highlighting HTML/HEEx, CSS and JS The plan is to remove it once it is upstreamed into official makeup repositories. --- mix.exs | 17 ++++++++++++++++- mix.lock | 5 +++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/mix.exs b/mix.exs index 4a322cce9e..5999081bcf 100644 --- a/mix.exs +++ b/mix.exs @@ -51,8 +51,23 @@ defmodule Phoenix.LiveView.MixProject do {:jason, "~> 1.0", optional: true}, {:floki, "~> 0.36", optional: true}, {:ex_doc, "~> 0.29", only: :docs}, - {:makeup_eex, ">= 0.1.1", only: :docs}, + # TODO: change me when new makeup_elixir is released + # {:makeup_elixir, "~> 1.0", only: :docs}, + {:makeup_elixir, + github: "elixir-makeup/makeup_elixir", + ref: "532ebf9e10989a4a54fff47cb51d36a621928b99", + only: :docs, + override: true}, {:makeup_diff, "~> 0.1.1", only: :docs}, + # TODO: change me when makeup_lexers is not needed any more + # {:makeup_eex, "~> 1.0", only: :docs}, + {:makeup_eex, + github: "SteffenDE/makeup_eex", + ref: "5cfc91389dbdfad885734bc8050af61840eab019", + only: :docs, + override: true}, + # TODO: remove me when makeup_lexers is not needed any more + {:makeup_lexers, github: "SteffenDE/makeup_lexers", only: :docs}, {:html_entities, ">= 0.0.0", only: :test}, {:phoenix_live_reload, "~> 1.4", only: :test}, {:phoenix_html_helpers, "~> 1.0", only: :test}, diff --git a/mix.lock b/mix.lock index 6406b49e8c..9a7955d17b 100644 --- a/mix.lock +++ b/mix.lock @@ -13,10 +13,11 @@ "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"}, "makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"}, "makeup_diff": {:hex, :makeup_diff, "0.1.1", "01498f8c95970081297837eaf4686b6f3813e535795b8421f15ace17a59aea37", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "fadb0bf014bd328badb7be986eadbce1a29955dd51c27a9e401c3045cf24184e"}, - "makeup_eex": {:hex, :makeup_eex, "1.0.0", "436d4c00204c250b17a775d64e197798aaf374627e6a4f2d3fd3074a8db61db4", [:mix], [{:makeup, "~> 1.2.1 or ~> 1.3", [hex: :makeup, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_html, "~> 0.1.0 or ~> 1.0", [hex: :makeup_html, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "3bb699bc519e4f509f1bf8a2e0ba0e08429edf3580053cd31a4f9c1bc5da86c8"}, - "makeup_elixir": {:hex, :makeup_elixir, "1.0.0", "74bb8348c9b3a51d5c589bf5aebb0466a84b33274150e3b6ece1da45584afc82", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "49159b7d7d999e836bedaf09dcf35ca18b312230cf901b725a64f3f42e407983"}, + "makeup_eex": {:git, "https://github.com/SteffenDE/makeup_eex.git", "5cfc91389dbdfad885734bc8050af61840eab019", [ref: "5cfc91389dbdfad885734bc8050af61840eab019"]}, + "makeup_elixir": {:git, "https://github.com/elixir-makeup/makeup_elixir.git", "532ebf9e10989a4a54fff47cb51d36a621928b99", [ref: "532ebf9e10989a4a54fff47cb51d36a621928b99"]}, "makeup_erlang": {:hex, :makeup_erlang, "1.0.1", "c7f58c120b2b5aa5fd80d540a89fdf866ed42f1f3994e4fe189abebeab610839", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "8a89a1eeccc2d798d6ea15496a6e4870b75e014d1af514b1b71fa33134f57814"}, "makeup_html": {:hex, :makeup_html, "0.1.2", "19d4050c0978a4f1618ffe43054c0049f91fe5feeb9ae8d845b5dc79c6008ae5", [:mix], [{:makeup, "~> 1.2", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "b7fb9afedd617d167e6644a0430e49c1279764bfd3153da716d4d2459b0998c5"}, + "makeup_lexers": {:git, "https://github.com/SteffenDE/makeup_lexers.git", "a8a7f4c18cfe1ad6598fa4ead6a81432e0d08260", []}, "mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"}, "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"}, "phoenix": {:hex, :phoenix, "1.7.14", "a7d0b3f1bc95987044ddada111e77bd7f75646a08518942c72a8440278ae7825", [: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.7", [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", "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"}, From 341df3b7555d1b797452806b5a3a546110ccf9fe Mon Sep 17 00:00:00 2001 From: Steffen Deusch Date: Tue, 19 Nov 2024 18:52:01 +0100 Subject: [PATCH 2/2] fix unclosed script tag --- guides/cheatsheets/html-attrs.cheatmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guides/cheatsheets/html-attrs.cheatmd b/guides/cheatsheets/html-attrs.cheatmd index 624ebf769d..9da39b9731 100644 --- a/guides/cheatsheets/html-attrs.cheatmd +++ b/guides/cheatsheets/html-attrs.cheatmd @@ -172,5 +172,5 @@ let liveSocket = new LiveSocket("/live", Socket, {hooks: Hooks}) ```heex - ```