From 5530e152dcc66307555acbb8f4fbb19e51fc9a98 Mon Sep 17 00:00:00 2001
From: ruslandoga <67764432+ruslandoga@users.noreply.github.com>
Date: Sat, 21 Dec 2024 14:15:04 +0700
Subject: [PATCH 1/3] try Elixir v1.18, Erlang 27.2

---
 .tool-versions                                |  4 +-
 Dockerfile                                    |  2 +-
 lib/plausible/auth/user_admin.ex              | 27 ++++----
 lib/plausible/crm_extensions.ex               |  4 +-
 lib/plausible/goal/schema.ex                  |  2 +-
 lib/plausible_release.ex                      |  6 +-
 .../controllers/api/external_controller.ex    |  4 +-
 .../live/components/verification.ex           |  4 +-
 lib/plausible_web/live/register_form.ex       |  6 +-
 lib/plausible_web/live/sites.ex               | 66 +++++++++----------
 .../plugs/authorize_public_api.ex             | 38 +++++------
 .../plugs/authorize_site_access.ex            | 25 +++----
 .../plugs/maybe_disable_registration.ex       | 29 ++++----
 lib/plausible_web/router.ex                   | 25 ++++---
 .../email/site_setup_help_email.html.heex     |  8 ++-
 .../email/site_setup_success_email.html.heex  | 10 +--
 .../templates/layout/_header.html.heex        | 48 +++++++-------
 .../templates/site/settings_people.html.heex  | 16 +++--
 lib/plausible_web/views/layout_view.ex        |  9 ++-
 mix.lock                                      | 18 ++---
 test/plausible/exports_test.exs               | 10 ++-
 test/plausible/imported/csv_importer_test.exs |  4 +-
 .../api/stats_controller/imported_test.exs    |  2 +-
 23 files changed, 197 insertions(+), 170 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 8d70cf79e8bd..276dee0388d9 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-erlang 27.0
-elixir 1.17.1-otp-27
+erlang 27.2
+elixir 1.18.0-otp-27
 nodejs 21.7.3
diff --git a/Dockerfile b/Dockerfile
index ec88934621cf..041e2792c1aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # platform specific, it makes sense to build it in the docker
 
 #### Builder
-FROM hexpm/elixir:1.17.1-erlang-27.0-alpine-3.20.1 AS buildcontainer
+FROM hexpm/elixir:1.18.0-erlang-27.2-alpine-3.20.1 AS buildcontainer
 
 ARG MIX_ENV=ce
 
diff --git a/lib/plausible/auth/user_admin.ex b/lib/plausible/auth/user_admin.ex
index 4e24f343ebf2..7c72ae2085fe 100644
--- a/lib/plausible/auth/user_admin.ex
+++ b/lib/plausible/auth/user_admin.ex
@@ -171,22 +171,21 @@ defmodule Plausible.Auth.UserAdmin do
   defp subscription_status(user) do
     team = user.my_team
 
