@graphcommerce/next-config 9.1.0-canary.44 → 9.1.0-canary.46

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 9.1.0-canary.46
+
+### Patch Changes
+
+- [`f6b9c0d`](https://github.com/graphcommerce-org/graphcommerce/commit/f6b9c0d2bc5f678fc6cde279f1590b30ef631f8a) - Temporarily pin prettier to 3.5.3 to fix the GraphCommerce build: https://github.com/hosseinmd/prettier-plugin-jsdoc/pull/246/files ([@paales](https://github.com/paales))
+
+## 9.1.0-canary.45
+
+### Patch Changes
+
+- [`f508396`](https://github.com/graphcommerce-org/graphcommerce/commit/f50839619c75c8f7b1782c079f1c25998cb9217b) - Solve issue where optional chaining for import.meta.graphCommmerce configuration paths didn't work. ([@paales](https://github.com/paales))
+
 ## 9.1.0-canary.44
 
 ## 9.1.0-canary.43
@@ -342,7 +354,6 @@
   - NextLink makes all relative href absolute. `href="my-page"` will be rendered as `href="/my-page"`. ([@paales](https://github.com/paales))
 
 - [#1786](https://github.com/graphcommerce-org/graphcommerce/pull/1786) [`b76679204`](https://github.com/graphcommerce-org/graphcommerce/commit/b766792049e1e6ebe45671c0b36e78746ef159e2) - Created a completely new [GraphCommerce config system](https://www.graphcommerce.org/docs/framework/config) to allow for greater confiugration options and rely less on a .env file to configuration.
-
   - GraphCommerce can be configured in the graphcommerce.config.js
   - The configuration is automatically validated on startup.
   - All configuration values can be overwritten by environment variables. ([@paales](https://github.com/paales))

package/__tests__/config/utils/configToImportMeta.ts

@@ -1,36 +1,49 @@
 import { configToImportMeta } from '../../../src/config/utils/configToImportMeta'
-
 const configFile = {
   storefront: [{ locale: 'en', hygraphLocales: ['en'], magentoStoreCode: 'en_us' }],
   demoMode: true,
   googleTagmanagerKey: 'GTM-XXXXXXX',
   productFiltersPro: false,
-  deeper: {
-    arrayvalue: ['test'],
-    nested: {
-      value: 'test',
-    },
-  },
+  deeper: { arrayvalue: ['test'], nested: { value: 'test' } },
 }
-
 it('flattens a config object', () => {
-  expect(configToImportMeta(configFile)).toMatchInlineSnapshot(`
+  expect(configToImportMeta(configFile)).toMatchInlineSnapshot(
+    `
     {
       "import.meta.graphCommerce": "{ __debug: "'import.meta.graphCommerce' can not be destructured, please access deeper properties directly" }",
       "import.meta.graphCommerce.deeper": "{ __debug: "'import.meta.graphCommerce.deeper' can not be destructured, please access deeper properties directly" }",
       "import.meta.graphCommerce.deeper.arrayvalue": "["test"]",
       "import.meta.graphCommerce.deeper.nested": "{ __debug: "'import.meta.graphCommerce.deeper.nested' can not be destructured, please access deeper properties directly" }",
       "import.meta.graphCommerce.deeper.nested.value": ""test"",
+      "import.meta.graphCommerce.deeper.nested?.value": ""test"",
+      "import.meta.graphCommerce.deeper?.arrayvalue": "["test"]",
+      "import.meta.graphCommerce.deeper?.nested": "{ __debug: "'import.meta.graphCommerce.deeper?.nested' can not be destructured, please access deeper properties directly" }",
+      "import.meta.graphCommerce.deeper?.nested.value": ""test"",
+      "import.meta.graphCommerce.deeper?.nested?.value": ""test"",
       "import.meta.graphCommerce.demoMode": "true",
       "import.meta.graphCommerce.googleTagmanagerKey": ""GTM-XXXXXXX"",
       "import.meta.graphCommerce.productFiltersPro": "false",
       "import.meta.graphCommerce.storefront": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
+      "import.meta.graphCommerce?.deeper": "{ __debug: "'import.meta.graphCommerce?.deeper' can not be destructured, please access deeper properties directly" }",
+      "import.meta.graphCommerce?.deeper.arrayvalue": "["test"]",
+      "import.meta.graphCommerce?.deeper.nested": "{ __debug: "'import.meta.graphCommerce?.deeper.nested' can not be destructured, please access deeper properties directly" }",
+      "import.meta.graphCommerce?.deeper.nested.value": ""test"",
+      "import.meta.graphCommerce?.deeper.nested?.value": ""test"",
+      "import.meta.graphCommerce?.deeper?.arrayvalue": "["test"]",
+      "import.meta.graphCommerce?.deeper?.nested": "{ __debug: "'import.meta.graphCommerce?.deeper?.nested' can not be destructured, please access deeper properties directly" }",
+      "import.meta.graphCommerce?.deeper?.nested.value": ""test"",
+      "import.meta.graphCommerce?.deeper?.nested?.value": ""test"",
+      "import.meta.graphCommerce?.demoMode": "true",
+      "import.meta.graphCommerce?.googleTagmanagerKey": ""GTM-XXXXXXX"",
+      "import.meta.graphCommerce?.productFiltersPro": "false",
+      "import.meta.graphCommerce?.storefront": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
     }
-  `)
+  `,
+  )
 })
-
 it('creates keys but does not stringify values', () => {
-  expect(configToImportMeta(configFile, 'graphCommerce', false)).toMatchInlineSnapshot(`
+  expect(configToImportMeta(configFile, 'graphCommerce', false)).toMatchInlineSnapshot(
+    `
     {
       "graphCommerce": {
         "deeper": {
@@ -67,10 +80,42 @@ it('creates keys but does not stringify values', () => {
         "value": "test",
       },
       "graphCommerce.deeper.nested.value": "test",
+      "graphCommerce.deeper.nested?.value": "test",
+      "graphCommerce.deeper?.arrayvalue": "["test"]",
+      "graphCommerce.deeper?.nested": {
+        "value": "test",
+      },
+      "graphCommerce.deeper?.nested.value": "test",
+      "graphCommerce.deeper?.nested?.value": "test",
       "graphCommerce.demoMode": true,
       "graphCommerce.googleTagmanagerKey": "GTM-XXXXXXX",
       "graphCommerce.productFiltersPro": false,
       "graphCommerce.storefront": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
+      "graphCommerce?.deeper": {
+        "arrayvalue": [
+          "test",
+        ],
+        "nested": {
+          "value": "test",
+        },
+      },
+      "graphCommerce?.deeper.arrayvalue": "["test"]",
+      "graphCommerce?.deeper.nested": {
+        "value": "test",
+      },
+      "graphCommerce?.deeper.nested.value": "test",
+      "graphCommerce?.deeper.nested?.value": "test",
+      "graphCommerce?.deeper?.arrayvalue": "["test"]",
+      "graphCommerce?.deeper?.nested": {
+        "value": "test",
+      },
+      "graphCommerce?.deeper?.nested.value": "test",
+      "graphCommerce?.deeper?.nested?.value": "test",
+      "graphCommerce?.demoMode": true,
+      "graphCommerce?.googleTagmanagerKey": "GTM-XXXXXXX",
+      "graphCommerce?.productFiltersPro": false,
+      "graphCommerce?.storefront": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
     }
-  `)
+  `,
+  )
 })

package/dist/index.js

@@ -650,7 +650,10 @@ function flattenKeys(value, initialPathPrefix, stringify) {
       [initialPathPrefix]: outputValue,
       ...Object.keys(value).map((key) => {
         const deep = value[key];
-        return flattenKeys(deep, `${initialPathPrefix}.${key}`, stringify);
+        return {
+          ...flattenKeys(deep, `${initialPathPrefix}.${key}`, stringify),
+          ...flattenKeys(deep, `${initialPathPrefix}?.${key}`, stringify)
+        };
       }).reduce((acc, path) => ({ ...acc, ...path }), {})
     };
   }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.1.0-canary.44",
+  "version": "9.1.0-canary.46",
   "type": "module",
   "types": "./src/index.ts",
   "exports": {
@@ -43,7 +43,7 @@
     "zod": "^3.24.1"
   },
   "peerDependencies": {
-    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.44",
+    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.46",
     "@lingui/loader": "*",
     "@lingui/macro": "*",
     "@lingui/react": "*",

package/src/config/utils/configToImportMeta.ts

@@ -32,7 +32,10 @@ function flattenKeys(
       ...Object.keys(value)
         .map((key) => {
           const deep = (value as Record<string, unknown>)[key]
-          return flattenKeys(deep, `${initialPathPrefix}.${key}`, stringify)
+          return {
+            ...flattenKeys(deep, `${initialPathPrefix}.${key}`, stringify),
+            ...flattenKeys(deep, `${initialPathPrefix}?.${key}`, stringify),
+          }
         })
         .reduce((acc, path) => ({ ...acc, ...path }), {}),
     }