diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 484a2e9..7109760 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,7 @@ name: CI env: - ELIXIR_VERSION: "1.17" + ELIXIR_VERSION: "1.18" OTP_VERSION: "27" on: @@ -14,14 +14,11 @@ on: jobs: tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}} strategy: matrix: include: - - { elixir: 1.13, otp: 23 } - - { elixir: 1.13, otp: 24 } - - { elixir: 1.14, otp: 23 } - { elixir: 1.14, otp: 24 } - { elixir: 1.14, otp: 25 } - { elixir: 1.15, otp: 24 } @@ -33,6 +30,9 @@ jobs: - { elixir: 1.17, otp: 25 } - { elixir: 1.17, otp: 26 } - { elixir: 1.17, otp: 27 } + - { elixir: 1.18, otp: 25 } + - { elixir: 1.18, otp: 26 } + - { elixir: 1.18, otp: 27 } env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -61,7 +61,7 @@ jobs: matrix-results: if: ${{ always() }} - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 name: Tests needs: - tests @@ -75,7 +75,7 @@ jobs: fi example-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Example application tests env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -121,7 +121,7 @@ jobs: run: mix test code-quality: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Code Quality env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/example/lib/nested_web/components/core_components.ex b/example/lib/nested_web/components/core_components.ex index 4128aa5..3a95595 100644 --- a/example/lib/nested_web/components/core_components.ex +++ b/example/lib/nested_web/components/core_components.ex @@ -92,17 +92,17 @@ defmodule NestedWeb.CoreComponents do id={"#{@id}-title"} class="text-lg font-semibold leading-8 text-zinc-800" > - <%= render_slot(@title) %> + {render_slot(@title)}

- <%= render_slot(@subtitle) %> + {render_slot(@subtitle)}

- <%= render_slot(@inner_block) %> + {render_slot(@inner_block)}
- <%= render_slot(confirm) %> + {render_slot(confirm)} <.link :for={cancel <- @cancel} phx-click={hide_modal(@on_cancel, @id)} class="text-sm font-semibold leading-6 text-zinc-900 hover:text-zinc-700" > - <%= render_slot(cancel) %> + {render_slot(cancel)}
@@ -184,9 +184,9 @@ defmodule NestedWeb.CoreComponents do > - <%= @title %> + {@title}

-

<%= msg %>

+

{msg}

""" end @@ -377,9 +377,9 @@ defmodule NestedWeb.CoreComponents do class="rounded border-zinc-300 text-zinc-900 focus:ring-zinc-900" {@rest} /> - <%= @label %> + {@label} - <.error :for={msg <- @errors}><%= msg %> + <.error :for={msg <- @errors}>{msg} """ end @@ -387,7 +387,7 @@ defmodule NestedWeb.CoreComponents do def input(%{type: "select"} = assigns) do ~H"""
- <.label for={@id}><%= @label %> + <.label for={@id}>{@label} - <.error :for={msg <- @errors}><%= msg %> + <.error :for={msg <- @errors}>{msg}
""" end @@ -406,7 +406,7 @@ defmodule NestedWeb.CoreComponents do def input(%{type: "textarea"} = assigns) do ~H"""
- <.label for={@id}><%= @label %> + <.label for={@id}>{@label} - <.error :for={msg <- @errors}><%= msg %> + <.error :for={msg <- @errors}>{msg}
""" end @@ -428,7 +428,7 @@ defmodule NestedWeb.CoreComponents do def input(assigns) do ~H"""
- <.label for={@id}><%= @label %> + <.label for={@id}>{@label} - <.error :for={msg <- @errors}><%= msg %> + <.error :for={msg <- @errors}>{msg}
""" end @@ -458,7 +458,7 @@ defmodule NestedWeb.CoreComponents do def label(assigns) do ~H""" """ end @@ -475,7 +475,7 @@ defmodule NestedWeb.CoreComponents do mini class="mt-0.5 h-5 w-5 flex-none fill-rose-500" /> - <%= render_slot(@inner_block) %> + {render_slot(@inner_block)}

""" end @@ -497,13 +497,13 @@ defmodule NestedWeb.CoreComponents do ]}>

- <%= render_slot(@inner_block) %> + {render_slot(@inner_block)}

- <%= render_slot(@subtitle) %> + {render_slot(@subtitle)}

-
<%= render_slot(@actions) %>
+
{render_slot(@actions)}
""" end @@ -553,7 +553,7 @@ defmodule NestedWeb.CoreComponents do - <%= col[:label] %> + {col[:label]} Actions @@ -576,7 +576,7 @@ defmodule NestedWeb.CoreComponents do
- <%= render_slot(col, @row_item.(row)) %> + {render_slot(col, @row_item.(row))}
@@ -587,7 +587,7 @@ defmodule NestedWeb.CoreComponents do :for={action <- @action} class="relative ml-4 font-semibold leading-6 text-zinc-900 hover:text-zinc-700" > - <%= render_slot(action, @row_item.(row)) %> + {render_slot(action, @row_item.(row))} @@ -618,9 +618,9 @@ defmodule NestedWeb.CoreComponents do
- <%= item.title %> + {item.title}
-
<%= render_slot(item) %>
+
{render_slot(item)}
@@ -645,7 +645,7 @@ defmodule NestedWeb.CoreComponents do class="text-sm font-semibold leading-6 text-zinc-900 hover:text-zinc-700" > - <%= render_slot(@inner_block) %> + {render_slot(@inner_block)} """ diff --git a/example/lib/nested_web/components/layouts/app.html.heex b/example/lib/nested_web/components/layouts/app.html.heex index 31707d9..46537ec 100644 --- a/example/lib/nested_web/components/layouts/app.html.heex +++ b/example/lib/nested_web/components/layouts/app.html.heex @@ -10,6 +10,6 @@
<.flash_group flash={@flash} /> - <%= @inner_content %> + {@inner_content}
diff --git a/example/lib/nested_web/components/layouts/root.html.heex b/example/lib/nested_web/components/layouts/root.html.heex index 0bd669d..8c71446 100644 --- a/example/lib/nested_web/components/layouts/root.html.heex +++ b/example/lib/nested_web/components/layouts/root.html.heex @@ -5,7 +5,7 @@ <.live_title suffix=" ยท Ecto Nested Changeset"> - <%= assigns[:page_title] || "Demo" %> + {assigns[:page_title] || "Demo"}