chore: realign to main and update test snapshots

plone · Dec 6, 2024 · 26d4e96 · 26d4e96
2 parents 066c1ad + c803226
commit 26d4e96
Show file tree

Hide file tree

Showing 12 changed files with 235 additions and 223 deletions.
diff --git a/docs/source/release-notes/index.md b/docs/source/release-notes/index.md
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
@@ -18,7 +24,7 @@
 
 ### Internal
 
-- Improve packaging and bring back the export for `src` folder. @sneridagh 
+- Improve packaging and bring back the export for `src` folder. @sneridagh
 
 ## 2.1.0 (2024-11-05)
 
@@ -30,7 +36,7 @@
 
 ### Internal
 
-- Release 2.0.0 @sneridagh 
+- Release 2.0.0 @sneridagh
 
 ## 2.0.0-alpha.16 (2024-10-18)
 
@@ -41,7 +47,8 @@
   Refactored the `Link` component to not use it, since `react-aria-components` uses the React Client Routing facilities that can be injected into the React tree.
 
   Breaking:
-    - Use the new providers in `@plone/providers` instead to make the new `Link` work with them. [#6069](https://github.com/plone/volto/issues/6069)
+
+  - Use the new providers in `@plone/providers` instead to make the new `Link` work with them. [#6069](https://github.com/plone/volto/issues/6069)
 
 ### Internal
 
@@ -260,14 +267,12 @@
 - Color Palette @sneridagh
   Stories cleanup @sneridagh [#6](https://github.com/plone/components/issues/6)
 
-
 ## 1.0.1 (2023-10-20)
 
 ### Bugfix
 
 - Cleanup @sneridagh [#2](https://github.com/plone/components/issues/2)
 
-
 ## 1.0.0 (2023-10-20)
 
 ### 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/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/locales/nl/LC_MESSAGES/volto.po b/packages/volto/locales/nl/LC_MESSAGES/volto.po
@@ -89,7 +89,7 @@ msgstr "Toevoegen"
 #. Default: "To make new add-ons show up here, add them to your configuration, build, and restart the server process. For detailed instructions see"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Add Add-ons"
-msgstr "Om nieuwe modules hier te laten verschijnen voeg je ze toe in jouw configuratie, bouw en herstart dan het serverproces. Voor gedetailleerde instructies zie"
+msgstr ""
 
 #. Default: "Add Alternative URL"
 #: components/manage/Controlpanels/Aliases
@@ -234,7 +234,7 @@ msgstr "Modules"
 #. Default: "Add-on Configuration"
 #: components/manage/Controlpanels/Controlpanels
 msgid "Add-on Configuration"
-msgstr "Module configuratie"
+msgstr "Module configuratie<<<<<<< HEAD"
 
 #. Default: "Add-on could not be installed"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -264,7 +264,7 @@ msgstr "Module succesvol gedeïnstalleerd"
 #. Default: "Add-on upgraded succesfuly"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Add-on upgraded succesfuly"
-msgstr "Module succesvol bijgewerkt"
+msgstr "Module succesvol bijgewerkt=======>>>>>>> main"
 
 #. Default: "Add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -284,7 +284,7 @@ msgstr "Toegevoegd"
 #. Default: "Additional date"
 #: components/manage/Widgets/RecurrenceWidget/Occurences
 msgid "Additional date"
-msgstr "Bijkomende datum"
+msgstr "Bijkomende datum<<<<<<< HEAD======="
 
 #. Default: "Advanced facet?"
 #: components/manage/Blocks/Search/schema
@@ -438,12 +438,12 @@ msgstr "Automatisch"
 #. Default: "Available"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Available"
-msgstr "Beschikbaar"
+msgstr "Beschikbaar<<<<<<< HEAD"
 
 #. Default: "Available add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Available add-ons"
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #. Default: "Available content rules:"
 #: components/manage/Rules/Rules
@@ -1885,12 +1885,12 @@ msgstr "Installeren"
 #. Default: "Installed"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Installed"
-msgstr "Geïnstalleerd"
+msgstr "Geïnstalleerd<<<<<<< HEAD"
 
 #. Default: "Installed add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Installed add-ons"
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #. Default: "Installed version"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -2392,12 +2392,12 @@ msgstr "Nieuwsbericht weergave"
 #: components/manage/Contents/ContentsItem
 #: components/manage/Controlpanels/ContentTypes
 msgid "No"
-msgstr "Nee"
+msgstr "Nee<<<<<<< HEAD"
 
 #. Default: "No add-ons available for installation."
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "No Addon available"
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #. Default: "No installed add-ons."
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -2417,12 +2417,12 @@ msgstr "Geen transacties geselecteerd"
 #. Default: "No transactions selected to do undo"
 #: components/manage/Controlpanels/UndoControlpanel
 msgid "No Transactions Selected To Do Undo"
-msgstr "Geen transacties geselecteerd om ongedaan te maken"
+msgstr "Geen transacties geselecteerd om ongedaan te maken<<<<<<< HEAD"
 
 #. Default: "No upgrades in this corner. You are up to date. High fives."
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "No Upgrades available"
-msgstr "Geen upgrades in deze hoek. Je bent up-to-date. High five!"
+msgstr "Geen upgrades in deze hoek. Je bent up-to-date. High five!=======>>>>>>> main"
 
 #. Default: "No Video selected"
 #: components/manage/Blocks/Video/VideoSidebar
@@ -2432,7 +2432,7 @@ msgstr "Geen video geselecteerd"
 #. Default: "No add-ons found"
 #: components/manage/Controlpanels/VersionOverview
 msgid "No add-ons found"
-msgstr ""
+msgstr "======="
 
 #. Default: "No broken relations found."
 #: components/manage/Controlpanels/Relations/RelationsMatrix
@@ -3837,12 +3837,12 @@ msgstr "Er zijn fouten opgetreden."
 #. Default: "Third"
 #: components/manage/Widgets/RecurrenceWidget/WeekdayOfTheMonthIndexField
 msgid "Third"
-msgstr "Derde"
+msgstr "Derde<<<<<<< HEAD"
 
 #. Default: "This add-on was updated. Current profile installed version is {installedVersion}. New available profile version is {newVersion}"
 #: components/manage/Controlpanels/Addons/AddonItem
 msgid "This add-on was updated. Current profile installed version is {installedVersion}. New available profile version is {newVersion}"
-msgstr "Deze add-on is bijgewerkt. De momenteel geïnstalleerde profielversie is {installedVersion}. De nieuwe beschikbare profielversie is {newVersion}."
+msgstr "Deze add-on is bijgewerkt. De momenteel geïnstalleerde profielversie is {installedVersion}. De nieuwe beschikbare profielversie is {newVersion}.=======>>>>>>> main"
 
 #. Default: "This has an ongoing working copy in {title}"
 #: components/manage/WorkingCopyToastsFactory/WorkingCopyToastsFactory
@@ -4099,22 +4099,22 @@ msgstr "Bijwerken"
 #. Default: "Update User"
 #: helpers/MessageLabels/MessageLabels
 msgid "Update User"
-msgstr "Gebruiker bijwerken<<<<<<< HEAD======="
+msgstr ""
 
 #. Default: "Update installed add-ons:"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Update installed add-ons:"
-msgstr "Geïnstalleerde modules bijwerken:"
+msgstr ""
 
 #. Default: "Updates available"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Updates available"
-msgstr "Updates beschikbaar"
+msgstr "Updates beschikbaar<<<<<<< HEAD"
 
 #. Default: "Upgradable add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Upgradable add-ons"
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #. Default: "Upgrade"
 #: components/manage/Controlpanels/UpgradeControlPanel
@@ -5090,7 +5090,7 @@ msgstr "Inhoudstafel"
 #. Default: "Toggle"
 #: config/Blocks
 msgid "toggleFacet"
-msgstr "Schakelen<<<<<<< HEAD======="
+msgstr ""
 
 #. Default: "Upload an image from your computer"
 #: components/manage/Widgets/ImageWidget

diff --git a/packages/volto/locales/ro/LC_MESSAGES/volto.po b/packages/volto/locales/ro/LC_MESSAGES/volto.po
@@ -236,7 +236,7 @@ msgstr "Extensii Add-on"
 #. Default: "Add-on Configuration"
 #: components/manage/Controlpanels/Controlpanels
 msgid "Add-on Configuration"
-msgstr "Configurare add-on-uri"
+msgstr "Configurare add-on-uri<<<<<<< HEAD"
 
 #. Default: "Add-on could not be installed"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -266,7 +266,7 @@ msgstr "Extensia add-on a fost dezinstalată cu succes"
 #. Default: "Add-on upgraded succesfuly"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "Add-on upgraded succesfuly"
-msgstr "Extensia add-on a fost actualizată cu succes"
+msgstr "Extensia add-on a fost actualizată cu succes=======>>>>>>> main"
 
 #. Default: "Add-ons"
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
@@ -286,7 +286,7 @@ msgstr "Adăugat"
 #. Default: "Additional date"
 #: components/manage/Widgets/RecurrenceWidget/Occurences
 msgid "Additional date"
-msgstr "Dată suplimentară"
+msgstr "Dată suplimentară<<<<<<< HEAD======="
 
 #. Default: "Advanced facet?"
 #: components/manage/Blocks/Search/schema
@@ -2419,12 +2419,12 @@ msgstr "Nu s-au selectat tranzacții"
 #. Default: "No transactions selected to do undo"
 #: components/manage/Controlpanels/UndoControlpanel
 msgid "No Transactions Selected To Do Undo"
-msgstr "Nu s-au selectat tranzacții pentru a le anula"
+msgstr "Nu s-au selectat tranzacții pentru a le anula<<<<<<< HEAD"
 
 #. Default: "No upgrades in this corner. You are up to date. High fives."
 #: components/manage/Controlpanels/Addons/AddonsControlpanel
 msgid "No Upgrades available"
-msgstr "Nicio actualizare în această zonă. Ești la zi. Bate palma!"
+msgstr "Nicio actualizare în această zonă. Ești la zi. Bate palma!=======>>>>>>> main"
 
 #. Default: "No Video selected"
 #: components/manage/Blocks/Video/VideoSidebar
@@ -5092,7 +5092,7 @@ msgstr "Cuprins"
 #. Default: "Toggle"
 #: config/Blocks
 msgid "toggleFacet"
-msgstr "Alternează<<<<<<< HEAD======="
+msgstr ""
 
 #. Default: "Upload an image from your computer"
 #: components/manage/Widgets/ImageWidget

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;
 };