From fd2ecd4c459beb2a9e079dd60dc781dfee7ad1e0 Mon Sep 17 00:00:00 2001
From: ArneBo <arne@ecobasa.org>
Date: Thu, 24 Oct 2024 12:57:12 +0200
Subject: [PATCH] experimental shadow package from ui components

---
 compose.yml          |  6 +++++-
 front/Dockerfile.dev | 10 ++++++++--
 front/package.json   |  2 +-
 front/vite.config.ts |  8 +++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/compose.yml b/compose.yml
index 55560113a..c087153a3 100644
--- a/compose.yml
+++ b/compose.yml
@@ -47,16 +47,20 @@ services:
       dockerfile: Dockerfile.dev
     ports:
       - "${VUE_PORT:-8080}:${VUE_PORT:-8080}"
+      - "24678:24678" # Vite HMR (Hot Module Replacement) port
     environment:
       - HOST
       - VUE_PORT
+      - VITE_HMR_HOST=localhost
+      - VITE_HMR_PORT=24678
     volumes:
+      - "./ui:/app/ui"
       - "./front:/app"
       - "/app/node_modules"
       - "./po:/po"
     networks:
       - internal
-    command: "yarn dev --host"
+    command: sh -c "ls -la && yarn dev --host"
 
   api:
     extends:
diff --git a/front/Dockerfile.dev b/front/Dockerfile.dev
index f280b65ae..9f4a89029 100644
--- a/front/Dockerfile.dev
+++ b/front/Dockerfile.dev
@@ -5,10 +5,16 @@ RUN apk add --no-cache jq bash coreutils python3
 
 EXPOSE 8080
 WORKDIR /app/
+
+# Create node_modules directory to prevent it from being hidden by volume mounts
+RUN mkdir -p node_modules
+
+# Copy UI package for initial installation
+COPY ui ./ui/
+
+# Copy entry script
 COPY scripts/ ./scripts/
 ADD package.json yarn.lock  ./
 RUN yarn install
 
-COPY . .
-
 CMD ["yarn", "serve"]
diff --git a/front/package.json b/front/package.json
index f5527ee6a..a731796cf 100644
--- a/front/package.json
+++ b/front/package.json
@@ -18,7 +18,6 @@
     "postinstall": "yarn run fix-fomantic-css"
   },
   "dependencies": {
-    "@funkwhale/ui": "0.3.0",
     "@sentry/tracing": "7.47.0",
     "@sentry/vue": "7.47.0",
     "@tauri-apps/api": "2.0.0-beta.1",
@@ -66,6 +65,7 @@
     "vuex-router-sync": "5.0.0"
   },
   "devDependencies": {
+    "ui": "file:/app/ui",
     "@faker-js/faker": "8.4.1",
     "@iconify/vue": "4.1.1",
     "@intlify/eslint-plugin-vue-i18n": "2.0.0",
diff --git a/front/vite.config.ts b/front/vite.config.ts
index c4b07fb2b..404e2dfb0 100644
--- a/front/vite.config.ts
+++ b/front/vite.config.ts
@@ -58,7 +58,13 @@ export default defineConfig(({ mode }) => ({
     vueDevTools(),
   ],
   server: {
-    port
+    host: '0.0.0.0',
+    port: 8080,
+    hmr: {
+      host: 'localhost',
+      port: 24678,
+      protocol: 'ws'
+    },
   },
   resolve: {
     alias: [