https://github.com/bonfire-networks/bonfire-app/issues/851

2024-05-17 08:32:41 +00:00 · 2024-02-16 16:01:42 +00:00 · 2024-02-16 16:01:42 +00:00 · 8ab9193c73
parent 25f23b2787
commit 8ab9193c73
4 changed files with 4 additions and 201 deletions
--- a/flavours/classic/config/deps.git
+++ b/flavours/classic/config/deps.git
@ -1,98 +0,0 @@
-## GENERAL
-bonfire = "https://github.com/bonfire-networks/bonfire_spark#main"
-bonfire_common = "https://github.com/bonfire-networks/bonfire_common#main"
-bonfire_mailer = "https://github.com/bonfire-networks/bonfire_mailer#main"
-bonfire_epics = "https://github.com/bonfire-networks/bonfire_epics#main"
-bonfire_ecto = "https://github.com/bonfire-networks/bonfire_ecto#main"
-bonfire_search = "https://github.com/bonfire-networks/bonfire_search#main"
-bonfire_data_assort = "https://github.com/bonfire-networks/bonfire_data_assort#master"
-bonfire_files = "https://github.com/bonfire-networks/bonfire_files#main"
-bonfire_boundaries = "https://github.com/bonfire-networks/bonfire_boundaries#main"
-bonfire_federate_activitypub = "https://github.com/bonfire-networks/bonfire_federate_activitypub#main"
-bonfire_invite_links= "https://github.com/bonfire-networks/bonfire_invite_links#main"
-
-## Flavour:CLASSIC
-bonfire_data_access_control = "https://github.com/bonfire-networks/bonfire_data_access_control#main"
-bonfire_data_activity_pub = "https://github.com/bonfire-networks/bonfire_data_activity_pub#main"
-bonfire_data_identity = "https://github.com/bonfire-networks/bonfire_data_identity#main"
-bonfire_data_social = "https://github.com/bonfire-networks/bonfire_data_social#main"
-bonfire_data_edges = "https://github.com/bonfire-networks/bonfire_data_edges#main"
-bonfire_me = "https://github.com/bonfire-networks/bonfire_me#main"
-bonfire_social = "https://github.com/bonfire-networks/bonfire_social#main"
-bonfire_social_graph = "https://github.com/bonfire-networks/bonfire_social_graph"
-bonfire_posts = "https://github.com/bonfire-networks/bonfire_posts"
-bonfire_messages = "https://github.com/bonfire-networks/bonfire_messages"
-bonfire_ui_common = "https://github.com/bonfire-networks/bonfire_ui_common#main"
-bonfire_ui_social = "https://github.com/bonfire-networks/bonfire_ui_social#main"
-bonfire_ui_social_graph = "https://github.com/bonfire-networks/bonfire_ui_social_graph"
-bonfire_ui_posts = "https://github.com/bonfire-networks/bonfire_ui_posts"
-bonfire_ui_messages = "https://github.com/bonfire-networks/bonfire_ui_messages"
-bonfire_ui_reactions = "https://github.com/bonfire-networks/bonfire_ui_reactions"
-bonfire_ui_moderation = "https://github.com/bonfire-networks/bonfire_ui_moderation"
-bonfire_ui_me = "https://github.com/bonfire-networks/bonfire_ui_me#main" 
-bonfire_data_shared_user = "https://github.com/bonfire-networks/bonfire_data_shared_user#main"
-bonfire_tag = "https://github.com/bonfire-networks/bonfire_tag#main"
-bonfire_classify = "https://github.com/bonfire-networks/bonfire_classify#main"
-
-## UTILS
-# arrows = "https://github.com/bonfire-networks/arrows"
-# untangle = "https://github.com/bonfire-networks/untangle#main"
-# exto = "https://github.com/bonfire-networks/exto#main"
-# needle = "https://github.com/bonfire-networks/needle#main"
-# needle_ulid = "https://github.com/bonfire-networks/needle_ulid#main"
-activity_pub = "https://github.com/bonfire-networks/activity_pub#develop"
-mfm_parser = "https://akkoma.dev/AkkomaGang/mfm-parser.git"
-nodeinfo = "https://github.com/bonfire-networks/nodeinfo#main"
-ex_aws = "https://github.com/bonfire-networks/ex_aws#main"
-emote = "https://github.com/bonfire-networks/emote#master"
-paginator = "https://github.com/bonfire-networks/paginator#main"
-voodoo = "https://github.com/bonfire-networks/voodoo#main"
-# ecto_sparkles = "https://github.com/bonfire-networks/ecto_sparkles#main"
-#twinkle_star = "https://github.com/bonfire-networks/twinkle_star"
-#tree_magic = "https://github.com/bonfire-networks/tree_magic.ex"
-live_admin = "https://github.com/bonfire-networks/live_admin"
-entrepot = "https://github.com/bonfire-networks/entrepot"
-entrepot_ecto = "https://github.com/bonfire-networks/entrepot_ecto"
-
-## EXPERIMENTAL ##
-bonfire_label = "https://github.com/bonfire-networks/bonfire_label#main"
-# bonfire_pages = "https://github.com/bonfire-networks/bonfire_pages#main"
-# bonfire_ui_groups = "https://github.com/bonfire-networks/bonfire_ui_groups#main"
-# 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#main"
-
-# bonfire_open_id = "https://github.com/bonfire-networks/bonfire_open_id#main"
-# boruta = "https://gitlab.com/patatoid/boruta_auth#master"
-
-# rauversion_extension = "https://github.com/mayel/rauversion-phx.git#modular-extension-step2"
-# need for rauversion:
-mogrify = "https://github.com/chaskiq/mogrify.git#identify-option"
-
-#bonfire_encrypt = "https://github.com/bonfire-networks/bonfire_encrypt#main"
-
-# phoenix_live_view = "https://github.com/phoenixframework/phoenix_live_view#main"
-# 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 
-
-# bonfire_livebook = "https://github.com/bonfire-networks/bonfire_livebook#main" 
-# livebook = "https://github.com/mayel/livebook#fork" 
-
-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"
-
-# bonfire_editor_ck = "https://github.com/bonfire-networks/bonfire_editor_ck#main"
-# bonfire_editor_quill = "https://github.com/bonfire-networks/bonfire_editor_quill#main"
-bonfire_editor_milkdown = "https://github.com/bonfire-networks/bonfire_editor_milkdown"
-
-# bonfire_gatherings = "https://github.com/bonfire-networks/bonfire_gatherings"
-
-forecastr = "https://github.com/bonfire-networks/forecastr"
-# image = "https://github.com/elixir-image/image"
-
--- a/flavours/classic/config/deps.hex
+++ b/flavours/classic/config/deps.hex
@ -1,100 +0,0 @@
-untangle = "~> 0.3"
-arrows = "~> 0.1"
-needle_ulid = "~> 0.3"
-needle = "~> 0.7"
-ecto_sparkles = "~> 0.1"
-
-# earmark = "~> 1.4.28" # handle markdown
-# earmark_parser = "~> 1.4.25" # parse markdown
-ex_cldr = "~> 2.30" # internationalisation
-
-# Web
-# livebook = "~> 0.7.2"
-surface = "~> 0.11.0" # note: usually we should let bonfire_ui_common control this
-phoenix = "~> 1.7.0" # note: should match version supported by version of surface used
-# phoenix_live_view = "<= 0.20.1" # usually should let surface decide the version
-phoenix_live_view = "~> 0.20.7" # usually should let surface decide the version
-# live_view_native = "~> 0.2.0"
-# live_view_native_swiftui = "~> 0.2.1"
-# phoenix_html = "~> 3.3.0" # note: usually we should let bonfire_ui_common control this
-phoenix_view = "~> 2.0" # should match phx/lv - dunno why isn't upgraded otherwise
-plug_crypto = "~> 2.0" # newer crypto for plug/phoenix
-plug_cowboy = "~> 2.7" # should match the version in phoenix's mix.exs
-cowboy = "~> 2.10" # should match the version used in plug_cowboy
-# gettext = "<= 0.21.0" # note: usually we should let bonfire_ui_common control this
-bandit = "~> 1.0" # alternative to Cowboy web server
-orion = "~> 1.0" # tracing with web UI (at /admin/system/orion)
-
-# admin tools
-phoenix_live_dashboard = "~> 0.8.0"
-live_admin = "~> 0.9.0"
-wobserver_ng = "~> 1.14"
-
-# DB
-ecto_sql = "~> 3.8"
-exto = "~> 0.3"
-postgrex = ">= 0.16.2"
-ecto_psql_extras = "~> 0.7.4"
-# endo = "~> 0.1"
-
-# Uploads (depending on what service you use)
-ex_aws_s3 = "~> 2.3"
-ex_marcel = "~> 0.1.0"
-
-# Auth
-eqrcode = "~> 0.1.10"
-
-# Misc
-req = "~> 0.4.0"
-finch = "~> 0.16"
-httpoison = "~> 2.1"
-jason = "~> 1.4.0"
-poison = "~> 5.0" # not our preferred one, but some libs use it
-tz = "~> 0.26.2"
-timex = "~> 3.7.8"
-solid = "~> 0.13"
-mime = "~> 2.0.3"
-oban = "~> 2.17"
-mdex = "~> 0.1" # handle markdown 
-sourceror = "~> 0.14.0"
-owl = "~> 0.8" # command line UI
-
-# Testing
-floki = "~> 0.33"
-# untangle = "~> 0.1"
-
-# Data Schemas
-# bonfire_data_access_control = "~> 0.1"
-# bonfire_data_activity_pub = "~> 0.1"
-# bonfire_data_identity = "~> 0.1"
-# bonfire_data_social = "~> 0.1"
-
-# Testing a UI component library
-# surface_catalogue = "~> 0.1.0"  
-
-# Language 
-gettext = "~> 0.24" 
-text = "~> 0.2.0"
-text_corpus_udhr = "~> 0.1.0"
-
-# Version overrides
-#result = "~> 1.7"
-
-# telemetry
-telemetry = "~> 1.2.0"
-telemetry_metrics = "~> 0.6.1"
-telemetry_poller = "~> 1.0.0"
-opentelemetry_exporter = "~> 1.0"
-opentelemetry = "~> 1.0"
-opentelemetry_api = "~> 1.0"
-opentelemetry_ecto = "~> 1.0"
-opentelemetry_liveview = "~> 1.0.0-rc.4"
-opentelemetry_phoenix = "~> 1.0"
-opentelemetry_cowboy = "~> 0.2"
-opentelemetry_oban = "~> 1.0"
-oban_live_dashboard = "~> 0.1.1"
-
-# graphDB
-bolt_sips = "~> 2.0.11"
-
-forecastr = "~> 0.3.0"
--- a/3
+++ b/3
@ -97,10 +97,11 @@ init services="db": pre-init
 	-rm ./config/flavour_* 2> /dev/null
 	just pre-setup $select_flavour

