Merge branch 'main' into pnicolli-remove-barrel-files

* main: Release 18.1.2 Remove devserver settings for HMR of volto (#6511) Release @plone/components 2.2.1 [components] Fix color picker usability (#6512) Fix README in npm by copying it from the root of the monorepo. (#6510)
plone · Dec 5, 2024 · 4f5c77a · 4f5c77a
2 parents a118254 + c803226
commit 4f5c77a
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 18 deletions.
diff --git a/docs/source/release-notes/index.md b/docs/source/release-notes/index.md
@@ -17,6 +17,23 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.1.2 (2024-12-05)
+
+### Bugfix
+
+- Remove `not ie 11` from browserslist configuration, because it is now included in `not dead`. @stevepiercy [#6501](https://github.com/plone/volto/issues/6501)
+- Fix warnings related to `snapshot.managedPaths` on startup. @davisagli [#6511](https://github.com/plone/volto/issues/6511)
+
+### Internal
+
+- Add Accessibility acceptance tests for content types. @ana-oprea @ichim-david [#6339](https://github.com/plone/volto/issues/6339)
+- Fixed the `README.md` for Volto core when releasing to npm registry: copy it from the root of the monorepo on release. @sneridagh [#6510](https://github.com/plone/volto/issues/6510)
+
+### Documentation
+
+- Add new Volto trainings to tutorials. @stevepiercy [#6499](https://github.com/plone/volto/issues/6499)
+- `html_use_opensearch` value must not have a trailing slash. Clean up comments. @stevepiercy [#6502](https://github.com/plone/volto/issues/6502)
+
 ## 18.1.1 (2024-11-21)
 
 ### Bugfix

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 2.2.1 (2024-12-05)
+
+### Bugfix
+
+- Fix color picker usability. @sneridagh [#6512](https://github.com/plone/volto/issues/6512)
+
 ## 2.2.0 (2024-11-21)
 
 ### Feature

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -8,7 +8,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "repository": {
     "type": "git",
     "url": "http://github.com/plone/components.git"

diff --git a/packages/components/src/components/ColorPicker/ColorPicker.stories.tsx b/packages/components/src/components/ColorPicker/ColorPicker.stories.tsx
@@ -14,11 +14,22 @@ const meta = {
   tags: ['autodocs'],
 } satisfies Meta<typeof ColorPicker>;
 
+const ColorPickerStory = (args: any) => {
+  const [color, setColor] = React.useState(args.defaultValue);
+
+  return (
+    <>
+      <ColorPicker {...args} value={color} onChange={setColor} />
+      The color is: {color.toString('hex')}
+    </>
+  );
+};
+
 export default meta;
 type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
-  render: (args: any) => <ColorPicker {...args} />,
+  render: ColorPickerStory,
 };
 
 Default.args = {

diff --git a/packages/components/src/components/ColorPicker/ColorPicker.tsx b/packages/components/src/components/ColorPicker/ColorPicker.tsx
@@ -35,7 +35,14 @@ export function ColorPicker({ label, children, ...props }: ColorPickerProps) {
                   yChannel="brightness"
                 />
                 <ColorSlider colorSpace="hsb" channel="hue" />
-                <ColorField label="Hex" />
+                <ColorField
+                  label="Hex"
+                  onKeyDown={(e) => {
+                    if (e.key === 'Enter') {
+                      e.currentTarget.blur();
+                    }
+                  }}
+                />
               </>
             )}
           </Dialog>

diff --git a/packages/volto/.release-it.json b/packages/volto/.release-it.json
@@ -5,7 +5,9 @@
   "hooks": {
     "before:bump": ["pnpm i18n", "pnpm build:types", "git add types"],
     "after:bump": [
-      "pipx run towncrier build --draft --yes --version ${version} > .changelog.draft && pipx run towncrier build --yes --version ${version}",
+      "pipx run towncrier build --draft --yes --version ${version} > .changelog.draft",
+      "pipx run towncrier build --yes --version ${version}",
+      "cp ../../README.md ./",
       "make release-notes-copy-to-docs"
     ],
     "after:release": "rm .changelog.draft"

diff --git a/packages/volto/CHANGELOG.md b/packages/volto/CHANGELOG.md
@@ -17,6 +17,23 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.1.2 (2024-12-05)
+
+### Bugfix
+
+- Remove `not ie 11` from browserslist configuration, because it is now included in `not dead`. @stevepiercy [#6501](https://github.com/plone/volto/issues/6501)
+- Fix warnings related to `snapshot.managedPaths` on startup. @davisagli [#6511](https://github.com/plone/volto/issues/6511)
+
+### Internal
+
+- Add Accessibility acceptance tests for content types. @ana-oprea @ichim-david [#6339](https://github.com/plone/volto/issues/6339)
+- Fixed the `README.md` for Volto core when releasing to npm registry: copy it from the root of the monorepo on release. @sneridagh [#6510](https://github.com/plone/volto/issues/6510)
+
+### Documentation
+
+- Add new Volto trainings to tutorials. @stevepiercy [#6499](https://github.com/plone/volto/issues/6499)
+- `html_use_opensearch` value must not have a trailing slash. Clean up comments. @stevepiercy [#6502](https://github.com/plone/volto/issues/6502)
+
 ## 18.1.1 (2024-11-21)
 
 ### Bugfix

diff --git a/packages/volto/news/6339.internal b/packages/volto/news/6339.internal
diff --git a/packages/volto/news/6499.documentation b/packages/volto/news/6499.documentation
diff --git a/packages/volto/news/6501.bugfix b/packages/volto/news/6501.bugfix
diff --git a/packages/volto/news/6502.documentation b/packages/volto/news/6502.documentation
diff --git a/packages/volto/package.json b/packages/volto/package.json
@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.1.1",
+  "version": "18.1.2",
   "repository": {
     "type": "git",
     "url": "[email protected]:plone/volto.git"

diff --git a/packages/volto/razzle.config.js b/packages/volto/razzle.config.js
@@ -414,15 +414,6 @@ const defaultModify = ({
         ]
       : [];
 
-  if (config.devServer) {
-    config.devServer.static.watch.ignored = /node_modules\/(?!@plone\/volto)/;
-    config.snapshot = {
-      managedPaths: [
-        /^(.+?[\\/]node_modules[\\/](?!(@plone[\\/]volto))(@.+?[\\/])?.+?)[\\/]/,
-      ],
-    };
-  }
-
   return config;
 };