Merge branch 'develop' into feature/use-filtered-fields-in-ecto-adapter

Author: Flo0807

.github/renovate.json

@@ -12,11 +12,22 @@
     ":automergePatch",
     "helpers:pinGitHubActionDigestsToSemver"
   ],
+  "pinDigests": false,
   "lockFileMaintenance": {
-    "enabled": true
+    "enabled": true,
+    "extends": [
+      "schedule:weekly"
+    ]
   },
   "additionalBranchPrefix": "{{packageFileDir}}-",
   "packageRules": [
+    {
+      "description": "Set Mix versioning strategy to update-lockfile",
+      "matchManagers": [
+        "mix"
+      ],
+      "rangeStrategy": "update-lockfile"
+    },
     {
       "description": "Group dependency updates to the Elixir base image",
       "groupName": "Base Image",
@@ -28,16 +39,15 @@
       "pinDigests": false
     },
     {
-      "description": "Disable ubuntu major updates and digest pinning",
+      "description": "Disable ubuntu major updates",
       "matchDatasources": [
         "docker"
       ],
       "matchDepNames": [
         "ubuntu"
       ],
       "matchUpdateTypes": [
-        "major",
-        "pinDigest"
+        "major"
       ],
       "enabled": false
     },
@@ -46,16 +56,10 @@
       "matchDatasources": [
         "docker"
       ],
-      "automerge": false
-    },
-    {
-      "matchManagers": [
-        "mix"
-      ],
-      "rangeStrategy": "update-lockfile"
+      "automerge": true
     },
     {
-      "description": "Automatically merge github actions updates",
+      "description": "Automatically merge non-major github actions updates",
       "matchManagers": [
         "github-actions"
       ],
@@ -67,6 +71,26 @@
       ],
       "automerge": true
     },
