@graphcommerce/magento-cms 9.1.0-canary.18 → 9.1.0-canary.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/components/CmsBlock/CmsBlock.tsx +6 -2
  3. package/components/CmsPageContent/CmsPageContent.tsx +7 -3
  4. package/components/CmsPageMeta/CmsPageMeta.graphql +2 -0
  5. package/components/CmsPageMeta/CmsPageMeta.tsx +4 -3
  6. package/graphql/CmsConfig.graphql +5 -0
  7. package/package.json +6 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Change Log
2
2
 
3
+ ## 9.1.0-canary.19
4
+
5
+ ### Patch Changes
6
+
7
+ - [#2499](https://github.com/graphcommerce-org/graphcommerce/pull/2499) [`eb973e7`](https://github.com/graphcommerce-org/graphcommerce/commit/eb973e7dec375178e4348e74069fc0d132a091c7) - Render the no-route page (or whatever is configured) on the 404 page when running with only Magento. ([@paales](https://github.com/paales))
8
+
3
9
  ## 9.1.0-canary.18
4
10
 
5
11
  ## 9.1.0-canary.17
package/components/CmsBlock/CmsBlock.tsx CHANGED
@@ -1,9 +1,13 @@
1
+ import type { ProductListItemRenderer } from '@graphcommerce/magento-product'
1
2
  import type { CmsBlockFragment } from './CmsBlock.gql'
2
3
 
3
- export type CmsBlockProps = { cmsBlock: CmsBlockFragment | null | undefined }
4
+ export type CmsBlockProps = {
5
+ cmsBlock: CmsBlockFragment | null | undefined
6
+ productListRenderer: ProductListItemRenderer
7
+ }
4
8
 
5
9
  export function CmsBlock(props: CmsBlockProps) {
6
- const { cmsBlock } = props
10
+ const { cmsBlock, productListRenderer } = props
7
11
  if (!cmsBlock?.content) return null
8
12
  // eslint-disable-next-line react/no-danger
9
13
  return <div dangerouslySetInnerHTML={{ __html: cmsBlock.content }} />
package/components/CmsPageContent/CmsPageContent.tsx CHANGED
@@ -1,12 +1,16 @@
1
+ import type { ProductListItemRenderer } from '@graphcommerce/magento-product'
1
2
  import { Container } from '@mui/material'
2
3
  import type { CmsPageContentFragment } from './CmsPageContent.gql'
3
4
 
4
- export type CmsPageContentProps = { cmsPage: CmsPageContentFragment }
5
+ export type CmsPageContentProps = {
6
+ cmsPage: CmsPageContentFragment
7
+ productListRenderer: ProductListItemRenderer
8
+ }
5
9
 
6
10
  export function CmsPageContent(props: CmsPageContentProps) {
7
- const { cmsPage } = props
11
+ const { cmsPage, productListRenderer } = props
8
12
  return (
9
- <Container>
13
+ <Container maxWidth='md'>
10
14
  {/* eslint-disable-next-line react/no-danger */}
11
15
  {cmsPage.content && <div dangerouslySetInnerHTML={{ __html: cmsPage.content }} />}
12
16
  </Container>
package/components/CmsPageMeta/CmsPageMeta.graphql CHANGED
@@ -1,6 +1,8 @@
1
1
  fragment CmsPageMeta on CmsPage {
2
2
  meta_title
3
3
  meta_description
4
+ meta_keywords
5
+ page_layout
4
6
  url_key
5
7
  title
6
8
  }
package/components/CmsPageMeta/CmsPageMeta.tsx CHANGED
@@ -3,12 +3,13 @@ import type { CmsPageMetaFragment } from './CmsPageMeta.gql'
3
3
 
4
4
  /** @public */
5
5
  export function CmsPageMeta(props: CmsPageMetaFragment) {
6
- const { title, meta_title, meta_description } = props
6
+ const { title, meta_title, meta_description, meta_keywords } = props
7
7
 
8
8
  return (
9
9
  <PageMeta
10
- title={meta_title ?? title ?? ''}
11
- metaDescription={meta_description ?? ''}
10
+ title={meta_title ?? title}
11
+ metaDescription={meta_description}
12
+ metaKeywords={meta_keywords}
12
13
  metaRobots={['noindex']}
13
14
  />
14
15
  )
package/graphql/CmsConfig.graphql ADDED
@@ -0,0 +1,5 @@
1
+ fragment CmsConfig on StoreConfig @inject(into: ["StoreConfigFragment"]) {
2
+ cms_home_page
3
+ cms_no_cookies
4
+ cms_no_route
5
+ }
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@graphcommerce/magento-cms",
3
3
  "homepage": "https://www.graphcommerce.org/",
4
4
  "repository": "github:graphcommerce-org/graphcommerce",
5
- "version": "9.1.0-canary.18",
5
+ "version": "9.1.0-canary.19",
6
6
  "sideEffects": false,
7
7
  "prettier": "@graphcommerce/prettier-config-pwa",
8
8
  "eslintConfig": {
@@ -12,11 +12,11 @@
12
12
  }
13
13
  },
14
14
  "peerDependencies": {
15
- "@graphcommerce/eslint-config-pwa": "^9.1.0-canary.18",
16
- "@graphcommerce/graphql": "^9.1.0-canary.18",
17
- "@graphcommerce/magento-store": "^9.1.0-canary.18",
18
- "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.18",
19
- "@graphcommerce/typescript-config-pwa": "^9.1.0-canary.18",
15
+ "@graphcommerce/eslint-config-pwa": "^9.1.0-canary.19",
16
+ "@graphcommerce/graphql": "^9.1.0-canary.19",
17
+ "@graphcommerce/magento-store": "^9.1.0-canary.19",
18
+ "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.19",
19
+ "@graphcommerce/typescript-config-pwa": "^9.1.0-canary.19",
20
20
  "@lingui/core": "^4.2.1",
21
21
  "@lingui/macro": "^4.2.1",
22
22
  "@lingui/react": "^4.2.1",