-    cond do
-      team && team.subscription ->
-        status_str =
-          PlausibleWeb.SettingsView.present_subscription_status(team.subscription.status)
-
-        if team.subscription.paddle_subscription_id do
-          {:safe, ~s(<a href="#{manage_url(team.subscription)}">#{status_str}</a>)}
-        else
-          status_str
-        end
-
-      Plausible.Teams.on_trial?(team) ->
+    if team && team.subscription do
+      status_str =
+        PlausibleWeb.SettingsView.present_subscription_status(team.subscription.status)
+
+      if team.subscription.paddle_subscription_id do
+        {:safe, ~s(<a href="#{manage_url(team.subscription)}">#{status_str}</a>)}
+      else
+        status_str
+      end
+    else
+      if Plausible.Teams.on_trial?(team) do
         "On trial"
-
-      true ->
+      else
         "Trial expired"
+      end
     end
   end
 
diff --git a/lib/plausible/crm_extensions.ex b/lib/plausible/crm_extensions.ex
index 054b6106f003..be9e49f4f669 100644
--- a/lib/plausible/crm_extensions.ex
+++ b/lib/plausible/crm_extensions.ex
@@ -48,7 +48,9 @@ defmodule Plausible.CrmExtensions do
       ]
     end
 
-    def javascripts(%{assigns: %{context: "billing", resource: "enterprise_plan", changeset: %{}}}) do
+    def javascripts(%{
+          assigns: %{context: "billing", resource: "enterprise_plan", changeset: %{}}
+        }) do
       [
         Phoenix.HTML.raw("""
         <script type="text/javascript">
diff --git a/lib/plausible/goal/schema.ex b/lib/plausible/goal/schema.ex
index 8f2e29febe01..3479a89aba28 100644
--- a/lib/plausible/goal/schema.ex
+++ b/lib/plausible/goal/schema.ex
@@ -112,7 +112,7 @@ defmodule Plausible.Goal do
   end
 
   defp maybe_drop_currency(changeset) do
-    if ee?() and get_field(changeset, :page_path) do
+    if get_field(changeset, :page_path) do
       delete_change(changeset, :currency)
     else
       changeset
diff --git a/lib/plausible_release.ex b/lib/plausible_release.ex
index 00b0c876d566..f8385d4d47a8 100644
--- a/lib/plausible_release.ex
+++ b/lib/plausible_release.ex
@@ -12,10 +12,8 @@ defmodule Plausible.Release do
   ]
 
   def should_be_first_launch? do
-    on_ee do
-      false
-    else
-      not (_has_users? = Repo.exists?(Plausible.Auth.User))
+    if Plausible.ce?() do
+      not Repo.exists?(Plausible.Auth.User)
     end
   end
 
diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex
index 46622ee202d9..fd5b1b18aa5a 100644
--- a/lib/plausible_web/controllers/api/external_controller.ex
+++ b/lib/plausible_web/controllers/api/external_controller.ex
@@ -26,7 +26,9 @@ defmodule PlausibleWeb.Api.ExternalController do
             conn
             |> put_resp_header("x-plausible-dropped", "#{Enum.count(dropped)}")
             |> put_status(400)
-            |> json(%{errors: Plausible.ChangesetHelpers.traverse_errors(first_invalid_changeset)})
+            |> json(%{
+              errors: Plausible.ChangesetHelpers.traverse_errors(first_invalid_changeset)
+            })
           else
             conn
             |> put_resp_header("x-plausible-dropped", "#{Enum.count(dropped)}")
diff --git a/lib/plausible_web/live/components/verification.ex b/lib/plausible_web/live/components/verification.ex
index 4513aae550d9..2fafc50e0da5 100644
--- a/lib/plausible_web/live/components/verification.ex
+++ b/lib/plausible_web/live/components/verification.ex
@@ -27,6 +27,8 @@ defmodule PlausibleWeb.Live.Components.Verification do
   attr(:awaiting_first_pageview?, :boolean, default: false)
 
   def render(assigns) do
+    assigns = assign(assigns, :ee?, Plausible.ee?())
+
     ~H"""
     <div id="progress-indicator">
       <.focus_box>
@@ -102,7 +104,7 @@ defmodule PlausibleWeb.Live.Components.Verification do
 
         <:footer :if={@finished? and not @success?}>
           <.focus_list>
-            <:item :if={ee?() and @attempts >= 3}>
+            <:item :if={@ee? and @attempts >= 3}>
               <b>Need further help with your installation?</b>
               <.styled_link href="https://plausible.io/contact">
                 Contact us
diff --git a/lib/plausible_web/live/register_form.ex b/lib/plausible_web/live/register_form.ex
index dc7a4aea79cc..2669d3139fd8 100644
--- a/lib/plausible_web/live/register_form.ex
+++ b/lib/plausible_web/live/register_form.ex
@@ -59,10 +59,12 @@ defmodule PlausibleWeb.Live.RegisterForm do
   end
 
   def render(assigns) do
+    assigns = assign(assigns, :ce?, ce?())
+
     ~H"""
     <div class="mx-auto text-center dark:text-gray-300">
       <h1 class="text-3xl font-black">
-        <%= if ce?() or @live_action == :register_from_invitation_form do %>
+        <%= if @ce? or @live_action == :register_from_invitation_form do %>
           Register your <%= Plausible.product_name() %> account
         <% else %>
           Register your 30-day free trial
@@ -170,7 +172,7 @@ defmodule PlausibleWeb.Live.RegisterForm do
         <% end %>
 
         <% submit_text =
-          if ce?() or @invitation do
+          if @ce? or @invitation do
             "Create my account"
           else
             "Start my free trial"
diff --git a/lib/plausible_web/live/sites.ex b/lib/plausible_web/live/sites.ex
index 377f9f711e66..9f2a37957171 100644
--- a/lib/plausible_web/live/sites.ex
+++ b/lib/plausible_web/live/sites.ex
@@ -677,45 +677,32 @@ defmodule PlausibleWeb.Live.Sites do
     |> Enum.map(&check_limits(&1, user))
   end
 
-  defp check_limits(%{role: :owner, site: site} = invitation, user) do
-    team =
-      case Plausible.Teams.get_by_owner(user) do
-        {:ok, team} -> team
-        _ -> nil
-      end
+  on_ee do
+    defp check_limits(%{role: :owner, site: site} = invitation, user) do
+      team =
+        case Plausible.Teams.get_by_owner(user) do
+          {:ok, team} -> team
+          _ -> nil
+        end
 
-    case ensure_can_take_ownership(site, team) do
-      :ok ->
-        check_features(invitation, team)
+      case ensure_can_take_ownership(site, team) do
+        :ok ->
+          check_features(invitation, team)
 
-      {:error, :no_plan} ->
-        %{invitation: invitation, no_plan: true}
+        {:error, :no_plan} ->
+          %{invitation: invitation, no_plan: true}
 
-      {:error, {:over_plan_limits, limits}} ->
-        limits = PlausibleWeb.TextHelpers.pretty_list(limits)
-        %{invitation: invitation, exceeded_limits: limits}
+        {:error, {:over_plan_limits, limits}} ->
+          limits = PlausibleWeb.TextHelpers.pretty_list(limits)
+          %{invitation: invitation, exceeded_limits: limits}
+      end
     end
+
+    defdelegate ensure_can_take_ownership(site, team), to: Plausible.Teams.Invitations
   end
 
   defp check_limits(invitation, _), do: %{invitation: invitation}
 
-  defdelegate ensure_can_take_ownership(site, team), to: Plausible.Teams.Invitations
-
-  def check_features(%{role: :owner, site: site} = invitation, team) do
-    case check_feature_access(site, team) do
-      :ok ->
-        %{invitation: invitation}
-
-      {:error, {:missing_features, features}} ->
-        feature_names =
-          features
-          |> Enum.map(& &1.display_name())
-          |> PlausibleWeb.TextHelpers.pretty_list()
-
-        %{invitation: invitation, missing_features: feature_names}
-    end
-  end
-
   on_ee do
     defp check_feature_access(site, new_team) do
       missing_features =
@@ -728,9 +715,20 @@ defmodule PlausibleWeb.Live.Sites do
         {:error, {:missing_features, missing_features}}
       end
     end
-  else
-    defp check_feature_access(_site, _new_team) do
-      :ok
+
+    defp check_features(%{role: :owner, site: site} = invitation, team) do
+      case check_feature_access(site, team) do
+        :ok ->
+          %{invitation: invitation}
+
+        {:error, {:missing_features, features}} ->
+          feature_names =
+            features
+            |> Enum.map(& &1.display_name())
+            |> PlausibleWeb.TextHelpers.pretty_list()
+
+          %{invitation: invitation, missing_features: feature_names}
+      end
     end
   end
 
diff --git a/lib/plausible_web/plugs/authorize_public_api.ex b/lib/plausible_web/plugs/authorize_public_api.ex
index 90f7acd00da1..77754ca9ba5b 100644
--- a/lib/plausible_web/plugs/authorize_public_api.ex
+++ b/lib/plausible_web/plugs/authorize_public_api.ex
@@ -134,30 +134,30 @@ defmodule PlausibleWeb.Plugs.AuthorizePublicAPI do
   end
 
   defp verify_site_access(api_key, site) do
-    team =
-      case Plausible.Teams.get_by_owner(api_key.user) do
-        {:ok, team} -> team
-        _ -> nil
-      end
-
-    is_member? = Plausible.Teams.Memberships.site_member?(site, api_key.user)
-    is_super_admin? = Auth.is_super_admin?(api_key.user_id)
+    if Auth.is_super_admin?(api_key.user_id) do
+      :ok
+    else
+      team =
+        case Plausible.Teams.get_by_owner(api_key.user) do
+          {:ok, team} -> team
+          _ -> nil
+        end
 
-    cond do
-      is_super_admin? ->
-        :ok
+      is_member? = Plausible.Teams.Memberships.site_member?(site, api_key.user)
 
-      Sites.locked?(site) ->
-        {:error, :site_locked}
+      cond do
+        Sites.locked?(site) ->
+          {:error, :site_locked}
 
-      Plausible.Billing.Feature.StatsAPI.check_availability(team) !== :ok ->
-        {:error, :upgrade_required}
+        Plausible.Billing.Feature.StatsAPI.check_availability(team) !== :ok ->
+          {:error, :upgrade_required}
 
-      is_member? ->
-        :ok
+        is_member? ->
+          :ok
 
-      true ->
-        {:error, :invalid_api_key}
+        true ->
+          {:error, :invalid_api_key}
+      end
     end
   end
 
diff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.ex
index 4019fdfb9a90..d4c3a056c302 100644
--- a/lib/plausible_web/plugs/authorize_site_access.ex
+++ b/lib/plausible_web/plugs/authorize_site_access.ex
@@ -81,21 +81,22 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess do
            get_site_with_role(conn, current_user, domain),
          {:ok, shared_link} <- maybe_get_shared_link(conn, site) do
       role =
-        cond do
-          membership_role ->
-            membership_role
-
-          Plausible.Auth.is_super_admin?(current_user) ->
-            :super_admin
+        if Plausible.Auth.is_super_admin?(current_user) do
+          :super_admin
+        else
+          cond do
+            membership_role ->
+              membership_role
 
-          site.public ->
-            :public
+            site.public ->
+              :public
 
-          shared_link ->
-            :public
+            shared_link ->
+              :public
 
-          true ->
-            nil
+            true ->
+              nil
+          end
         end
 
       if role in allowed_roles do
diff --git a/lib/plausible_web/plugs/maybe_disable_registration.ex b/lib/plausible_web/plugs/maybe_disable_registration.ex
index 7c05a7b91039..00a212c3041f 100644
--- a/lib/plausible_web/plugs/maybe_disable_registration.ex
+++ b/lib/plausible_web/plugs/maybe_disable_registration.ex
@@ -14,19 +14,26 @@ defmodule PlausibleWeb.Plugs.MaybeDisableRegistration do
   end
 
   def call(conn, _opts) do
-    disabled_for = List.wrap(conn.assigns.disable_registration_for)
+    cond do
+      Release.should_be_first_launch?() ->
+        conn
 
-    selfhost_config = Application.get_env(:plausible, :selfhost)
-    disable_registration = Keyword.fetch!(selfhost_config, :disable_registration)
-    first_launch? = Release.should_be_first_launch?()
+      disable_registration?() ->
+        conn
+        |> put_flash(:error, "Registration is disabled on this instance")
+        |> redirect(to: Routes.auth_path(conn, :login_form))
+        |> halt()
 
-    if not first_launch? and disable_registration in disabled_for do
-      conn
-      |> put_flash(:error, "Registration is disabled on this instance")
-      |> redirect(to: Routes.auth_path(conn, :login_form))
-      |> halt()
-    else
-      conn
+      true ->
+        conn
+    end
+  end
+
+  defp disable_registration? do
+    if Plausible.ce?() do
+      config = Application.get_env(:plausible, :selfhost)
+      disable_registration = Keyword.fetch!(config, :disable_registration)
+      disable_registration in [:invite_only, true]
     end
   end
 end
diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex
index a03955599f7c..5d50f192b369 100644
--- a/lib/plausible_web/router.ex
+++ b/lib/plausible_web/router.ex
@@ -140,7 +140,8 @@ defmodule PlausibleWeb.Router do
       get("/swagger-ui", OpenApiSpex.Plug.SwaggerUI, path: "/api/plugins/spec/openapi")
     end
 
-    scope "/v1/capabilities", PlausibleWeb.Plugins.API.Controllers, assigns: %{plugins_api: true} do
+    scope "/v1/capabilities", PlausibleWeb.Plugins.API.Controllers,
+      assigns: %{plugins_api: true} do
       pipe_through([:plugins_api])
       get("/", Capabilities, :index)
     end
@@ -217,7 +218,8 @@ defmodule PlausibleWeb.Router do
     get "/timeseries", ExternalStatsController, :timeseries
   end
 
-  scope "/api/v2", PlausibleWeb.Api, assigns: %{api_scope: "stats:read:*", schema_type: :public} do
+  scope "/api/v2", PlausibleWeb.Api,
+    assigns: %{api_scope: "stats:read:*", schema_type: :public} do
     pipe_through [:public_api, PlausibleWeb.Plugs.AuthorizePublicAPI]
 
     post "/query", ExternalQueryApiController, :query
@@ -289,20 +291,15 @@ defmodule PlausibleWeb.Router do
     pipe_through [:browser, :csrf]
 
     scope alias: Live, assigns: %{connect_live_socket: true} do
-      pipe_through [PlausibleWeb.RequireLoggedOutPlug, :app_layout]
-
-      scope assigns: %{disable_registration_for: [:invite_only, true]} do
-        pipe_through PlausibleWeb.Plugs.MaybeDisableRegistration
-
-        live "/register", RegisterForm, :register_form, as: :auth
-      end
+      pipe_through [
+        PlausibleWeb.RequireLoggedOutPlug,
+        :app_layout,
+        PlausibleWeb.Plugs.MaybeDisableRegistration
+      ]
 
-      scope assigns: %{
-              disable_registration_for: true,
-              dogfood_page_path: "/register/invitation/:invitation_id"
-            } do
-        pipe_through PlausibleWeb.Plugs.MaybeDisableRegistration
+      live "/register", RegisterForm, :register_form, as: :auth
 
+      scope assigns: %{dogfood_page_path: "/register/invitation/:invitation_id"} do
         live "/register/invitation/:invitation_id", RegisterForm, :register_from_invitation_form,
           as: :auth
       end
diff --git a/lib/plausible_web/templates/email/site_setup_help_email.html.heex b/lib/plausible_web/templates/email/site_setup_help_email.html.heex
index 04b4d5d18599..d0b9d1721d36 100644
--- a/lib/plausible_web/templates/email/site_setup_help_email.html.heex
+++ b/lib/plausible_web/templates/email/site_setup_help_email.html.heex
@@ -1,6 +1,8 @@
-<%= if Plausible.ee?() and Plausible.Teams.on_trial?(@site.team) do %>
-  You signed up for a free 30-day trial of Plausible, a simple and privacy-friendly website analytics tool.
-  <br /><br />
+<%= if Plausible.ee?() do %>
+  <%= if Plausible.Teams.on_trial?(@site.team) do %>
+    You signed up for a free 30-day trial of Plausible, a simple and privacy-friendly website analytics tool.
+    <br /><br />
+  <% end %>
 <% end %>
 To finish your setup for <%= @site.domain %>, review
 <a href={"#{plausible_url()}/#{URI.encode_www_form(@site.domain)}/installation"}>your installation</a> and start collecting visitor statistics.
diff --git a/lib/plausible_web/templates/email/site_setup_success_email.html.heex b/lib/plausible_web/templates/email/site_setup_success_email.html.heex
index a6b70cfebf0f..3553411374b8 100644
--- a/lib/plausible_web/templates/email/site_setup_success_email.html.heex
+++ b/lib/plausible_web/templates/email/site_setup_success_email.html.heex
@@ -5,10 +5,12 @@ Do check out your <a href={"#{plausible_url()}/#{URI.encode_www_form(@site.domai
 <br /><br />
 Something looks off? Take a look at our <a href="https://plausible.io/docs/troubleshoot-integration">installation troubleshooting guide</a>.
 <br /><br />
-<%= if not Plausible.ce?() and Plausible.Teams.on_trial?(@site_team) do %>
-  You're on a 30-day free trial with no obligations so do take your time to explore Plausible.
-  Here's how to get <a href="https://plausible.io/docs/your-plausible-experience">the most out of your Plausible experience</a>.
-  <br /><br />
+<%= if Plausible.ee?() do %>
+  <%= if Plausible.Teams.on_trial?(@site_team) do %>
+    You're on a 30-day free trial with no obligations so do take your time to explore Plausible.
+    Here's how to get <a href="https://plausible.io/docs/your-plausible-experience">the most out of your Plausible experience</a>.
+    <br /><br />
+  <% end %>
 <% end %>
 PS: You can import your historical Google Analytics stats into your Plausible dashboard.
 <a href="https://plausible.io/docs/google-analytics-import">Learn how our GA importer works</a>.
diff --git a/lib/plausible_web/templates/layout/_header.html.heex b/lib/plausible_web/templates/layout/_header.html.heex
index 6ca73f09fe29..67394b917040 100644
--- a/lib/plausible_web/templates/layout/_header.html.heex
+++ b/lib/plausible_web/templates/layout/_header.html.heex
@@ -31,29 +31,33 @@
         <%= cond do %>
           <% @conn.assigns[:current_user] -> %>
             <ul class="flex items-center w-full sm:w-auto">
-              <li :if={
-                ee?() && @conn.assigns[:site] &&
-                  Plausible.Auth.is_super_admin?(@conn.assigns[:current_user])
-              }>
-                <.styled_link
-                  class="text-sm mr-6"
-                  href={PlausibleWeb.Endpoint.url() <> "/crm/sites/site/#{@conn.assigns[:site].id}"}
-                  new_tab={true}
-                >
-                  CRM
-                </.styled_link>
-              </li>
-              <li
-                :if={ee?() and Plausible.Teams.on_trial?(@conn.assigns[:my_team])}
-                class="hidden mr-6 sm:block"
-              >
-                <.styled_link
-                  class="text-sm text-yellow-900 dark:text-yellow-900 rounded px-3 py-2 rounded-md bg-yellow-100 dark:bg-yellow-100"
-                  href={Routes.settings_path(@conn, :subscription)}
+              <%= if ee?() do %>
+                <li :if={
+                  @conn.assigns[:site] &&
+                    Plausible.Auth.is_super_admin?(@conn.assigns[:current_user])
+                }>
+                  <.styled_link
+                    class="text-sm mr-6"
+                    href={PlausibleWeb.Endpoint.url() <> "/crm/sites/site/#{@conn.assigns[:site].id}"}
+                    new_tab={true}
+                  >
+                    CRM
+                  </.styled_link>
+                </li>
+              <% end %>
+              <%= if ee?() do %>
+                <li
+                  :if={Plausible.Teams.on_trial?(@conn.assigns[:my_team])}
+                  class="hidden mr-6 sm:block"
                 >
-                  <%= trial_notification(@conn.assigns[:my_team]) %>
-                </.styled_link>
-              </li>
+                  <.styled_link
+                    class="text-sm text-yellow-900 dark:text-yellow-900 rounded px-3 py-2 rounded-md bg-yellow-100 dark:bg-yellow-100"
+                    href={Routes.settings_path(@conn, :subscription)}
+                  >
+                    <%= trial_notification(@conn.assigns[:my_team]) %>
+                  </.styled_link>
+                </li>
+              <% end %>
               <li class="w-full sm:w-auto">
                 <.dropdown>
                   <:button class="flex items-center gap-3 px-3 py-2 rounded-md hover:bg-gray-100 dark:hover:bg-gray-800">
diff --git a/lib/plausible_web/templates/site/settings_people.html.heex b/lib/plausible_web/templates/site/settings_people.html.heex
index 516e9cd6c54f..1e631cd69081 100644
--- a/lib/plausible_web/templates/site/settings_people.html.heex
+++ b/lib/plausible_web/templates/site/settings_people.html.heex
@@ -32,13 +32,15 @@
                   <span class="text-gray-500 dark:text-gray-400">
                     <%= membership.user.email %>
                   </span>
-                  <.styled_link
-                    :if={ee?() and Plausible.Auth.is_super_admin?(@current_user)}
-                    new_tab={true}
-                    href={PlausibleWeb.Endpoint.url() <> "/crm/auth/user/#{membership.user.id}"}
-                  >
-                    CRM
-                  </.styled_link>
+                  <%= if ee?() do %>
+                    <.styled_link
+                      :if={Plausible.Auth.is_super_admin?(@current_user)}
+                      new_tab={true}
+                      href={PlausibleWeb.Endpoint.url() <> "/crm/auth/user/#{membership.user.id}"}
+                    >
+                      CRM
+                    </.styled_link>
+                  <% end %>
                 </p>
               </div>
 
diff --git a/lib/plausible_web/views/layout_view.ex b/lib/plausible_web/views/layout_view.ex
index 33435af9ddbc..11d1a4cb606b 100644
--- a/lib/plausible_web/views/layout_view.ex
+++ b/lib/plausible_web/views/layout_view.ex
@@ -40,12 +40,15 @@ defmodule PlausibleWeb.LayoutView do
     end
   end
 
-  def logo_path(filename) do
+  logo_path =
     if ee?() do
-      Path.join("/images/ee/", filename)
+      "/images/ee/"
     else
-      Path.join("/images/ce/", filename)
+      "/images/ce/"
     end
+
+  def logo_path(filename) do
+    Path.join(unquote(logo_path), filename)
   end
 
   def settings_tabs(conn) do
diff --git a/mix.lock b/mix.lock
index 59456e4ff966..af5883efd619 100644
--- a/mix.lock
+++ b/mix.lock
@@ -7,11 +7,11 @@
   "bcrypt_elixir": {:hex, :bcrypt_elixir, "3.1.0", "0b110a9a6c619b19a7f73fa3004aa11d6e719a67e672d1633dc36b6b2290a0f7", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "2ad2acb5a8bc049e8d5aa267802631912bb80d5f4110a178ae7999e69dca1bf7"},
   "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
   "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"},
-  "castore": {:hex, :castore, "1.0.9", "5cc77474afadf02c7c017823f460a17daa7908e991b0cc917febc90e466a375c", [:mix], [], "hexpm", "5ea956504f1ba6f2b4eb707061d8e17870de2bee95fb59d512872c2ef06925e7"},
+  "castore": {:hex, :castore, "1.0.10", "43bbeeac820f16c89f79721af1b3e092399b3a1ecc8df1a472738fd853574911", [:mix], [], "hexpm", "1b0b7ea14d889d9ea21202c43a4fa015eb913021cb535e8ed91946f4b77a8848"},
   "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
   "ch": {:hex, :ch, "0.2.9", "8273e27b741f2a31410c0c6291700abfbd262d0d9bd70b51c0deef624d6079b8", [:mix], [{:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: false]}], "hexpm", "889a12ad2dae69a6136b7109cbc73ba4f0d719f48d1a4c567ad3f95ad752a9c9"},
   "chatterbox": {:hex, :ts_chatterbox, "0.15.1", "5cac4d15dd7ad61fc3c4415ce4826fc563d4643dee897a558ec4ea0b1c835c9c", [:rebar3], [{:hpack, "~> 0.3.0", [hex: :hpack_erl, repo: "hexpm", optional: false]}], "hexpm", "4f75b91451338bc0da5f52f3480fa6ef6e3a2aeecfc33686d6b3d0a0948f31aa"},
-  "cldr_utils": {:hex, :cldr_utils, "2.27.0", "a75d5cdaaf6b7432eb10f547e6abe635c94746985c5b78e35bbbd08b16473b6c", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "516f601e28da10b8f1f3af565321c4e3da3b898a0b50a5e5be425eff76d587e1"},
+  "cldr_utils": {:hex, :cldr_utils, "2.28.2", "f500667164a9043369071e4f9dcef31f88b8589b2e2c07a1eb9f9fa53cb1dce9", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "c506eb1a170ba7cdca59b304ba02a56795ed119856662f6b1a420af80ec42551"},
   "cloak": {:hex, :cloak, "1.1.2", "7e0006c2b0b98d976d4f559080fabefd81f0e0a50a3c4b621f85ceeb563e80bb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "940d5ac4fcd51b252930fd112e319ea5ae6ab540b722f3ca60a85666759b9585"},
   "cloak_ecto": {:hex, :cloak_ecto, "1.2.0", "e86a3df3bf0dc8980f70406bcb0af2858bac247d55494d40bc58a152590bd402", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "8bcc677185c813fe64b786618bd6689b1707b35cd95acaae0834557b15a0c62f"},
   "combination": {:hex, :combination, "0.0.3", "746aedca63d833293ec6e835aa1f34974868829b1486b1e1cb0685f0b2ae1f41", [:mix], [], "hexpm", "72b099f463df42ef7dc6371d250c7070b57b6c5902853f69deb894f79eda18ca"},
@@ -25,9 +25,9 @@
   "credo": {:hex, :credo, "1.7.7", "771445037228f763f9b2afd612b6aa2fd8e28432a95dbbc60d8e03ce71ba4446", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "8bc87496c9aaacdc3f90f01b7b0582467b69b4bd2441fe8aae3109d843cc2f2e"},
   "ctx": {:hex, :ctx, "0.6.0", "8ff88b70e6400c4df90142e7f130625b82086077a45364a78d208ed3ed53c7fe", [:rebar3], [], "hexpm", "a14ed2d1b67723dbebbe423b28d7615eb0bdcba6ff28f2d1f1b0a7e1d4aa5fc2"},
   "db_connection": {:hex, :db_connection, "2.7.0", "b99faa9291bb09892c7da373bb82cba59aefa9b36300f6145c5f201c7adf48ec", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dcf08f31b2701f857dfc787fbad78223d61a32204f217f15e881dd93e4bdd3ff"},
-  "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
+  "decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"},
   "dialyxir": {:hex, :dialyxir, "1.4.3", "edd0124f358f0b9e95bfe53a9fcf806d615d8f838e2202a9f430d59566b6b53b", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"},
-  "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
+  "digital_token": {:hex, :digital_token, "1.0.0", "454a4444061943f7349a51ef74b7fb1ebd19e6a94f43ef711f7dae88c09347df", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "8ed6f5a8c2fa7b07147b9963db506a1b4c7475d9afca6492136535b064c9e9e6"},
   "double": {:hex, :double, "0.8.2", "8e1cfcccdaef76c18846bc08e555555a2a699b806fa207b6468572a60513cc6a", [:mix], [], "hexpm", "90287642b2ec86125e0457aaba2ab0e80f7d7050cc80a0cef733e59bd70aa67c"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
   "ecto": {:hex, :ecto, "3.12.4", "267c94d9f2969e6acc4dd5e3e3af5b05cdae89a4d549925f3008b2b7eb0b93c3", [: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", "ef04e4101688a67d061e1b10d7bc1fbf00d1d13c17eef08b71d070ff9188f747"},
@@ -41,16 +41,16 @@
   "esbuild": {:hex, :esbuild, "0.8.1", "0cbf919f0eccb136d2eeef0df49c4acf55336de864e63594adcea3814f3edf41", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.4", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "25fc876a67c13cb0a776e7b5d7974851556baeda2085296c14ab48555ea7560f"},
   "ex_aws": {:hex, :ex_aws, "2.5.1", "7418917974ea42e9e84b25e88b9f3d21a861d5f953ad453e212f48e593d8d39f", [:mix], [{:configparser_ex, "~> 4.0", [hex: :configparser_ex, repo: "hexpm", optional: true]}, {:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: true]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: true]}, {:jsx, "~> 2.8 or ~> 3.0", [hex: :jsx, repo: "hexpm", optional: true]}, {:mime, "~> 1.2 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:sweet_xml, "~> 0.7", [hex: :sweet_xml, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1b95431f70c446fa1871f0eb9b183043c5a625f75f9948a42d25f43ae2eff12b"},
   "ex_aws_s3": {:hex, :ex_aws_s3, "2.5.3", "422468e5c3e1a4da5298e66c3468b465cfd354b842e512cb1f6fbbe4e2f5bdaf", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm", "4f09dd372cc386550e484808c5ac5027766c8d0cd8271ccc578b82ee6ef4f3b8"},
-  "ex_cldr": {:hex, :ex_cldr, "2.39.2", "4a3a77797da8f900369822ea9353adfa035a5bbbbfff09b2d3d1b6fa461768e3", [:mix], [{:cldr_utils, "~> 2.25", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "02fd8913ef28d1b2a4190fd8016c2dec1f2291c9ce56c17d7649848c0261a6eb"},
-  "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.16.1", "29317f533cb5ec046d04523256cca4090291e9157028f28731395149b06ff8b2", [:mix], [{:ex_cldr, "~> 2.38", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "095d5e973bf0ee066dd1153990d10cb6fa6d8ff0e028295bdce7a7821c70a0e4"},
-  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.33.1", "49dc6e77e6d9ad22660aaa2480a7408ad3aedfbe517e4e83e5fe3a7bf5345770", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.38", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.16", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "c003bfaa3fdee6bab5195f128b94038c2ce1cf4879a759eef431dd075d9a5dac"},
+  "ex_cldr": {:hex, :ex_cldr, "2.40.1", "c1fcb0cd9d2a70d28f4540a99f32127e7f1813e0db109d65ab29dea5337ae266", [:mix], [{:cldr_utils, "~> 2.28", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.19", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: true]}], "hexpm", "509810702e8e81991851d9426ffe6b34b48b7b9baa12922e7b3fb8f6368606f3"},
+  "ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.16.3", "1ec6444b5d0c0aabba5a3bc321d73f1c9c751c6add92e7fb7775ccc071d96bd8", [:mix], [{:ex_cldr, "~> 2.38", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "4d1b5f8449fdf0ece6a2e5c7401ad8fcfde77ee6ea480bddc16e266dfa2b570c"},
+  "ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.33.4", "ecb06f40fc63f484a53d4ea80e1bdd6860ec44d3032f2b10b17340d34c0a13d5", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:digital_token, "~> 0.3 or ~> 1.0", [hex: :digital_token, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.38", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.16", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "d15b7e217e9e60c328e73045e51dc67d7ac5d2997247b833efab2c69b2ed06f5"},
   "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"},
   "ex_json_logger": {:hex, :ex_json_logger, "1.4.0", "ad1dcc1cfe6940ee1d9d489b20757c89769626ce34c4957548d6fbe155cd96f1", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "7548a1ecba290746e06214d2b3d8783c76760c779a8903a8e44bfd23a7340444"},
   "ex_json_schema": {:hex, :ex_json_schema, "0.10.2", "7c4b8c1481fdeb1741e2ce66223976edfb9bccebc8014f6aec35d4efe964fb71", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "37f43be60f8407659d4d0155a7e45e7f406dab1f827051d3d35858a709baf6a6"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_money": {:hex, :ex_money, "5.17.0", "9064a30d877d85b3e3ec7ca52339542037473bc71fc5c5b9f6c31d86516002b9", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.33", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:gringotts, "~> 1.1", [hex: :gringotts, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.0 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:poison, "~> 3.0 or ~> 4.0 or ~> 5.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm", "226aa8906c85cb121f1d0ead0b108b259ba68d92c8fc79fa1758d520ff5c84c0"},
   "excoveralls": {:hex, :excoveralls, "0.18.0", "b92497e69465dc51bc37a6422226ee690ab437e4c06877e836f1c18daeb35da9", [:mix], [{:castore, "~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "1109bb911f3cb583401760be49c02cbbd16aed66ea9509fc5479335d284da60b"},
-  "expo": {:hex, :expo, "0.5.2", "beba786aab8e3c5431813d7a44b828e7b922bfa431d6bfbada0904535342efe2", [:mix], [], "hexpm", "8c9bfa06ca017c9cb4020fabe980bc7fdb1aaec059fd004c2ab3bff03b1c599c"},
+  "expo": {:hex, :expo, "1.1.0", "f7b9ed7fb5745ebe1eeedf3d6f29226c5dd52897ac67c0f8af62a07e661e5c75", [:mix], [], "hexpm", "fbadf93f4700fb44c331362177bdca9eeb8097e8b0ef525c9cc501cb9917c960"},
   "file_system": {:hex, :file_system, "1.0.1", "79e8ceaddb0416f8b8cd02a0127bdbababe7bf4a23d2a395b983c1f8b3f73edd", [:mix], [], "hexpm", "4414d1f38863ddf9120720cd976fce5bdde8e91d8283353f0e31850fa89feb9e"},
   "finch": {:hex, :finch, "0.17.0", "17d06e1d44d891d20dbd437335eebe844e2426a0cd7e3a3e220b461127c73f70", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "8d014a661bb6a437263d4b5abf0bcbd3cf0deb26b1e8596f2a271d22e48934c7"},
   "floki": {:hex, :floki, "0.35.2", "87f8c75ed8654b9635b311774308b2760b47e9a579dabf2e4d5f1e1d42c39e0b", [:mix], [], "hexpm", "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"},
@@ -58,7 +58,7 @@
   "fun_with_flags_ui": {:hex, :fun_with_flags_ui, "1.0.0", "d764a4d1cc1233bdbb18dfb416a6ef96d0ecf4a5dc5a0201f7aa0b13cf2e7802", [:mix], [{:cowboy, ">= 2.0.0", [hex: :cowboy, repo: "hexpm", optional: true]}, {:fun_with_flags, "~> 1.11", [hex: :fun_with_flags, repo: "hexpm", optional: false]}, {:plug, "~> 1.12", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, ">= 2.0.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm", "b0c145894c00d65d5dc20ee5b1f18457985d1fd0b87866f0b41894d5979e55e0"},
   "gen_cycle": {:hex, :gen_cycle, "1.0.4", "2315199f1256116328fad6a9d4371c2fb0bc39c7f5111b88d2de582300c931cc", [:rebar3], [], "hexpm", "67817e31b352bb00715f80a5571b3c069e26e994b2ebafa376acf76a2d0f66d8"},
   "gen_smtp": {:hex, :gen_smtp, "1.2.0", "9cfc75c72a8821588b9b9fe947ae5ab2aed95a052b81237e0928633a13276fd3", [:rebar3], [{:ranch, ">= 1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"},
-  "gettext": {:hex, :gettext, "0.24.0", "6f4d90ac5f3111673cbefc4ebee96fe5f37a114861ab8c7b7d5b30a1108ce6d8", [:mix], [{:expo, "~> 0.5.1", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b"},
+  "gettext": {:hex, :gettext, "0.26.2", "5978aa7b21fada6deabf1f6341ddba50bc69c999e812211903b169799208f2a8", [:mix], [{:expo, "~> 0.5.1 or ~> 1.0", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "aa978504bcf76511efdc22d580ba08e2279caab1066b76bb9aa81c4a1e0a32a5"},
   "gproc": {:hex, :gproc, "0.9.1", "f1df0364423539cf0b80e8201c8b1839e229e5f9b3ccb944c5834626998f5b8c", [:rebar3], [], "hexpm", "905088e32e72127ed9466f0bac0d8e65704ca5e73ee5a62cb073c3117916d507"},
   "grpcbox": {:hex, :grpcbox, "0.17.1", "6e040ab3ef16fe699ffb513b0ef8e2e896da7b18931a1ef817143037c454bcce", [:rebar3], [{:acceptor_pool, "~> 1.0.0", [hex: :acceptor_pool, repo: "hexpm", optional: false]}, {:chatterbox, "~> 0.15.1", [hex: :ts_chatterbox, repo: "hexpm", optional: false]}, {:ctx, "~> 0.6.0", [hex: :ctx, repo: "hexpm", optional: false]}, {:gproc, "~> 0.9.1", [hex: :gproc, repo: "hexpm", optional: false]}], "hexpm", "4a3b5d7111daabc569dc9cbd9b202a3237d81c80bf97212fbc676832cb0ceb17"},
   "hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~> 2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~> 6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~> 1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~> 1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~> 1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"},
diff --git a/test/plausible/exports_test.exs b/test/plausible/exports_test.exs
index eebc8d1136a4..8458ae3ea827 100644
--- a/test/plausible/exports_test.exs
+++ b/test/plausible/exports_test.exs
@@ -90,7 +90,9 @@ defmodule Plausible.ExportsTest do
       end)
 
       assert {:ok, files} =
-               :zip.unzip(to_charlist(Path.join(tmp_dir, "numbers.zip")), cwd: tmp_dir)
+               :zip.unzip(to_charlist(Path.join(tmp_dir, "numbers.zip")),
+                 cwd: to_charlist(tmp_dir)
+               )
 
       assert Enum.map(files, &Path.basename/1) == ["1.csv", "2.csv"]
 
@@ -138,8 +140,10 @@ defmodule Plausible.ExportsTest do
         end)
       end
 
-      assert {:error, :einval} =
-               :zip.unzip(to_charlist(Path.join(tmp_dir, "failed.zip")), cwd: tmp_dir)
+      assert {:error, :bad_eocd} =
+               :zip.unzip(to_charlist(Path.join(tmp_dir, "failed.zip")),
+                 cwd: to_charlist(tmp_dir)
+               )
     end
   end
 end
diff --git a/test/plausible/imported/csv_importer_test.exs b/test/plausible/imported/csv_importer_test.exs
index 7e5831a952b2..75bd3f822820 100644
--- a/test/plausible/imported/csv_importer_test.exs
+++ b/test/plausible/imported/csv_importer_test.exs
@@ -560,7 +560,9 @@ defmodule Plausible.Imported.CSVImporterTest do
 
       # unzip archive
       {:ok, files} =
-        :zip.unzip(to_charlist(Path.join(tmp_dir, "plausible-export.zip")), cwd: tmp_dir)
+        :zip.unzip(to_charlist(Path.join(tmp_dir, "plausible-export.zip")),
+          cwd: to_charlist(tmp_dir)
+        )
 
       # upload csvs
       uploads =
diff --git a/test/plausible_web/controllers/api/stats_controller/imported_test.exs b/test/plausible_web/controllers/api/stats_controller/imported_test.exs
index 4e36ba8effea..ef7b03f0b83c 100644
--- a/test/plausible_web/controllers/api/stats_controller/imported_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/imported_test.exs
@@ -20,7 +20,7 @@ defmodule PlausibleWeb.Api.StatsController.ImportedTest do
             source: :google_analytics_4,
             start_date: ~D[2005-01-01],
             end_date: Timex.today(),
-            legacy: unquote(import_type) == :new_and_legacy
+            legacy: unquote(import_type == :new_and_legacy)
           }
 
         site_import =

From c64be81a8ad684d1d064ac23cd4a07d47069f706 Mon Sep 17 00:00:00 2001
From: ruslandoga <ruslandoga+gh@icloud.com>
Date: Sat, 28 Dec 2024 11:09:43 +0000
Subject: [PATCH 2/3] try v1.18.1

---
 .tool-versions | 2 +-
 Dockerfile     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 276dee0388d9..953250e9d7ff 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
 erlang 27.2
-elixir 1.18.0-otp-27
+elixir 1.18.1-otp-27
 nodejs 21.7.3
diff --git a/Dockerfile b/Dockerfile
index 041e2792c1aa..837d2d131ab8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # platform specific, it makes sense to build it in the docker
 
 #### Builder
-FROM hexpm/elixir:1.18.0-erlang-27.2-alpine-3.20.1 AS buildcontainer
+FROM hexpm/elixir:1.18.1-erlang-27.2-alpine-3.20.1 AS buildcontainer
 
 ARG MIX_ENV=ce
 

From e89d74ec7394405a5122c5c9ead75cd02bf4e1ff Mon Sep 17 00:00:00 2001
From: ruslandoga <ruslandoga+gh@icloud.com>
Date: Mon, 6 Jan 2025 13:20:59 +0300
Subject: [PATCH 3/3] pin 1.18

---
 mix.exs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index bff10a52e8a9..0a55bb2a521e 100644
--- a/mix.exs
+++ b/mix.exs
@@ -8,7 +8,7 @@ defmodule Plausible.MixProject do
       docs: docs(),
       app: :plausible,
       version: System.get_env("APP_VERSION", "0.0.1"),
-      elixir: "~> 1.17",
+      elixir: "~> 1.18",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() in [:prod, :ce],
       aliases: aliases(),