Skip to content

Commit

Permalink
https://github.com/bonfire-networks/bonfire-app/issues/1043
Browse files Browse the repository at this point in the history
  • Loading branch information
mayel committed Oct 8, 2024
1 parent 113498d commit f5f908b
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
COMPILE_DISABLED_EXTENSIONS: all
WITH_DOCKER: no
CI: true
ENABLE_IMAGE_VIX: "0"
WITH_IMAGE_VIX: "0"
ENABLE_AI: "0"
EXQLITE_USE_SYSTEM: 1
EXQLITE_SYSTEM_CFLAGS: -I/usr/include
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
ERLANG_VERSION: "27.1"
ELIXIR_VERSION: "1.17.3"
# TODO: read these ^ from .tool-versions.env
ENABLE_IMAGE_VIX: "0"
WITH_IMAGE_VIX: "0"
ENABLE_AI: "0"
# ^ TEMP workaround for evision_nif crash on app start
steps:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
# ghcr.io/bonfire-networks/bonfire-app:${{steps.version.outputs.current-version}}-${{ env.FLAVOUR }}${{ matrix.tag_extra }}
build-args: |
"ENABLE_AI=${{ env.ENABLE_AI }}"
"ENABLE_IMAGE_VIX=${{ env.ENABLE_IMAGE_VIX }}"
"WITH_IMAGE_VIX=${{ env.WITH_IMAGE_VIX }}"
"ALPINE_VERSION=${{ env.ALPINE_VERSION }}"
"ELIXIR_DOCKER_IMAGE=${{env.ELIXIR_VERSION}}-erlang-${{env.ERLANG_VERSION}}-alpine-${{env.ALPINE_VERSION}}"
-
Expand Down
2 changes: 1 addition & 1 deletion flavours/classic/config/dev.exs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ if System.get_env("HOT_CODE_RELOAD") != "-1" do
~r{(live|views|pages|components)/.*(ex|css)$},
~r".*(heex|leex|sface|neex|hooks.js)$",
~r"priv/catalogue/.*(ex)$",
~r"priv/static/*.styles$"
~r"priv/static/.*styles$"
]

# filename patterns that should trigger full page reloads (only within the above dirs)
Expand Down
2 changes: 1 addition & 1 deletion flavours/classic/config/native.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Config

# Use LiveView Native to add support for native platforms
config :live_view_native,
modularity: if(System.get_env("NATIVE_ENABLED") not in ["1", "true"], do: :disabled),
modularity: if(System.get_env("WITH_LV_NATIVE") not in ["1", "true"], do: :disabled),
plugins: [
LiveViewNative.SwiftUI
# LiveViewNative.Jetpack
Expand Down
1 change: 1 addition & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ deps-clean dep:
just deps-clean plug
just deps-clean phoenix_html
just deps-clean bonfire_ui_common
just deps-clean bonfire

#### DEPENDENCY & EXTENSION RELATED COMMANDS ####

Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ defmodule Bonfire.Umbrella.MixProject do
else: []
)

