Skip to content

Commit

Permalink
misc
Browse files Browse the repository at this point in the history
  • Loading branch information
mayel committed Feb 15, 2025
1 parent f478f21 commit ef51718
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,4 @@ docs/xref_graph.svg

lib/mix/tasks

lib/bonfire
lib/bonfire*
2 changes: 1 addition & 1 deletion Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ RUN ls -la ./config/current_flavour/


# Optionally include local forks
RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then rm ./config/deps*path && rm ./config/current_flavour/deps*path ; else echo "Include locally forked extensions." ; fi
RUN if [ "$FORKS_TO_COPY_PATH" = "data/null" ] ; then rm ./config/deps*path && rm ./config/current_flavour/deps*path ; else echo "Include locally forked extensions." ; fi || echo "No forks defined"
COPY --link ${FORKS_TO_COPY_PATH} ./${FORKS_TO_COPY_PATH}

# Update Bonfire extensions to latest git version (mostly useful in CI, and temporary: eventually we want to rely on version numbers and lockfile)
Expand Down
13 changes: 5 additions & 8 deletions config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -288,26 +288,25 @@ config :sentry,

# native app
if System.get_env("WITH_LV_NATIVE") in ["1", "true"] do

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)
for dep <- bonfire_deps do
if Mix.Project.deps_paths()[dep], do: {dep, "lib/**/*swiftui*"}
end)
|> Enum.reject(&is_nil/1)
]
|> Bonfire.Mixer.log("SwiftUI stylesheet paths"),
output: "assets/static/assets"

import_config "native.exs"

IO.puts("Native app config prepared")
else
config :live_view_native,
modularity: :disabled
modularity: :disabled

IO.puts("Native app config skipped")
end
Expand All @@ -319,7 +318,6 @@ config :live_view_native,
# LiveViewNative.Jetpack
]


# TODO: refactor
# if Code.ensure_loaded?(Bonfire.Mixer) and Code.ensure_loaded?(Hex) and Bonfire.Mixer.compile_disabled?() do
# for dep <-
Expand Down Expand Up @@ -367,7 +365,6 @@ IO.puts("Flavours compile-time configs prepared")
# federation library
import_config "activity_pub.exs"


# finally, append/override config based on env, which will override any config set above (including from imported files)
import_config "#{env}.exs"

Expand Down

0 comments on commit ef51718

Please sign in to comment.