Release@main

contentful · Nov 8, 2024 · 49d5618 · 49d5618
2 parents 150c6c7 + 482ea60
commit 49d5618
Show file tree

Hide file tree

Showing 21 changed files with 366 additions and 965 deletions.
diff --git a/examples/next-app-router/package-lock.json b/examples/next-app-router/package-lock.json
diff --git a/examples/next-pages-router/package-lock.json b/examples/next-pages-router/package-lock.json
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "npmClient": "npm",
-  "version": "1.21.0",
+  "version": "1.22.0-beta.0",
   "command": {
     "version": {
       "allowBranch": ["main", "next", "development"],

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experiences-components-react",
-  "version": "1.21.0",
+  "version": "1.22.0-beta.0",
   "description": "A basic set of components to use with Studio Experiences",
   "homepage": "https://github.com/contentful/experience-builder/tree/next/packages/components#readme",
   "repository": {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experiences-core",
-  "version": "1.21.0",
+  "version": "1.22.0-beta.0",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.js",

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -160,6 +160,13 @@ export type ExperienceTreeNode = {
     dataSource: ExperienceDataSource;
     unboundValues: ExperienceUnboundValues;
     breakpoints: Breakpoint[];
+    pattern?: {
+      id: string;
+      nodeId: string;
+      nodeLocation: string;
+      isVisibilityPropertyExposed: boolean;
+      variableNameToComponentValueKeyMap: Record<string, string>;
+    };
   };
   children: ExperienceTreeNode[];
   parentId?: string;

diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts
@@ -10,5 +10,4 @@ export * from './isLinkToAsset';
 export * from './isLink';
 export * from './pathSchema';
 export * from './resolveHyperlinkPattern';
-export * from './patternUtils';
 export * from './sanitizeNodeProps';
diff --git a/packages/core/src/utils/patternUtils.spec.ts b/packages/core/src/utils/patternUtils.spec.ts
diff --git a/packages/core/src/utils/patternUtils.ts b/packages/core/src/utils/patternUtils.ts
diff --git a/packages/create-contentful-studio-experiences/package.json b/packages/create-contentful-studio-experiences/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-contentful-studio-experiences",
-  "version": "1.21.0",
+  "version": "1.22.0-beta.0",
   "description": "A CLI tool to get up and running with Contentful Studio Experiences quickly",
   "homepage": "https://github.com/contentful/experience-builder/tree/next/packages/create-contentful-studio-experiences#readme",
   "repository": {

diff --git a/packages/experience-builder-sdk/package.json b/packages/experience-builder-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experiences-sdk-react",
-  "version": "1.21.0",
+  "version": "1.22.0-beta.0",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "typings": "./dist/src/index.d.ts",

diff --git a/packages/experience-builder-sdk/src/core/sdkFeatures.ts b/packages/experience-builder-sdk/src/core/sdkFeatures.ts
@@ -2,4 +2,5 @@
 export const sdkFeatures: Record<string, unknown> = {
   hasSDKVersionUI: true,
   cfVisibility: true,
+  patternResolution: true,
 };
diff --git a/packages/validators/package.json b/packages/validators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experiences-validators",
-  "version": "1.21.0",
+  "version": "1.22.0-beta.0",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/visual-editor/package.json b/packages/visual-editor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experiences-visual-editor-react",
-  "version": "1.21.0",
+  "version": "1.22.0-beta.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",

diff --git a/packages/visual-editor/src/hooks/useComponent.tsx b/packages/visual-editor/src/hooks/useComponent.tsx
@@ -9,7 +9,6 @@ import { useMemo } from 'react';
 import { useComponentProps } from './useComponentProps';
 import { ASSEMBLY_NODE_TYPE } from '@contentful/experiences-core/constants';
 import { Assembly } from '@contentful/experiences-components-react';
-import { resolveAssembly } from '@/utils/assemblyUtils';
 import { componentRegistry, createAssemblyRegistration } from '@/store/registries';
 import { useEntityStore } from '@/store/entityStore';
 import { ImportedComponentErrorBoundary } from '@components/DraggableHelpers/ImportedComponentErrorBoundary';
@@ -25,24 +24,12 @@ type UseComponentProps = {
 };
 
 export const useComponent = ({
-  node: rawNode,
+  node,
   resolveDesignValue,
   renderDropzone,
   userIsDragging,
 }: UseComponentProps) => {
   const areEntitiesFetched = useEntityStore((state) => state.areEntitiesFetched);
-  const entityStore = useEntityStore((state) => state.entityStore);
-
-  const node = useMemo(() => {
-    if (rawNode.type === ASSEMBLY_NODE_TYPE && areEntitiesFetched) {
-      return resolveAssembly({
-        node: rawNode,
-        entityStore,
-      });
-    }
-
-    return rawNode;
-  }, [areEntitiesFetched, rawNode, entityStore]);
 
   const componentRegistration: ComponentRegistration | undefined = useMemo(() => {
     let registration = componentRegistry.get(node.data.blockId!);