From 7a1532260a69d116ad35f9012270a9d52214a93a Mon Sep 17 00:00:00 2001
From: Philip Bauer <bauer@starzel.de>
Date: Thu, 7 Mar 2024 13:08:57 +0100
Subject: [PATCH 1/2] Fix migrating bocks by bypassing the frontend-specific
 modifiers when serializing and deserializing blocks

---
 src/collective/exportimport/configure.zcml  |  2 ++
 src/collective/exportimport/deserializer.py | 12 ++++++++++++
 src/collective/exportimport/serializer.py   | 11 +++++++++++
 3 files changed, 25 insertions(+)

diff --git a/src/collective/exportimport/configure.zcml b/src/collective/exportimport/configure.zcml
index 9aef47fb..0c5b1d2d 100644
--- a/src/collective/exportimport/configure.zcml
+++ b/src/collective/exportimport/configure.zcml
@@ -137,10 +137,12 @@
   <adapter factory=".serializer.CollectionFieldSerializer" />
   <adapter factory=".serializer.ChoiceFieldSerializer" />
   <adapter factory=".serializer.long_converter" />
+  <adapter factory=".serializer.ExportingBlocksJSONFieldSerializer" />
 
   <!-- Deserializers -->
   <adapter factory=".deserializer.RichTextFieldDeserializerWithoutUnescape" />
   <adapter factory=".deserializer.PortletRichTextFieldDeserializer" />
+  <adapter factory=".deserializer.ImportingBlocksJSONFieldDeserializer" />
 
   <browser:page
       name="exportimport_links"
diff --git a/src/collective/exportimport/deserializer.py b/src/collective/exportimport/deserializer.py
index bd6fa0bc..b2388c27 100644
--- a/src/collective/exportimport/deserializer.py
+++ b/src/collective/exportimport/deserializer.py
@@ -3,8 +3,11 @@
 from plone.app.textfield.value import RichTextValue
 from plone.dexterity.interfaces import IDexterityContent
 from plone.portlets.interfaces import IPortletAssignment
+from plone.restapi.behaviors import IBlocks
 from plone.restapi.deserializer.dxfields import DefaultFieldDeserializer
 from plone.restapi.interfaces import IFieldDeserializer
+from plone.restapi.interfaces import IFieldDeserializer
+from plone.schema import IJSONField
 from zope.component import adapter
 from zope.interface import implementer
 
@@ -15,6 +18,7 @@ class RichTextFieldDeserializerWithoutUnescape(DefaultFieldDeserializer):
     """Override default RichTextFieldDeserializer without using html_parser.unescape().
     Fixes https://github.com/collective/collective.exportimport/issues/99
     """
+
     def __call__(self, value):
         content_type = self.field.default_mime_type
         encoding = "utf8"
@@ -38,3 +42,11 @@ def __call__(self, value):
 @adapter(IRichText, IPortletAssignment, IMigrationMarker)
 class PortletRichTextFieldDeserializer(RichTextFieldDeserializerWithoutUnescape):
     pass
+
+
+@implementer(IFieldDeserializer)
+@adapter(IJSONField, IBlocks, IMigrationMarker)
+class ImportingBlocksJSONFieldDeserializer(DefaultFieldDeserializer):
+    """We skip the subscribers that deserialize the blocks from the frontend.
+    We only need the raw data.
+    """
diff --git a/src/collective/exportimport/serializer.py b/src/collective/exportimport/serializer.py
index 1f303ba2..acb5a67b 100644
--- a/src/collective/exportimport/serializer.py
+++ b/src/collective/exportimport/serializer.py
@@ -9,10 +9,13 @@
 from plone.dexterity.interfaces import IDexterityContent
 from plone.namedfile.interfaces import INamedFileField, INamedBlobFileField
 from plone.namedfile.interfaces import INamedImageField
+from plone.restapi.behaviors import IBlocks
 from plone.restapi.interfaces import IFieldSerializer
 from plone.restapi.interfaces import IJsonCompatible
+from plone.restapi.serializer.blocks import BlocksJSONFieldSerializer
 from plone.restapi.serializer.converters import json_compatible
 from plone.restapi.serializer.dxfields import DefaultFieldSerializer
+from plone.schema import IJSONField
 from Products.CMFCore.utils import getToolByName
 from zope.component import adapter
 from zope.component import getUtility
@@ -607,6 +610,14 @@ def __call__(self):
         return json_compatible(result)
 
 
+@adapter(IJSONField, IBlocks, IMigrationMarker)
+@implementer(IFieldSerializer)
+class ExportingBlocksJSONFieldSerializer(DefaultFieldSerializer):
+    """We skip the subscribers that serialize the blocks for the frontend.
+    We only need the raw data.
+    """
+
+
 if six.PY2:
 
     @adapter(long)

From 8b730b93c24b7e6d7b2b21c2e1a36521c0e193e9 Mon Sep 17 00:00:00 2001
From: Philip Bauer <bauer@starzel.de>
Date: Thu, 7 Mar 2024 14:59:02 +0100
Subject: [PATCH 2/2] Add changenote

---
 CHANGES.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4d1e4203..65fafc06 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,8 @@ Changelog
 1.12 (unreleased)
 -----------------
 
-- Nothing changed yet.
+- Fix migrating bocks to make Volto sites portable and support plone.distribution.
+  [pbauer, tlotze]
 
 
 1.11 (2024-02-28)