@graphcommerce/next-config 6.2.0-canary.40 → 6.2.0-canary.42

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 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

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

@@ -29,7 +29,7 @@ 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_CHECKBOX",
+  "GC_COMPARE_VARIANT",
   "GC_CUSTOMER_REQUIRE_EMAIL_CONFIRMATION",
   "GC_DEBUG",
   "GC_DEBUG_PLUGIN_STATUS",
@@ -53,7 +53,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_0",
   "GC_STOREFRONT_0_CANONICAL_BASE_URL",
   "GC_STOREFRONT_0_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_0_COMPARE_CHECKBOX",
   "GC_STOREFRONT_0_DEFAULT_LOCALE",
   "GC_STOREFRONT_0_DOMAIN",
   "GC_STOREFRONT_0_GOOGLE_ANALYTICS_ID",
@@ -87,7 +86,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_1",
   "GC_STOREFRONT_1_CANONICAL_BASE_URL",
   "GC_STOREFRONT_1_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_1_COMPARE_CHECKBOX",
   "GC_STOREFRONT_1_DEFAULT_LOCALE",
   "GC_STOREFRONT_1_DOMAIN",
   "GC_STOREFRONT_1_GOOGLE_ANALYTICS_ID",
@@ -121,7 +119,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_2",
   "GC_STOREFRONT_2_CANONICAL_BASE_URL",
   "GC_STOREFRONT_2_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_2_COMPARE_CHECKBOX",
   "GC_STOREFRONT_2_DEFAULT_LOCALE",
   "GC_STOREFRONT_2_DOMAIN",
   "GC_STOREFRONT_2_GOOGLE_ANALYTICS_ID",
@@ -155,7 +152,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_3",
   "GC_STOREFRONT_3_CANONICAL_BASE_URL",
   "GC_STOREFRONT_3_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_3_COMPARE_CHECKBOX",
   "GC_STOREFRONT_3_DEFAULT_LOCALE",
   "GC_STOREFRONT_3_DOMAIN",
   "GC_STOREFRONT_3_GOOGLE_ANALYTICS_ID",
@@ -189,7 +185,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_4",
   "GC_STOREFRONT_4_CANONICAL_BASE_URL",
   "GC_STOREFRONT_4_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_4_COMPARE_CHECKBOX",
   "GC_STOREFRONT_4_DEFAULT_LOCALE",
   "GC_STOREFRONT_4_DOMAIN",
   "GC_STOREFRONT_4_GOOGLE_ANALYTICS_ID",
@@ -223,7 +218,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_5",
   "GC_STOREFRONT_5_CANONICAL_BASE_URL",
   "GC_STOREFRONT_5_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_5_COMPARE_CHECKBOX",
   "GC_STOREFRONT_5_DEFAULT_LOCALE",
   "GC_STOREFRONT_5_DOMAIN",
   "GC_STOREFRONT_5_GOOGLE_ANALYTICS_ID",
@@ -257,7 +251,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_6",
   "GC_STOREFRONT_6_CANONICAL_BASE_URL",
   "GC_STOREFRONT_6_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_6_COMPARE_CHECKBOX",
   "GC_STOREFRONT_6_DEFAULT_LOCALE",
   "GC_STOREFRONT_6_DOMAIN",
   "GC_STOREFRONT_6_GOOGLE_ANALYTICS_ID",
@@ -291,7 +284,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_7",
   "GC_STOREFRONT_7_CANONICAL_BASE_URL",
   "GC_STOREFRONT_7_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_7_COMPARE_CHECKBOX",
   "GC_STOREFRONT_7_DEFAULT_LOCALE",
   "GC_STOREFRONT_7_DOMAIN",
   "GC_STOREFRONT_7_GOOGLE_ANALYTICS_ID",
@@ -325,7 +317,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_8",
   "GC_STOREFRONT_8_CANONICAL_BASE_URL",
   "GC_STOREFRONT_8_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_8_COMPARE_CHECKBOX",
   "GC_STOREFRONT_8_DEFAULT_LOCALE",
   "GC_STOREFRONT_8_DOMAIN",
   "GC_STOREFRONT_8_GOOGLE_ANALYTICS_ID",
