@magento/pagebuilder 7.2.0-alpha.1 → 7.3.0-alpha.1

package/lib/ContentTypes/Banner/banner.js

@@ -3,7 +3,7 @@ import defaultClasses from './banner.module.css';
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import { arrayOf, bool, oneOf, shape, string, func, object } from 'prop-types';
 import Button from '@magento/venia-ui/lib/components/Button/button';
-import resolveLinkProps from '../../resolveLinkProps';
+import resolveLinkProps from '@magento/peregrine/lib/util/resolveLinkProps';
 import { Link, useHistory } from 'react-router-dom';
 import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
 import useIntersectionObserver from '@magento/peregrine/lib/hooks/useIntersectionObserver';

package/lib/ContentTypes/ButtonItem/buttonItem.js

@@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom';
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import Button from '@magento/venia-ui/lib/components/Button/button';
 
-import resolveLinkProps from '../../resolveLinkProps';
+import resolveLinkProps from '@magento/peregrine/lib/util/resolveLinkProps';
 import defaultClasses from './buttonItem.module.css';
 
 /**

package/lib/ContentTypes/DynamicBlock/__tests__/__snapshots__/dynamicBlock.ce.spec.js.snap

@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`#PageBuilder DynamicBlock CE renders 1`] = `null`;
+exports[`#PageBuilder DynamicBlock MOS renders 1`] = `null`;

package/lib/ContentTypes/DynamicBlock/__tests__/__snapshots__/dynamicBlock.ee.spec.js.snap

@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`#PageBuilder DynamicBlock EE does not render a Dynamic Block component when no uids are provided 1`] = `null`;
+exports[`#PageBuilder DynamicBlock AC does not render a Dynamic Block component when no uids are provided 1`] = `null`;
 
-exports[`#PageBuilder DynamicBlock EE renders a Dynamic Block component inlined 1`] = `
+exports[`#PageBuilder DynamicBlock AC renders a Dynamic Block component inlined 1`] = `
 <span
   aria-busy="false"
   aria-live="polite"
@@ -32,7 +32,7 @@ exports[`#PageBuilder DynamicBlock EE renders a Dynamic Block component inlined
 </span>
 `;
 
-exports[`#PageBuilder DynamicBlock EE renders a Dynamic Block component with custom classes 1`] = `
+exports[`#PageBuilder DynamicBlock AC renders a Dynamic Block component with custom classes 1`] = `
 <div
   aria-busy="false"
   aria-live="polite"
@@ -62,7 +62,7 @@ exports[`#PageBuilder DynamicBlock EE renders a Dynamic Block component with cus
 </div>
 `;
 
-exports[`#PageBuilder DynamicBlock EE renders a Dynamic Block component without custom classes 1`] = `
+exports[`#PageBuilder DynamicBlock AC renders a Dynamic Block component without custom classes 1`] = `
 <div
   aria-busy="false"
   aria-live="polite"

package/lib/ContentTypes/DynamicBlock/__tests__/dynamicBlock.ce.spec.js

@@ -8,7 +8,7 @@ const Component = () => {
     return <DynamicBlock />;
 };
 
-describe('#PageBuilder DynamicBlock CE', () => {
+describe('#PageBuilder DynamicBlock MOS', () => {
     it('renders', () => {
         const tree = createTestInstance(<Component />);
 

package/lib/ContentTypes/DynamicBlock/__tests__/dynamicBlock.ee.spec.js

@@ -29,7 +29,7 @@ const defaultProps = {
     paddingLeft: '10px'
 };
 
-describe('#PageBuilder DynamicBlock EE', () => {
+describe('#PageBuilder DynamicBlock AC', () => {
     it('renders a Dynamic Block component without custom classes', () => {
         const component = createTestInstance(
             <DynamicBlock {...defaultProps} />

package/lib/ContentTypes/DynamicBlock/dynamicBlock.ce.js

@@ -1,5 +1,5 @@
 /**
- * Dynamic Block is an EE-only feature for now.
- * Here in CE, don't render the component at all.
+ * Dynamic Block is an AC-only feature for now.
+ * Here in MOS, don't render the component at all.
  */
 export default () => null;

package/lib/ContentTypes/Image/image.js

@@ -2,7 +2,7 @@ import React from 'react';
 import defaultClasses from './image.module.css';
 import { arrayOf, bool, oneOf, shape, string, number } from 'prop-types';
 import { Link } from 'react-router-dom';
