hum

Author: aerosol

.github/workflows/elixir.yml

@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CACHE_VERSION: v16
+  CACHE_VERSION: v17
   PERSISTENT_CACHE_DIR: cached
 
 jobs:

Dockerfile

@@ -1,8 +1,10 @@
 # we can not use the pre-built tar because the distribution is
 # platform specific, it makes sense to build it in the docker
 
+ARG ALPINE_VERSION=3.22.2
+
 #### Builder
-FROM hexpm/elixir:1.19.4-erlang-27.3.4-6-alpine-3.22.2 AS buildcontainer
+FROM hexpm/elixir:1.19.4-erlang-27.3.4.6-alpine-${ALPINE_VERSION} AS buildcontainer
 
 ARG MIX_ENV=ce
 
@@ -20,7 +22,7 @@ RUN mkdir /app
 WORKDIR /app
 
 # install build dependencies
-RUN apk add --no-cache git "nodejs-current=23.2.0-r1" yarn npm python3 ca-certificates wget gnupg make gcc libc-dev brotli
+RUN apk add --no-cache git "nodejs-current=23.11.1-r0" yarn npm python3 ca-certificates wget gnupg make gcc libc-dev brotli
 
 COPY mix.exs ./
 COPY mix.lock ./
@@ -54,7 +56,8 @@ COPY rel rel
 RUN mix release plausible
 
 # Main Docker Image
-FROM alpine:3.21.3
+FROM alpine:${ALPINE_VERSION}
+
 LABEL maintainer="plausible.io <hello@plausible.io>"
 
 ARG BUILD_METADATA={}
@@ -84,3 +87,4 @@ EXPOSE 8000
 ENV DEFAULT_DATA_DIR=/var/lib/plausible
 VOLUME /var/lib/plausible
 CMD ["run"]
+

extra/lib/plausible_web/plugins/api/controllers/funnels.ex

