Merge pull request #50 from plone/update

Update plone.de

.github/workflows/backend-testing.yml

@@ -3,11 +3,10 @@ name: Backend testing.plone.de CI and Deploy
 on:
   push:
     paths:
-      - "backend/**"
+      - 'backend/**'
   workflow_dispatch:
 
 jobs:
-
   black:
     if: github.ref_type == 'branch'
     runs-on: ubuntu-latest
@@ -69,7 +68,7 @@ jobs:
         python:
           - 3.11
         plone:
-          - "6.0.4"
+          - '6.0.10.1'
 
     defaults:
       run:
@@ -100,7 +99,6 @@ jobs:
     needs: [black, flake8, isort, zpretty, tests]
 
     steps:
-
       - name: Checkout
         uses: actions/checkout@v3
 
@@ -153,14 +151,14 @@ jobs:
       - name: Deploy to testing.plone.de
         uses: kitconcept/docker-stack-deploy@v1.2.0
         with:
-          registry: "ghcr.io"
+          registry: 'ghcr.io'
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           remote_host: ${{ vars.DEPLOY_HOST }}
           remote_port: ${{ vars.DEPLOY_PORT }}
           remote_user: ${{ vars.DEPLOY_USER }}
           remote_private_key: ${{ secrets.DEPLOY_SSH }}
-          stack_file: "devops/stacks/testing.plone.de.yml"
-          stack_name: "testing-plone-de"
+          stack_file: 'devops/stacks/testing.plone.de.yml'
+          stack_name: 'testing-plone-de'
           env_file: ${{ secrets.ENV_FILE }}
           deploy_timeout: 480

.github/workflows/codeanalysis.yml

@@ -4,10 +4,9 @@ on:
   push:
 
 env:
-  node-version: 16.x
+  node-version: 18.x
 
 jobs:
-
   eslint:
     runs-on: ubuntu-latest
     defaults:
@@ -112,4 +111,4 @@ jobs:
         uses: plone/code-analysis-action@v2
         with:
           base_dir: 'backend'
-          check: 'zpretty'
+          check: 'zpretty'

.github/workflows/frontend-testing.yml

@@ -4,17 +4,16 @@ on:
   workflow_dispatch:
   push:
     paths:
-      - "frontend/**"
+      - 'frontend/**'
 
 env:
-  node-version: 16.x
+  node-version: 18.x
 
 defaults:
   run:
     working-directory: ./frontend
 
 jobs:
-
   eslint:
     if: github.ref_type == 'branch'
     runs-on: ubuntu-latest
@@ -92,7 +91,6 @@ jobs:
     needs: [eslint, prettier, i18n, unit]
 
     steps:
-
       - name: Checkout
         uses: actions/checkout@v3
 
@@ -129,14 +127,13 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: $${{ steps.meta.outputs.labels }}
 
-
   deploy:
     if: ${{ github.ref == 'refs/heads/main' }}
     concurrency: deploy_testing
     needs:
       - release
     runs-on: ubuntu-latest
-    environment: 
+    environment:
       name: testing.plone.de
       url: https://testing.plone.de
     steps:
@@ -146,14 +143,14 @@ jobs:
       - name: Deploy to testing.plone.de
         uses: kitconcept/docker-stack-deploy@v1.2.0
         with:
-          registry: "ghcr.io"
+          registry: 'ghcr.io'
           username: ${{ github.actor }}
           password: ${{ secrets.DEPLOY_GHCR_READ_TOKEN }}
           remote_host: ${{ vars.DEPLOY_HOST }}
           remote_port: ${{ vars.DEPLOY_PORT }}
           remote_user: ${{ vars.DEPLOY_USER }}
           remote_private_key: ${{ secrets.DEPLOY_SSH }}
-          stack_file: "devops/stacks/testing.plone.de.yml"
-          stack_name: "testing-plone-de"
+          stack_file: 'devops/stacks/testing.plone.de.yml'
+          stack_name: 'testing-plone-de'
           env_file: ${{ secrets.ENV_FILE }}
           deploy_timeout: 480

.gitignore

@@ -1 +1,2 @@
 !.vscode
+data/

backend/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG PLONE_VERSION=6.0.7
+ARG PLONE_VERSION=6.0.10.1
 FROM plone/plone-backend:${PLONE_VERSION}
 
 LABEL maintainer="Simples Consultoria <comercial@plone.de>" \

backend/Dockerfile.acceptance