+    {
+      "description": "Automerge some non-major node package updates",
+      "matchDepNames": [
+        "@sentry/browser",
+        "stylelint",
+        "stylelint-config-standard",
+        "standard",
+        "playwright",
+        "topbar",
+        "npm-run-all2"
+      ],
+      "matchDatasources": [
+        "npm"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ],
+      "automerge": true
+    },
     {
       "description": "Label dependency updates in demo directory",
       "matchFileNames": [

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - uses: erlef/setup-beam@e6d7c94229049569db56a7ad5a540c051a010af9 # v1.20.4
         with:
@@ -41,12 +41,12 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version: 20
+          node-version: 22
           cache: 'yarn'
           cache-dependency-path: yarn.lock
 
       - name: Restore the deps and _build cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         id: restore-cache
         env:
           MIX_LOCK_HASH: ${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
@@ -99,6 +99,9 @@ jobs:
       - name: Gettext Check
         run: mix gettext.extract --check-up-to-date
 
+      - name: Check assets up-to-date
+        run: mix assets.check
+
   publish:
     needs: test
     if: github.event_name == 'release'
@@ -107,7 +110,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - uses: erlef/setup-beam@e6d7c94229049569db56a7ad5a540c051a010af9 # v1.20.4
         id: beam
@@ -132,7 +135,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:16.9@sha256:fec2740c517838d4f582e48a8a9a1cb51082af3dcae59e9b12a66ec262302b97
+        image: postgres:16.10@sha256:66a5efb5677ffac1037774a0e141fd3a4c035c9c0c0e624c9cc980dfa10f45e5
         env:
           POSTGRES_PASSWORD: postgres
         options: >-
@@ -145,7 +148,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Setup beam
         uses: erlef/setup-beam@e6d7c94229049569db56a7ad5a540c051a010af9 # v1.20.4
@@ -157,12 +160,12 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
-          node-version: 20
+          node-version: 22
           cache: 'yarn'
           cache-dependency-path: demo/yarn.lock
 
       - name: Restore the deps and _build cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         id: restore-cache
         env:
           OTP_VERSION: ${{ steps.beam.outputs.otp-version }}
@@ -262,22 +265,22 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Log in to the container registry
         if: env.PUSH_IMAGE == 'true'
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_RUNTIME }}
 

Dockerfile

@@ -7,7 +7,7 @@ ARG ELIXIR_VERSION=1.18.4
 # renovate: datasource=github-tags depName=erlang packageName=erlang/otp versioning=regex:^(?<major>\d+?)\.(?<minor>\d+?)(\.(?<patch>\d+))?$ extractVersion=^OTP-(?<version>\S+)
 ARG OTP_VERSION=28.0.2
 # renovate: datasource=docker depName=ubuntu packageName=ubuntu versioning=ubuntu
-ARG UBUNTU_VERSION=noble-20250714
+ARG UBUNTU_VERSION=noble-20250805
 
 ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-ubuntu-${UBUNTU_VERSION}"
 ARG RUNTIME_IMAGE="ubuntu:${UBUNTU_VERSION}"
@@ -56,14 +56,15 @@ RUN mix do deps.compile
 COPY demo/priv priv/
 COPY demo/package.json demo/yarn.lock demo/.stylelintrc.json ./
 
+COPY assets ../assets/
+COPY package.json ../
+
 RUN yarn install --pure-lockfile
 
 COPY demo/assets assets/
 COPY demo/lib lib/
 
-COPY assets ../assets/
-COPY package.json ../
-
+RUN mix compile
 RUN mix assets.deploy
 
 # Copy the rest of the application files

compose.yml

@@ -20,7 +20,7 @@ services:
       postgres:
         condition: service_healthy
   postgres:
-    image: postgres:16.9@sha256:fec2740c517838d4f582e48a8a9a1cb51082af3dcae59e9b12a66ec262302b97
+    image: postgres:16.10@sha256:66a5efb5677ffac1037774a0e141fd3a4c035c9c0c0e624c9cc980dfa10f45e5
     environment:
       - POSTGRES_PASSWORD=postgres
     ports:

config/config.exs

@@ -0,0 +1,18 @@
+import Config
+
+if Mix.env() == :dev do
+  esbuild = fn args ->
+    [
+      args: ~w(./js/backpex --bundle) ++ args,
+      cd: Path.expand("../assets", __DIR__),
+      env: %{"NODE_PATH" => Path.expand("../deps", __DIR__)}
+    ]
+  end
+
+  config :esbuild,
+    version: "0.25.9",
+    module: esbuild.(~w(--format=esm --sourcemap --outfile=../priv/static/js/backpex.esm.js)),
+    main: esbuild.(~w(--format=cjs --sourcemap --outfile=../priv/static/js/backpex.cjs.js))
+end
+
+import_config "#{config_env()}.exs"

config/dev.exs

@@ -0,0 +1 @@
+import Config

config/test.exs

@@ -0,0 +1,4 @@
+import Config
+
+config :logger, :level, :debug
+config :logger, :default_handler, false

demo/.gitignore

@@ -22,6 +22,7 @@ erl_crash.dump
 demo-*.tar
 /priv/cert
 /priv/static/assets/
+/priv/static/js
 /priv/static/cache_manifest.json
 report.*.json
 openapi.json

demo/assets/css/app.css

@@ -1,6 +1,6 @@
 @import "tailwindcss";
 
-@plugin "./tailwind_heroicons.js";
+@plugin "../vendor/heroicons";
 
 @plugin "daisyui" {
   themes: all;

demo/assets/js/app.js

@@ -3,7 +3,10 @@ import * as Sentry from '@sentry/browser'
 import topbar from 'topbar'
 import { Socket } from 'phoenix'
 import { LiveSocket } from 'phoenix_live_view'
-import { Hooks as BackpexHooks } from 'backpex'
+import { hooks as colocatedHooks } from 'phoenix-colocated/demo'
+// in your app.js, just use 'backpex' like this:
+// import { Hooks as BackpexHooks } from 'backpex'
+import { Hooks as BackpexHooks } from '#backpex'
 
 /**
  * Sentry
@@ -32,7 +35,7 @@ const csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute
 
 const liveSocket = new LiveSocket('/live', Socket, {
   params: { _csrf_token: csrfToken },
-  hooks: { ...BackpexHooks }
+  hooks: { ...BackpexHooks, ...colocatedHooks }
 })
 
 liveSocket.connect()
@@ -41,3 +44,38 @@ liveSocket.connect()
  * Globals
  */
 window.liveSocket = liveSocket
+
+// The lines below enable quality of life phoenix_live_reload
+// development features:
+//
+//     1. stream server logs to the browser console
+//     2. click on elements to jump to their definitions in your code editor
+//
+if (process.env.NODE_ENV === 'development') {
+  window.addEventListener('phx:live_reload:attached', ({ detail: reloader }) => {
+    // Enable server log streaming to client.
+    // Disable with reloader.disableServerLogs()
+    reloader.enableServerLogs()
+
+    // Open configured PLUG_EDITOR at file:line of the clicked element's HEEx component
+    //
+    //   * click with "c" key pressed to open at caller location
+    //   * click with "d" key pressed to open at function component definition location
+    let keyDown
+    window.addEventListener('keydown', function (e) { keyDown = e.key })
+    window.addEventListener('keyup', function (e) { keyDown = null })
+    window.addEventListener('click', function (e) {
+      if (keyDown === 'c') {
+        e.preventDefault()
+        e.stopImmediatePropagation()
+        reloader.openEditorAtCaller(e.target)
+      } else if (keyDown === 'd') {
+        e.preventDefault()
+        e.stopImmediatePropagation()
+        reloader.openEditorAtDef(e.target)
+      }
+    }, true)
+
+    window.liveReloader = reloader
+  })
+}