@@ -359,7 +350,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_9",
   "GC_STOREFRONT_9_CANONICAL_BASE_URL",
   "GC_STOREFRONT_9_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_9_COMPARE_CHECKBOX",
   "GC_STOREFRONT_9_DEFAULT_LOCALE",
   "GC_STOREFRONT_9_DOMAIN",
   "GC_STOREFRONT_9_GOOGLE_ANALYTICS_ID",
@@ -393,7 +383,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_10",
   "GC_STOREFRONT_10_CANONICAL_BASE_URL",
   "GC_STOREFRONT_10_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_10_COMPARE_CHECKBOX",
   "GC_STOREFRONT_10_DEFAULT_LOCALE",
   "GC_STOREFRONT_10_DOMAIN",
   "GC_STOREFRONT_10_GOOGLE_ANALYTICS_ID",
@@ -427,7 +416,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_11",
   "GC_STOREFRONT_11_CANONICAL_BASE_URL",
   "GC_STOREFRONT_11_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_11_COMPARE_CHECKBOX",
   "GC_STOREFRONT_11_DEFAULT_LOCALE",
   "GC_STOREFRONT_11_DOMAIN",
   "GC_STOREFRONT_11_GOOGLE_ANALYTICS_ID",
@@ -461,7 +449,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_12",
   "GC_STOREFRONT_12_CANONICAL_BASE_URL",
   "GC_STOREFRONT_12_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_12_COMPARE_CHECKBOX",
   "GC_STOREFRONT_12_DEFAULT_LOCALE",
   "GC_STOREFRONT_12_DOMAIN",
   "GC_STOREFRONT_12_GOOGLE_ANALYTICS_ID",
@@ -495,7 +482,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_13",
   "GC_STOREFRONT_13_CANONICAL_BASE_URL",
   "GC_STOREFRONT_13_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_13_COMPARE_CHECKBOX",
   "GC_STOREFRONT_13_DEFAULT_LOCALE",
   "GC_STOREFRONT_13_DOMAIN",
   "GC_STOREFRONT_13_GOOGLE_ANALYTICS_ID",
@@ -529,7 +515,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_14",
   "GC_STOREFRONT_14_CANONICAL_BASE_URL",
   "GC_STOREFRONT_14_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_14_COMPARE_CHECKBOX",
   "GC_STOREFRONT_14_DEFAULT_LOCALE",
   "GC_STOREFRONT_14_DOMAIN",
   "GC_STOREFRONT_14_GOOGLE_ANALYTICS_ID",
@@ -563,7 +548,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_15",
   "GC_STOREFRONT_15_CANONICAL_BASE_URL",
   "GC_STOREFRONT_15_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_15_COMPARE_CHECKBOX",
   "GC_STOREFRONT_15_DEFAULT_LOCALE",
   "GC_STOREFRONT_15_DOMAIN",
   "GC_STOREFRONT_15_GOOGLE_ANALYTICS_ID",
@@ -597,7 +581,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_16",
   "GC_STOREFRONT_16_CANONICAL_BASE_URL",
   "GC_STOREFRONT_16_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_16_COMPARE_CHECKBOX",
   "GC_STOREFRONT_16_DEFAULT_LOCALE",
   "GC_STOREFRONT_16_DOMAIN",
   "GC_STOREFRONT_16_GOOGLE_ANALYTICS_ID",
@@ -631,7 +614,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_17",
   "GC_STOREFRONT_17_CANONICAL_BASE_URL",
   "GC_STOREFRONT_17_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_17_COMPARE_CHECKBOX",
   "GC_STOREFRONT_17_DEFAULT_LOCALE",
   "GC_STOREFRONT_17_DOMAIN",
   "GC_STOREFRONT_17_GOOGLE_ANALYTICS_ID",
