@graphcommerce/next-config 6.0.0-canary.40 → 6.0.0-canary.41

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 6.0.0-canary.41
+
+### Patch Changes
+
+- [#1839](https://github.com/graphcommerce-org/graphcommerce/pull/1839) [`e4a3f5e98`](https://github.com/graphcommerce-org/graphcommerce/commit/e4a3f5e986287b78c3e048d8a33611c61070b79e) - Make sure the configuration is validated before executing ([@paales](https://github.com/paales))
+
+- [#1839](https://github.com/graphcommerce-org/graphcommerce/pull/1839) [`8eb310409`](https://github.com/graphcommerce-org/graphcommerce/commit/8eb3104098749a6b08d2affb6cdc8a7e6698866f) - Use graphCommerce._ instead of import.meta.graphCommerce._ in .meshrc.yml ([@paales](https://github.com/paales))
+
 ## 6.0.0-canary.40
 
 ## 6.0.0-canary.39

package/Config.graphqls

@@ -33,6 +33,13 @@ function MyComponent() {
 }
 ```
 
+You can also use the configuration in your `.meshrc.yml` by accessing
+`{graphCommerce.myField}`
+
+```yml
+endpoint: '{graphCommerce.magentoEndpoint}'
+```
+
 ## Environment variables to override configuration
 
 Configuration values can be overwriten by environment variables, with the following rules:

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

@@ -737,6 +737,7 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_MAGENTO_ENDPOINT",
   "GC_PREVIEW_SECRET",
   "GC_PRODUCT_FILTERS_PRO",
+  "GC_PRODUCT_ROUTE",
   "GC_ROBOTS_ALLOW",
   "GC_WISHLIST_HIDE_FOR_GUESTS",
   "GC_WISHLIST_IGNORE_PRODUCT_WISHLIST_STATUS",

package/__tests__/config/utils/configToImportMeta.ts

@@ -36,49 +36,17 @@ it('flattens a config object', () => {
 it('creates keys but does not stringify values', () => {
   expect(configToImportMeta(configFile, false)).toMatchInlineSnapshot(`
     {
-      "import.meta.graphCommerce": {
-        "customerRequireEmailConfirmation": false,
-        "deeper": {
-          "arrayvalue": [
-            "test",
-          ],
-          "nested": {
-            "value": "test",
-          },
-        },
-        "demoMode": true,
-        "googleTagmanagerKey": "GTM-XXXXXXX",
-        "i18n": [
-          {
-            "hygraphLocales": [
-              "en",
-            ],
-            "locale": "en",
-            "magentoStoreCode": "en_us",
-          },
-        ],
-        "legacyProductRoute": true,
-        "productFiltersPro": false,
-      },
-      "import.meta.graphCommerce.customerRequireEmailConfirmation": false,
-      "import.meta.graphCommerce.deeper": {
-        "arrayvalue": [
-          "test",
-        ],
-        "nested": {
-          "value": "test",
-        },
-      },
-      "import.meta.graphCommerce.deeper.arrayvalue": "["test"]",
-      "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.i18n": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
-      "import.meta.graphCommerce.legacyProductRoute": true,
-      "import.meta.graphCommerce.productFiltersPro": false,
+      "false": "{ __debug: "'false' can not be destructured, please access deeper properties directly" }",
+      "false.customerRequireEmailConfirmation": "false",
+      "false.deeper": "{ __debug: "'false.deeper' can not be destructured, please access deeper properties directly" }",
+      "false.deeper.arrayvalue": "["test"]",
+      "false.deeper.nested": "{ __debug: "'false.deeper.nested' can not be destructured, please access deeper properties directly" }",
+      "false.deeper.nested.value": ""test"",
+      "false.demoMode": "true",
+      "false.googleTagmanagerKey": ""GTM-XXXXXXX"",
+      "false.i18n": "[{"locale":"en","hygraphLocales":["en"],"magentoStoreCode":"en_us"}]",
+      "false.legacyProductRoute": "true",
+      "false.productFiltersPro": "false",
     }
   `)
 })

package/__tests__/config/utils/replaceConfigInString.ts

@@ -6,19 +6,17 @@ import { replaceConfigInString } from '../../../src/config/utils/replaceConfigIn
 it('replaces config in string', () => {
   const config = { ...demoConfig, replaceMe: '1234', do: { replaceMe: 'CHECK' } }
 
-  const meshrc = `
-
-  sources:
+  const meshrc = `sources:
   - name: hygraph
     handler:
       graphql:
         useGETForQueries: true
-        endpoint: '{import.meta.graphCommerce.hygraphEndpoint}'
+        endpoint: '{graphCommerce.hygraphEndpoint}'
         batch: false
-        i18nConfig: {import.meta.graphCommerce.i18n}
+        i18nConfig: {graphCommerce.i18n}
         operationHeaders:
           gcms-locales: "{context.headers['gcms-locales']}"
-          path: /nl/v3/json/getAddress/index.php?postcode={args.postcode}&huisnummer={args.housenumber}&secure_code={import.meta.graphCommerce.replaceMe}&public_key={import.meta.graphCommerce.do.replaceMe}
+          path: /nl/v3/json/getAddress/index.php?postcode={args.postcode}&huisnummer={args.housenumber}&secure_code={graphCommerce.replaceMe}&public_key={graphCommerce.do.replaceMe}
     transforms:
       - filterSchema:
           filters:

package/__tests__/interceptors/findPlugins.ts

@@ -15,12 +15,6 @@ it('finds plugins', () => {
 
   expect(enabled).toMatchInlineSnapshot(`
     [
-      {
-        "component": "AddProductsToCartForm",
-        "enabled": true,
-        "exported": "@graphcommerce/magento-product",
-        "plugin": "./plugins/MyPlugin",
-      },
       {
         "component": "AddProductsToCartForm",
         "enabled": true,
@@ -170,7 +164,7 @@ it('finds plugins', () => {
         "enabled": false,
         "exported": "@graphcommerce/magento-product",
         "ifConfig": "demoMode",
-        "plugin": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoAddProductsToCartForm",
+        "plugin": "./plugins/EnableCrosssellsPlugin",
       },
       {
         "component": "ProductListItem",

package/dist/config/loadConfig.js

@@ -30,7 +30,6 @@ function loadConfig(cwd) {
     try {
         const result = loader.search(cwd);
         let confFile = result?.config;
-        const hasEnv = Object.keys((0, mergeEnvIntoConfig_1.filterEnv)(process.env)).length > 0;
         if (!confFile) {
             if (isMainProcess)
                 console.warn('No graphcommerce.config.js found in the project, using demo config');
@@ -38,8 +37,9 @@ function loadConfig(cwd) {
         }
         confFile ||= {};
         const schema = (0, config_1.GraphCommerceConfigSchema)();
-        const parsed = schema.safeParse(confFile);
-        const [mergedConfig, applyResult] = (0, rewriteLegacyEnv_1.rewriteLegacyEnv)((0, config_1.GraphCommerceConfigSchema)(), parsed.success ? parsed.data : {}, process.env);
+        const [mergedConfig, applyResult] = (0, rewriteLegacyEnv_1.rewriteLegacyEnv)(schema, process.env, 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        confFile);
         if (applyResult.length > 0 && isMainProcess)
             console.log((0, mergeEnvIntoConfig_1.formatAppliedEnv)(applyResult));
         const finalParse = schema.parse(mergedConfig);
@@ -52,7 +52,7 @@ function loadConfig(cwd) {
     catch (error) {
         if (error instanceof Error) {
             if (isMainProcess) {
-                console.log(error.message);
+                console.log('Error while parsing graphcommerce.config.js', error.message);
                 process.exit(1);
             }
         }

package/dist/config/utils/configToImportMeta.js

@@ -30,7 +30,7 @@ function flattenKeys(value, initialPathPrefix, stringify) {
     throw Error(`Unexpected value: ${value}`);
 }
 /** The result of this function is passed to the webpack DefinePlugin as import.meta.graphCommerce.* */
-function configToImportMeta(config, stringify = true) {
-    return flattenKeys(config, 'import.meta.graphCommerce', stringify);
+function configToImportMeta(config, path = 'import.meta.graphCommerce', stringify = true) {
+    return flattenKeys(config, path, stringify);
 }
 exports.configToImportMeta = configToImportMeta;

package/dist/config/utils/replaceConfigInString.js

@@ -4,7 +4,7 @@ exports.replaceConfigInString = void 0;
 const configToImportMeta_1 = require("./configToImportMeta");
 function replaceConfigInString(str, config) {
     let result = str;
-    const replacers = (0, configToImportMeta_1.configToImportMeta)(config, false);
+    const replacers = (0, configToImportMeta_1.configToImportMeta)(config, 'graphCommerce', false);
     Object.entries(replacers).forEach(([from, to]) => {
         result = result.replace(new RegExp(`{${from}}`, 'g'), to);
     });

package/dist/config/utils/rewriteLegacyEnv.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rewriteLegacyEnv = void 0;
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const mergeEnvIntoConfig_1 = require("./mergeEnvIntoConfig");
-function rewriteLegacyEnv(schema, config, env) {
+function rewriteLegacyEnv(schema, env, config = {}) {
     const clonedEnv = (0, cloneDeep_1.default)(env);
     const applied = [];
     function renamedTo(to) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "6.0.0-canary.40",
+  "version": "6.0.0-canary.41",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/config/loadConfig.ts

@@ -19,7 +19,6 @@ export function loadConfig(cwd: string): GraphCommerceConfig {
     const result = loader.search(cwd)
 
     let confFile = result?.config
-    const hasEnv = Object.keys(filterEnv(process.env)).length > 0
     if (!confFile) {
       if (isMainProcess)
         console.warn('No graphcommerce.config.js found in the project, using demo config')
@@ -28,17 +27,17 @@ export function loadConfig(cwd: string): GraphCommerceConfig {
     confFile ||= {}
 
     const schema = GraphCommerceConfigSchema()
-    const parsed = schema.safeParse(confFile)
-
     const [mergedConfig, applyResult] = rewriteLegacyEnv(
-      GraphCommerceConfigSchema(),
-      parsed.success ? parsed.data : {},
+      schema,
       process.env,
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      confFile,
     )
 
     if (applyResult.length > 0 && isMainProcess) console.log(formatAppliedEnv(applyResult))
 
     const finalParse = schema.parse(mergedConfig)
+
     if (process.env.DEBUG && isMainProcess) {
       console.log('Parsed configuration')
       console.log(finalParse)
@@ -47,7 +46,7 @@ export function loadConfig(cwd: string): GraphCommerceConfig {
   } catch (error) {
     if (error instanceof Error) {
       if (isMainProcess) {
-        console.log(error.message)
+        console.log('Error while parsing graphcommerce.config.js', error.message)
         process.exit(1)
       }
     }

package/src/config/utils/configToImportMeta.ts

@@ -38,6 +38,10 @@ function flattenKeys(
 }
 
 /** The result of this function is passed to the webpack DefinePlugin as import.meta.graphCommerce.* */
-export function configToImportMeta(config: unknown, stringify = true) {
-  return flattenKeys(config, 'import.meta.graphCommerce', stringify) as Record<string, string>
+export function configToImportMeta(
+  config: unknown,
+  path = 'import.meta.graphCommerce',
+  stringify = true,
+) {
+  return flattenKeys(config, path, stringify) as Record<string, string>
 }

package/src/config/utils/replaceConfigInString.ts

@@ -3,7 +3,7 @@ import { configToImportMeta } from './configToImportMeta'
 
 export function replaceConfigInString(str: string, config: Partial<GraphCommerceConfig>) {
   let result = str
-  const replacers = configToImportMeta(config, false)
+  const replacers = configToImportMeta(config, 'graphCommerce', false)
 
   Object.entries(replacers).forEach(([from, to]) => {
     result = result.replace(new RegExp(`{${from}}`, 'g'), to)

package/src/config/utils/rewriteLegacyEnv.ts

@@ -4,8 +4,8 @@ import { ApplyResult, mergeEnvIntoConfig, ZodNode } from './mergeEnvIntoConfig'
 
 export function rewriteLegacyEnv(
   schema: ZodNode,
-  config: Partial<GraphCommerceConfig>,
   env: Record<string, string | undefined>,
+  config: Partial<GraphCommerceConfig> = {},
 ) {
   const clonedEnv: Record<string, string | undefined> = cloneDeep(env)
   const applied: ApplyResult = []

package/src/generated/config.ts

@@ -49,6 +49,13 @@ export type Scalars = {
  * }
  * ```
  *
+ * You can also use the configuration in your `.meshrc.yml` by accessing
+ * `{graphCommerce.myField}`
+ *
+ * ```yml
+ * endpoint: '{graphCommerce.magentoEndpoint}'
+ * ```
+ *
  * ## Environment variables to override configuration
  *
  * Configuration values can be overwriten by environment variables, with the following rules:
@@ -130,7 +137,7 @@ export type GraphCommerceConfig = {
    *
    * Provide a value to enable Google Analytics for your store.
    *
-   * To enable only for a specific locale, override the value in the i18n config.
+   * To override the value for a specific locale, configure in i18n config.
    */
   googleAnalyticsId?: InputMaybe<Scalars['String']>;
   /**