@graphcommerce/next-config 6.2.0-canary.6 → 6.2.0-canary.61

package/CHANGELOG.md

@@ -1,5 +1,143 @@
 # Change Log
 
+## 6.2.0-canary.61
+
+## 6.2.0-canary.60
+
+## 6.2.0-canary.59
+
+## 6.2.0-canary.58
+
+## 6.2.0-canary.57
+
+### Patch Changes
+
+- [#1982](https://github.com/graphcommerce-org/graphcommerce/pull/1982) [`e1fab2f6d`](https://github.com/graphcommerce-org/graphcommerce/commit/e1fab2f6d8f57d0488d8a915596d5c19cb7718e6) - Better detection what the package roots are when a custom node_modules directory is used ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.56
+
+## 6.2.0-canary.55
+
+## 6.2.0-canary.54
+
+## 6.2.0-canary.53
+
+## 6.2.0-canary.52
+
+## 6.2.0-canary.51
+
+## 6.2.0-canary.50
+
+### Minor Changes
+
+- [`e55d8c390`](https://github.com/graphcommerce-org/graphcommerce/commit/e55d8c390d90b4bb7bab11c6a99027ac72bd7e3e) - Created a new sidebar layout system, can be configured with productFiltersLayout in the graphcommerce.config.js ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.49
+
+### Patch Changes
+
+- [#1959](https://github.com/graphcommerce-org/graphcommerce/pull/1959) [`d0809b132`](https://github.com/graphcommerce-org/graphcommerce/commit/d0809b132a0e4cbdfeb86164f6c16a89ebecd987) - Added support for default values in the Config.graphqls files for the documentation ([@JoshuaS98](https://github.com/JoshuaS98))
+
+## 6.2.0-canary.48
+
+## 6.2.0-canary.47
+
+## 6.2.0-canary.46
+
+## 6.2.0-canary.45
+
+## 6.2.0-canary.44
+
+## 6.2.0-canary.43
+
+## 6.2.0-canary.42
+
+## 6.2.0-canary.41
+
+### Patch Changes
+
+- [#1960](https://github.com/graphcommerce-org/graphcommerce/pull/1960) [`86e14569b`](https://github.com/graphcommerce-org/graphcommerce/commit/86e14569b1f68f73be7f93b614e36b382c5debff) - Updated to the latest release of GraphQL codegen and solve compatibility issues with our own generator ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.40
+
+## 6.2.0-canary.39
+
+## 6.2.0-canary.38
+
+## 6.2.0-canary.37
+
+## 6.2.0-canary.36
+
+## 6.2.0-canary.35
+
+## 6.2.0-canary.34
+
+## 6.2.0-canary.33
+
+## 6.2.0-canary.32
+
+## 6.2.0-canary.31
+
+## 6.2.0-canary.30
+
+## 6.2.0-canary.29
+
+## 6.2.0-canary.28
+
+## 6.2.0-canary.27
+
+## 6.2.0-canary.26
+
+## 6.2.0-canary.25
+
+## 6.2.0-canary.24
+
+## 6.2.0-canary.23
+
+## 6.2.0-canary.22
+
+## 6.2.0-canary.21
+
+## 6.2.0-canary.20
+
+### Patch Changes
+
+- [#1928](https://github.com/graphcommerce-org/graphcommerce/pull/1928) [`09d6a7abd`](https://github.com/graphcommerce-org/graphcommerce/commit/09d6a7abdf44c04a37f59432e9fc0c0722e6df76) - Added number to config value formatter, so Graphcommerce config accepts number values. ([@mikekeehnen](https://github.com/mikekeehnen))
+
+## 6.2.0-canary.19
+
+## 6.2.0-canary.18
+
+## 6.2.0-canary.17
+
+## 6.2.0-canary.16
+
+## 6.2.0-canary.15
+
+## 6.2.0-canary.14
+
+### Patch Changes
+
+- [#1925](https://github.com/graphcommerce-org/graphcommerce/pull/1925) [`2b595bf13`](https://github.com/graphcommerce-org/graphcommerce/commit/2b595bf13f3725a77661586cce021ce8d4791558) - Fixed bug for type error in `demoConfig.ts`. All storefront config values in the demo config are now optional. ([@mikekeehnen](https://github.com/mikekeehnen))
+
+## 6.2.0-canary.13
+
+### Patch Changes
+
+- [#1924](https://github.com/graphcommerce-org/graphcommerce/pull/1924) [`04581f619`](https://github.com/graphcommerce-org/graphcommerce/commit/04581f619c609f2f6ca5268ee5effb6a1db3f0eb) - Use the latest branch from graphql-mesh so that all versions are in sync ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.12
+
+## 6.2.0-canary.11
+
+## 6.2.0-canary.10
+
+## 6.2.0-canary.9
+
+## 6.2.0-canary.8
+
+## 6.2.0-canary.7
+
 ## 6.2.0-canary.6
 
 ### Minor Changes

package/__tests__/config/utils/__snapshots__/mergeEnvIntoConfig.ts.snap

@@ -28,6 +28,8 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
 [
   "GC_CANONICAL_BASE_URL",
   "GC_CART_DISPLAY_PRICES_INCL_TAX",
+  "GC_COMPARE",
+  "GC_COMPARE_VARIANT",
   "GC_CUSTOMER_REQUIRE_EMAIL_CONFIRMATION",
   "GC_DEBUG",
   "GC_DEBUG_PLUGIN_STATUS",
@@ -38,6 +40,8 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_GOOGLE_RECAPTCHA_KEY",
   "GC_GOOGLE_TAGMANAGER_ID",
   "GC_HYGRAPH_ENDPOINT",
+  "GC_HYGRAPH_WRITE_ACCESS_ENDPOINT",
+  "GC_HYGRAPH_WRITE_ACCESS_TOKEN",
   "GC_LEGACY_PRODUCT_ROUTE",
   "GC_LIMIT_SSG",
   "GC_MAGENTO_ENDPOINT",

package/__tests__/interceptors/findPlugins.ts

@@ -165,6 +165,12 @@ it('finds plugins', () => {
         "func": "graphqlConfig",
         "plugin": "@graphcommerce/magento-store/plugins/magentoStoreGraphqlConfig",
       },
+      {
+        "enabled": true,
+        "exported": "@graphcommerce/graphql/config",
+        "func": "graphqlConfig",
+        "plugin": "@graphcommerce/magento-graphql/plugins/magentoGraphqlConfig",
+      },
     ]
   `)
   expect(disabled).toMatchInlineSnapshot(`
@@ -211,6 +217,34 @@ it('finds plugins', () => {
         "ifConfig": "googleTagmanagerId",
         "plugin": "@graphcommerce/googletagmanager/plugins/GtagFramerNextPages",
       },
+      {
+        "component": "CartFab",
+        "enabled": false,
+        "exported": "@graphcommerce/magento-cart",
+        "ifConfig": "compare",
+        "plugin": "@graphcommerce/magento-compare/plugins/AddCompareFabNextToCart",
+      },
+      {
+        "component": "ProductPageAddToCartActionsRow",
+        "enabled": false,
+        "exported": "@graphcommerce/magento-product",
+        "ifConfig": "compare",
+        "plugin": "@graphcommerce/magento-compare/plugins/AddCompareToProductPage",
+      },
+      {
+        "component": "GraphQLProvider",
+        "enabled": false,
+        "exported": "@graphcommerce/graphql",
+        "ifConfig": "compare",
+        "plugin": "@graphcommerce/magento-compare/plugins/AddCompareTypePolicies",
+      },
+      {
+        "component": "ProductListItem",
+        "enabled": false,
+        "exported": "@graphcommerce/magento-product",
+        "ifConfig": "compare",
+        "plugin": "@graphcommerce/magento-compare/plugins/CompareAbleProductListItem",
+      },
     ]
   `)
 })

package/__tests__/utils/packageRoots.ts

@@ -0,0 +1,35 @@
+import { packageRoots } from '../../src/utils/packageRoots'
+
+describe('packageRoots', () => {
+  it('should simplify all common paths', () => {
+    const paths = [
+      '../../packages/cli',
+      '../../packages/hygraph-cli',
+      '../../packagesDev/next-config',
+      '../../packagesDev/next-la',
+      '../../../layers/paketo-buildpacks_yarn-install/build-modules/node_modules/@graphcommerce/magento-cart-items',
+      '../../../layers/paketo-buildpacks_yarn-install/build-modules/node_modules/@graphcommerce/magento-product',
+      // ... (rest of your paths)
+    ]
+
+    const expectedRoots = [
+      '../../packages',
+      '../../packagesDev',
+      '../../../layers/paketo-buildpacks_yarn-install/build-modules/node_modules/@graphcommerce',
+    ]
+
+    const roots = packageRoots(paths)
+
+    // Expect roots to be an array
+    expect(Array.isArray(roots)).toBe(true)
+
+    // Expect the roots array to be equal to expectedRoots
+    expect(expectedRoots).toEqual(roots)
+  })
+
+  it('should return an empty array for no common roots', () => {
+    const paths = ['../a/b', '../c/d']
+    const roots = packageRoots(paths)
+    expect(roots).toEqual([])
+  })
+})

package/__tests__/utils/resolveDependenciesSync.ts

@@ -9,12 +9,13 @@ it('resolves dependences', () => {
     Map {
       "." => "examples/magento-graphcms",
       "@graphcommerce/cli" => "packages/cli",
+      "@graphcommerce/hygraph-cli" => "packages/hygraph-cli",
       "@graphcommerce/demo-magento-graphcommerce" => "packages/demo-magento-graphcommerce",
       "@graphcommerce/googleanalytics" => "packages/googleanalytics",
       "@graphcommerce/magento-cart-shipping-method" => "packages/magento-cart-shipping-method",
       "@graphcommerce/googlerecaptcha" => "packages/googlerecaptcha",
       "@graphcommerce/googletagmanager" => "packages/googletagmanager",
-      "@graphcommerce/graphcms-ui" => "packages/graphcms-ui",
+      "@graphcommerce/graphcms-ui" => "packages/hygraph-ui",
       "@graphcommerce/lingui-next" => "packages/lingui-next",
       "@graphcommerce/next-config" => "packagesDev/next-config",
       "@graphcommerce/magento-cart-billing-address" => "packages/magento-cart-billing-address",
@@ -22,6 +23,7 @@ it('resolves dependences', () => {
       "@graphcommerce/magento-cart-coupon" => "packages/magento-cart-coupon",
       "@graphcommerce/magento-cart-email" => "packages/magento-cart-email",
       "@graphcommerce/magento-cms" => "packages/magento-cms",
+      "@graphcommerce/magento-compare" => "packages/magento-compare",
       "@graphcommerce/magento-newsletter" => "packages/magento-newsletter",
       "@graphcommerce/magento-payment-included" => "packages/magento-payment-included",
       "@graphcommerce/magento-cart-payment-method" => "packages/magento-cart-payment-method",

package/dist/config/commands/generateConfig.js

@@ -25,6 +25,7 @@ async function generateConfig() {
                     content: '/* eslint-disable */',
                     schema: 'zod',
                     notAllowEmptyString: true,
+                    strictScalars: true,
                     enumsAsTypes: true,
                     scalarSchemas: {
                         Domain: 'z.string()',

package/dist/config/demoConfig.js

@@ -19,7 +19,10 @@ exports.demoConfig = {
         { locale: 'en-ca', magentoStoreCode: 'en_CA' },
     ],
     productFiltersPro: true,
+    productFiltersLayout: 'DEFAULT',
+    compareVariant: 'ICON',
     robotsAllow: false,
     demoMode: true,
     limitSsg: true,
+    compare: true,
 };

package/dist/config/utils/exportConfigToEnv.js

@@ -10,6 +10,9 @@ const fmt = (value) => {
     if (typeof formattedValue === 'object') {
         formattedValue = JSON.stringify(formattedValue);
     }
+    if (typeof formattedValue === 'number') {
+        formattedValue = String(formattedValue);
+    }
     return formattedValue;
 };
 function exportConfigToEnv(config) {

package/dist/generated/config.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphCommerceStorefrontConfigSchema = exports.GraphCommerceDebugConfigSchema = exports.GraphCommerceConfigSchema = exports.definedNonNullAnySchema = exports.isDefinedNonNullAny = void 0;
+exports.GraphCommerceStorefrontConfigSchema = exports.GraphCommerceDebugConfigSchema = exports.GraphCommerceConfigSchema = exports.ProductFiltersLayoutSchema = exports.CompareVariantSchema = exports.definedNonNullAnySchema = exports.isDefinedNonNullAny = void 0;
 /* eslint-disable */
 const zod_1 = require("zod");
 const isDefinedNonNullAny = (v) => v !== undefined && v !== null;
 exports.isDefinedNonNullAny = isDefinedNonNullAny;
 exports.definedNonNullAnySchema = zod_1.z.any().refine((v) => (0, exports.isDefinedNonNullAny)(v));
+exports.CompareVariantSchema = zod_1.z.enum(['CHECKBOX', 'ICON']);
+exports.ProductFiltersLayoutSchema = zod_1.z.enum(['DEFAULT', 'SIDEBAR']);
 function GraphCommerceConfigSchema() {
     return zod_1.z.object({
         canonicalBaseUrl: zod_1.z.string().min(1),
         cartDisplayPricesInclTax: zod_1.z.boolean().nullish(),
+        compare: zod_1.z.boolean().nullish(),
+        compareVariant: exports.CompareVariantSchema.nullish(),
         customerRequireEmailConfirmation: zod_1.z.boolean().nullish(),
         debug: GraphCommerceDebugConfigSchema().nullish(),
         demoMode: zod_1.z.boolean().nullish(),
@@ -17,10 +21,13 @@ function GraphCommerceConfigSchema() {
         googleRecaptchaKey: zod_1.z.string().nullish(),
         googleTagmanagerId: zod_1.z.string().nullish(),
         hygraphEndpoint: zod_1.z.string().min(1),
+        hygraphWriteAccessEndpoint: zod_1.z.string().nullish(),
+        hygraphWriteAccessToken: zod_1.z.string().nullish(),
         legacyProductRoute: zod_1.z.boolean().nullish(),
         limitSsg: zod_1.z.boolean().nullish(),
         magentoEndpoint: zod_1.z.string().min(1),
         previewSecret: zod_1.z.string().nullish(),
+        productFiltersLayout: exports.ProductFiltersLayoutSchema.nullish(),
         productFiltersPro: zod_1.z.boolean().nullish(),
         productRoute: zod_1.z.string().nullish(),
         robotsAllow: zod_1.z.boolean().nullish(),

package/dist/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./utils/isMonorepo"), exports);
 __exportStar(require("./utils/resolveDependenciesSync"), exports);
+__exportStar(require("./utils/packageRoots"), exports);
 __exportStar(require("./withGraphCommerce"), exports);
 __exportStar(require("./generated/config"), exports);
 __exportStar(require("./config"), exports);

package/dist/utils/packageRoots.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.packageRoots = void 0;
+const packageRoots = (packagePaths) => {
+    const pathMap = {};
+    // Iterate over each path in the array
+    packagePaths.forEach((singlePath) => {
+        const parts = singlePath.split('/');
+        // Iterate through each part of the path
+        for (let i = 1; i < parts.length; i++) {
+            const subPath = parts.slice(0, i + 1).join('/');
+            // Increment the count of this subPath
+            if (pathMap[subPath]) {
+                pathMap[subPath].count += 1;
+            }
+            else {
+                pathMap[subPath] = { path: subPath, count: 1 };
+            }
+        }
+    });
+    // Filter the paths that appear more than once
+    const roots = [];
+    Object.values(pathMap).forEach(({ path, count }) => {
+        if (count > 1) {
+            roots.push(path);
+        }
+    });
+    // Filter out the sub-paths which are part of another longer sub-path
+    return roots.filter((root, index, self) => self.findIndex((r) => r !== root && r.startsWith(root + '/')) === -1);
+};
+exports.packageRoots = packageRoots;

package/dist/withGraphCommerce.js

@@ -53,8 +53,9 @@ function withGraphCommerce(nextConfig, cwd) {
     return {
         ...nextConfig,
         experimental: {
-            enableUndici: true,
             ...nextConfig.experimental,
+            scrollRestoration: true,
+            swcPlugins: [...(nextConfig.experimental?.swcPlugins ?? []), ['@lingui/swc-plugin', {}]],
         },
         i18n: {
             defaultLocale: storefront.find((locale) => locale.defaultLocale)?.locale ?? storefront[0].locale,
@@ -79,6 +80,7 @@ function withGraphCommerce(nextConfig, cwd) {
                     { source: '/product/downloadable/:url*', destination, permanent: true },
                     { source: '/product/grouped/:url*', destination, permanent: true },
                     { source: '/product/virtual/:url*', destination, permanent: true },
+                    { source: '/customer/account', destination: '/account', permanent: true },
                 ]);
                 if (destination !== '/product/:url*')
                     redirects.push({ source: '/product/:url*', destination, permanent: true });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "6.2.0-canary.6",
+  "version": "6.2.0-canary.61",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -12,9 +12,10 @@
     "prepack": "tsc"
   },
   "dependencies": {
-    "@graphql-mesh/cli": "0.82.25",
-    "@lingui/loader": "3.17.2",
-    "@swc/core": "1.3.39",
+    "@graphql-mesh/cli": "latest",
+    "@lingui/loader": "4.2.1",
+    "@swc/core": "1.3.62",
+    "@lingui/swc-plugin": "^4.0.2",
     "circular-dependency-plugin": "^5.2.2",
     "inspectpack": "^4.7.1",
     "js-yaml-loader": "^1.2.2",
@@ -26,7 +27,7 @@
     "@types/circular-dependency-plugin": "^5.0.5",
     "@types/cli-table": "^0.3.1",
     "@types/lodash": "^4.14.191",
-    "typescript": "4.9.5"
+    "typescript": "5.1.3"
   },
   "peerDependencies": {
     "next": "^13.2.0",

package/src/config/commands/generateConfig.ts

@@ -27,6 +27,7 @@ export async function generateConfig() {
           content: '/* eslint-disable */',
           schema: 'zod',
           notAllowEmptyString: true,
+          strictScalars: true,
           enumsAsTypes: true,
           scalarSchemas: {
             Domain: 'z.string()',

package/src/config/demoConfig.ts

@@ -1,6 +1,9 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { PartialDeep } from 'type-fest'
 import { GraphCommerceConfig } from '../generated/config'
 
-export const demoConfig: Partial<GraphCommerceConfig> & Record<string, unknown> = {
+export const demoConfig: PartialDeep<GraphCommerceConfig, { recurseIntoArrays: true }> &
+  Record<string, unknown> = {
   canonicalBaseUrl: 'https://graphcommerce.vercel.app',
   hygraphEndpoint: 'https://eu-central-1.cdn.hygraph.com/content/ckhx7xadya6xs01yxdujt8i80/master',
   magentoEndpoint: 'https://backend.reachdigital.dev/graphql',
@@ -18,7 +21,10 @@ export const demoConfig: Partial<GraphCommerceConfig> & Record<string, unknown>
     { locale: 'en-ca', magentoStoreCode: 'en_CA' },
   ],
   productFiltersPro: true,
+  productFiltersLayout: 'DEFAULT',
+  compareVariant: 'ICON',
   robotsAllow: false,
   demoMode: true,
   limitSsg: true,
+  compare: true,
 }

package/src/config/utils/exportConfigToEnv.ts

@@ -1,7 +1,7 @@
 import { GraphCommerceConfig } from '../../generated/config'
 import { toEnvStr } from './mergeEnvIntoConfig'
 
-const fmt = (value: string | boolean | object | null) => {
+const fmt = (value: string | number | boolean | object | null) => {
   let formattedValue = value
 
   if (typeof formattedValue === 'boolean') {
@@ -11,6 +11,10 @@ const fmt = (value: string | boolean | object | null) => {
     formattedValue = JSON.stringify(formattedValue)
   }
 
+  if (typeof formattedValue === 'number') {
+    formattedValue = String(formattedValue)
+  }
+
   return formattedValue
 }
 

package/src/generated/config.ts

@@ -5,15 +5,21 @@ export type InputMaybe<T> = Maybe<T>;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
 export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
 export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+export type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };
+export type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };
 /** All built-in and custom scalars, mapped to their actual values */
 export type Scalars = {
-  ID: string;
-  String: string;
-  Boolean: boolean;
-  Int: number;
-  Float: number;
+  ID: { input: string | number; output: string; }
+  String: { input: string; output: string; }
+  Boolean: { input: boolean; output: boolean; }
+  Int: { input: number; output: number; }
+  Float: { input: number; output: number; }
 };
 
+export type CompareVariant =
+  | 'CHECKBOX'
+  | 'ICON';
+
 /**
  * # GraphCommerce configuration system
  *
@@ -100,13 +106,20 @@ export type GraphCommerceConfig = {
    * - https://example.com/en
    * - https://example.com/en-US
    */
-  canonicalBaseUrl: Scalars['String'];
+  canonicalBaseUrl: Scalars['String']['input'];
   /**
    * Due to a limitation of the GraphQL API it is not possible to determine if a cart should be displayed including or excluding tax.
    *
    * When Magento's StoreConfig adds this value, this can be replaced.
    */
-  cartDisplayPricesInclTax?: InputMaybe<Scalars['Boolean']>;
+  cartDisplayPricesInclTax?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Use compare functionality */
+  compare?: InputMaybe<Scalars['Boolean']['input']>;
+  /**
+   * By default the compare feature is denoted with a 'compare ICON' (2 arrows facing one another).
+   * This may be fine for experienced users, but for more clarity it's also possible to present the compare feature as a CHECKBOX accompanied by the 'Compare' label
+   */
+  compareVariant?: InputMaybe<CompareVariant>;
   /**
    * Due to a limitation in the GraphQL API of Magento 2, we need to know if the
    * customer requires email confirmation.
@@ -114,7 +127,7 @@ export type GraphCommerceConfig = {
    * This value should match Magento 2's configuration value for
    * `customer/create_account/confirm` and should be removed once we can query
    */
-  customerRequireEmailConfirmation?: InputMaybe<Scalars['Boolean']>;
+  customerRequireEmailConfirmation?: InputMaybe<Scalars['Boolean']['input']>;
   /** Debug configuration for GraphCommerce */
   debug?: InputMaybe<GraphCommerceDebugConfig>;
   /**
@@ -124,7 +137,7 @@ export type GraphCommerceConfig = {
    * - Adds "dominant_color" attribute swatches to the product list items.
    * - Creates a big list items in the product list.
    */
-  demoMode?: InputMaybe<Scalars['Boolean']>;
+  demoMode?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * See https://support.google.com/analytics/answer/9539598?hl=en
    *
@@ -132,25 +145,65 @@ export type GraphCommerceConfig = {
    *
    * To override the value for a specific locale, configure in i18n config.
    */
-  googleAnalyticsId?: InputMaybe<Scalars['String']>;
+  googleAnalyticsId?: InputMaybe<Scalars['String']['input']>;
   /**
-   * Google reCAPTCHA key, get from https://developers.google.com/recaptcha/docs/v3
+   * Google reCAPTCHA site key.
+   * When using reCAPTCHA, this value is required, even if you are configuring different values for each locale.
    *
-   * This value is required even if you are configuring different values for each locale.
+   * Get a site key and a secret key from https://developers.google.com/recaptcha/docs/v3
+   *
+   * The secret key should be added in the Magento admin panel (Stores > Configuration > Security > Google ReCAPTCHA Storefront > reCAPTCHA v3 Invisible)
+   * ReCAPTCHA can then be enabled/disabled for the different forms, separately (Stores > Configuration > Security > Google ReCAPTCHA Storefront > Storefront)
    */
-  googleRecaptchaKey?: InputMaybe<Scalars['String']>;
+  googleRecaptchaKey?: InputMaybe<Scalars['String']['input']>;
   /**
    * The Google Tagmanager ID to be used on the site.
    *
    * This value is required even if you are configuring different values for each locale.
    */
-  googleTagmanagerId?: InputMaybe<Scalars['String']>;
+  googleTagmanagerId?: InputMaybe<Scalars['String']['input']>;
   /**
    * The HyGraph endpoint.
    *
+   * > Read-only endpoint that allows low latency and high read-throughput content delivery.
+   *
    * Project settings -> API Access -> High Performance Read-only Content API
    */
-  hygraphEndpoint: Scalars['String'];
+  hygraphEndpoint: Scalars['String']['input'];
+  /**
+   * Content API. **Only used for migrations.**
+   *
+   * > Regular read & write endpoint that allows querying and mutating data in your project.
+   *
+   * Project settings -> API Access -> Content API
+   */
+  hygraphWriteAccessEndpoint?: InputMaybe<Scalars['String']['input']>;
+  /**
+   * Hygraph Management SDK Authorization Token. **Only used for migrations.**
+   *
+   * Project settings -> API Access -> Permanent Auth Tokens
+   *
+   * 1. Click  'Add token' and give it a name, something like 'GraphCommerce Write Access Token' and keep stage on 'Published'.
+   * 2. Under 'Management API', click 'Yes, Initialize defaults'
+   * 3. Click 'Edit Permissions' and enable: 'Update' and 'Delete' permissions for 'models', 'enumerations', 'fields', 'components' and 'sources'
+   *   - Update existing models
+   *   - Delete existing models
+   *   - Update existing fields
+   *   - Delete existing fields
+   *   - Update existing enumerations
+   *   - Delete existing enumerations
+   *   - Update existing components
+   *   - Delete existing components
+   *   - Update remote sources
+   *   - Delete remote sources
+   *
+   * ```
+   * GC_HYGRAPH_WRITE_ACCESS_ENDPOINT="https://...hygraph.com/v2/..."
+   * GC_HYGRAPH_WRITE_ACCESS_TOKEN="AccessTokenFromHygraph"
+   * yarn graphcommerce hygraph-migrate
+   * ```
+   */
+  hygraphWriteAccessToken?: InputMaybe<Scalars['String']['input']>;
   /**
    * On older versions of GraphCommerce products would use a product type specific route.
    *
@@ -158,57 +211,63 @@ export type GraphCommerceConfig = {
    *
    * @deprecated Will be removed in a future version. [migration](../upgrading/graphcommerce-5-to-6.md#product-routing-changes)
    */
-  legacyProductRoute?: InputMaybe<Scalars['Boolean']>;
+  legacyProductRoute?: InputMaybe<Scalars['Boolean']['input']>;
   /** Limit the static generation of SSG when building */
-  limitSsg?: InputMaybe<Scalars['Boolean']>;
+  limitSsg?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * GraphQL Magento endpoint.
    *
    * Examples:
    * - https://magento2.test/graphql
    */
-  magentoEndpoint: Scalars['String'];
+  magentoEndpoint: Scalars['String']['input'];
   /** To enable next.js' preview mode, configure the secret you'd like to use. */
-  previewSecret?: InputMaybe<Scalars['String']>;
+  previewSecret?: InputMaybe<Scalars['String']['input']>;
+  /**
+   * Layout how the filters are rendered.
+   * DEFAULT: Will be rendered as horzontal chips on desktop and mobile
+   * SIDEBAR: Will be rendered as a sidebar on desktop and horizontal chips on mobile
+   */
+  productFiltersLayout?: InputMaybe<ProductFiltersLayout>;
   /**
    * Product filters with better UI for mobile and desktop.
    *
    * @experimental This is an experimental feature and may change in the future.
    */
-  productFiltersPro?: InputMaybe<Scalars['Boolean']>;
+  productFiltersPro?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * By default we route products to /p/[url] but you can change this to /product/[url] if you wish.
    *
    * Default: '/p/'
    * Example: '/product/'
    */
-  productRoute?: InputMaybe<Scalars['String']>;
+  productRoute?: InputMaybe<Scalars['String']['input']>;
   /**
    * Allow the site to be indexed by search engines.
    * If false, the robots.txt file will be set to disallow all.
    */
-  robotsAllow?: InputMaybe<Scalars['Boolean']>;
+  robotsAllow?: InputMaybe<Scalars['Boolean']['input']>;
   /** All storefront configuration for the project */
   storefront: Array<GraphCommerceStorefrontConfig>;
   /** Hide the wishlist functionality for guests. */
-  wishlistHideForGuests?: InputMaybe<Scalars['Boolean']>;
+  wishlistHideForGuests?: InputMaybe<Scalars['Boolean']['input']>;
   /** Ignores whether a product is already in the wishlist, makes the toggle an add only. */
-  wishlistIgnoreProductWishlistStatus?: InputMaybe<Scalars['Boolean']>;
+  wishlistIgnoreProductWishlistStatus?: InputMaybe<Scalars['Boolean']['input']>;
   /** Show a message when the product is added to the wishlist. */
-  wishlistShowFeedbackMessage?: InputMaybe<Scalars['Boolean']>;
+  wishlistShowFeedbackMessage?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
 /** Debug configuration for GraphCommerce */
 export type GraphCommerceDebugConfig = {
   /** Reports which plugins are enabled or disabled. */
-  pluginStatus?: InputMaybe<Scalars['Boolean']>;
+  pluginStatus?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * Cyclic dependencies can cause memory issues and other strange bugs.
    * This plugin will warn you when it detects a cyclic dependency.
    *
    * When running into memory issues, it can be useful to enable this plugin.
    */
-  webpackCircularDependencyPlugin?: InputMaybe<Scalars['Boolean']>;
+  webpackCircularDependencyPlugin?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * When updating packages it can happen that the same package is included with different versions in the same project.
    *
@@ -216,7 +275,7 @@ export type GraphCommerceDebugConfig = {
    * - The same package is included multiple times in the bundle, increasing the bundle size.
    * - The Typescript types of the package are not compatible with each other, causing Typescript errors.
    */
-  webpackDuplicatesPlugin?: InputMaybe<Scalars['Boolean']>;
+  webpackDuplicatesPlugin?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
 /** All storefront configuration for the project */
@@ -229,33 +288,33 @@ export type GraphCommerceStorefrontConfig = {
    * - https://example.com/en
    * - https://example.com/en-US
    */
-  canonicalBaseUrl?: InputMaybe<Scalars['String']>;
+  canonicalBaseUrl?: InputMaybe<Scalars['String']['input']>;
   /** Due to a limitation of the GraphQL API it is not possible to determine if a cart should be displayed including or excluding tax. */
-  cartDisplayPricesInclTax?: InputMaybe<Scalars['Boolean']>;
+  cartDisplayPricesInclTax?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * There can only be one entry with defaultLocale set to true.
    * - If there are more, the first one is used.
    * - If there is none, the first entry is used.
    */
-  defaultLocale?: InputMaybe<Scalars['Boolean']>;
+  defaultLocale?: InputMaybe<Scalars['Boolean']['input']>;
   /** Domain configuration, must be a domain https://tools.ietf.org/html/rfc3986 */
-  domain?: InputMaybe<Scalars['String']>;
+  domain?: InputMaybe<Scalars['String']['input']>;
   /**
    * Configure different Google Analytics IDs for different locales.
    *
    * To disable for a specific locale, set the value to null.
    */
-  googleAnalyticsId?: InputMaybe<Scalars['String']>;
+  googleAnalyticsId?: InputMaybe<Scalars['String']['input']>;
   /** Locale specific google reCAPTCHA key. */
-  googleRecaptchaKey?: InputMaybe<Scalars['String']>;
+  googleRecaptchaKey?: InputMaybe<Scalars['String']['input']>;
   /** The Google Tagmanager ID to be used per locale. */
-  googleTagmanagerId?: InputMaybe<Scalars['String']>;
+  googleTagmanagerId?: InputMaybe<Scalars['String']['input']>;
   /** Add a gcms-locales header to make sure queries return in a certain language, can be an array to define fallbacks. */
-  hygraphLocales?: InputMaybe<Array<Scalars['String']>>;
+  hygraphLocales?: InputMaybe<Array<Scalars['String']['input']>>;
   /** Specify a custom locale for to load translations. */
-  linguiLocale?: InputMaybe<Scalars['String']>;
+  linguiLocale?: InputMaybe<Scalars['String']['input']>;
   /** Must be a locale string https://www.unicode.org/reports/tr35/tr35-59/tr35.html#Identifiers */
-  locale: Scalars['String'];
+  locale: Scalars['String']['input'];
   /**
    * Magento store code.
    *
@@ -266,9 +325,13 @@ export type GraphCommerceStorefrontConfig = {
    * - en-us
    * - b2b-us
    */
-  magentoStoreCode: Scalars['String'];
+  magentoStoreCode: Scalars['String']['input'];
 };
 
+export type ProductFiltersLayout =
+  | 'DEFAULT'
+  | 'SIDEBAR';
+
 
 type Properties<T> = Required<{
   [K in keyof T]: z.ZodType<T[K], any, T[K]>;
@@ -280,10 +343,16 @@ export const isDefinedNonNullAny = (v: any): v is definedNonNullAny => v !== und
 
 export const definedNonNullAnySchema = z.any().refine((v) => isDefinedNonNullAny(v));
 
+export const CompareVariantSchema = z.enum(['CHECKBOX', 'ICON']);
+
+export const ProductFiltersLayoutSchema = z.enum(['DEFAULT', 'SIDEBAR']);
+
 export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerceConfig>> {
-  return z.object<Properties<GraphCommerceConfig>>({
+  return z.object({
     canonicalBaseUrl: z.string().min(1),
     cartDisplayPricesInclTax: z.boolean().nullish(),
+    compare: z.boolean().nullish(),
+    compareVariant: CompareVariantSchema.nullish(),
     customerRequireEmailConfirmation: z.boolean().nullish(),
     debug: GraphCommerceDebugConfigSchema().nullish(),
     demoMode: z.boolean().nullish(),
@@ -291,10 +360,13 @@ export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerc
     googleRecaptchaKey: z.string().nullish(),
     googleTagmanagerId: z.string().nullish(),
     hygraphEndpoint: z.string().min(1),
+    hygraphWriteAccessEndpoint: z.string().nullish(),
+    hygraphWriteAccessToken: z.string().nullish(),
     legacyProductRoute: z.boolean().nullish(),
     limitSsg: z.boolean().nullish(),
     magentoEndpoint: z.string().min(1),
     previewSecret: z.string().nullish(),
+    productFiltersLayout: ProductFiltersLayoutSchema.nullish(),
     productFiltersPro: z.boolean().nullish(),
     productRoute: z.string().nullish(),
     robotsAllow: z.boolean().nullish(),
@@ -306,7 +378,7 @@ export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerc
 }
 
 export function GraphCommerceDebugConfigSchema(): z.ZodObject<Properties<GraphCommerceDebugConfig>> {
-  return z.object<Properties<GraphCommerceDebugConfig>>({
+  return z.object({
     pluginStatus: z.boolean().nullish(),
     webpackCircularDependencyPlugin: z.boolean().nullish(),
     webpackDuplicatesPlugin: z.boolean().nullish()
@@ -314,7 +386,7 @@ export function GraphCommerceDebugConfigSchema(): z.ZodObject<Properties<GraphCo
 }
 
 export function GraphCommerceStorefrontConfigSchema(): z.ZodObject<Properties<GraphCommerceStorefrontConfig>> {
-  return z.object<Properties<GraphCommerceStorefrontConfig>>({
+  return z.object({
     canonicalBaseUrl: z.string().nullish(),
     cartDisplayPricesInclTax: z.boolean().nullish(),
     defaultLocale: z.boolean().nullish(),

package/src/index.ts

@@ -2,6 +2,7 @@ import type React from 'react'
 
 export * from './utils/isMonorepo'
 export * from './utils/resolveDependenciesSync'
+export * from './utils/packageRoots'
 export * from './withGraphCommerce'
 export * from './generated/config'
 export * from './config'

package/src/utils/packageRoots.ts

@@ -0,0 +1,35 @@
+type PathCount = { path: string; count: number }
+
+export const packageRoots = (packagePaths: string[]): string[] => {
+  const pathMap: { [key: string]: PathCount } = {}
+
+  // Iterate over each path in the array
+  packagePaths.forEach((singlePath) => {
+    const parts = singlePath.split('/')
+
+    // Iterate through each part of the path
+    for (let i = 1; i < parts.length; i++) {
+      const subPath = parts.slice(0, i + 1).join('/')
+
+      // Increment the count of this subPath
+      if (pathMap[subPath]) {
+        pathMap[subPath].count += 1
+      } else {
+        pathMap[subPath] = { path: subPath, count: 1 }
+      }
+    }
+  })
+
+  // Filter the paths that appear more than once
+  const roots: string[] = []
+  Object.values(pathMap).forEach(({ path, count }) => {
+    if (count > 1) {
+      roots.push(path)
+    }
+  })
+
+  // Filter out the sub-paths which are part of another longer sub-path
+  return roots.filter(
+    (root, index, self) => self.findIndex((r) => r !== root && r.startsWith(root + '/')) === -1,
+  )
+}

package/src/withGraphCommerce.ts

@@ -61,8 +61,9 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string): NextConf
   return {
     ...nextConfig,
     experimental: {
-      enableUndici: true,
       ...nextConfig.experimental,
+      scrollRestoration: true,
+      swcPlugins: [...(nextConfig.experimental?.swcPlugins ?? []), ['@lingui/swc-plugin', {}]],
     },
     i18n: {
       defaultLocale:
@@ -91,6 +92,7 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string): NextConf
             { source: '/product/downloadable/:url*', destination, permanent: true },
             { source: '/product/grouped/:url*', destination, permanent: true },
             { source: '/product/virtual/:url*', destination, permanent: true },
+            { source: '/customer/account', destination: '/account', permanent: true },
           ],
         )