@graphcommerce/hygraph-dynamic-rows 8.1.0-canary.9 → 9.0.0-canary.101

package/CHANGELOG.md

@@ -1,5 +1,201 @@
 # @graphcommerce/hygraph-dynamic-rows
 
+## 9.0.0-canary.101
+
+## 9.0.0-canary.100
+
+## 9.0.0-canary.99
+
+## 9.0.0-canary.98
+
+## 9.0.0-canary.97
+
+## 9.0.0-canary.96
+
+## 9.0.0-canary.95
+
+## 9.0.0-canary.94
+
+## 9.0.0-canary.93
+
+## 9.0.0-canary.92
+
+## 9.0.0-canary.91
+
+## 9.0.0-canary.90
+
+## 9.0.0-canary.89
+
+## 9.0.0-canary.88
+
+## 9.0.0-canary.87
+
+## 9.0.0-canary.86
+
+## 9.0.0-canary.85
+
+## 9.0.0-canary.84
+
+## 9.0.0-canary.83
+
+## 9.0.0-canary.82
+
+## 9.0.0-canary.81
+
+## 9.0.0-canary.80
+
+## 9.0.0-canary.79
+
+## 9.0.0-canary.78
+
+## 9.0.0-canary.77
+
+## 9.0.0-canary.76
+
+### Minor Changes
+
+- [#2318](https://github.com/graphcommerce-org/graphcommerce/pull/2318) [`886837f`](https://github.com/graphcommerce-org/graphcommerce/commit/886837ff44d95404512716dbb9b2272c38b9ad27) - Terminate row field on DynamicRows model ([@JoshuaS98](https://github.com/JoshuaS98))
+
+## 9.0.0-canary.75
+
+## 9.0.0-canary.74
+
+## 9.0.0-canary.73
+
+## 9.0.0-canary.72
+
+## 9.0.0-canary.71
+
+## 9.0.0-canary.70
+
+## 9.0.0-canary.69
+
+## 9.0.0-canary.68
+
+## 9.0.0-canary.67
+
+## 9.0.0-canary.66
+
+## 9.0.0-canary.65
+
+## 9.0.0-canary.64
+
+## 9.0.0-canary.63
+
+## 9.0.0-canary.62
+
+## 9.0.0-canary.61
+
+## 9.0.0-canary.60
+
+### Patch Changes
+
+- [#2331](https://github.com/graphcommerce-org/graphcommerce/pull/2331) [`702bfc9`](https://github.com/graphcommerce-org/graphcommerce/commit/702bfc93566c9745546988e57988431d5d4d8cb0) - Moved plugins to new format ([@paales](https://github.com/paales))
+
+## 9.0.0-canary.59
+
+## 9.0.0-canary.58
+
+## 9.0.0-canary.57
+
+## 9.0.0-canary.56
+
+## 9.0.0-canary.55
+
+## 9.0.0-canary.54
+
+## 8.1.0-canary.53
+
+## 8.1.0-canary.52
+
+## 8.1.0-canary.51
+
+## 8.1.0-canary.50
+
+## 8.1.0-canary.49
+
+## 8.1.0-canary.48
+
+## 8.1.0-canary.47
+
+## 8.1.0-canary.46
+
+## 8.1.0-canary.45
+
+## 8.1.0-canary.44
+
+## 8.1.0-canary.43
+
+## 8.1.0-canary.42
+
+## 8.1.0-canary.41
+
+## 8.1.0-canary.40
+
+## 8.1.0-canary.39
+
+## 8.1.0-canary.38
+
+## 8.1.0-canary.37
+
+## 8.1.0-canary.36
+
+## 8.1.0-canary.35
+
+## 8.1.0-canary.34
+
+## 8.1.0-canary.33
+
+## 8.1.0-canary.32
+
+## 8.1.0-canary.31
+
+## 8.1.0-canary.30
+
+## 8.1.0-canary.29
+
+## 8.1.0-canary.28
+
+## 8.1.0-canary.27
+
+## 8.1.0-canary.26
+
+## 8.1.0-canary.25
+
+## 8.1.0-canary.24
+
+## 8.1.0-canary.23
+
+## 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
+
+### Patch Changes
+
+- [#2268](https://github.com/graphcommerce-org/graphcommerce/pull/2268) [`8ffe2d5`](https://github.com/graphcommerce-org/graphcommerce/commit/8ffe2d5d1b040797ee4987d7740de5fdeadd4f72) - Fix for non extensible object error in Dynamic Row package ([@JoshuaS98](https://github.com/JoshuaS98))
+
+## 8.1.0-canary.12
+
+## 8.1.0-canary.11
+
+## 8.1.0-canary.10
+
 ## 8.1.0-canary.9
 
 ## 8.1.0-canary.8
@@ -24,8 +220,7 @@
 
 ### 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))
+- [#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
 
@@ -33,8 +228,7 @@
 
 ### 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))
+- [#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
 
@@ -102,11 +296,9 @@
 
 ### Patch Changes
 
-- [`df385d9`](https://github.com/graphcommerce-org/graphcommerce/commit/df385d9a2e724715e0f08cc13b1bef6748b38b82) - Allow muiltiple rows for each Dynamic Row entry in Hygraph
-  ([@JoshuaS98](https://github.com/JoshuaS98))
+- [`df385d9`](https://github.com/graphcommerce-org/graphcommerce/commit/df385d9a2e724715e0f08cc13b1bef6748b38b82) - Allow muiltiple rows for each Dynamic Row entry in Hygraph ([@JoshuaS98](https://github.com/JoshuaS98))
 
-- [#2182](https://github.com/graphcommerce-org/graphcommerce/pull/2182) [`a93c312`](https://github.com/graphcommerce-org/graphcommerce/commit/a93c312b9d6e0d6cc102b49cc3ad02953200a1f6) - Dynamic rows would break page rendering if there was a dynamic row but no page returned
-  ([@paales](https://github.com/paales))
+- [#2182](https://github.com/graphcommerce-org/graphcommerce/pull/2182) [`a93c312`](https://github.com/graphcommerce-org/graphcommerce/commit/a93c312b9d6e0d6cc102b49cc3ad02953200a1f6) - Dynamic rows would break page rendering if there was a dynamic row but no page returned ([@paales](https://github.com/paales))
 
 ## 8.0.0-canary.100
 
@@ -116,8 +308,7 @@
 
 ### Patch Changes
 
-- [#2182](https://github.com/graphcommerce-org/graphcommerce/pull/2182) [`a93c312`](https://github.com/graphcommerce-org/graphcommerce/commit/a93c312b9d6e0d6cc102b49cc3ad02953200a1f6) - Dynamic rows would break page rendering if there was a dynamic row but no page returned
-  ([@paales](https://github.com/paales))
+- [#2182](https://github.com/graphcommerce-org/graphcommerce/pull/2182) [`a93c312`](https://github.com/graphcommerce-org/graphcommerce/commit/a93c312b9d6e0d6cc102b49cc3ad02953200a1f6) - Dynamic rows would break page rendering if there was a dynamic row but no page returned ([@paales](https://github.com/paales))
 
 ## 8.0.0-canary.97
 

package/graphql/DynamicRow.graphql

@@ -1,28 +1,15 @@
-fragment DynamicRow on DynamicRow @injectable {
+fragment DynamicRow on DynamicRow {
   placement
   target {
     ... on Node {
       id
     }
   }
-
-  row {
-    __typename
-    ... on Node {
-      id
-    }
-
-    ...RowColumnOne
-    ...RowQuote
-    ...RowLinks
-  }
-
   rows {
     __typename
     ... on Node {
       id
     }
-
     ...RowColumnOne
     ...RowQuote
     ...RowLinks

package/lib/getAllHygraphDynamicRows.ts

@@ -1,4 +1,5 @@
 import type { ApolloClient, NormalizedCacheObject, ApolloQueryResult } from '@apollo/client'
+import { cacheFirst } from '@graphcommerce/graphql'
 import { AllDynamicRowsDocument, AllDynamicRowsQuery } from '../graphql'
 
 type DynamicRows = AllDynamicRowsQuery['dynamicRows']
@@ -8,10 +9,11 @@ export async function getAllHygraphDynamicRows(
   options: { pageSize?: number } = {},
 ) {
   const { pageSize = 100 } = options
+
   const query = client.query({
     query: AllDynamicRowsDocument,
     variables: { first: pageSize },
-    fetchPolicy: process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined,
+    fetchPolicy: cacheFirst(client),
   })
 
   const pages: Promise<ApolloQueryResult<AllDynamicRowsQuery>>[] = [query]
@@ -24,7 +26,7 @@ export async function getAllHygraphDynamicRows(
         client.query({
           query: AllDynamicRowsDocument,
           variables: { first: pageSize, skip: pageSize * (i - 1) },
-          fetchPolicy: process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined,
+          fetchPolicy: cacheFirst(client),
         }),
       )
     }

package/lib/hygraphDynamicRows.ts

@@ -1,5 +1,5 @@
 import { HygraphPagesQuery } from '@graphcommerce/graphcms-ui'
-import { ApolloClient, NormalizedCacheObject } from '@graphcommerce/graphql'
+import { ApolloClient, NormalizedCacheObject, cacheFirst } from '@graphcommerce/graphql'
 import {
   ConditionTextFragment,
   ConditionNumberFragment,
@@ -94,8 +94,7 @@ export async function hygraphDynamicRows(
   cached: boolean,
   additionalProperties?: Promise<object> | object,
 ): Promise<{ data: HygraphPagesQuery }> {
-  const alwaysCache = process.env.NODE_ENV !== 'development' ? 'cache-first' : undefined
-  const fetchPolicy = cached ? alwaysCache : undefined
+  const fetchPolicy = cached ? cacheFirst(client) : undefined
 
   const allRoutes = await getAllHygraphDynamicRows(client)
 
@@ -117,25 +116,22 @@ export async function hygraphDynamicRows(
   const page = pageResult.data.pages[0] as Page | undefined
 
   // Create a copy of the content array.
-  const content = page?.content ?? []
+  const content = [...(page?.content ?? [])]
 
   dynamicResult?.data.dynamicRows.forEach((dynamicRow) => {
-    const { placement, target, rows, row } = dynamicRow
-    if (!rows && !row) return
-
-    const rowsToMerge = rows
-    if (row && rows.length === 0) rowsToMerge.push(row)
+    const { placement, target, rows } = dynamicRow
+    if (!rows) return
 
     if (!target) {
-      if (placement === 'BEFORE') content.unshift(...rowsToMerge)
-      else content.push(...rowsToMerge)
+      if (placement === 'BEFORE') content.unshift(...rows)
+      else content.push(...rows)
       return
     }
 
     const targetIdx = content.findIndex((c) => c.id === target.id)
-    if (placement === 'BEFORE') content.splice(targetIdx, 0, ...rowsToMerge)
-    if (placement === 'AFTER') content.splice(targetIdx + 1, 0, ...rowsToMerge)
-    if (placement === 'REPLACE') content.splice(targetIdx, 1, ...rowsToMerge)
+    if (placement === 'BEFORE') content.splice(targetIdx, 0, ...rows)
+    if (placement === 'AFTER') content.splice(targetIdx + 1, 0, ...rows)
+    if (placement === 'REPLACE') content.splice(targetIdx, 1, ...rows)
   })
 
   if (!content.length) return pageResult

package/package.json

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

package/plugins/hygraphDynamicRowsPageContent.ts

@@ -1,11 +1,13 @@
-import type { hygraphPageContent } from '@graphcommerce/graphcms-ui'
-import type { MethodPlugin } from '@graphcommerce/next-config'
+import type { hygraphPageContent as hygraphPageContentType } from '@graphcommerce/graphcms-ui'
+import type { FunctionPlugin, PluginConfig } from '@graphcommerce/next-config'
 import { hygraphDynamicRows } from '../lib/hygraphDynamicRows'
 
-export const func = 'hygraphPageContent'
-export const exported = '@graphcommerce/graphcms-ui'
+export const config: PluginConfig = {
+  type: 'function',
+  module: '@graphcommerce/graphcms-ui',
+}
 
-const hygraphDynamicRowsPageContent: MethodPlugin<typeof hygraphPageContent> = (
+export const hygraphPageContent: FunctionPlugin<typeof hygraphPageContentType> = (
   prev,
   client,
   url,
@@ -15,5 +17,3 @@ const hygraphDynamicRowsPageContent: MethodPlugin<typeof hygraphPageContent> = (
   const pageQuery = prev(client, url, additionalProperties, cached)
   return hygraphDynamicRows(client, pageQuery, url, cached, additionalProperties)
 }
-
-export const plugin = hygraphDynamicRowsPageContent