@maybe_image_vix if(System.get_env("ENABLE_IMAGE_VIX") != "0",
@maybe_image_vix if(System.get_env("WITH_IMAGE_VIX") != "0",
do: [
{:image, "~> 0.37", runtime: true, override: true},
{:evision, "~> 0.1", runtime: true, override: true}
Expand Down
12 changes: 6 additions & 6 deletions mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@
"dog_sketch": {:hex, :dog_sketch, "0.1.3", "b74fa9edaadd9f9e9d233d607b6e487862bd716b66468a67e293a886863837db", [:mix], [], "hexpm", "be6d172a3d3809a0acbc85421a5d25a794841560b6f930540c345342c591d0df"},
"earmark": {:hex, :earmark, "1.4.47", "7e7596b84fe4ebeb8751e14cbaeaf4d7a0237708f2ce43630cfd9065551f94ca", [:mix], [], "hexpm", "3e96bebea2c2d95f3b346a7ff22285bc68a99fbabdad9b655aa9c6be06c698f8"},
"earmark_parser": {:hex, :earmark_parser, "1.4.41", "ab34711c9dc6212dda44fcd20ecb87ac3f3fce6f0ca2f28d4a00e4154f8cd599", [:mix], [], "hexpm", "a81a04c7e34b6617c2792e291b5a2e57ab316365c2644ddc553bb9ed863ebefa"},
"ecto": {:hex, :ecto, "3.12.3", "1a9111560731f6c3606924c81c870a68a34c819f6d4f03822f370ea31a582208", [: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", "9efd91506ae722f95e48dc49e70d0cb632ede3b7a23896252a60a14ac6d59165"},
"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"},
"ecto_dev_logger": {:hex, :ecto_dev_logger, "0.13.0", "ddd8327737b60e2d93ed34dcaf74946077ed3874801d039f862995303a27e46b", [:mix], [{:ecto, "~> 3.7", [hex: :ecto, repo: "hexpm", optional: false]}, {:geo, "~> 3.5.1", [hex: :geo, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "17ec2b45dde985627f379b0be54394b1654bda2bd7e4e69ed1b1ef23eda1758f"},
"ecto_erd": {:hex, :ecto_erd, "0.6.2", "dbd3052198b43cc6aa3a1a503566d166709373f13503a5ee58bbb223b41df2ae", [:mix], [{:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:html_entities, "~> 0.5", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "4fc7ce9cb862c09fd471e6222d898f4dccee11947f3d35120d65f21e5aed465c"},
"ecto_materialized_path": {:git, "https://github.com/bonfire-networks/ecto_materialized_path", "7d084db8b2527b34591e0182664cdd5753121232", []},
"ecto_psql_extras": {:hex, :ecto_psql_extras, "0.8.1", "cdfee5cb21d51af37d14233e4aa3ef38189bf42c499d6a8160a943c990cc74e2", [:mix], [{:ecto_sql, "~> 3.7", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "> 0.16.0 and < 0.20.0", [hex: :postgrex, repo: "hexpm", optional: false]}, {:table_rex, "~> 3.1.1 or ~> 4.0.0", [hex: :table_rex, repo: "hexpm", optional: false]}], "hexpm", "c0a1df8181c87a0419afa881452329a9dfd2c1fb2a737bf147f862dfa44a1af0"},
"ecto_ranked": {:hex, :ecto_ranked, "0.6.0", "c3bc7925610244d3f0be01befb02991670c00f32890174392f2701f760124b26", [:mix], [{:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}], "hexpm", "735dd6e02096445f4084e0f76e1d0e100cdcf5386d40d6d4cb7e54f2d437fb27"},
"ecto_shorts": {:git, "https://github.com/bonfire-networks/ecto_shorts", "df0b0cc301616da9ea47131b425ca4a06d3e78cf", [branch: "refactor/attempt1"]},
"ecto_sparkles": {:hex, :ecto_sparkles, "0.2.1", "c61ffd4e6aa2965b383e1d7ea53ddc730c5141306199abd57882261ba8555b96", [:mix], [{:ecto, "~> 3.8", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_dev_logger, "~> 0.9", [hex: :ecto_dev_logger, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.8", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:html_sanitize_ex, "~> 1.4.2", [hex: :html_sanitize_ex, repo: "hexpm", optional: true]}, {:recase, "~> 0.7", [hex: :recase, repo: "hexpm", optional: false]}, {:untangle, "~> 0.3", [hex: :untangle, repo: "hexpm", optional: false]}], "hexpm", "60cd0a891b258f7c03534179e647fbc6265bf7e89c8693c6d9570e10664dc8e7"},
"ecto_sql": {:hex, :ecto_sql, "3.12.0", "73cea17edfa54bde76ee8561b30d29ea08f630959685006d9c6e7d1e59113b7d", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dc9e4d206f274f3947e96142a8fdc5f69a2a6a9abb4649ef5c882323b6d512f0"},
"ecto_sql": {:hex, :ecto_sql, "3.12.1", "c0d0d60e85d9ff4631f12bafa454bc392ce8b9ec83531a412c12a0d415a3a4d0", [:mix], [{:db_connection, "~> 2.4.1 or ~> 2.5", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.12", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.7", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.19 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1 or ~> 2.2", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "aff5b958a899762c5f09028c847569f7dfb9cc9d63bdb8133bff8a5546de6bf5"},
"ecto_vista": {:hex, :ecto_vista, "0.2.0", "54f46a946fa5aa1c9501e02c590bf9b30d5e7c3222a1909bd2795344e3f0d855", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.5", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.15", [hex: :postgrex, repo: "hexpm", optional: false]}], "hexpm", "a1beb25e78e418b6437ed1d2e3f299b1822390926e58a02954be9c4718377a12"},
"elbat": {:hex, :elbat, "0.0.6", "35270ae629058435c0f705fc5b281662597fda0c1c0479080e35205d2758c6a5", [:mix], [], "hexpm", "74bbac013afe869123833273e5f26826fad453e17c09aeabcb7d8d0a74baf868"},
"elixir_make": {:hex, :elixir_make, "0.8.4", "4960a03ce79081dee8fe119d80ad372c4e7badb84c493cc75983f9d3bc8bde0f", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.0", [hex: :certifi, repo: "hexpm", optional: true]}], "hexpm", "6e7f1d619b5f61dfabd0a20aa268e575572b542ac31723293a4c1a567d5ef040"},
Expand Down Expand Up @@ -214,10 +214,10 @@
"linkify": {:git, "https://github.com/bonfire-networks/linkify", "74b8a46c56e7a2b5749c5b38dffe86d6406a3044", []},
"live_admin": {:git, "https://github.com/bonfire-networks/live_admin", "9dd24e7b4a73e200f2a5ace09cc55695907a3110", []},
"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.0", "a99d773740c7ca0178fdf609e4585dbd9859e1e29f65b67e3301da9afccc0e9c", [: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", "7a343414c210f8f088b4aa5981490a1db8ef39a629ce55f79843919813e92e8c"},
"live_view_native_live_form": {:hex, :live_view_native_live_form, "0.3.0", "71452bd34b065baeacc16bf32ea274a87c8d2489c0fd70346661ff9cd4b8a52a", [:mix], [{:live_view_native, "~> 0.3.0", [hex: :live_view_native, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.20.4", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}], "hexpm", "5799d8615197d120b4000f5dd375437223c47f04605be71c7cb41a9e1af5ecb1"},
"live_view_native_stylesheet": {:hex, :live_view_native_stylesheet, "0.3.0", "decd7a02ee490406045649e911426d5ea515543023a29256dca95a409ca9079b", [:mix], [{:live_view_native, "~> 0.3.0", [hex: :live_view_native, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cec8e41b12c5177e1ffd63c061a6eab6455617d53d99c506c3787c8970de7c19"},
"live_view_native_swiftui": {:hex, :live_view_native_swiftui, "0.3.0", "ce6f14c926fd0d6d790eee6195e5e71e32fca15ae11632b5692d885e93e24843", [:mix], [{:live_view_native, "~> 0.3.0", [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", "be3c1a807445795beb6029f35e4fd6718cc1761db591c7af5fae8f5639c97895"},
"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_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"},
"makeup_diff": {:hex, :makeup_diff, "0.1.1", "01498f8c95970081297837eaf4686b6f3813e535795b8421f15ace17a59aea37", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "fadb0bf014bd328badb7be986eadbce1a29955dd51c27a9e401c3045cf24184e"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/liveview-native/liveview-client-swiftui",
"state" : {
"revision" : "4059372fbeb67742718d67a2aa355c8020f10e9b",
"version" : "0.3.0"
"revision" : "669274b2314862b36a622d52f78eab007769bed9",
"version" : "0.3.1"
}
},
{
Expand All @@ -24,8 +24,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/liveview-native/liveview-native-live-form",
"state" : {
"revision" : "f2bfd7f540c0278963437268e3e5d7e319b2501f",
"version" : "0.3.0"
"revision" : "ecedbf941e8818f6ba25ce71e612e3b2371a5039",
"version" : "0.3.1"
}
},
{
Expand Down
Binary file not shown.

0 comments on commit f5f908b

Please sign in to comment.