Added forward/backward compatiblity for LiveView 0.18.0 #31

Author: dominicletz

lib/desktop.ex

@@ -61,7 +61,7 @@ defmodule Desktop do
       best_match != nil ->
         put_default_locale(best_match)
 
-        # We have seen windows return an empty string for language_code
+      # We have seen windows return an empty string for language_code
       byte_size(language_code) >= 2 ->
         # Looking for a prefix match 'xx' == 'yy'
         prefix = binary_part(language_code, 0, 2)
@@ -108,4 +108,7 @@ defmodule Desktop do
     # :persistent_term.put(@key, locale)
     Application.put_env(:gettext, :default_locale, locale)
   end
+
+  @live_view_version elem(:application.get_key(:phoenix_live_view, :vsn), 1) |> List.to_string()
+  def live_view_version(), do: @live_view_version
 end

lib/desktop/endpoint.ex

@@ -6,12 +6,17 @@ defmodule Desktop.Endpoint do
       defoverridable url: 0
 
       def url do
+        # Checking for pre LiveView 0.18.0
         url =
-          Phoenix.Config.cache(
-            __MODULE__,
-            :__phoenix_url__,
-            &Phoenix.Endpoint.Supervisor.url/1
-          )
+          if Version.compare(Desktop.live_view_version(), "0.18.0") == :lt do
+            Phoenix.Config.cache(
+              __MODULE__,
+              :__phoenix_url__,
+              fn a -> apply(Phoenix.Endpoint.Supervisor, :url, [a]) end
+            )
+          else
+            :persistent_term.get({Phoenix.Endpoint, __MODULE__}, nil).url
+          end
 
         endpoint = Module.safe_concat(__MODULE__, HTTP)
         String.replace(url, ":0", ":#{:ranch.get_port(endpoint)}")

lib/desktop/menu.ex

@@ -135,15 +135,28 @@ defmodule Desktop.Menu do
 
     Module.put_attribute(__CALLER__.module, :is_menu_server, Keyword.get(opts, :server, true))
 
-    # Phoenix.LiveView.HTMLEngine vs. Phoenix.HTML.Engine
-    quote do
-      @behaviour Desktop.Menu
-      import Desktop.Menu, only: [assign: 2, connected?: 1]
-      import Phoenix.HTML, only: [sigil_e: 2, sigil_E: 2]
-      import Phoenix.LiveView.Helpers, only: [sigil_L: 2, sigil_H: 2]
-      alias Desktop.Menu
-
-      @before_compile Desktop.Menu
+    # Checking for pre LiveView 0.18.0
+    if Version.compare(Desktop.live_view_version(), "0.18.0") == :lt do
+      quote do
+        @behaviour Desktop.Menu
+        import Desktop.Menu, only: [assign: 2, connected?: 1]
+        import Phoenix.HTML, only: [sigil_e: 2, sigil_E: 2]
+        import Phoenix.LiveView.Helpers, only: [sigil_L: 2, sigil_H: 2]
+        alias Desktop.Menu
+
+        @before_compile Desktop.Menu
+      end
+    else
+      quote do
+        @behaviour Desktop.Menu
+        import Desktop.Menu, only: [assign: 2, connected?: 1]
+        import Phoenix.HTML, only: [sigil_e: 2, sigil_E: 2]
+        import Phoenix.LiveView.Helpers, only: [sigil_L: 2]
+        import Phoenix.Component, only: [sigil_H: 2]
+        alias Desktop.Menu
+
+        @before_compile Desktop.Menu
+      end
     end
   end