From 42574bec999c8c8fe29d5ed10a43ce39ffcdbd2a Mon Sep 17 00:00:00 2001
From: Mayel de Borniol <git@mayel.space>
Date: Wed, 30 Nov 2022 11:59:22 +1300
Subject: [PATCH] misc

---
 .dockerignore  |  9 +++++++++
 .formatter.exs |  1 +
 assets         |  2 +-
 justfile       | 13 +++++++------
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index ae61f57bc2..00079245ed 100755
--- a/.dockerignore
+++ b/.dockerignore
@@ -22,6 +22,7 @@ assets/.parcel-cache
 # Makefile
 README*
 priv/static
+node_modules
 assets/node_modules
 .pnpm-store
 data/search
@@ -37,3 +38,11 @@ forks/*/.mix
 forks/*/.hex
 forks/*/_build
 forks/*/deps
+extensions/*/data/postgres
+extensions/*/.git
+extensions/*/.config
+extensions/*/.npm
+extensions/*/.mix
+extensions/*/.hex
+extensions/*/_build
+extensions/*/deps
diff --git a/.formatter.exs b/.formatter.exs
index 49c3619aa3..990580d4ac 100644
--- a/.formatter.exs
+++ b/.formatter.exs
@@ -6,6 +6,7 @@
   inputs: [
     "{mix,.formatter,mess}.exs",
     "{flavours,lib,test}/**/*.{ex,exs,sface,heex}",
+    "extensions/*/{config,lib,test}/**/*.{ex,exs,sface,heex}",
     "forks/bonfire*/{config,lib,test}/**/*.{ex,exs,sface,heex}"
   ],
   subdirectories: ["priv/*/migrations"],
diff --git a/assets b/assets
index f6ed91a966..08e1b03891 120000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-extensions/bonfire_ui_common/assets
\ No newline at end of file
+deps/bonfire_ui_common/assets
\ No newline at end of file
diff --git a/justfile b/justfile
index b1ff63ee1f..8c0f5d69b7 100644
--- a/justfile
+++ b/justfile
@@ -21,6 +21,7 @@ DB_DOCKER_IMAGE := if arch() == "aarch64" { "ghcr.io/baosystems/postgis:12-3.3"
 
 ## Other configs - edit these here if necessary
 FORKS_PATH := "extensions/"
+EXTRA_FORKS_PATH := "forks/"
 ORG_NAME := "bonfirenetworks"
 APP_NAME := "bonfire"
 APP_VSN_EXTRA := "beta"
@@ -215,24 +216,24 @@ update-deps-all: deps-clean-unused pre-update-deps
 
 # Update a specify dep (eg. `just update.dep pointers`)
 update-dep dep: 
-	@chmod +x git-publish.sh && ./git-publish.sh $FORKS_PATH/$dep pull
+	@chmod +x git-publish.sh && ./git-publish.sh $FORKS_PATH/$dep pull && ./git-publish.sh $EXTRA_FORKS_PATH/$dep pull 
 	just mix-remote "deps.update $dep"
 	./js-deps-get.sh $dep
 
 # Pull the latest commits from all forks
 update-forks: 
 	@jungle git fetch || echo "Jungle not available, will fetch one by one instead."
-	@chmod +x git-publish.sh && find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d -exec ./git-publish.sh {} rebase \;
+	@chmod +x git-publish.sh && find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d -exec ./git-publish.sh {} rebase \; && find $EXTRA_FORKS_PATH -mindepth 1 -maxdepth 1 -type d -exec ./git-publish.sh {} rebase \;
 # TODO: run in parallel? find $FORKS_PATH -mindepth 1 -maxdepth 1 -type d | xargs -P 50 -I '{}' ./git-publish.sh '{}'
 
 # Pull the latest commits from all forks
 update-fork dep: 
-	@chmod +x git-publish.sh && find $FORKS_PATH/$dep -mindepth 0 -maxdepth 0 -type d -exec ./git-publish.sh {} pull \;
+	@chmod +x git-publish.sh && find $FORKS_PATH/$dep -mindepth 0 -maxdepth 0 -type d -exec ./git-publish.sh {} pull \; && find $EXTRA_FORKS_PATH/$dep -mindepth 0 -maxdepth 0 -type d -exec ./git-publish.sh {} pull \;
 
 # Fetch locked version of non-forked deps
 deps-get: 
-	just mix-remote deps.get
 	just mix deps.get 
+	just mix-remote deps.get
 	just js-deps-get
 
 deps-clean dep: 
@@ -247,7 +248,7 @@ deps-clean-api:
 #### DEPENDENCY & EXTENSION RELATED COMMANDS ####
 
 js-deps-get: js-ext-deps
-	@[ -d "extensions/bonfire_ui_common" ] && ln -s "extensions/bonfire_ui_common/assets" && echo "Assets served from the local UI.Common extension will be used" || ln -s "deps/bonfire_ui_common/assets" 
+	@[ -d "extensions/bonfire_ui_common" ] && ln -sf "extensions/bonfire_ui_common/assets" && echo "Assets served from the local UI.Common extension will be used" || ln -sf "deps/bonfire_ui_common/assets" 
 
 js-ext-deps yarn_args='':
 	chmod +x ./config/deps.js.sh 
@@ -569,7 +570,7 @@ rebuild: init
 shell: 
 	just cmd bash
 
-docker-stop-web: 
+@docker-stop-web: 
 	-docker stop $WEB_CONTAINER
 	-docker rm $WEB_CONTAINER