@@ -1,4 +1,4 @@
-ARG PLONE_VERSION=6.0.7
+ARG PLONE_VERSION=6.0.10.1
 FROM plone/plone-backend:${PLONE_VERSION}
 
 LABEL maintainer="Jonas Piterek <piterek@kitconcept.com>" \

backend/Makefile

@@ -15,7 +15,7 @@ GREEN=`tput setaf 2`
 RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
-PLONE_VERSION=6.0.7
+PLONE_VERSION=$$(cat version.txt)
 
 BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
@@ -94,6 +94,11 @@ config: bin/pip  ## Create instance configuration
 	@echo "$(GREEN)==> Create instance configuration$(RESET)"
 	bin/cookiecutter -f --no-input --config-file instance.yaml gh:plone/cookiecutter-zope-instance
 
+.PHONY: config-fs
+config-fs: bin/pip  ## Create instance configuration
+	@echo "$(GREEN)==> Create instance configuration$(RESET)"
+	bin/cookiecutter -f --no-input --config-file instance-filestorage.yaml gh:plone/cookiecutter-zope-instance
+
 # i18n
 bin/i18ndude: bin/pip
 	@echo "$(GREEN)==> Install translation tools$(RESET)"
@@ -110,7 +115,15 @@ i18n: bin/i18ndude ## Update locales
 .PHONY: build-dev
 build-dev: config ## pip install Plone packages
 	@echo "$(GREEN)==> Setup Build$(RESET)"
-	bin/mxdev -c mx.ini
+	sed "s/PLONE_VERSION/$(PLONE_VERSION)/g" constraints-template.txt > constraints.txt
+	@bin/mxdev -c mx.ini
+	bin/pip install -r requirements-mxdev.txt
+
+.PHONY: build-dev-fs
+build-dev-fs: config-fs ## pip install Plone packages
+	@echo "$(GREEN)==> Setup Build$(RESET)"
+	sed "s/PLONE_VERSION/$(PLONE_VERSION)/g" constraints-template.txt > constraints.txt
+	@bin/mxdev -c mx.ini
 	bin/pip install -r requirements-mxdev.txt
 
 .PHONY: format

backend/constraints-template.txt

@@ -0,0 +1 @@
+-c https://dist.plone.org/release/PLONE_VERSION/constraints.txt

backend/constraints.txt

@@ -1 +1 @@
--c https://dist.plone.org/release/6.0-dev/constraints.txt
+-c https://dist.plone.org/release/6.0.10.1/constraints.txt

backend/instance-filestorage.yaml

@@ -0,0 +1,13 @@
+default_context:
+  initial_user_name: 'admin'
+  initial_user_password: 'admin'
+
+  load_zcml:
+    package_includes: ['plonede']
+
+  dos_protection_available: true
+
+  db_storage: direct
+
+  db_filestorage_location: ../data/filestorage/Data.fs
+  db_blobs_location: ../data/blobs

backend/instance.yaml

@@ -1,8 +1,8 @@
 default_context:
-    initial_user_name: 'admin'
-    initial_user_password: 'admin'
+  initial_user_name: 'admin'
+  initial_user_password: 'admin'
 
-    load_zcml:
-        package_includes: ['plonede']
+  load_zcml:
+    package_includes: ['plonede']
 
-    db_storage: direct
+  db_storage: direct

backend/requirements.txt

@@ -2,6 +2,8 @@
 -e src/plonede[test]
 
 zope.testrunner
+relstorage==4.0.0
+psycopg2==2.9.9
 
 # Add required add-ons
 # (Ideally add them in setup.py for plonede)

backend/version.txt

@@ -0,0 +1 @@
+6.0.10.1

devops/zodbconvert/relstorage.cfg

@@ -0,0 +1,11 @@
+<relstorage source>
+  blob-dir /tmp/blobcache
+  shared-blob-dir false 
+  <postgresql>
+    dsn dbname='plonede' user='plonede' host='127.0.0.1' port='5432' password='plonede'
+  </postgresql>
+</relstorage>
+<filestorage destination>
+  path ./data/filestorage/Data.fs
+  blob-dir ./data/blobs
+</filestorage>

frontend/Makefile

@@ -21,6 +21,7 @@ help: ## This help message
 .PHONY: clean
 clean: ## Clean installation
 	@echo "Clean installation"
+	rm -Rf yarn.lock
 	rm -Rf node_modules
 
 .PHONY: build

frontend/locales/de/LC_MESSAGES/volto.po

