Upgrade Plone, Volto (#11)

* Upgrade Plone, Volto

* Remove volto-twitter-block

* Bump volto-matomo

.github/workflows/backend.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   PYTHON_VERSION: 3.11
-  PLONE_VERSION: 6.0.2
+  PLONE_VERSION: 6.0.6
   IMAGE_NAME_SUFFIX: backend
 
 defaults:

backend/Makefile

@@ -15,7 +15,7 @@ GREEN=`tput setaf 2`
 RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
-PLONE_VERSION=6.0.2
+PLONE_VERSION=6.0.6
 
 ifndef LOG_LEVEL
 	LOG_LEVEL=INFO

backend/src/ploneorgbr.core/setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name="ploneorgbr.core",
-    version="1.0a1",
+    version="1.0.0a1",
     description="Plone Brasil configuration package.",
     long_description=long_description,
     classifiers=[
@@ -25,6 +25,8 @@
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],
@@ -51,6 +53,9 @@
         "kitconcept.api",
         "collective.volto.formsupport>=2.5",
         "pas.plugins.authomatic>=1.0b2",
+        "collective.exportimport",
+        "collective.mastodon>=1.0.0a2",
+        "collective.bluesky",
     ],
     extras_require={
         "test": [

devops/stacks/plone.org.br.yml

@@ -1,4 +1,4 @@
-version: '3.3'
+version: '3.8'
 
 services:
 
@@ -16,6 +16,10 @@ services:
       placement:
         constraints:
           - node.labels.type == app
+      update_config:
+        parallelism: 1
+        delay: 5s
+        order: start-first
       labels:
         - traefik.enable=true
         - traefik.docker.network=public
@@ -34,6 +38,8 @@ services:
     image: ghcr.io/plonegovbr/ploneorgbr-backend:${STACK_PARAM:-latest}
     environment:
       RELSTORAGE_DSN: "dbname='${DB_NAME:-plone}' user='${DB_USER:-plone}' host='${DB_HOST:-db}' password='${DB_PASSWORD:-plone}'"
+      MASTODON_APPS: "${MASTODON_APPS:-[]}"
+      BLUESKY_APPS: "${BLUESKY_APPS:-[]}"
     networks:
       - public
       - nw-plone-org-br
@@ -42,21 +48,39 @@ services:
       placement:
         constraints:
           - node.labels.type == app
+      update_config:
+        parallelism: 1
+        delay: 5s
+        order: start-first
       labels:
         - traefik.enable=true
         - traefik.docker.network=public
         - traefik.constraint-label=public
         # Service
         - traefik.http.services.svc-ploneorgbr-live-backend.loadbalancer.server.port=8080
         # Middlewares
+        ## /++api++
         - "traefik.http.middlewares.mw-ploneorgbr-live-vhm-api.replacepathregex.regex=^/\\+\\+api\\+\\+($$|/.*)"
         - "traefik.http.middlewares.mw-ploneorgbr-live-vhm-api.replacepathregex.replacement=/VirtualHostBase/https/plone.org.br/Plone/++api++/VirtualHostRoot/$$1"
+        ## /ClassicUI
+        - "traefik.http.middlewares.mw-ploneorgbr-live-vhm-classicui.replacepathregex.regex=^/ClassicUI($$|/.*)"
+        - "traefik.http.middlewares.mw-ploneorgbr-live-vhm-classicui.replacepathregex.replacement=/VirtualHostBase/https/plone.org.br/Plone/VirtualHostRoot/_vh_ClassicUI/$$1"
+        ## BasicAuth
+        - traefik.http.middlewares.mw-ploneorgbr-live-backend-auth.basicauth.users=${BASIC_AUTH}
+
         # Router
+        ## /++api++
         - traefik.http.routers.rt-ploneorgbr-live-backend.rule=Host(`plone.org.br`) && PathPrefix(`/++api++`)
         - traefik.http.routers.rt-ploneorgbr-live-backend.entrypoints=https
         - traefik.http.routers.rt-ploneorgbr-live-backend.tls=true
         - traefik.http.routers.rt-ploneorgbr-live-backend.service=svc-ploneorgbr-live-backend
         - traefik.http.routers.rt-ploneorgbr-live-backend.middlewares=gzip,mw-ploneorgbr-live-vhm-api
+        ## /ClassicUI
+        - traefik.http.routers.rt-ploneorgbr-live-classicui.rule=Host(`plone.org.br`) && PathPrefix(`/ClassicUI`)
+        - traefik.http.routers.rt-ploneorgbr-live-classicui.entrypoints=https
+        - traefik.http.routers.rt-ploneorgbr-live-classicui.tls=true
+        - traefik.http.routers.rt-ploneorgbr-live-classicui.service=svc-ploneorgbr-live-backend
+        - traefik.http.routers.rt-ploneorgbr-live-classicui.middlewares=gzip,mw-ploneorgbr-live-backend-auth,mw-ploneorgbr-live-vhm-classicui
 
 networks:
   public:

frontend/package.json

@@ -49,7 +49,7 @@
     "@kitconcept/volto-slider-block",
     "@plone-collective/volto-authomatic",
     "@plonegovbr/volto-code-block",
-    "@plonegovbr/volto-twitter-block",
+    "@kitconcept/volto-social-blocks",
     "volto-form-block"
   ],
   "jest": {
@@ -153,20 +153,20 @@
   "dependencies": {
     "@codesyntax/volto-social-sharing": "*",
     "@eeacms/volto-accordion-block": "*",
-    "@eeacms/volto-matomo": "*",
+    "@eeacms/volto-matomo": "4.1.3",
     "@eeacms/volto-statistic-block": "*",
     "@kitconcept/volto-blocks-grid": "*",
     "@kitconcept/volto-button-block": "*",
     "@kitconcept/volto-carousel-block": "*",
     "@kitconcept/volto-heading-block": "*",
     "@kitconcept/volto-separator-block": "*",
     "@kitconcept/volto-slider-block": "*",
+    "@kitconcept/volto-social-blocks": "1.0.0-alpha.4",
     "@plone-collective/volto-authomatic": "*",
-    "@plone/scripts": "2.1.2",
-    "@plone/volto": "16.16.0",
-    "@plonegovbr/volto-code-block": "1.0.0",
-    "@plonegovbr/volto-twitter-block": "0.1.0",
-    "volto-form-block": "3.0.0",
+    "@plone/scripts": "3.0.0",
+    "@plone/volto": "16.22.2",
+    "@plonegovbr/volto-code-block": "2.1.0",
+    "volto-form-block": "3.1.0",
     "volto-subblocks": "2.0.0"
   },
   "devDependencies": {