@graphcommerce/next-config 9.0.0-canary.106 → 9.0.0-canary.108

package/__tests__/config/utils/rewriteLegancyEnv.ts

@@ -2,7 +2,6 @@ import { formatAppliedEnv } from '../../../src/config/utils/mergeEnvIntoConfig'
 import { rewriteLegacyEnv } from '../../../src/config/utils/rewriteLegacyEnv'
 import type { GraphCommerceConfig } from '../../../src/generated/config'
 import { GraphCommerceConfigSchema } from '../../../src/generated/config'
-
 export const removeColor = (str: string) =>
   str.replace(
     new RegExp(
@@ -14,7 +13,6 @@ export const removeColor = (str: string) =>
     ),
     '',
   )
-
 it('rewrites legacy env', () => {
   const configFile: GraphCommerceConfig = {
     storefront: [{ locale: 'en', hygraphLocales: ['en'], magentoStoreCode: 'en_us' }],
@@ -26,7 +24,6 @@ it('rewrites legacy env', () => {
     robotsAllow: true,
     magentoVersion: 246,
   }
-
   const legacyEnv = {
     GRAPHCMS_URL: 'https://api-eu-central-1.graphcms.com/v2/ckhx7xadya6xs01yxdujt8i80/master',
     MAGENTO_ENDPOINT: 'https://backend.reachdigital.dev/graphql',
@@ -44,40 +41,38 @@ it('rewrites legacy env', () => {
     DEMO_MAGENTO_GRAPHCOMMERCE: '1',
     SOME_KEY: 'bla',
   }
-
   const [, appliedRewrite] = rewriteLegacyEnv(GraphCommerceConfigSchema(), legacyEnv, configFile)
-
   expect(removeColor(formatAppliedEnv(appliedRewrite))).toMatchInlineSnapshot(`
     "warning   - Loaded GraphCommerce env variables
-     ‼ GRAPHCMS_URL='https://api-eu-central-1.graphcms.com/v2/ckhx7xadya6xs01yxdujt8i80/master' => should be renamed to GC_HYGRAPH_ENDPOINT='https://api-eu-central-1.graphcms.com/v2/ckhx7xadya6xs01yxdujt8i80/master'
-     ‼ MAGENTO_ENDPOINT='https://backend.reachdigital.dev/graphql' => should be renamed to GC_MAGENTO_ENDPOINT='https://backend.reachdigital.dev/graphql'
-     ‼ NEXT_PUBLIC_GRAPHQL_ENDPOINT='http://localhost:3000/api/graphql' => should be removed
-     ‼ IMAGE_DOMAINS='backend.reachdigital.dev,media.graphcms.com,media.graphassets.com' => should be removed: will automatically add the Magento/Hygraph URL. For more advanced configurations, see: https://nextjs.org/docs/api-reference/next/image#configuration-options
-     ‼ NEXT_PUBLIC_LOCALE_STORES='{"en-us": "en_US", "nl-nl": "nl_NL", "fr-be": "fr_BE", "nl-be": "nl_BE", "en-gb": "en_GB", "en-ca": "en_CA"}' => env variable is is modified, rewritten to GC_STOREFRONT.
-     ‼ NEXT_PUBLIC_SITE_URL='https://graphcommerce.vercel.app/' => should be renamed to GC_CANONICAL_BASE_URL='https://graphcommerce.vercel.app/'
-     ‼ NEXT_PUBLIC_GTM_ID='123' => should be renamed to GC_GOOGLE_TAGMANAGER_ID='123'
-     ‼ NEXT_PUBLIC_GOOGLE_ANALYTICS='{"en-us": "G-111", "nl-nl": "G-222", "fr-be": "G-333", "nl-be": "G-444", "en-gb":"G-555", "en-ca": "G-666"}' => should be rewritten to GC_STOREFRONT_*_GOOGLE_ANALYTICS_ID
-     ‼ NEXT_PUBLIC_GOOGLE_RECAPTCHA_V3_SITE_KEY='' => should be renamed to GC_GOOGLE_RECAPTCHA_KEY=''
-     ‼ NEXT_PUBLIC_DISPLAY_INCL_TAX='nl,fr-be,nl-be,en-gb,eu' => env variable is renamed, move to configuration: cartDisplayPricesInclTax
-     ‼ PREVIEW_SECRET='dya6xs01y' => should be renamed to GC_PREVIEW_SECRET='dya6xs01y'
-     ‼ DEMO_MAGENTO_GRAPHCOMMERCE='1' => should be renamed to GC_DEMO_MODE='1'
-     ~ GC_CANONICAL_BASE_URL='https://graphcommerce.vercel.app/' => canonicalBaseUrl: "https://example.com" => "https://graphcommerce.vercel.app/"
-     + GC_DEMO_MODE='1' => demoMode: true
-     + GC_GOOGLE_ANALYTICS_ID='enabled' => googleAnalyticsId: "enabled"
-     + GC_GOOGLE_RECAPTCHA_KEY='' => googleRecaptchaKey: ""
-     + GC_GOOGLE_TAGMANAGER_ID='123' => googleTagmanagerId: "123"
-     ~ GC_HYGRAPH_ENDPOINT='https://api-eu-central-1.graphcms.com/v2/ckhx7xadya6xs01yxdujt8i80/master' => hygraphEndpoint: "https://example.com" => "https://api-eu-central-1.graphcms.com/v2/ckhx7xadya6xs01yxdujt8i80/master"
-     ~ GC_MAGENTO_ENDPOINT='https://backend.reachdigital.dev/graphql' => magentoEndpoint: "https://example.com" => "https://backend.reachdigital.dev/graphql"
-     ~ GC_PREVIEW_SECRET='dya6xs01y' => previewSecret: "secret" => "dya6xs01y"
-     = GC_STOREFRONT='[{"locale":"en-us","magentoStoreCode":"en_US"},{"locale":"nl-nl","magentoStoreCode":"nl_NL"},{"locale":"fr-be","magentoStoreCode":"fr_BE"},{"locale":"nl-be","magentoStoreCode":"nl_BE"},{"locale":"en-gb","magentoStoreCode":"en_GB"},{"locale":"en-ca","magentoStoreCode":"en_CA"}]' => storefront: (ignored, no change/wrong format)
-     + GC_STOREFRONT_0_GOOGLE_ANALYTICS_ID='G-111' => storefront.[0].googleAnalyticsId: "G-111"
-     + GC_STOREFRONT_1_GOOGLE_ANALYTICS_ID='G-222' => storefront.[1].googleAnalyticsId: "G-222"
-     + GC_STOREFRONT_2_CART_DISPLAY_PRICES_INCL_TAX='1' => storefront.[2].cartDisplayPricesInclTax: true
-     + GC_STOREFRONT_2_GOOGLE_ANALYTICS_ID='G-333' => storefront.[2].googleAnalyticsId: "G-333"
-     + GC_STOREFRONT_3_CART_DISPLAY_PRICES_INCL_TAX='1' => storefront.[3].cartDisplayPricesInclTax: true
-     + GC_STOREFRONT_3_GOOGLE_ANALYTICS_ID='G-444' => storefront.[3].googleAnalyticsId: "G-444"
-     + GC_STOREFRONT_4_CART_DISPLAY_PRICES_INCL_TAX='1' => storefront.[4].cartDisplayPricesInclTax: true
-     + GC_STOREFRONT_4_GOOGLE_ANALYTICS_ID='G-555' => storefront.[4].googleAnalyticsId: "G-555"
-     + GC_STOREFRONT_5_GOOGLE_ANALYTICS_ID='G-666' => storefront.[5].googleAnalyticsId: "G-666""
+     ‼ GRAPHCMS_URL => should be renamed to GC_HYGRAPH_ENDPOINT='https://api-eu-central-1.graphcms.com/v2/ckhx7xadya6xs01yxdujt8i80/master'
+     ‼ MAGENTO_ENDPOINT => should be renamed to GC_MAGENTO_ENDPOINT='https://backend.reachdigital.dev/graphql'
+     ‼ NEXT_PUBLIC_GRAPHQL_ENDPOINT => should be removed
+     ‼ IMAGE_DOMAINS => should be removed: will automatically add the Magento/Hygraph URL. For more advanced configurations, see: https://nextjs.org/docs/api-reference/next/image#configuration-options
+     ‼ NEXT_PUBLIC_LOCALE_STORES => env variable is is modified, rewritten to GC_STOREFRONT.
+     ‼ NEXT_PUBLIC_SITE_URL => should be renamed to GC_CANONICAL_BASE_URL='https://graphcommerce.vercel.app/'
+     ‼ NEXT_PUBLIC_GTM_ID => should be renamed to GC_GOOGLE_TAGMANAGER_ID='123'
+     ‼ NEXT_PUBLIC_GOOGLE_ANALYTICS => should be rewritten to GC_STOREFRONT_*_GOOGLE_ANALYTICS_ID
+     ‼ NEXT_PUBLIC_GOOGLE_RECAPTCHA_V3_SITE_KEY => should be renamed to GC_GOOGLE_RECAPTCHA_KEY=''
+     ‼ NEXT_PUBLIC_DISPLAY_INCL_TAX => env variable is renamed, move to configuration: cartDisplayPricesInclTax
+     ‼ PREVIEW_SECRET => should be renamed to GC_PREVIEW_SECRET='dya6xs01y'
+     ‼ DEMO_MAGENTO_GRAPHCOMMERCE => should be renamed to GC_DEMO_MODE='1'
+     ~ GC_CANONICAL_BASE_URL => canonicalBaseUrl
+     + GC_DEMO_MODE => demoMode
+     + GC_GOOGLE_ANALYTICS_ID => googleAnalyticsId
+     + GC_GOOGLE_RECAPTCHA_KEY => googleRecaptchaKey
+     + GC_GOOGLE_TAGMANAGER_ID => googleTagmanagerId
+     ~ GC_HYGRAPH_ENDPOINT => hygraphEndpoint
+     ~ GC_MAGENTO_ENDPOINT => magentoEndpoint
+     ~ GC_PREVIEW_SECRET => previewSecret
+     = GC_STOREFRONT => storefront: (ignored)
+     + GC_STOREFRONT_0_GOOGLE_ANALYTICS_ID => storefront.[0].googleAnalyticsId
+     + GC_STOREFRONT_1_GOOGLE_ANALYTICS_ID => storefront.[1].googleAnalyticsId
+     + GC_STOREFRONT_2_CART_DISPLAY_PRICES_INCL_TAX => storefront.[2].cartDisplayPricesInclTax
+     + GC_STOREFRONT_2_GOOGLE_ANALYTICS_ID => storefront.[2].googleAnalyticsId
+     + GC_STOREFRONT_3_CART_DISPLAY_PRICES_INCL_TAX => storefront.[3].cartDisplayPricesInclTax
+     + GC_STOREFRONT_3_GOOGLE_ANALYTICS_ID => storefront.[3].googleAnalyticsId
+     + GC_STOREFRONT_4_CART_DISPLAY_PRICES_INCL_TAX => storefront.[4].cartDisplayPricesInclTax
+     + GC_STOREFRONT_4_GOOGLE_ANALYTICS_ID => storefront.[4].googleAnalyticsId
+     + GC_STOREFRONT_5_GOOGLE_ANALYTICS_ID => storefront.[5].googleAnalyticsId"
   `)
 })

package/__tests__/interceptors/findPlugins.ts

@@ -1,26 +1,55 @@
 import type { GraphCommerceConfig } from '../../src/generated/config'
 import { findPlugins } from '../../src/interceptors/findPlugins'
-
 const projectRoot = `${process.cwd()}/examples/magento-graphcms`
-
 it('finds plugins', () => {
   const fakeconfig = {
     googleRecaptchaKey: '123',
     googleAnalyticsId: '123',
-    // demoMode: true,
-    debug: {
-      pluginStatus: true,
-    },
+    demoMode: true,
+    debug: { pluginStatus: true },
   } as GraphCommerceConfig
-
   const [plugins, errors] = findPlugins(fakeconfig, projectRoot)
   const disabled = plugins.filter((p) => !p.enabled)
   const enabled = plugins.filter((p) => p.enabled)
-
   expect(errors).toMatchInlineSnapshot('[]')
-
   expect(enabled).toMatchInlineSnapshot(`
     [
+      {
+        "enabled": true,
+        "ifConfig": "demoMode",
+        "sourceExport": "AddProductsToCartForm",
+        "sourceModule": "./plugins/EnableCrosssellsPlugin",
+        "targetExport": "AddProductsToCartForm",
+        "targetModule": "@graphcommerce/magento-product",
+        "type": "component",
+      },
+      {
+        "enabled": true,
+        "ifConfig": "demoMode",
+        "sourceExport": "RowLinks",
+        "sourceModule": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoRowLinks",
+        "targetExport": "RowLinks",
+        "targetModule": "@graphcommerce/next-ui",
+        "type": "component",
+      },
+      {
+        "enabled": true,
+        "ifConfig": "demoMode",
+        "sourceExport": "RecentlyViewedProducts",
+        "sourceModule": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoRecentlyViewedProducts",
+        "targetExport": "RecentlyViewedProducts",
+        "targetModule": "@graphcommerce/magento-recently-viewed-products",
+        "type": "component",
+      },
+      {
+        "enabled": true,
+        "ifConfig": "demoMode",
+        "sourceExport": "ProductListItemConfigurable",
+        "sourceModule": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoProductListItemConfigurable",
+        "targetExport": "ProductListItemConfigurable",
+        "targetModule": "@graphcommerce/magento-product-configurable",
+        "type": "component",
+      },
       {
         "enabled": true,
         "ifConfig": "googleAnalyticsId",
@@ -211,14 +240,6 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-product",
         "type": "component",
       },
-      {
-        "enabled": true,
-        "sourceExport": "ProductPageGallery",
-        "sourceModule": "@graphcommerce/magento-product-configurable/plugins/ConfigurableProductPage/ConfigurableProductPageGallery",
-        "targetExport": "ProductPageGallery",
-        "targetModule": "@graphcommerce/magento-product",
-        "type": "component",
-      },
       {
         "enabled": true,
         "sourceExport": "CartItemActionCard",
@@ -503,14 +524,6 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/graphql",
         "type": "component",
       },
-      {
-        "enabled": true,
-        "sourceExport": "graphqlConfig",
-        "sourceModule": "@graphcommerce/magento-store/plugins/magentoStoreGraphqlConfig",
-        "targetExport": "graphqlConfig",
-        "targetModule": "@graphcommerce/graphql",
-        "type": "function",
-      },
       {
         "enabled": true,
         "sourceExport": "meshConfig",
@@ -539,42 +552,6 @@ it('finds plugins', () => {
   `)
   expect(disabled).toMatchInlineSnapshot(`
     [
-      {
-        "enabled": false,
-        "ifConfig": "demoMode",
-        "sourceExport": "AddProductsToCartForm",
-        "sourceModule": "./plugins/EnableCrosssellsPlugin",
-        "targetExport": "AddProductsToCartForm",
-        "targetModule": "@graphcommerce/magento-product",
-        "type": "component",
-      },
-      {
-        "enabled": false,
-        "ifConfig": "demoMode",
-        "sourceExport": "RowLinks",
-        "sourceModule": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoRowLinks",
-        "targetExport": "RowLinks",
-        "targetModule": "@graphcommerce/next-ui",
-        "type": "component",
-      },
-      {
-        "enabled": false,
-        "ifConfig": "demoMode",
-        "sourceExport": "RecentlyViewedProducts",
-        "sourceModule": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoRecentlyViewedProducts",
-        "targetExport": "RecentlyViewedProducts",
-        "targetModule": "@graphcommerce/magento-recently-viewed-products",
-        "type": "component",
-      },
-      {
-        "enabled": false,
-        "ifConfig": "demoMode",
-        "sourceExport": "ProductListItemConfigurable",
-        "sourceModule": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoProductListItemConfigurable",
-        "targetExport": "ProductListItemConfigurable",
-        "targetModule": "@graphcommerce/magento-product-configurable",
-        "type": "component",
-      },
       {
         "enabled": false,
         "ifConfig": "recentlyViewedProducts.enabled",
@@ -683,6 +660,15 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-product",
         "type": "component",
       },
+      {
+        "enabled": false,
+        "ifConfig": "configurableVariantValues.gallery",
+        "sourceExport": "ProductPageGallery",
+        "sourceModule": "@graphcommerce/magento-product-configurable/plugins/ConfigurableProductPage/ConfigurableProductPageGallery",
+        "targetExport": "ProductPageGallery",
+        "targetModule": "@graphcommerce/magento-product",
+        "type": "component",
+      },
       {
         "enabled": false,
         "ifConfig": "configurableVariantValues.content",