@graphcommerce/magento-category 4.2.2 → 4.3.1

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Change Log
 
+## 4.3.1
+
+### Patch Changes
+
+- [#1588](https://github.com/graphcommerce-org/graphcommerce/pull/1588) [`42030e04b`](https://github.com/graphcommerce-org/graphcommerce/commit/42030e04b2ebe004379c6f052e10407c2f5df18f) Thanks [@paales](https://github.com/paales)! - Make sure the canonical of a page doesn’t contain a double forward slash
+
+- Updated dependencies [[`b6d3a3c13`](https://github.com/graphcommerce-org/graphcommerce/commit/b6d3a3c13ea63ef0f691f497507f07c0e094de5b)]:
+  - @graphcommerce/next-ui@4.19.0
+  - @graphcommerce/framer-scroller@2.1.30
+  - @graphcommerce/magento-product@4.4.23
+  - @graphcommerce/magento-store@4.2.25
+
+## 4.3.0
+
+### Minor Changes
+
+- [#1577](https://github.com/graphcommerce-org/graphcommerce/pull/1577) [`ad55e6c50`](https://github.com/graphcommerce-org/graphcommerce/commit/ad55e6c50c3a3223ee2c17826881808fa9d8f27c) Thanks [@mikekeehnen](https://github.com/mikekeehnen)! - Added improvements voor the category pages' meta description
+
+### Patch Changes
+
+- Updated dependencies [[`6ce2cbaf2`](https://github.com/graphcommerce-org/graphcommerce/commit/6ce2cbaf2cf27e21b753f7cb71e7e74826294de6), [`6ce2cbaf2`](https://github.com/graphcommerce-org/graphcommerce/commit/6ce2cbaf2cf27e21b753f7cb71e7e74826294de6), [`6ce2cbaf2`](https://github.com/graphcommerce-org/graphcommerce/commit/6ce2cbaf2cf27e21b753f7cb71e7e74826294de6)]:
+  - @graphcommerce/magento-product@4.4.22
+  - @graphcommerce/graphql@3.4.5
+  - @graphcommerce/next-ui@4.18.0
+  - @graphcommerce/magento-store@4.2.24
+  - @graphcommerce/framer-scroller@2.1.29
+
+## 4.2.3
+
+### Patch Changes
+
+- Updated dependencies [[`bfbcd59d8`](https://github.com/graphcommerce-org/graphcommerce/commit/bfbcd59d8f7652d7a7c028f79cc994216e8dbe3a), [`49370878a`](https://github.com/graphcommerce-org/graphcommerce/commit/49370878a48b90a4579026a7c56c54f97840cebb), [`b6ce5548c`](https://github.com/graphcommerce-org/graphcommerce/commit/b6ce5548c66a8ca62d3aee29467045f7f07f30c8)]:
+  - @graphcommerce/magento-product@4.4.21
+  - @graphcommerce/graphql@3.4.4
+  - @graphcommerce/next-ui@4.17.0
+  - @graphcommerce/magento-store@4.2.23
+  - @graphcommerce/framer-scroller@2.1.28
+
 ## 4.2.2
 
 ### Patch Changes

package/components/CategoryMeta/CategoryMeta.tsx

@@ -1,32 +1,50 @@
 import { ProductListParams } from '@graphcommerce/magento-product'
 import { PageMeta } from '@graphcommerce/magento-store'
 import { PageMetaProps } from '@graphcommerce/next-ui'
+import { i18n } from '@lingui/core'
 import { CategoryMetaFragment } from './CategoryMeta.gql'
 
-type CategoryMetaProps = CategoryMetaFragment &
-  Omit<PageMetaProps, 'title' | 'metaDescription'> & {
+export type CategoryMetaProps = CategoryMetaFragment &
+  Partial<PageMetaProps> & {
     params?: ProductListParams
     current_page?: number | null | undefined
   }
 
 export function CategoryMeta(props: CategoryMetaProps) {
-  const { name, meta_title, meta_description, current_page, params, ...pageMetaProps } = props
+  const { meta_title, meta_description, name, params, current_page } = props
+  let {
+    title = meta_title ?? name ?? '',
+    metaDescription = meta_description ?? undefined,
+    metaRobots,
+    canonical,
+  } = props
+
+  if (params?.url && !canonical) canonical = `/${params.url}`
+
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
   const anyFilterActive = Object.keys(params?.filters ?? {}).length > 0
+  const currentPage = params?.currentPage ?? 1
+  const isPaginated = currentPage > 1 && !anyFilterActive
+
+  const titleTrans =
+    title && isPaginated
+      ? i18n._(/* i18n */ '{title} - Page {currentPage}', { title, currentPage })
+      : title
+
+  const metaDescriptionTrans =
+    metaDescription && isPaginated
+      ? i18n._(/* i18n */ '{metaDescription} - Page {currentPage}', {
+          metaDescription,
+          currentPage,
+        })
+      : metaDescription
 
   return (
     <PageMeta
-      title={`${meta_title ?? name ?? ''} ${
-        current_page && current_page > 1 ? `- Page ${current_page}` : ''
-      }`}
-      metaDescription={`${meta_description ?? undefined} ${
-        current_page && current_page > 1 ? `- Page ${current_page}` : ''
-      }`}
-      metaRobots={anyFilterActive ? ['noindex'] : undefined}
-      canonical={`/${params?.url}${
-        (params?.currentPage ?? 1) > 1 ? `/q/page/${params?.currentPage}` : ''
-      }`}
-      {...pageMetaProps}
+      title={titleTrans}
+      metaDescription={metaDescriptionTrans}
+      metaRobots={anyFilterActive ? ['noindex'] : metaRobots}
+      canonical={isPaginated ? `${canonical}/q/page/${currentPage}` : canonical}
     />
   )
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-category",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.2.2",
+  "version": "4.3.1",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -19,12 +19,12 @@
     "type-fest": "^2.12.2"
   },
   "dependencies": {
-    "@graphcommerce/framer-scroller": "2.1.27",
-    "@graphcommerce/graphql": "3.4.3",
+    "@graphcommerce/framer-scroller": "2.1.30",
+    "@graphcommerce/graphql": "3.4.5",
     "@graphcommerce/image": "3.1.7",
-    "@graphcommerce/magento-product": "4.4.20",
-    "@graphcommerce/magento-store": "4.2.22",
-    "@graphcommerce/next-ui": "4.16.0"
+    "@graphcommerce/magento-product": "4.4.23",
+    "@graphcommerce/magento-store": "4.2.25",
+    "@graphcommerce/next-ui": "4.19.0"
   },
   "peerDependencies": {
     "@lingui/react": "^3.13.2",

package/queries/GetCategoryStaticPaths.graphql

@@ -12,6 +12,14 @@ query GetCategoryStaticPaths($rootCategory: String!) {
           children {
             uid
             url_path
+            children {
+              uid
+              url_path
+              children {
+                uid
+                url_path
+              }
+            }
           }
         }
       }