@@ -5,7 +5,7 @@ defmodule PlausibleWeb.Plugins.API.Controllers.Funnels do
   use PlausibleWeb, :plugins_api_controller
 
   operation(:create,
-    id: "Funnel.GetOrCreate",
+    operation_id: "Funnel.GetOrCreate",
     summary: "Get or create Funnel",
     request_body: {"Funnel params", "application/json", Schemas.Funnel.CreateRequest},
     responses: %{

lib/plausible/google/ga4/api.ex

@@ -202,7 +202,7 @@ defmodule Plausible.Google.GA4.API do
     end
   end
 
-  defp prepare_request(report_request = %GA4.ReportRequest{}, date_range, property, access_token) do
+  defp prepare_request(%GA4.ReportRequest{} = report_request, date_range, property, access_token) do
     %GA4.ReportRequest{
       report_request
       | date_range: date_range,

lib/plausible/stats/query_optimizer.ex

@@ -100,7 +100,7 @@ defmodule Plausible.Stats.QueryOptimizer do
     end
   end
 
-  defp update_time_in_order_by(query = %Query{}) do
+  defp update_time_in_order_by(%Query{} = query) do
     order_by =
       query.order_by
       |> Enum.map(fn
@@ -126,7 +126,7 @@ defmodule Plausible.Stats.QueryOptimizer do
   # To avoid showing referrers across hostnames when event:hostname
   # filter is present for breakdowns, add entry/exit page hostname
   # filters
-  defp extend_hostname_filters_to_visit(query = %Query{}) do
+  defp extend_hostname_filters_to_visit(%Query{} = query) do
     # Note: Only works since event:hostname is only allowed as a top level filter
     hostname_filters =
       query.filters

lib/plausible_web/controllers/avatar_controller.ex

@@ -31,7 +31,7 @@ defmodule PlausibleWeb.AvatarController do
   end
 
   @forwarded_headers ["content-type", "cache-control", "expires"]
-  defp forward_headers(conn = %Plug.Conn{}, headers) do
+  defp forward_headers(%Plug.Conn{} = conn, headers) do
     headers_to_forward = Enum.filter(headers, fn {k, _} -> k in @forwarded_headers end)
     %Plug.Conn{conn | resp_headers: headers_to_forward}
   end

lib/plausible_web/plugins/api/controllers/custom_props.ex

@@ -5,7 +5,7 @@ defmodule PlausibleWeb.Plugins.API.Controllers.CustomProps do
   use PlausibleWeb, :plugins_api_controller
 
   operation(:enable,
-    id: "CustomProp.GetOrEnable",
+    operation_id: "CustomProp.GetOrEnable",
     summary: "Get or enable CustomProp(s)",
     request_body:
       {"CustomProp enable params", "application/json", Schemas.CustomProp.EnableRequest},
@@ -50,7 +50,7 @@ defmodule PlausibleWeb.Plugins.API.Controllers.CustomProps do
   end
 
   operation(:disable,
-    id: "CustomProp.DisableBulk",
+    operation_id: "CustomProp.DisableBulk",
     summary: "Disable CustomProp(s)",
     request_body:
       {"CustomProp disable params", "application/json", Schemas.CustomProp.DisableRequest},

lib/plausible_web/plugins/api/controllers/goals.ex

@@ -5,7 +5,7 @@ defmodule PlausibleWeb.Plugins.API.Controllers.Goals do
   use PlausibleWeb, :plugins_api_controller
 
   operation(:create,
-    id: "Goal.GetOrCreate",
+    operation_id: "Goal.GetOrCreate",
     summary: "Get or create Goal",
     request_body: {"Goal params", "application/json", Schemas.Goal.CreateRequest},
     responses: %{
@@ -141,7 +141,7 @@ defmodule PlausibleWeb.Plugins.API.Controllers.Goals do
   end
 
   operation(:delete_bulk,
-    id: "Goal.DeleteBulk",
+    operation_id: "Goal.DeleteBulk",
     summary: "Delete Goals in bulk",
     request_body: {"Goal params", "application/json", Schemas.Goal.DeleteBulkRequest},
     responses: %{

lib/plausible_web/plugs/favicon.ex

@@ -130,7 +130,7 @@ defmodule PlausibleWeb.Favicon do
   end
 
   @forwarded_headers ["content-type", "cache-control", "expires"]
-  defp forward_headers(conn = %Plug.Conn{}, headers) do
+  defp forward_headers(%Plug.Conn{} = conn, headers) do
     headers_to_forward = Enum.filter(headers, fn {k, _} -> k in @forwarded_headers end)
     %Plug.Conn{conn | resp_headers: headers_to_forward}
   end

mix.exs

@@ -70,24 +70,24 @@ defmodule Plausible.MixProject do
       {:bamboo_mua, "~> 0.2.0"},
       {:bcrypt_elixir, "~> 3.3"},
       {:bypass, "~> 2.1", only: [:dev, :test, :ce_test]},
-      {:ecto_ch, "~> 0.7.1"},
+      {:ecto_ch, "~> 0.8.2"},
       {:cloak, "~> 1.1"},
       {:cloak_ecto, "~> 1.2"},
       {:combination, "~> 0.0.3"},
       {:cors_plug, "~> 3.0"},
       {:credo, "~> 1.5", only: [:dev, :test], runtime: false},
       {:dialyxir, "~> 1.0", only: [:dev, :test], runtime: false},
       {:double, "~> 0.8.0", only: [:dev, :test, :ce_test, :ce_dev]},
-      {:ecto, "~> 3.13.2"},
+      {:ecto, "~> 3.13.5"},
       {:ecto_sql, "~> 3.13.2"},
       {:envy, "~> 1.1.1"},
       {:eqrcode, "~> 0.2.1"},
       {:ex_machina, "~> 2.3", only: [:dev, :test, :ce_dev, :ce_test]},
       {:excoveralls, "~> 0.10", only: :test},
-      {:finch, "~> 0.19.0"},
+      {:finch, "~> 0.20.0"},
       {:floki, "~> 0.36"},
       {:lazy_html, "~> 0.1.8"},
-      {:fun_with_flags, "~> 1.11.0"},
+      {:fun_with_flags, "~> 1.13.0"},
       {:fun_with_flags_ui, "~> 1.0"},
       {:locus, "~> 2.3"},
       {:gen_cycle, "~> 1.0.4"},
@@ -97,33 +97,33 @@ defmodule Plausible.MixProject do
       {:mox, "~> 1.0", only: [:test, :ce_test]},
       {:nanoid, "~> 2.1.0"},
       {:nimble_totp, "~> 1.0"},
-      {:oban, "~> 2.19.1"},
+      {:oban, "~> 2.20.1"},
       {:observer_cli, "~> 1.7"},
       {:opentelemetry, "~> 1.1"},
       {:opentelemetry_api, "~> 1.1"},
       {:opentelemetry_ecto, "~> 1.1.0"},
       {:opentelemetry_exporter, "~> 1.6.0"},
       {:opentelemetry_phoenix, "~> 1.0"},
       {:opentelemetry_oban, "~> 1.1.1"},
-      {:phoenix, "~> 1.8.0"},
+      {:phoenix, "~> 1.8.2"},
       {:phoenix_view, "~> 2.0"},
       {:phoenix_ecto, "~> 4.5"},
       {:phoenix_html, "~> 4.1"},
       {:phoenix_live_reload, "~> 1.2", only: [:dev, :ce_dev]},
       {:phoenix_pubsub, "~> 2.0"},
-      {:phoenix_live_view, "~> 1.1"},
+      {:phoenix_live_view, "~> 1.1.17"},
       {:php_serializer, "~> 2.0"},
       {:plug, "~> 1.13", override: true},
       {:prima, "~> 0.2.1"},
       {:plug_cowboy, "~> 2.3"},
       {:polymorphic_embed, "~> 5.0"},
-      {:postgrex, "~> 0.19.0"},
+      {:postgrex, "~> 0.21.1"},
       {:prom_ex, "~> 1.8"},
-      {:peep, "~> 3.4"},
+      {:peep, "~> 3.0"},
       {:public_suffix, git: "https://github.com/axelson/publicsuffix-elixir"},
       {:ref_inspector, "~> 2.0"},
       {:referrer_blocklist, git: "https://github.com/plausible/referrer-blocklist.git"},
-      {:sentry, "~> 10.8.1"},
+      {:sentry, "~> 11.0.4"},
       {:simple_saml, "~> 1.2"},
       {:xml_builder, "~> 2.1"},
       {:siphash, "~> 3.2"},
@@ -136,24 +136,24 @@ defmodule Plausible.MixProject do
       {:mjml, "~> 3.1.0"},
       {:heroicons, "~> 0.5.0"},
       {:zxcvbn, git: "https://github.com/techgaun/zxcvbn-elixir.git"},
-      {:open_api_spex, "~> 3.18"},
+      {:open_api_spex, "~> 3.22.1"},
       {:joken, "~> 2.5"},
       {:paginator, git: "https://github.com/duffelhq/paginator.git"},
-      {:scrivener_ecto, "~> 2.0"},
+      {:scrivener_ecto, "~> 3.1"},
       {:esbuild, "~> 0.7", runtime: Mix.env() in [:dev, :ce_dev]},
       {:tailwind, "~> 0.4.0", runtime: Mix.env() in [:dev, :ce_dev]},
       {:ex_json_logger, "~> 1.4.0"},
-      {:ecto_network, "~> 1.5.0"},
+      {:ecto_network, "~> 1.6.0"},
       {:ex_aws, "~> 2.5"},
       {:ex_aws_s3, "~> 2.5"},
       {:sweet_xml, "~> 0.7.4"},
       {:zstream, "~> 0.6.4"},
       {:con_cache,
        git: "https://github.com/aerosol/con_cache", branch: "ensure-dirty-ops-emit-telemetry"},
-      {:req, "~> 0.5.0"},
+      {:req, "~> 0.5.16"},
       {:happy_tcp, github: "ruslandoga/happy_tcp", only: [:ce, :ce_dev, :ce_test]},
-      {:ex_json_schema, "~> 0.10.2"},
-      {:odgn_json_pointer, "~> 3.0.1"},
+      {:ex_json_schema, "~> 0.11.1"},
+      {:odgn_json_pointer, "~> 3.1.0"},
       {:phoenix_bakery, "~> 0.1.2", only: [:ce, :ce_dev, :ce_test]},
       {:site_encrypt, github: "sasa1977/site_encrypt", only: [:ce, :ce_dev, :ce_test]},
       {:phoenix_storybook, "~> 0.9"},