Update to RAC 1.2.0 (#6014)

plone · May 13, 2024 · 5b915b6 · 5b915b6
1 parent 09239bf
commit 5b915b6
Show file tree

Hide file tree

Showing 9 changed files with 1,465 additions and 13 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/news/6014.internal b/packages/components/news/6014.internal
@@ -0,0 +1 @@
+Update to RAC 1.2.0 @sneridagh
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -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/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) {