-import resolveLinkProps from '../../resolveLinkProps';
+import resolveLinkProps from '@magento/peregrine/lib/util/resolveLinkProps';
 import { useStyle } from '@magento/venia-ui/lib/classify';
 import resourceUrl from '@magento/peregrine/lib/util/makeUrl';
 

package/lib/ContentTypes/Products/Carousel/__fixtures__/apolloMocks.js

@@ -1,9 +1,9 @@
-import eeOperations from '../carousel.gql.ee';
-import ceOperations from '../carousel.gql.ce';
+import acOperations from '../carousel.gql.ee';
+import mosOperations from '../carousel.gql.ce';
 
-export const mockGetStoreConfigEE = {
+export const mockGetStoreConfigAC = {
     request: {
-        query: eeOperations.getStoreConfigQuery
+        query: acOperations.getStoreConfigQuery
     },
     result: {
         data: {
@@ -17,9 +17,9 @@ export const mockGetStoreConfigEE = {
     }
 };
 
-export const mockGetStoreConfigCE = {
+export const mockGetStoreConfigMOS = {
     request: {
-        query: ceOperations.getStoreConfigQuery
+        query: mosOperations.getStoreConfigQuery
     },
     result: {
         data: {

package/lib/ContentTypes/Products/Carousel/__tests__/useCarousel.spec.js

@@ -5,15 +5,15 @@ import { renderHook } from '@testing-library/react-hooks';
 
 import typePolicies from '@magento/peregrine/lib/Apollo/policies';
 import {
-    mockGetStoreConfigCE,
-    mockGetStoreConfigEE
+    mockGetStoreConfigMOS,
+    mockGetStoreConfigAC
 } from '../__fixtures__/apolloMocks';
 
 import { useCarousel } from '../useCarousel';
 
 import defaultOperations from '../carousel.gql';
-import ceOperations from '../carousel.gql.ce';
-import eeOperations from '../carousel.gql.ee';
+import mosOperations from '../carousel.gql.ce';
+import acOperations from '../carousel.gql.ee';
 
 jest.mock(
     '@magento/peregrine/lib/hooks/useCustomerWishlistSkus/useCustomerWishlistSkus',
@@ -39,11 +39,11 @@ const renderHookWithProviders = ({
     return renderHook(useCarousel, { wrapper, ...renderHookOptions });
 };
 
-test('returns store config EE', async () => {
-    defaultOperations.getStoreConfigQuery = eeOperations.getStoreConfigQuery;
+test('returns store config AC', async () => {
+    defaultOperations.getStoreConfigQuery = acOperations.getStoreConfigQuery;
 
     const { result, waitForNextUpdate } = renderHookWithProviders({
-        mocks: [mockGetStoreConfigEE]
+        mocks: [mockGetStoreConfigAC]
     });
 
     expect(result.current).toMatchInlineSnapshot(`
@@ -67,13 +67,13 @@ test('returns store config EE', async () => {
 });
 
 test('returns store config C', async () => {
-    defaultOperations.getStoreConfigQuery = ceOperations.getStoreConfigQuery;
+    defaultOperations.getStoreConfigQuery = mosOperations.getStoreConfigQuery;
 
     const { result, waitForNextUpdate } = renderHookWithProviders({
-        mocks: [mockGetStoreConfigCE]
+        mocks: [mockGetStoreConfigMOS]
     });
 
-    // I am unsure why this test renders without a loading state whereas the EE
+    // I am unsure why this test renders without a loading state whereas the AC
     // test renders with a loading (null) state.
     expect(result.current).toMatchInlineSnapshot(`
         Object {

package/lib/ContentTypes/Products/Carousel/carousel.gql.ce.js

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
 export const GET_STORE_CONFIG = gql`
-    query GetStoreConfigForCarouselCE {
+    query GetStoreConfigForCarouselMOS {
         # eslint-disable-next-line @graphql-eslint/require-id-when-available
         storeConfig {
             store_code

package/lib/ContentTypes/Products/Carousel/carousel.gql.ee.js

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
 export const GET_STORE_CONFIG = gql`
-    query GetStoreConfigForCarouselEE {
+    query GetStoreConfigForCarouselAC {
         # eslint-disable-next-line @graphql-eslint/require-id-when-available
         storeConfig {
             store_code

package/lib/ContentTypes/Products/__tests__/products.spec.js

@@ -227,7 +227,9 @@ test('render products and ensure order is correct passed to Gallery', () => {
 
     createTestInstance(<Products {...productProps} />);
     expect(useQuery).toHaveBeenCalledWith(GET_PRODUCTS_BY_URL_KEY, {
-        variables: { url_keys: urlKeys, pageSize: urlKeys.length }
+        variables: { url_keys: urlKeys, pageSize: urlKeys.length },
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first'
     });
     expect(mockGallery).toHaveBeenCalledWith(
         expect.objectContaining({

package/lib/ContentTypes/Products/products.js

@@ -101,7 +101,9 @@ const Products = props => {
     });
 
     const { loading, error, data } = useQuery(GET_PRODUCTS_BY_URL_KEY, {
-        variables: { url_keys: urlKeys, pageSize: urlKeys.length }
+        variables: { url_keys: urlKeys, pageSize: urlKeys.length },
+        fetchPolicy: 'cache-and-network',
+        nextFetchPolicy: 'cache-first'
     });
 
     if (loading) return null;
@@ -286,7 +288,7 @@ export const GET_PRODUCTS_BY_URL_KEY = gql`
                 name
                 price_range {
                     maximum_price {
-                        regular_price {
+                        final_price {
                             currency
                             value
                         }

package/lib/ContentTypes/Text/text.js

@@ -5,7 +5,9 @@ import defaultClasses from './text.module.css';
 import { useHistory } from 'react-router-dom';
 import handleHtmlContentClick from '../../handleHtmlContentClick';
 
-const toHTML = str => ({ __html: str });
+import htmlStringImgUrlConverter from '@magento/peregrine/lib/util/htmlStringImgUrlConverter';
+
+const toHTML = str => ({ __html: htmlStringImgUrlConverter(str) });
 
 /**
  * Page Builder Text component.

package/lib/utils.js

@@ -194,9 +194,12 @@ export function cssToJSXStyle(style) {
 }
 
 /**
+ * Retrieve media queries from a master format node
  *
- * @param  node
- * @returns {{mediaQueries: [{media: string, style: string}]}}
+ * @param node
+ * @param {Array} mediaQueries
+ *
+ * @returns {{mediaQueries: {media: string, style: string}}}
  */
 export function getMediaQueries(node) {
     const response = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magento/pagebuilder",
-  "version": "7.2.0-alpha.1",
+  "version": "7.3.0-alpha.1",
   "publishConfig": {
     "access": "public"
   },
@@ -26,7 +26,7 @@
     "storybook:build": "build-storybook -c .storybook -o storybook-dist"
   },
   "repository": "github:magento/pwa-studio",
-  "author": "Magento Commerce",
+  "author": "Adobe Commerce",
   "license": "(OSL-3.0 OR AFL-3.0)",
   "bugs": {
     "url": "https://github.com/magento/pwa-studio/issues"
@@ -34,9 +34,9 @@
   "homepage": "https://github.com/magento/pwa-studio/tree/main/packages/pagebuilder#readme",
   "dependencies": {},
   "devDependencies": {
-    "@magento/peregrine": "12.3.0-alpha.1",
-    "@magento/pwa-buildpack": "11.2.0-alpha.1",
-    "@magento/venia-ui": "9.3.0-alpha.1",
+    "@magento/peregrine": "12.4.0-alpha.1",
+    "@magento/pwa-buildpack": "11.3.0-alpha.1",
+    "@magento/venia-ui": "9.4.0-alpha.1",
     "@storybook/react": "~6.3.7",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
@@ -49,10 +49,10 @@
   },
   "peerDependencies": {
     "@apollo/client": "~3.4.0",
-    "@magento/babel-preset-peregrine": "~1.2.0",
-    "@magento/peregrine": "12.3.0-alpha.1",
-    "@magento/pwa-buildpack": "11.2.0-alpha.1",
-    "@magento/venia-ui": "9.3.0-alpha.1",
+    "@magento/babel-preset-peregrine": "1.2.1-alpha.1",
+    "@magento/peregrine": "12.4.0-alpha.1",
+    "@magento/pwa-buildpack": "11.3.0-alpha.1",
+    "@magento/venia-ui": "9.4.0-alpha.1",
     "jarallax": "~1.11.1",
     "load-google-maps-api": "~2.0.1",
     "lodash.escape": "~4.0.1",