-@pre-setup flavour='classic':
+pre-setup flavour='classic':
 	mkdir -p config
 	mkdir -p ./flavours/$flavour/config/prod/
 	mkdir -p ./flavours/$flavour/config/dev/
+	cd config && (ln -sfn ../extensions/bonfire/deps.* ./ || ln -sfn ../deps/bonfire/deps.* ./)
 	cd config && ln -sfn ../flavours/classic/config/* ./ && ln -sfn ../flavours/$flavour/config/* ./
 	touch ./config/deps.path
 	mkdir -p data
--- a/mix.lock
+++ b/mix.lock
@ -188,7 +188,7 @@
  "mneme": {:hex, :mneme, "0.5.0", "773c575fa3d7408a8970016351a8ae92f2c4457193bdf1bcf9a5f0adf06b9695", [:mix], [{:nimble_options, "~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:owl, "~> 0.8.0", [hex: :owl, repo: "hexpm", optional: false]}, {:rewrite, "~> 0.7", [hex: :rewrite, repo: "hexpm", optional: false]}, {:sourceror, "~> 0.12", [hex: :sourceror, repo: "hexpm", optional: false]}], "hexpm", "c25ef684985c1036560b507e3fd87d44818320ae541c6f1c017caab37d15f325"},
  "mochiweb": {:hex, :mochiweb, "3.2.1", "ff287e1ec653a0828f226cd5a009d52be74537dc3fc274b765525a77ce01f8ec", [:rebar3], [], "hexpm", "975466d335403a78cd58186636b8e960e3c84c4d9c1a85eb7fe53b6a5dd54de7"},
  "mock": {:hex, :mock, "0.3.8", "7046a306b71db2488ef54395eeb74df0a7f335a7caca4a3d3875d1fc81c884dd", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"},
-  "mogrify": {:git, "https://github.com/chaskiq/mogrify.git", "48e237d2332d24ddf5996f78b13d8bc97221b094", [branch: "identify-option"]},
+  "mogrify": {:hex, :mogrify, "0.9.3", "238c782f00271dace01369ad35ae2e9dd020feee3443b9299ea5ea6bed559841", [:mix], [], "hexpm", "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"},
  "mox": {:hex, :mox, "1.1.0", "0f5e399649ce9ab7602f72e718305c0f9cdc351190f72844599545e4996af73c", [:mix], [], "hexpm", "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"},
  "nebulex": {:hex, :nebulex, "2.6.0", "6e581c0b53aab80a1431488d367a41c6a8ee53763f86e7a7a6754ee571ecfdab", [:mix], [{:decorator, "~> 1.4", [hex: :decorator, repo: "hexpm", optional: true]}, {:shards, "~> 1.1", [hex: :shards, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "cf4a0040bd6d58b8d0204f668641973520fdbd78bd8618e1cdb7a11e7bc560cf"},
  "needle": {:hex, :needle, "0.7.1", "2272843b615d38ce7c9e549dd2f8784ee9b850aef846031114e0fd64bfee73de", [:mix], [{:ecto_sql, "~> 3.8", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:exto, "~> 0.3", [hex: :exto, repo: "hexpm", optional: false]}, {:needle_ulid, "~> 0.3", [hex: :needle_ulid, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4238739f377c885d71958da02512636e38a020042e8f2a580b3c4fc0e8a3a408"},
@ -263,7 +263,7 @@
  "sleeplocks": {:hex, :sleeplocks, "1.1.2", "d45aa1c5513da48c888715e3381211c859af34bee9b8290490e10c90bb6ff0ca", [:rebar3], [], "hexpm", "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"},
  "sobelow": {:hex, :sobelow, "0.12.2", "45f4d500e09f95fdb5a7b94c2838d6b26625828751d9f1127174055a78542cf5", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "2f0b617dce551db651145662b84c8da4f158e7abe049a76daaaae2282df01c5d"},
  "solid": {:hex, :solid, "0.15.2", "6921af98a3a862041bb6af72b5f6e094dbf0242366b142f98a92cabe4ed30d2a", [:mix], [{:nimble_parsec, "~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "18b062b04948b7f7b99ac4a9360681dac7e0bd142df5e62a7761696c7384be45"},
-  "sourceror": {:hex, :sourceror, "0.14.1", "c6fb848d55bd34362880da671debc56e77fd722fa13b4dcbeac89a8998fc8b09", [:mix], [], "hexpm", "8b488a219e4c4d7d9ff29d16346fd4a5858085ccdd010e509101e226bbfd8efc"},
+  "sourceror": {:hex, :sourceror, "1.0.1", "ec2c41726d181adce888ac94b3f33b359a811b46e019c084509e02c70042e424", [:mix], [], "hexpm", "28225464ffd68bda1843c974f3ff7ccef35e29be09a65dfe8e3df3f7e3600c57"},
  "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.7", "354c321cf377240c7b8716899e182ce4890c5938111a1296add3ec74cf1715df", [:make, :mix, :rebar3], [], "hexpm", "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"},
  "statistex": {:hex, :statistex, "1.0.0", "f3dc93f3c0c6c92e5f291704cf62b99b553253d7969e9a5fa713e5481cd858a5", [:mix], [], "hexpm", "ff9d8bee7035028ab4742ff52fc80a2aa35cece833cf5319009b52f1b5a86c27"},
  "surface": {:git, "https://github.com/surface-ui/surface", "ff39d25153c54bc459045e0b1692599721e8c64a", []},