From 2ad1e84d79ad03f392a9074338516b5bec0f5082 Mon Sep 17 00:00:00 2001
From: Mikel Larreategi <mlarreategi@codesyntax.com>
Date: Thu, 21 Nov 2024 10:40:32 +0100
Subject: [PATCH 1/4] do not remove the src folder when bulding the docker
 image

---
 .../{{ cookiecutter.__folder_name }}/backend/Dockerfile          | 1 -
 .../backend/Dockerfile.acceptance                                | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile
index 7cf000b..01e351d 100644
--- a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile	
+++ b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile	
@@ -21,7 +21,6 @@ RUN <<EOT
     ../bin/uv pip install -r requirements-mxdev.txt
     ../bin/python /compile_mo.py
     cd /app
-    rm -Rf src/
 EOT
 
 FROM plone/server-prod-config:${PLONE_VERSION}
diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile.acceptance b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile.acceptance
index a6a1bf9..a8d89bf 100644
--- a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile.acceptance	
+++ b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile.acceptance	
@@ -21,7 +21,6 @@ RUN <<EOT
     ../bin/uv pip install -r requirements-mxdev.txt
     ../bin/python /compile_mo.py
     cd /app
-    rm -Rf src/
 EOT
 
 FROM plone/server-acceptance:${PLONE_VERSION}

From 4cd35d9e05ab24595d84347adf3f90eb15234aa6 Mon Sep 17 00:00:00 2001
From: Mikel Larreategi <mlarreategi@codesyntax.com>
Date: Thu, 21 Nov 2024 16:37:56 +0100
Subject: [PATCH 2/4] remove unneeded /app

---
 .../{{ cookiecutter.__folder_name }}/backend/Dockerfile          | 1 -
 .../backend/Dockerfile.acceptance                                | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile
index 01e351d..8c06545 100644
--- a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile	
+++ b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile	
@@ -20,7 +20,6 @@ RUN <<EOT
     ../bin/mxdev -c mx.ini
     ../bin/uv pip install -r requirements-mxdev.txt
     ../bin/python /compile_mo.py
-    cd /app
 EOT
 
 FROM plone/server-prod-config:${PLONE_VERSION}
diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile.acceptance b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile.acceptance
index a8d89bf..09ffe5b 100644
--- a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile.acceptance	
+++ b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Dockerfile.acceptance	
@@ -20,7 +20,6 @@ RUN <<EOT
     ../bin/mxdev -c mx.ini
     ../bin/uv pip install -r requirements-mxdev.txt
     ../bin/python /compile_mo.py
-    cd /app
 EOT
 
 FROM plone/server-acceptance:${PLONE_VERSION}

From 13d437734310e49c7afa63d8b9607e764a04ed60 Mon Sep 17 00:00:00 2001
From: Mikel Larreategi <mlarreategi@codesyntax.com>
Date: Thu, 21 Nov 2024 16:39:01 +0100
Subject: [PATCH 3/4] develop also frontend addons if present

---
 .../{{ cookiecutter.__folder_name }}/frontend/Dockerfile        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile b/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile
index 413d54f..800dd90 100644
--- a/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile	
+++ b/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile	
@@ -5,11 +5,13 @@ FROM plone/frontend-builder:${VOLTO_VERSION} AS builder
 COPY --chown=node packages/{{cookiecutter.frontend_addon_name}} /app/packages/{{cookiecutter.frontend_addon_name}}
 COPY --chown=node volto.config.js /app/
 COPY --chown=node package.json /app/package.json.temp
+COPY --chown=node mrs.developer.json /app/
 
 RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
     set -e
     python3 -c "import json; orig_data = json.load(open('package.json.temp')); orig_deps = orig_data['dependencies']; data = json.load(open('package.json')); data['dependencies'].update(orig_deps); json.dump(data, open('package.json', 'w'), indent=2)"
     rm package.json.temp
+    pnpm dlx mrs-developer missdev --no-config --fetch-https
     pnpm install && pnpm build:deps
     pnpm build
     pnpm install --prod

From 74be9da200a461bc4532333dabfc49682abc8630 Mon Sep 17 00:00:00 2001
From: Mikel Larreategi <mlarreategi@codesyntax.com>
Date: Fri, 22 Nov 2024 09:26:42 +0100
Subject: [PATCH 4/4] support addons generated with cookieplone. See #109

---
 .../{{ cookiecutter.__folder_name }}/pnpm-workspace.yaml         | 1 +
 .../{{ cookiecutter.__folder_name }}/frontend/Dockerfile         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend_addon/{{ cookiecutter.__folder_name }}/pnpm-workspace.yaml b/frontend_addon/{{ cookiecutter.__folder_name }}/pnpm-workspace.yaml
index f9c0485..7dcfc08 100644
--- a/frontend_addon/{{ cookiecutter.__folder_name }}/pnpm-workspace.yaml	
+++ b/frontend_addon/{{ cookiecutter.__folder_name }}/pnpm-workspace.yaml	
@@ -2,3 +2,4 @@ packages:
   # all packages in direct subdirs of packages/
   - 'core/packages/*'
   - 'packages/*'
+  - 'packages/*/packages/*'
diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile b/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile
index 800dd90..4e295ae 100644
--- a/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile	
+++ b/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile	
@@ -6,6 +6,7 @@ COPY --chown=node packages/{{cookiecutter.frontend_addon_name}} /app/packages/{{
 COPY --chown=node volto.config.js /app/
 COPY --chown=node package.json /app/package.json.temp
 COPY --chown=node mrs.developer.json /app/
+COPY --chown=node pnpm-workspace.yaml /app/
 
 RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
     set -e