Merge remote-tracking branch 'origin/main' into handle-api-redirect

plone · May 13, 2024 · 3a300e4 · 3a300e4
2 parents 91f722e + 3aa82cf
commit 3a300e4
Show file tree

Hide file tree

Showing 20 changed files with 1,492 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -5,9 +5,9 @@
     "preinstall": "npx only-allow pnpm",
     "postinstall": "make setup",
     "watch": "pnpm --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers watch",
-    "build:deps": "pnpm --parallel --filter @plone/registry build",
-    "build:all": "pnpm --parallel --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers build",
-    "build:all:force": "pnpm --parallel --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers build:force",
+    "build:deps": "pnpm --filter @plone/registry build",
+    "build:all": "pnpm --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers build",
+    "build:all:force": "pnpm --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers build:force",
     "build:registry": "pnpm --filter @plone/registry run build",
     "build:components": "pnpm --filter @plone/components run build",
     "build": "pnpm --filter @plone/volto build",

diff --git a/packages/components/.storybook/main.ts b/packages/components/.storybook/main.ts
@@ -1,5 +1,5 @@
 import type { StorybookConfig } from '@storybook/react-vite';
-const { mergeConfig } = require('vite');
+import { mergeConfig } from 'vite';
 
 const config: StorybookConfig = {
   // For some reason the property does not allow negation

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -8,6 +8,20 @@
 
 <!-- towncrier release notes start -->
 
+## 2.0.0-alpha.8 (2024-05-13)
+
+### Bugfix
+
+- Update `vite` to 5.1.5. @davisagli [#5942](https://github.com/plone/volto/issues/5942)
+
+### Internal
+
+- Remove `parcel-optimizer-react-client` plugin @sneridagh [#5887](https://github.com/plone/volto/issues/5887)
+- Upgrade Storybook to version 8. @sneridagh [#5912](https://github.com/plone/volto/issues/5912)
+- Improvements to the monorepo setup with utilities, especially ESLint. Build cached option to speedup operations. @sneridagh [#5969](https://github.com/plone/volto/issues/5969)
+- Saner defaults for building deps, switch default to cached, add `build:force` command @sneridagh [#5980](https://github.com/plone/volto/issues/5980)
+- Update to RAC 1.2.0 @sneridagh [#6014](https://github.com/plone/volto/issues/6014)
+
 ## 2.0.0-alpha.7 (2024-03-14)
 
 ### Bugfix

diff --git a/packages/components/news/5887.internal b/packages/components/news/5887.internal
diff --git a/packages/components/news/5912.internal b/packages/components/news/5912.internal
diff --git a/packages/components/news/5942.bugfix b/packages/components/news/5942.bugfix
diff --git a/packages/components/news/5969.internal b/packages/components/news/5969.internal
diff --git a/packages/components/news/5980.internal b/packages/components/news/5980.internal
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -8,7 +8,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.8",
   "repository": {
     "type": "git",
     "url": "http://github.com/plone/components.git"
@@ -120,7 +120,7 @@
     "@react-spectrum/utils": "^3.11.1",
     "@storybook/test": "^8.0.4",
     "clsx": "^2.0.0",
-    "react-aria-components": "^1.1.1"
+    "react-aria-components": "^1.2.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",

diff --git a/packages/providers/.release-it.json b/packages/providers/.release-it.json
@@ -17,7 +17,7 @@
     "requireUpstream": false,
     "requireCleanWorkingDir": false,
     "commitMessage": "Release @plone/providers ${version}",
-    "tagName": "plone-components-${version}",
+    "tagName": "plone-providers-${version}",
     "tagAnnotation": "Release @plone/providers ${version}"
   },
   "github": {

diff --git a/packages/providers/CHANGELOG.md b/packages/providers/CHANGELOG.md
@@ -7,3 +7,14 @@
 -->
 
 <!-- towncrier release notes start -->
+
+## 1.0.0-alpha.0 (2024-05-13)
+
+### Feature
+
+- Initial implementation @sneridagh [#5887](https://github.com/plone/volto/issues/5887)
+
+### Internal
+
+- Improvements to the monorepo setup with utilities, especially ESLint. Build cached option to speedup operations. @sneridagh [#5969](https://github.com/plone/volto/issues/5969)
+- Saner defaults for building deps, switch default to cached, add `build:force` command @sneridagh [#5980](https://github.com/plone/volto/issues/5980)
diff --git a/packages/providers/news/5887.feature b/packages/providers/news/5887.feature
diff --git a/packages/providers/news/5969.internal b/packages/providers/news/5969.internal
diff --git a/packages/providers/news/5980.internal b/packages/providers/news/5980.internal
diff --git a/packages/providers/package.json b/packages/providers/package.json
@@ -9,7 +9,7 @@
   ],
   "funding": "https://github.com/sponsors/plone",
   "license": "MIT",
-  "version": "1.0.0",
+  "version": "1.0.0-alpha.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/plone/volto.git"

diff --git a/packages/types/news/6014.bugfix b/packages/types/news/6014.bugfix
@@ -0,0 +1 @@
+Fixed some type definitions @sneridagh
diff --git a/packages/types/src/blocks/index.d.ts b/packages/types/src/blocks/index.d.ts
@@ -9,6 +9,7 @@ import type { Location, History } from 'history';
 
 export interface BlocksFormData {
   '@type': AvailableBlocks;
+  variation?: string;
 }
 
 export interface BlockViewProps {

diff --git a/packages/volto/news/6014.bugfix b/packages/volto/news/6014.bugfix
@@ -0,0 +1 @@
+Fix some type definitions in JSDocs @sneridagh
diff --git a/packages/volto/src/helpers/Blocks/Blocks.js b/packages/volto/src/helpers/Blocks/Blocks.js
@@ -414,7 +414,7 @@ export function emptyBlocksForm() {
  * (could be empty, if not type given) and the number of blocks
  * @function blocksFormGenerator
  * @param {number} number How many blocks to generate of the type (could be "empty", if no type provided)
- * @param {number} type The type of the blocks
+ * @param {string} type The type of the blocks
  * @return {Object} blocks/blocks_layout pair filled with the generated blocks
  */
 export function blocksFormGenerator(number, type) {