@@ -1,13 +1,3 @@
-# Translation of plone.pot to German
-# Jan Ulrich Hasecke <jan.ulrich@hasecke.com>, 2003-2010.
-# Simon Eisenmann <simon@struktur.de>, 2003.
-# Hanno Schlichting <plone@hannosch.info>, 2003-2008.
-# Dominik Bittl <dominik@umount.org>, 2005.
-# Christian Ullrich <chris@chrullrich.de>, 2005.
-# Thomas Lotze <tl@gocept.com>, 2005-2008.
-# Sven Deichmann <deichmann@werkbank.com>, 2008-2010.
-# Harald Friessnegger <harald@webmeisterei.com>, 2011.
-# Andreas Jung <info@zopyx.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"

frontend/locales/es/LC_MESSAGES/volto.po

@@ -1,6 +1,3 @@
-# Gettext Message File for Plone
-# Translators:
-# Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"

frontend/locales/eu/LC_MESSAGES/volto.po

@@ -1,4 +1,3 @@
-# Translation of plone.pot to EU
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"

frontend/locales/fr/LC_MESSAGES/volto.po

@@ -1,13 +1,3 @@
-# Translation of plone.pot to French
-# French Translation Team <plone-i18n@lists.sourceforge.net>, 2003-2006.
-# Sebastien Douche <sdouche@gmail.com>, 2005-2007.
-# Encolpe Degoute <encolpe.degoute@ingeniweb.com>, 2006, 2007, 2008.
-# Gilles Lenfant <gilles.lenfant@ingeniweb.com>, 2008.
-# Encolpe Degoute <encolpe@gmail.com>, 2008.
-# Vincent Fretin <vincent.fretin@gmail.com>, 2009.
-# Kevin Deldycke <kevin@deldycke.com>, 2009.
-# JeanMichel FRANCOIS <toutpt@gmail.com>, 2010.
-# Denis Bitouzé <denis.bitouze@univ-littoral.fr>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"

frontend/locales/ja/LC_MESSAGES/volto.po

@@ -1,5 +1,3 @@
-# Manabu TERADA <terada@cmscom.jp> 2019
-# Peacock <peacock0803sz@gmail.com> 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"

frontend/locales/nl/LC_MESSAGES/volto.po

@@ -1,18 +1,3 @@
-# Translators:
-# Fred van Dijk <info@zestsoftware.nl>, 2016
-# Coen van der Kamp <c.van.der.kamp@zestsoftware.nl>, 2015
-# Danny Bloemendaal <danny.bloemendaal@informaat.nl>, 2007
-# Diederik Veeze <diederik_24@hotmail.com>, 2015
-# Duco Dokter <dokter@w20e.com>, 2007
-# Esther Ladage <e.ladage@zestsoftware.nl>, 2005
-# Jean-Paul Ladage <j.ladage@zestsoftware.nl>, 2017
-# Kees Hink <hink@gw20e.com>, 2010
-# Maarten Kling <maarten@fourdigits.nl>, 2013
-# Mark van Lent <m.vanlent@zestsoftware.nl>, 2007
-# Mirella van Teulingen <m.van.teulingen@zestsoftware.nl>, 2005
-# Reinout van Rees <reinout@zestsoftware.nl>, 2008
-# Roel Bruggink <roel@fourdigits.nl>, 2009
-# Wietze Helmantel <helmantel@goldmund-wyldebeast-wunderliebe.com>, 2007
 msgid ""
 msgstr ""
 "Project-Id-Version: PlonenPOT-Creation-Date: 2017-04-27T19:30:59.079Z\n"

frontend/locales/pt/LC_MESSAGES/volto.po

@@ -1,6 +1,3 @@
-# Translators:
-# Emanuel de Jesus <emanuel.angelo@gmail.com>, 2019
-# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"

frontend/locales/pt_BR/LC_MESSAGES/volto.po

@@ -1,5 +1,3 @@
-# Translators:
-# Léu Almeida <leo@webid.net.br>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"

frontend/locales/ro/LC_MESSAGES/volto.po

@@ -1,5 +1,3 @@
-# Translation of plone.pot to Romanian
-# Alin Voinea <avoinea@plone.org>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"

frontend/locales/volto.pot

@@ -1,13 +1,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2022-11-18T13:47:51.554Z\n"
+"POT-Creation-Date: 2024-03-08T10:18:29.664Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"MIME-Version: 1.0\n"
 "Language-Code: en\n"
 "Language-Name: English\n"
 "Preferred-Encodings: utf-8\n"