@graphcommerce/graphcms-ui 8.1.0-canary.2 → 8.1.0-canary.22

package/CHANGELOG.md

@@ -1,6 +1,112 @@
 # Change Log
 
-## 8.1.0-canary.2
+## 8.1.0-canary.22
+
+## 8.1.0-canary.21
+
+## 8.1.0-canary.20
+
+## 8.1.0-canary.19
+
+## 8.1.0-canary.18
+
+## 8.1.0-canary.17
+
+## 8.1.0-canary.16
+
+## 8.1.0-canary.15
+
+## 8.1.0-canary.14
+
+## 8.1.0-canary.13
+
+## 8.1.0-canary.12
+
+## 8.1.0-canary.11
+
+## 8.1.0-canary.10
+
+## 8.1.0-canary.9
+
+### Patch Changes
+
+- [#2223](https://github.com/graphcommerce-org/graphcommerce/pull/2223) [`0ccec63`](https://github.com/graphcommerce-org/graphcommerce/commit/0ccec630825d5fad398366beae90b3c90b2f84b8) - Added helper method to get Hygraph paths
+  ([@bramvanderholst](https://github.com/bramvanderholst))
+
+## 8.1.0-canary.8
+
+## 8.1.0-canary.7
+
+## 8.1.0-canary.6
+
+## 8.1.0-canary.5
+
+## 8.0.6-canary.4
+
+## 8.0.6-canary.3
+
+### Patch Changes
+
+- [#2219](https://github.com/graphcommerce-org/graphcommerce/pull/2219) [`2ed2055`](https://github.com/graphcommerce-org/graphcommerce/commit/2ed20550324c104265d72f22339fbedb26fb433b) - Allow blog pages to be nested
+  ([@Jessevdpoel](https://github.com/Jessevdpoel))
+
+## 8.0.6-canary.2
+
+## 8.0.6-canary.1
+
+## 8.0.6-canary.0
+
+## 8.0.5
+
+### Patch Changes
+
+- [#2238](https://github.com/graphcommerce-org/graphcommerce/pull/2238) [`db86432`](https://github.com/graphcommerce-org/graphcommerce/commit/db864324277fd5fb680c66eaa87d211cd7be4905) - Changed query limit to 100 from a 1000 on HygraphAllPages and AllDynamicRows query and added pagination.
+  ([@Jessevdpoel](https://github.com/Jessevdpoel))
+
+## 8.0.5-canary.10
+
+## 8.0.5-canary.9
+
+### Patch Changes
+
+- [#2238](https://github.com/graphcommerce-org/graphcommerce/pull/2238) [`db86432`](https://github.com/graphcommerce-org/graphcommerce/commit/db864324277fd5fb680c66eaa87d211cd7be4905) - Changed query limit to 100 from a 1000 on HygraphAllPages and AllDynamicRows query and added pagination.
+  ([@Jessevdpoel](https://github.com/Jessevdpoel))
+
+## 8.0.5-canary.8
+
+## 8.0.5-canary.7
+
+## 8.0.5-canary.6
+
+## 8.0.5-canary.5
+
+## 8.0.5-canary.4
+
+## 8.0.5-canary.3
+
+## 8.0.5-canary.2
+
+## 8.0.5-canary.1
+
+## 8.0.5-canary.0
+
+## 8.0.4
+
+## 8.0.4-canary.1
+
+## 8.0.4-canary.0
+
+## 8.0.3
+
+## 8.0.3-canary.6
+
+## 8.0.3-canary.5
+
+## 8.0.3-canary.4
+
+## 8.0.3-canary.3
+
+## 8.0.3-canary.2
 
 ## 8.0.3-canary.1
 

package/graphql/HygraphAllPages.graphql

@@ -1,5 +1,11 @@
-query HygraphAllPages($first: Int = 1000) {
-  pages(first: $first) {
+query HygraphAllPages($first: Int = 100, $skip: Int) {
+  pages(first: $first, skip: $skip) {
     url
   }
+
+  pagesConnection {
+    aggregate {
+      count
+    }
+  }
 }

package/graphql/HygraphStaticPaths.graphql

@@ -0,0 +1,11 @@
+query HygraphStaticPaths($pageSize: Int!, $skip: Int, $where: PageWhereInput) {
+  pages(first: $pageSize, skip: $skip, where: $where) {
+    url
+  }
+
+  pagesConnection {
+    aggregate {
+      count
+    }
+  }
+}

package/lib/getAllHygraphPages.ts

@@ -0,0 +1,41 @@
+import type { ApolloClient, NormalizedCacheObject, ApolloQueryResult } from '@apollo/client'
+import { HygraphAllPagesDocument, HygraphAllPagesQuery } from '../graphql'
+
+type Urls = { url: string }
+
+export async function getAllHygraphPages(
+  client: ApolloClient<NormalizedCacheObject>,
+  options: { pageSize?: number } = {},
+) {
+  const { pageSize = 100 } = options
+  const query = client.query({
+    query: HygraphAllPagesDocument,
+    variables: { first: pageSize },
+    fetchPolicy: process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined,
+  })
+  const pages: Promise<ApolloQueryResult<HygraphAllPagesQuery>>[] = [query]
+
+  const { data } = await query
+  const totalPages = Math.ceil(data.pagesConnection.aggregate.count / pageSize) ?? 1
+
+  if (totalPages > 1) {
+    for (let i = 2; i <= totalPages; i++) {
+      pages.push(
+        client.query({
+          query: HygraphAllPagesDocument,
+          variables: { first: pageSize, skip: pageSize * (i - 1) },
+          fetchPolicy: process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined,
+        }),
+      )
+    }
+  }
+
+  const paths: Urls[] = (await Promise.all(pages))
+    .map((q) => q.data.pages)
+    .flat(1)
+    .map((page) => ({
+      url: page.url,
+    }))
+
+  return paths
+}

package/lib/getHygraphPaths.ts

@@ -0,0 +1,43 @@
+import { ApolloClient, NormalizedCacheObject, ApolloQueryResult } from '@apollo/client'
+import type { PageWhereInput } from '@graphcommerce/graphql-mesh'
+import { GetStaticPathsResult } from 'next'
+import {
+  HygraphStaticPathsDocument,
+  HygraphStaticPathsQuery,
+} from '../graphql/HygraphStaticPaths.gql'
+
+type Return = GetStaticPathsResult<{ url: string }>
+
+export async function getHygraphStaticPaths(
+  client: ApolloClient<NormalizedCacheObject>,
+  locale: string,
+  options: { pageSize?: number; filter?: PageWhereInput } = {},
+) {
+  const { pageSize = 100, filter = {} } = options
+  const query = client.query({
+    query: HygraphStaticPathsDocument,
+    variables: { pageSize, where: filter },
+  })
+  const pages: Promise<ApolloQueryResult<HygraphStaticPathsQuery>>[] = [query]
+
+  const { data } = await query
+  const totalPages = Math.ceil(data.pagesConnection.aggregate.count / pageSize) ?? 1
+
+  if (totalPages > 1) {
+    for (let i = 2; i <= totalPages; i++) {
+      pages.push(
+        client.query({
+          query: HygraphStaticPathsDocument,
+          variables: { pageSize, skip: pageSize * (i - 1), where: filter },
+        }),
+      )
+    }
+  }
+
+  const paths: Return['paths'] = (await Promise.all(pages))
+    .map((q) => q.data.pages)
+    .flat(1)
+    .map((page) => ({ params: page, locale }))
+
+  return paths
+}

package/lib/hygraphPageContent.ts

@@ -1,5 +1,6 @@
 import { ApolloClient, NormalizedCacheObject } from '@graphcommerce/graphql'
-import { HygraphAllPagesDocument, HygraphPagesQuery, HygraphPagesDocument } from '../graphql'
+import { HygraphPagesQuery, HygraphPagesDocument } from '../graphql'
+import { getAllHygraphPages } from './getAllHygraphPages'
 
 /**
  * Fetch the page content for the given urls.
@@ -28,10 +29,9 @@ async function pageContent(
   const alwaysCache = process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined
   const fetchPolicy = cached ? alwaysCache : undefined
 
-  const allRoutes = await client.query({ query: HygraphAllPagesDocument, fetchPolicy: alwaysCache })
-
+  const allRoutes = await getAllHygraphPages(client)
   // Only do the query when there the page is found in the allRoutes
-  const found = allRoutes.data.pages.some((page) => page.url === url)
+  const found = allRoutes.some((page) => page.url === url)
 
   return found
     ? client.query({ query: HygraphPagesDocument, variables: { url }, fetchPolicy })

package/lib/index.ts

@@ -1 +1,2 @@
 export * from './hygraphPageContent'
+export * from './getHygraphPaths'

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/graphcms-ui",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.1.0-canary.2",
+  "version": "8.1.0-canary.22",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,12 +12,12 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/eslint-config-pwa": "^8.1.0-canary.2",
-    "@graphcommerce/graphql": "^8.1.0-canary.2",
-    "@graphcommerce/image": "^8.1.0-canary.2",
-    "@graphcommerce/next-ui": "^8.1.0-canary.2",
-    "@graphcommerce/prettier-config-pwa": "^8.1.0-canary.2",
-    "@graphcommerce/typescript-config-pwa": "^8.1.0-canary.2",
+    "@graphcommerce/eslint-config-pwa": "^8.1.0-canary.22",
+    "@graphcommerce/graphql": "^8.1.0-canary.22",
+    "@graphcommerce/image": "^8.1.0-canary.22",
+    "@graphcommerce/next-ui": "^8.1.0-canary.22",
+    "@graphcommerce/prettier-config-pwa": "^8.1.0-canary.22",
+    "@graphcommerce/typescript-config-pwa": "^8.1.0-canary.22",
     "@mui/material": "^5.10.16",
     "next": "*",
     "react": "^18.2.0",

package/plugins/hygraphGraphqlConfig.ts

@@ -1,10 +1,10 @@
 import { graphqlConfig, setContext } from '@graphcommerce/graphql'
-import type { MethodPlugin } from '@graphcommerce/next-config'
+import type { FunctionPlugin } from '@graphcommerce/next-config'
 
 export const func = 'graphqlConfig'
-export const exported = '@graphcommerce/graphql/config'
+export const exported = '@graphcommerce/graphql'
 
-const hygraphGraphqlConfig: MethodPlugin<typeof graphqlConfig> = (prev, config) => {
+const hygraphGraphqlConfig: FunctionPlugin<typeof graphqlConfig> = (prev, config) => {
   const results = prev(config)
 
   const locales = config.storefront.hygraphLocales