From 2e9352c05ed23f1d950e84309d9758999f300b5e Mon Sep 17 00:00:00 2001
From: Mikel Larreategi <mlarreategi@codesyntax.com>
Date: Wed, 13 Nov 2024 20:37:43 +0100
Subject: [PATCH 1/2] change clean command not to delete data and add a
 reset-data command to remove data (#103)

---
 backend_addon/{{ cookiecutter.__folder_name }}/Makefile    | 7 ++++++-
 .../{{ cookiecutter.__folder_name }}/backend/Makefile      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/backend_addon/{{ cookiecutter.__folder_name }}/Makefile b/backend_addon/{{ cookiecutter.__folder_name }}/Makefile
index cd8a7a5..e309401 100644
--- a/backend_addon/{{ cookiecutter.__folder_name }}/Makefile	
+++ b/backend_addon/{{ cookiecutter.__folder_name }}/Makefile	
@@ -73,7 +73,12 @@ build: build-dev ## Install Plone
 .PHONY: clean
 clean: ## Clean environment
 	@echo "$(RED)==> Cleaning environment and build$(RESET)"
-	rm -rf $(VENV_FOLDER) pyvenv.cfg .installed.cfg instance .tox .venv .pytest_cache
+	rm -rf $(VENV_FOLDER) pyvenv.cfg .installed.cfg instance/etc .tox .venv .pytest_cache
+
+.PHONY: remove-data
+remove-data: ## Remove all content
+	@echo "$(RED)==> Removing all content$(RESET)"
+	rm -rf $(VENV_FOLDER) instance/var
 
 .PHONY: start
 start: ## Start a Plone instance on localhost:8080
diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Makefile b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Makefile
index 1c8f8ca..a5d80bf 100644
--- a/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Makefile	
+++ b/sub/project_settings/{{ cookiecutter.__folder_name }}/backend/Makefile	
@@ -79,7 +79,12 @@ build: build-dev ## Install Plone
 .PHONY: clean
 clean: ## Clean environment
 	@echo "$(RED)==> Cleaning environment and build$(RESET)"
-	rm -rf $(VENV_FOLDER) pyvenv.cfg .installed.cfg instance .tox .venv .pytest_cache
+	rm -rf $(VENV_FOLDER) pyvenv.cfg .installed.cfg instance/etc .tox .venv .pytest_cache
+
+.PHONY: remove-data
+remove-data: ## Remove all content
+	@echo "$(RED)==> Removing all content$(RESET)"
+	rm -rf $(VENV_FOLDER) instance/var
 
 .PHONY: start
 start: ## Start a Plone instance on localhost:8080

From 978355fd9d51cad1a7a4037d768f0775817e4a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20de=20Alba?=
 <sneridagh@gmail.com>
Date: Wed, 13 Nov 2024 20:38:06 +0100
Subject: [PATCH 2/2] Improve the copy of the deps from the project to the
 boilerplate (#102)

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

diff --git a/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile b/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile
index 41a2c5c..413d54f 100644
--- a/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile	
+++ b/sub/project_settings/{{ cookiecutter.__folder_name }}/frontend/Dockerfile	
@@ -8,7 +8,7 @@ COPY --chown=node package.json /app/package.json.temp
 
 RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
     set -e
-    python3 -c "import json; data = json.load(open('package.json.temp')); deps = data['dependencies']; data['dependencies'].update(deps); json.dump(data, open('package.json', 'w'), indent=2)"
+    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 install && pnpm build:deps
     pnpm build