From de15cfeb336e5a4e62272df9e4fe13b1ad3cf115 Mon Sep 17 00:00:00 2001 From: Mayel de Borniol Date: Wed, 9 Oct 2024 13:48:32 +0100 Subject: [PATCH] https://github.com/bonfire-networks/bonfire-app/issues/1043 --- flavours/classic/config/config.exs | 11 ++++++----- mix.exs | 2 +- mix.lock | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/flavours/classic/config/config.exs b/flavours/classic/config/config.exs index efb83ba501..edb4d7128a 100644 --- a/flavours/classic/config/config.exs +++ b/flavours/classic/config/config.exs @@ -304,11 +304,12 @@ config :phoenix, :template_engines, neex: LiveViewNative.Engine config :live_view_native_stylesheet, content: [ - # swiftui: ["lib/**/*swiftui*"] ++ - # for dep <- bonfire_deps do - # if Mix.Project.deps_paths[dep], do: {dep, "lib/**/*swiftui*"} - # end - # |> Enum.reject(&is_nil/1) + swiftui: + (["lib/**/*swiftui*"] ++ + for dep <- bonfire_deps do + if Mix.Project.deps_paths()[dep], do: {dep, "lib/**/*swiftui*"} + end) + |> Enum.reject(&is_nil/1) ] |> IO.inspect(limit: :infinity), output: "assets/static/assets" diff --git a/mix.exs b/mix.exs index ba747a3957..b724f2ee4a 100644 --- a/mix.exs +++ b/mix.exs @@ -239,7 +239,7 @@ defmodule Bonfire.Umbrella.MixProject do "ecto_materialized_path", "exto", "untangle", - "grumble", + # "grumble", "linkify", "verbs", "voodoo", diff --git a/mix.lock b/mix.lock index 073b26a4eb..a682bd87ea 100644 --- a/mix.lock +++ b/mix.lock @@ -216,7 +216,7 @@ "live_select": {:hex, :live_select, "1.4.2", "193056948a52144177bb53266b116117c5ae129939a67f15d7927750d35dd1a9", [:mix], [{:ecto, "~> 3.8", [hex: :ecto, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, ">= 1.6.0", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_html_helpers, "~> 1.0", [hex: :phoenix_html_helpers, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.19", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "fc59e20d8fcb78f3971e898019ad82a4fe2bb516414ccfd63c8463231030ed1f"}, "live_view_native": {:hex, :live_view_native, "0.3.1", "da64f1507e772b6cf8be99c85c6b300a03d64c46ceabc9f00b1f97962cc49e2d", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.10", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0.4", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.5", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.5", [hex: :sourceror, repo: "hexpm", optional: false]}, {:text_diff, "~> 0.1", [hex: :text_diff, repo: "hexpm", optional: false]}], "hexpm", "fd526dd025f58393a2d648c9ec22383464037f7effe5d62061029743e7572a86"}, "live_view_native_live_form": {:hex, :live_view_native_live_form, "0.3.1", "5cf84867bdc9bfd9341147cfed9355abd1a9bd87ffd10295ba15bc15de7df70e", [:mix], [{:live_view_native, "~> 0.3.1", [hex: :live_view_native, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.4", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "5a7405463bc12d73dd87a9a9081217cfa4d188545807fcd152c0570f5eb6061a"}, - "live_view_native_stylesheet": {:hex, :live_view_native_stylesheet, "0.3.1", "71a1cee29ec3fe0003949250035ec905e6e7c706928e94ff8823be8108267e1b", [:mix], [{:live_view_native, "~> 0.3.1", [hex: :live_view_native, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "ca2a9a47b34be56099d6c1523a2cb69274ba2a5ecff441cacb4b885483fb39b3"}, + "live_view_native_stylesheet": {:git, "https://github.com/bonfire-networks/live_view_native_stylesheet", "19231a16861adbf9f3f5b68b6b6261a2508ad84c", []}, "live_view_native_swiftui": {:hex, :live_view_native_swiftui, "0.3.1", "9dda7b4ca05349186ac0f65cfe59d34828d43729f5d230a1ee8fca8d433ee43f", [:mix], [{:live_view_native, "~> 0.3.1", [hex: :live_view_native, repo: "hexpm", optional: false]}, {:makeup_eex, ">= 0.1.1", [hex: :makeup_eex, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "93ae2631f1282908b938300c3ad8e3211ba2dadb5da88422485e112de5a84d72"}, "mail": {:hex, :mail, "0.3.1", "cb0a14e4ed8904e4e5a08214e686ccf6f9099346885db17d8c309381f865cc5c", [:mix], [], "hexpm", "1db701e89865c1d5fa296b2b57b1cd587587cca8d8a1a22892b35ef5a8e352a6"}, "makeup": {:hex, :makeup, "1.1.2", "9ba8837913bdf757787e71c1581c21f9d2455f4dd04cfca785c70bbfff1a76a3", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cce1566b81fbcbd21eca8ffe808f33b221f9eee2cbc7a1706fc3da9ff18e6cac"},