Merge branch 'main' into erral-registration-form-with-userschema

plone · Nov 12, 2024 · 3f6c741 · 3f6c741
2 parents 166fa73 + 157df05
commit 3f6c741
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 10 deletions.
diff --git a/docs/source/release-notes/index.md b/docs/source/release-notes/index.md
@@ -17,6 +17,26 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.1.0 (2024-11-11)
+
+### Feature
+
+- Update Dutch translations. @fredvd [#6476](https://github.com/plone/volto/issues/6476)
+
+### Bugfix
+
+- URL Management control panel: Show errors from a failed CSV upload. @davisagli [#6473](https://github.com/plone/volto/issues/6473)
+- Added missing style Helmet serialization in the HTML component to make it work in SSR. @sneridagh
+  Fix deprecation notice for the usage of apple-mobile-web-app-capable. [#6480](https://github.com/plone/volto/issues/6480)
+
+### Internal
+
+- Added React Router 7 experimental PoC. @sneridagh [#6472](https://github.com/plone/volto/issues/6472)
+
+### Documentation
+
+- Overhaul and update of the add-ons section in documentation. @sneridagh [#6397](https://github.com/plone/volto/issues/6397)
+
 ## 18.0.3 (2024-11-05)
 
 ### Bugfix

diff --git a/packages/volto-slate/CHANGELOG.md b/packages/volto-slate/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 18.0.1 (2024-11-11)
+
+### Feature
+
+- Update Dutch translations. @fredvd [#6476](https://github.com/plone/volto/issues/6476)
+
 ## 18.0.0 (2024-10-31)
 
 ### Internal

diff --git a/packages/volto-slate/news/6476.feature b/packages/volto-slate/news/6476.feature
diff --git a/packages/volto-slate/package.json b/packages/volto-slate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "18.0.0",
+  "version": "18.0.1",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/packages/volto/CHANGELOG.md b/packages/volto/CHANGELOG.md
@@ -17,6 +17,26 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.1.0 (2024-11-11)
+
+### Feature
+
+- Update Dutch translations. @fredvd [#6476](https://github.com/plone/volto/issues/6476)
+
+### Bugfix
+
+- URL Management control panel: Show errors from a failed CSV upload. @davisagli [#6473](https://github.com/plone/volto/issues/6473)
+- Added missing style Helmet serialization in the HTML component to make it work in SSR. @sneridagh
+  Fix deprecation notice for the usage of apple-mobile-web-app-capable. [#6480](https://github.com/plone/volto/issues/6480)
+
+### Internal
+
+- Added React Router 7 experimental PoC. @sneridagh [#6472](https://github.com/plone/volto/issues/6472)
+
+### Documentation
+
+- Overhaul and update of the add-ons section in documentation. @sneridagh [#6397](https://github.com/plone/volto/issues/6397)
+
 ## 18.0.3 (2024-11-05)
 
 ### Bugfix

diff --git a/packages/volto/news/6397.documentation b/packages/volto/news/6397.documentation
diff --git a/packages/volto/news/6472.internal b/packages/volto/news/6472.internal
diff --git a/packages/volto/news/6473.bugfix b/packages/volto/news/6473.bugfix
diff --git a/packages/volto/news/6476.feature b/packages/volto/news/6476.feature
diff --git a/packages/volto/package.json b/packages/volto/package.json
@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.0.3",
+  "version": "18.1.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"

diff --git a/packages/volto/src/helpers/Html/Html.jsx b/packages/volto/src/helpers/Html/Html.jsx
@@ -102,6 +102,7 @@ class Html extends Component {
           {head.meta.toComponent()}
           {head.link.toComponent()}
           {head.script.toComponent()}
+          {head.style.toComponent()}
 
           <script
             dangerouslySetInnerHTML={{
@@ -129,7 +130,7 @@ class Html extends Component {
           <link rel="manifest" href="/site.webmanifest" />
           <meta name="generator" content="Plone 6 - https://plone.org" />
           <meta name="viewport" content="width=device-width, initial-scale=1" />
-          <meta name="apple-mobile-web-app-capable" content="yes" />
+          <meta name="mobile-web-app-capable" content="yes" />
           {process.env.NODE_ENV === 'production' && criticalCss && (
             <style
               dangerouslySetInnerHTML={{ __html: this.props.criticalCss }}

diff --git a/packages/volto/src/helpers/Html/Html.test.jsx b/packages/volto/src/helpers/Html/Html.test.jsx
@@ -20,6 +20,9 @@ jest.mock('../Helmet/Helmet', () => ({
     script: {
       toComponent: () => '',
     },
+    style: {
+      toComponent: () => '',
+    },
     htmlAttributes: {
       toComponent: () => ({
         lang: 'en',

diff --git a/packages/volto/src/helpers/Html/__snapshots__/Html.test.jsx.snap b/packages/volto/src/helpers/Html/__snapshots__/Html.test.jsx.snap
@@ -44,7 +44,7 @@ exports[`Html renders a html component 1`] = `
     />
     <meta
       content="yes"
-      name="apple-mobile-web-app-capable"
+      name="mobile-web-app-capable"
     />
     <link
       as="script"
@@ -136,7 +136,7 @@ exports[`Html renders a html component with apiPath present 1`] = `
     />
     <meta
       content="yes"
-      name="apple-mobile-web-app-capable"
+      name="mobile-web-app-capable"
     />
     <link
       as="script"