deps

Dockerfile.release

@@ -52,12 +52,12 @@ COPY --link mix.lock ./
 # # fetch more deps/extensions
 # RUN mix deps.get --only prod
 
-# add main dep sources
+# add main flavour dep sources
 COPY --link data/current_flavour/config/deps.flavour.* ./config/
 RUN ls -la config/* 
 
-# RUN mix deps.get --only prod
-RUN HEX_HTTP_CONCURRENCY=1 HEX_HTTP_TIMEOUT=120 mix deps.get --only prod
+RUN mix deps.get --only prod
+# RUN HEX_HTTP_CONCURRENCY=1 HEX_HTTP_TIMEOUT=120 mix deps.get --only prod
 # # ^ useful in case of spotty connectivity
 
 ## add extra deps 

flavours/classic/config/deps.flavour.git

@@ -16,8 +16,6 @@ exto = "https://github.com/bonfire-networks/exto"
 untangle = "https://github.com/bonfire-networks/untangle"
 arrows = "https://github.com/bonfire-networks/arrows"
 
-apical = "https://github.com/bonfire-networks/apical"
-boruta = "https://github.com/bonfire-networks/boruta"
 ex_cldr_territories = "https://github.com/elixir-cldr/cldr_territories" 
 ecto_sparkles = "https://github.com/bonfire-networks/ecto_sparkles"
 
@@ -34,17 +32,50 @@ bonfire_open_id = "https://github.com/bonfire-networks/bonfire_open_id"
 # bonfire_pages = "https://github.com/bonfire-networks/bonfire_pages"
 # bonfire_ui_groups = "https://github.com/bonfire-networks/bonfire_ui_groups"
 # bonfire_pages_beacon = "https://github.com/bonfire-networks/bonfire_pages_beacon"
-
 # beacon = "https://github.com/bonfire-networks/beacon#bonfire"
-
 # beacon = "https://github.com/beaconCMS/beacon"
-
 # beacon_live_admin = "https://github.com/beaconCMS/beacon_live_admin"
 
 # bonfire_website = "https://github.com/bonfire-networks/bonfire_website"
 
 # bonfire_gatherings = "https://github.com/bonfire-networks/bonfire_gatherings"
 
+
+
+entrepot = "https://github.com/bonfire-networks/entrepot"
+entrepot_ecto = "https://github.com/bonfire-networks/entrepot_ecto"
+
+mfm_parser = "https://akkoma.dev/AkkomaGang/mfm-parser.git"
+nodeinfo = "https://github.com/bonfire-networks/nodeinfo"
+
+emote = "https://github.com/bonfire-networks/emote"
+
+paginator = "https://github.com/bonfire-networks/paginator"
+
+voodoo = "https://github.com/bonfire-networks/voodoo"
+
+
+#twinkle_star = "https://github.com/bonfire-networks/twinkle_star"
+#tree_magic = "https://github.com/bonfire-networks/tree_magic.ex"
+
+# phoenix_live_view = "https://github.com/phoenixframework/phoenix_live_view"
+
+# live_view_native = "https://github.com/bonfire-networks/live_view_native#wip"
+
+# surface = "https://github.com/surface-ui/surface" 
+
+# surface_catalogue = "https://github.com/surface-ui/surface_catalogue"  # Testing a UI component library 
+
+paper_trail = "https://github.com/bonfire-networks/paper_trail#with-pointers"
+
+# source_inspector = "https://github.com/tmbb/source_inspector"
+
+# sentry = "https://github.com/getsentry/sentry-elixir"
+
+forecastr = "https://github.com/bonfire-networks/forecastr"
+
+# image = "https://github.com/elixir-image/image"
+
 # rauversion_extension = "https://github.com/mayel/rauversion-phx.git#modular-extension-step2"
 
 # needed for rauversion:

flavours/community/config/deps.flavour.git

@@ -15,3 +15,21 @@ bonfire_ui_groups = "https://github.com/bonfire-networks/bonfire_ui_groups"
 
 bonfire_classify = "https://github.com/bonfire-networks/bonfire_classify"
 
+
+# TEMP
+
+arrows = "https://github.com/bonfire-networks/arrows"
+
+# needle = "https://github.com/bonfire-networks/needle"
+# needle_ulid = "https://github.com/bonfire-networks/needle_ulid"
+# exto = "https://github.com/bonfire-networks/exto"
+
+# untangle = "https://github.com/bonfire-networks/untangle"
+# arrows = "https://github.com/bonfire-networks/arrows"
+
+# apical = "https://github.com/bonfire-networks/apical"
+# boruta = "https://github.com/bonfire-networks/boruta"
+# ex_cldr_territories = "https://github.com/elixir-cldr/cldr_territories" 
+# ecto_sparkles = "https://github.com/bonfire-networks/ecto_sparkles"
+
+# iconify_ex = "https://github.com/bonfire-networks/iconify_ex"

lib/mix/mixer.ex

@@ -189,8 +189,9 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do
            current_flavour,
            "1" = _WITH_ALL_FLAVOUR_DEPS
          ) do
-      enum_mess_sources(existing_sources) ++
-        [disabled: other_flavour_sources(existing_sources, current_flavour)]
+      (enum_mess_sources(existing_sources) ++
+         [disabled: other_flavour_sources(existing_sources, current_flavour)])
+      |> log("all_flavour_sources")
     end
 
     defp maybe_all_flavour_sources(existing_sources, _flavour, _not_WITH_ALL_FLAVOUR_DEPS) do
@@ -419,7 +420,8 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do
         {_dep, opts} -> opts[:runtime] == false
         {_dep, _v, opts} -> opts[:runtime] == false
       end)
-      |> log("test_deps: #{System.get_env("MIX_TEST_ONLY")}")
+
+      # |> log("test_deps: #{System.get_env("MIX_TEST_ONLY")}")
     end
 
     # Specifies which paths to compile per environment

mix.exs

@@ -19,10 +19,8 @@ defmodule Bonfire.Umbrella.MixProject do
   if @use_umbrella?, do: IO.puts("NOTE: Running as umbrella...")
 
   # including it by default breaks Dockerfile.release but not including it like this breaks CI...
-  @main_deps if(System.get_env("WITH_GIT_DEPS") == "0",
-               do: [{:bonfire, git: "https://github.com/bonfire-networks/bonfire"}],
-               else: []
-             )
+  @main_deps [{:bonfire, git: "https://github.com/bonfire-networks/bonfire"}]
+
   @maybe_api_deps if(System.get_env("WITH_API_GRAPHQL") == "yes",
                     do: [
                       {:absinthe, "~> 1.7"},

mix.lock

@@ -29,7 +29,7 @@
   "blurhash": {:hex, :rinpatch_blurhash, "0.1.0", "01a888b0f5f1f382ab52e4396f01831cbe8486ea5828604c90f4dac533d39a4b", [:mix], [{:mogrify, "~> 0.8.0", [hex: :mogrify, repo: "hexpm", optional: true]}], "hexpm", "19911a5dcbb0acb9710169a72f702bce6cb048822b12de566ccd82b2cc42b907"},
   "bolt_sips": {:hex, :bolt_sips, "2.0.11", "a1cb78d8db4aba750f6771a9fd4a10b3300618b7b0433b12105c64d21d27b4ba", [:mix], [{:calendar, "~> 0.17.2", [hex: :calendar, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.4", [hex: :db_connection, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}, {:poison, "~> 3.1", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm", "227a6669e14fa6d331738857b32b5cd022b4c13808e947ccfec8eccb8fedb0e5"},
   "bones": {:git, "https://github.com/bonfire-networks/bones", "450d974c40c8adabdb2111c67521c33c878f117c", []},
-  "bonfire": {:git, "https://github.com/bonfire-networks/bonfire", "daedd17c280f0497ef79690e68210be04e5c3fbb", []},
+  "bonfire": {:git, "https://github.com/bonfire-networks/bonfire", "a4ab47eacfd65b14a636f9919b41f4207e8a8862", []},
   "bonfire_api_graphql": {:git, "https://github.com/bonfire-networks/bonfire_api_graphql", "800c1c5f453cd560e6117d07c70d94d377b6ea4d", []},
   "bonfire_boundaries": {:git, "https://github.com/bonfire-networks/bonfire_boundaries", "f81dba5585df861086bdde1de8d9e8eb57151441", []},
   "bonfire_breadpub": {:git, "https://github.com/bonfire-networks/bonfire_breadpub", "0893813e2831dc18895ba4f3c6e5a2d38481f9b8", []},
@@ -170,7 +170,7 @@
   "finch": {:hex, :finch, "0.18.0", "944ac7d34d0bd2ac8998f79f7a811b21d87d911e77a786bc5810adb75632ada4", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "69f5045b042e531e53edc2574f15e25e735b522c37e2ddb766e15b979e03aa65"},
   "floki": {:hex, :floki, "0.36.2", "a7da0193538c93f937714a6704369711998a51a6164a222d710ebd54020aa7a3", [:mix], [], "hexpm", "a8766c0bc92f074e5cb36c4f9961982eda84c5d2b8e979ca67f5c268ec8ed580"},
   "flow": {:hex, :flow, "0.15.0", "503717c0e367b5713336181d5305106840f64abbad32c75d7af5ef1bb0908e38", [:mix], [{:gen_stage, "~> 0.14.0", [hex: :gen_stage, repo: "hexpm", optional: false]}], "hexpm", "d7ecbd4dd38a188494bc996d5014ef8335f436a0b262140a1f6441ae94714581"},
-  "forecastr": {:git, "https://github.com/bonfire-networks/forecastr", "0c95e01ea49e437fb30313c14d5ad6be785dbc8e", []},
+  "forecastr": {:hex, :forecastr, "0.3.0", "652e3f72ce0ab58e79f5f7d9a520ea3297a376cc03abc812f5c571106556fd4c", [:mix], [{:elbat, "~> 0.0.6", [hex: :elbat, repo: "hexpm", optional: false]}, {:httpoison, "~> 1.4", [hex: :httpoison, repo: "hexpm", optional: false]}, {:mogrify, "~> 0.7", [hex: :mogrify, repo: "hexpm", optional: false]}, {:poison, "~> 5.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm", "90cff4dc16caabb6294e7f98d99201f42b5df42406614ea55867843de61183ce"},
   "formula2": {:hex, :formula2, "0.1.0", "034c82015bffbf178b697f5c4c4b1020e58854bada138f839d8184ce0ffd5ef8", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:stream_data, "~> 0.5", [hex: :stream_data, repo: "hexpm", optional: false]}], "hexpm", "c0ef724f3b5db0eed4ede3f927868648bbaf889475a66769f424dc733ac6505b"},
   "gen_smtp": {:hex, :gen_smtp, "1.2.0", "9cfc75c72a8821588b9b9fe947ae5ab2aed95a052b81237e0928633a13276fd3", [:rebar3], [{:ranch, ">= 1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"},
   "gen_stage": {:hex, :gen_stage, "0.14.3", "d0c66f1c87faa301c1a85a809a3ee9097a4264b2edf7644bf5c123237ef732bf", [:mix], [], "hexpm", "8453e2289d94c3199396eb517d65d6715ef26bcae0ee83eb5ff7a84445458d76"},