diff --git a/.dockerignore b/.dockerignore
index f3706f09ed..63cb1a1cbe 100755
--- a/.dockerignore
+++ b/.dockerignore
@@ -19,8 +19,9 @@ Docker*
docker*
.parcel-cache
assets/.parcel-cache
-# Makefile
README*
+lib/mix/tasks
+lib/web
priv/static
node_modules
assets/node_modules
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 415c344aa6..1f8f04d33f 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -8,7 +8,7 @@ jobs:
docs:
name: Generate docs upon new release
runs-on: ubuntu-latest
- container: elixir:1.13-alpine
+ container: elixir:1.14-alpine
env:
FLAVOUR: classic
FLAVOUR_PATH: flavours/classic
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index b84eccd601..330f8d7914 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -11,7 +11,7 @@ jobs:
test_classic_flavour:
name: Test classic flavour
runs-on: ubuntu-latest
- container: elixir:1.13-alpine
+ container: elixir:1.14-alpine
env:
FLAVOUR: classic
MIX_ENV: test
diff --git a/Dockerfile.dev b/Dockerfile.dev
index d102525d0b..30c84b66b6 100755
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -17,7 +17,7 @@ RUN cd forks/messctl/origin && git checkout 8f53c86687ba2bd262471c6e8d9490ed00bf
RUN cd forks/messctl && cp -r origin/* . && cargo build --release && cargo install --path . --verbose
-FROM elixir:1.13-alpine
+FROM elixir:1.14-alpine
ENV HOME=/opt/app/ TERM=xterm USER=docker
WORKDIR $HOME
diff --git a/Dockerfile.release b/Dockerfile.release
index 584e7947b8..e769278064 100755
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -5,7 +5,7 @@
# - .github/workflows/test.yaml or .gitlab-ci.yml
# - Dockerfile.dev
# - .tool-versions
-ARG ELIXIR_IMAGE=1.13-alpine
+ARG ELIXIR_IMAGE=1.14-alpine
# The version of Alpine to use for the final image
# This should match the version of Alpine that the current elixir & erlang images (in Step 1) use.
diff --git a/flavours/classic/config/deps_hooks.js b/flavours/classic/config/deps_hooks.js
index 672db1f74e..1c46798cc3 100644
--- a/flavours/classic/config/deps_hooks.js
+++ b/flavours/classic/config/deps_hooks.js
@@ -19,8 +19,6 @@ import { EmojiHooks } from "./../../../deps/bonfire_ui_common/assets/js/emoji"
// import { EditorQuillHooks } from "./../../../deps/bonfire_editor_quill/assets/js/extension"
import { ComposerHooks } from "./../../../deps/bonfire_ui_common/assets/js/composer"
-// import { EditorQuillHooks } from "./../../../deps/bonfire_editor_quill/assets/js/extension"
-
// import { GeolocateHooks } from "./../../../deps/bonfire_geolocate/assets/js/extension"
// import { KanbanHooks } from "./../../../deps/bonfire_ui_kanban/assets/js/extension"
diff --git a/flavours/cooperation/config/deps_hooks.js b/flavours/cooperation/config/deps_hooks.js
index 498ab4d1ef..2b1cac479b 100644
--- a/flavours/cooperation/config/deps_hooks.js
+++ b/flavours/cooperation/config/deps_hooks.js
@@ -10,18 +10,24 @@ import { NotificationsHooks } from "./../../../deps/bonfire_ui_common/assets/js/
import { CarouselHooks } from "./../../../deps/bonfire_ui_common/assets/js/carousel"
import { ResponsiveTabsHooks } from "./../../../deps/bonfire_ui_common/assets/js/responsive_tabs"
import { ThemeHooks } from "./../../../deps/bonfire_ui_common/assets/js/theme"
+import { PopupHooks } from "./../../../deps/bonfire_ui_common/assets/js/popup"
+
import { FeedHooks } from "./../../../deps/bonfire_ui_common/assets/js/feed"
import { ImageHooks } from "./../../../deps/bonfire_ui_common/assets/js/image"
+import { EmojiHooks } from "./../../../deps/bonfire_ui_common/assets/js/emoji"
// import { EditorCkHooks } from "./../../../deps/bonfire_editor_ck/assets/js/extension"
-import { EditorQuillHooks } from "./../../../deps/bonfire_editor_quill/assets/js/extension"
-
+// import { EditorQuillHooks } from "./../../../deps/bonfire_editor_quill/assets/js/extension"
+import { ComposerHooks } from "./../../../deps/bonfire_ui_common/assets/js/composer"
+
import { GeolocateHooks } from "./../../../deps/bonfire_geolocate/assets/js/extension"
import { KanbanHooks } from "./../../../deps/bonfire_ui_kanban/assets/js/extension"
import { EncryptHooks } from "./../../../deps/bonfire_encrypt/assets/js/extension"
-import LiveSelect from "./../../../deps/live_select/assets/js/live_select"
+// import LiveSelect from "./../../../deps/live_select/assets/js/live_select"
+import LiveSelect from "./../../../deps/live_select/priv/static/live_select.min.js"
-Object.assign(ExtensionHooks, ResponsiveTabsHooks, EditorQuillHooks, CarouselHooks, FeedHooks, ChangeLocaleHooks, InputSelectHooks, NotificationsHooks, ThemeHooks, ImageHooks, GeolocateHooks, KanbanHooks, EncryptHooks, LiveSelect) // EditorCkHooks
+Object.assign(ExtensionHooks, ResponsiveTabsHooks, CarouselHooks, FeedHooks, ChangeLocaleHooks, InputSelectHooks, NotificationsHooks, ThemeHooks, ImageHooks, ComposerHooks, GeolocateHooks, KanbanHooks, EncryptHooks, LiveSelect)
+// EditorQuillHooks, EditorCkHooks
export { ExtensionHooks }
diff --git a/lib/mix/mess.exs b/lib/mix/mess.exs
index 698b744c01..59406623ef 100644
--- a/lib/mix/mess.exs
+++ b/lib/mix/mess.exs
@@ -55,10 +55,24 @@ if not Code.ensure_loaded?(Mess) do
end
defp deps_packages(packages, extra_deps, opts),
- do: Enum.flat_map(packages, &dep_spec(&1, opts)) |> deps_uniq(extra_deps, opts)
+ do:
+ (Enum.flat_map(packages, &dep_spec(&1, opts)) ++ extra_deps)
+ |> deps_uniq(opts)
+ |> maybe_filter_umbrella(opts)
- defp deps_uniq(packages, extra_deps, opts),
- do: Enum.uniq_by(packages ++ extra_deps, &elem(&1, 0)) |> maybe_filter_umbrella(opts)
+ defp deps_uniq(packages, opts),
+ do:
+ packages
+ # |> IO.inspect(label: "non-unique")
+ |> maybe_filter_invalid_paths(opts)
+ |> Enum.uniq_by(&elem(&1, 0))
+
+ defp maybe_filter_invalid_paths(deps, _opts) do
+ Enum.reject(deps, fn dep ->
+ dep_opts = elem(dep, 1)
+ is_list(dep_opts) and dep_opts[:path] && not File.exists?("#{dep_opts[:path]}/mix.exs")
+ end)
+ end
defp maybe_filter_umbrella(deps, opts) do
cond do
diff --git a/lib/web/icons b/lib/web/icons
new file mode 120000
index 0000000000..4a6f2f9f3d
--- /dev/null
+++ b/lib/web/icons
@@ -0,0 +1 @@
+../../extensions/bonfire/lib/web/icons
\ No newline at end of file
diff --git a/lib/web/icons/akar-icons/chat-remove.ex b/lib/web/icons/akar-icons/chat-remove.ex
deleted file mode 100644
index 9cb9efe089..0000000000
--- a/lib/web/icons/akar-icons/chat-remove.ex
+++ /dev/null
@@ -1,23 +0,0 @@
-defmodule Iconify.AkarIcons.ChatRemove do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/carbon/help.ex b/lib/web/icons/carbon/help.ex
deleted file mode 100644
index 9ce382cd9d..0000000000
--- a/lib/web/icons/carbon/help.ex
+++ /dev/null
@@ -1,24 +0,0 @@
-defmodule Iconify.Carbon.Help do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/carbon/settings.ex b/lib/web/icons/carbon/settings.ex
deleted file mode 100644
index 2049a9b4bf..0000000000
--- a/lib/web/icons/carbon/settings.ex
+++ /dev/null
@@ -1,24 +0,0 @@
-defmodule Iconify.Carbon.Settings do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/fa6-solid/shapes.ex b/lib/web/icons/fa6-solid/shapes.ex
deleted file mode 100644
index 1048975222..0000000000
--- a/lib/web/icons/fa6-solid/shapes.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.Fa6Solid.Shapes do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/heroicons-outline/question-mark-circle.ex b/lib/web/icons/heroicons-outline/question-mark-circle.ex
deleted file mode 100644
index 5f3dc29211..0000000000
--- a/lib/web/icons/heroicons-outline/question-mark-circle.ex
+++ /dev/null
@@ -1,25 +0,0 @@
-defmodule Iconify.HeroiconsOutline.QuestionMarkCircle do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/heroicons-solid/check.ex b/lib/web/icons/heroicons-solid/check.ex
deleted file mode 100644
index 1d500d0401..0000000000
--- a/lib/web/icons/heroicons-solid/check.ex
+++ /dev/null
@@ -1,23 +0,0 @@
-defmodule Iconify.HeroiconsSolid.Check do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/heroicons/arrow-long-left-20-solid.ex b/lib/web/icons/heroicons/arrow-long-left-20-solid.ex
deleted file mode 100644
index 99f1a16f58..0000000000
--- a/lib/web/icons/heroicons/arrow-long-left-20-solid.ex
+++ /dev/null
@@ -1,23 +0,0 @@
-defmodule Iconify.Heroicons.ArrowLongLeft20Solid do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/heroicons/arrow-long-right-20-solid.ex b/lib/web/icons/heroicons/arrow-long-right-20-solid.ex
deleted file mode 100644
index 02721dfb39..0000000000
--- a/lib/web/icons/heroicons/arrow-long-right-20-solid.ex
+++ /dev/null
@@ -1,23 +0,0 @@
-defmodule Iconify.Heroicons.ArrowLongRight20Solid do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/heroicons/question-mark-circle.ex b/lib/web/icons/heroicons/question-mark-circle.ex
deleted file mode 100644
index 9500b1ee73..0000000000
--- a/lib/web/icons/heroicons/question-mark-circle.ex
+++ /dev/null
@@ -1,25 +0,0 @@
-defmodule Iconify.Heroicons.QuestionMarkCircle do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/ic/baseline-remove-red-eye.ex b/lib/web/icons/ic/baseline-remove-red-eye.ex
deleted file mode 100644
index 1f6c84ad49..0000000000
--- a/lib/web/icons/ic/baseline-remove-red-eye.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.Ic.BaselineRemoveRedEye do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/ic/round-reply.ex b/lib/web/icons/ic/round-reply.ex
deleted file mode 100644
index c0f8b5626b..0000000000
--- a/lib/web/icons/ic/round-reply.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.Ic.RoundReply do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/material-symbols/arrow-right-alt-rounded.ex b/lib/web/icons/material-symbols/arrow-right-alt-rounded.ex
deleted file mode 100644
index d6fd451b2d..0000000000
--- a/lib/web/icons/material-symbols/arrow-right-alt-rounded.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.MaterialSymbols.ArrowRightAltRounded do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/material-symbols/cancel-rounded.ex b/lib/web/icons/material-symbols/cancel-rounded.ex
deleted file mode 100644
index d762c4469c..0000000000
--- a/lib/web/icons/material-symbols/cancel-rounded.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.MaterialSymbols.CancelRounded do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/material-symbols/check-indeterminate-small-rounded.ex b/lib/web/icons/material-symbols/check-indeterminate-small-rounded.ex
deleted file mode 100644
index 0771780016..0000000000
--- a/lib/web/icons/material-symbols/check-indeterminate-small-rounded.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.MaterialSymbols.CheckIndeterminateSmallRounded do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/material-symbols/check-small-rounded.ex b/lib/web/icons/material-symbols/check-small-rounded.ex
deleted file mode 100644
index 78039602c8..0000000000
--- a/lib/web/icons/material-symbols/check-small-rounded.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.MaterialSymbols.CheckSmallRounded do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/material-symbols/question-mark-rounded.ex b/lib/web/icons/material-symbols/question-mark-rounded.ex
deleted file mode 100644
index f33f0b1d12..0000000000
--- a/lib/web/icons/material-symbols/question-mark-rounded.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.MaterialSymbols.QuestionMarkRounded do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/material-symbols/settings.ex b/lib/web/icons/material-symbols/settings.ex
deleted file mode 100644
index fb6efdf5e7..0000000000
--- a/lib/web/icons/material-symbols/settings.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.MaterialSymbols.Settings do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/material-symbols/vpn-key-rounded.ex b/lib/web/icons/material-symbols/vpn-key-rounded.ex
deleted file mode 100644
index a77d58785a..0000000000
--- a/lib/web/icons/material-symbols/vpn-key-rounded.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.MaterialSymbols.VpnKeyRounded do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/mdi/arrow-left.ex b/lib/web/icons/mdi/arrow-left.ex
deleted file mode 100644
index a0a325422e..0000000000
--- a/lib/web/icons/mdi/arrow-left.ex
+++ /dev/null
@@ -1,18 +0,0 @@
-defmodule Iconify.Mdi.ArrowLeft do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/mdi/pencil-outline.ex b/lib/web/icons/mdi/pencil-outline.ex
deleted file mode 100644
index 2c1db206d7..0000000000
--- a/lib/web/icons/mdi/pencil-outline.ex
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Iconify.Mdi.PencilOutline do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/noto-v1/check-mark.ex b/lib/web/icons/noto-v1/check-mark.ex
deleted file mode 100644
index ca9dfddcfb..0000000000
--- a/lib/web/icons/noto-v1/check-mark.ex
+++ /dev/null
@@ -1,24 +0,0 @@
-defmodule Iconify.NotoV1.CheckMark do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/noto/globe-showing-europe-africa.ex b/lib/web/icons/noto/globe-showing-europe-africa.ex
deleted file mode 100644
index a09dc85647..0000000000
--- a/lib/web/icons/noto/globe-showing-europe-africa.ex
+++ /dev/null
@@ -1,112 +0,0 @@
-defmodule Iconify.Noto.GlobeShowingEuropeAfrica do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/noto/house-with-garden.ex b/lib/web/icons/noto/house-with-garden.ex
deleted file mode 100644
index 089a76a7b4..0000000000
--- a/lib/web/icons/noto/house-with-garden.ex
+++ /dev/null
@@ -1,69 +0,0 @@
-defmodule Iconify.Noto.HouseWithGarden do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end
diff --git a/lib/web/icons/octicon/x-16.ex b/lib/web/icons/octicon/x-16.ex
deleted file mode 100644
index 360d037dd2..0000000000
--- a/lib/web/icons/octicon/x-16.ex
+++ /dev/null
@@ -1,22 +0,0 @@
-defmodule Iconify.Octicon.X16 do
- use Phoenix.Component
-
- def render(assigns) do
- ~H"""
-
- """
- end
-end