@@ -665,7 +647,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_18",
   "GC_STOREFRONT_18_CANONICAL_BASE_URL",
   "GC_STOREFRONT_18_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_18_COMPARE_CHECKBOX",
   "GC_STOREFRONT_18_DEFAULT_LOCALE",
   "GC_STOREFRONT_18_DOMAIN",
   "GC_STOREFRONT_18_GOOGLE_ANALYTICS_ID",
@@ -699,7 +680,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_19",
   "GC_STOREFRONT_19_CANONICAL_BASE_URL",
   "GC_STOREFRONT_19_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_19_COMPARE_CHECKBOX",
   "GC_STOREFRONT_19_DEFAULT_LOCALE",
   "GC_STOREFRONT_19_DOMAIN",
   "GC_STOREFRONT_19_GOOGLE_ANALYTICS_ID",
@@ -733,7 +713,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_20",
   "GC_STOREFRONT_20_CANONICAL_BASE_URL",
   "GC_STOREFRONT_20_CART_DISPLAY_PRICES_INCL_TAX",
-  "GC_STOREFRONT_20_COMPARE_CHECKBOX",
   "GC_STOREFRONT_20_DEFAULT_LOCALE",
   "GC_STOREFRONT_20_DOMAIN",
   "GC_STOREFRONT_20_GOOGLE_ANALYTICS_ID",

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/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,

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.40",
+  "version": "6.2.0-canary.42",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -13,8 +13,9 @@
   },
   "dependencies": {
     "@graphql-mesh/cli": "latest",
-    "@lingui/loader": "3.17.2",
-    "@swc/core": "1.3.39",
+    "@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/generated/config.ts

@@ -5,13 +5,15 @@ 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 =
@@ -104,15 +106,15 @@ 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']>;
+  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
@@ -125,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>;
   /**
@@ -135,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
    *
@@ -143,7 +145,7 @@ 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 site key.
    * When using reCAPTCHA, this value is required, even if you are configuring different values for each locale.
@@ -153,13 +155,13 @@ export type GraphCommerceConfig = {
    * 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.
    *
@@ -167,7 +169,7 @@ export type GraphCommerceConfig = {
    *
    * Project settings -> API Access -> High Performance Read-only Content API
    */
-  hygraphEndpoint: Scalars['String'];
+  hygraphEndpoint: Scalars['String']['input'];
   /**
    * Content API. **Only used for migrations.**
    *
@@ -175,7 +177,7 @@ export type GraphCommerceConfig = {
    *
    * Project settings -> API Access -> Content API
    */
-  hygraphWriteAccessEndpoint?: InputMaybe<Scalars['String']>;
+  hygraphWriteAccessEndpoint?: InputMaybe<Scalars['String']['input']>;
   /**
    * Hygraph Management SDK Authorization Token. **Only used for migrations.**
    *
@@ -201,7 +203,7 @@ export type GraphCommerceConfig = {
    * yarn graphcommerce hygraph-migrate
    * ```
    */
-  hygraphWriteAccessToken?: InputMaybe<Scalars['String']>;
+  hygraphWriteAccessToken?: InputMaybe<Scalars['String']['input']>;
   /**
    * On older versions of GraphCommerce products would use a product type specific route.
    *
@@ -209,57 +211,57 @@ 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']>;
   /**
    * 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.
    *
@@ -267,7 +269,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 */
@@ -280,33 +282,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.
    *
@@ -317,7 +319,7 @@ export type GraphCommerceStorefrontConfig = {
    * - en-us
    * - b2b-us
    */
-  magentoStoreCode: Scalars['String'];
+  magentoStoreCode: Scalars['String']['input'];
 };
 
 
@@ -334,7 +336,7 @@ export const definedNonNullAnySchema = z.any().refine((v) => isDefinedNonNullAny
 export const CompareVariantSchema = z.enum(['CHECKBOX', 'ICON']);
 
 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(),
@@ -363,7 +365,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()
@@ -371,7 +373,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/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: