Merge branch 'main' into slots-base

* main: Added upgrade guide fix for HMR (#6446) Fix CSS lint in Volto Slate (#6444)
plone · Oct 28, 2024 · 699b79f · 699b79f
2 parents 3accc47 + 907f5a4
commit 699b79f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/docs/source/upgrade-guide/index.md b/docs/source/upgrade-guide/index.md
@@ -579,6 +579,27 @@ Also in the Storybook configuration {file}`.storybook/main.js`.
 ```{versionadded} @plone/registry 3.0.0-alpha.0
 ```
 
+### Add missing overrides to projects in `package.json`
+
+This will fix some issues with Hot Module Reload in projects.
+It's required in Volto `18.0.0-alpha.47` and later, otherwise the site breaks in development mode.
+Add this object to the `pnpm` key in your project {file}`package.json`.
+
+```json
+  "pnpm": {
+    "overrides": {
+			"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
+			"react-refresh": "^0.14.2"
+    }
+  },
+```
+
+```{versionadded} Volto 18.0.0-alpha.47
+```
+
+```{versionadded} @plone/registry 3.0.0-alpha.0
+```
+
 ### Deprecation notices for Volto 18
 
 #### `@plone/generator-volto`

diff --git a/packages/volto-slate/news/6444.bugfix b/packages/volto-slate/news/6444.bugfix
@@ -0,0 +1 @@
+Fix slight CSS lint violation in volto-slate @sneridagh
diff --git a/packages/volto-slate/src/editor/less/editor.less b/packages/volto-slate/src/editor/less/editor.less
@@ -28,7 +28,7 @@
 
     .link-form-container {
       margin-left: 2px;
-      display: flex; 
+      display: flex;
       align-items: center;
     }
   }

diff --git a/packages/volto/news/6446.documentation b/packages/volto/news/6446.documentation
@@ -0,0 +1 @@
+Added upgrade guide fix for HMR. @sneridagh