@graphcommerce/next-config 6.2.0-canary.88 → 6.2.0-canary.89

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Change Log
 
+## 6.2.0-canary.89
+
 ## 6.2.0-canary.88
 
 ## 6.2.0-canary.87

package/__tests__/interceptors/writeInterceptors.ts

@@ -1,32 +1,35 @@
 import { generateInterceptors } from '../../src/interceptors/generateInterceptors'
-import { writeInterceptors } from '../../src/interceptors/writeInterceptors'
 import { resolveDependency } from '../../src/utils/resolveDependency'
 
 const projectRoot = `${process.cwd()}/examples/magento-graphcms`
 
 it('writes all interceptors to disk', () => {
   const resolve = resolveDependency(projectRoot)
-  const interceptors = generateInterceptors(
+  generateInterceptors(
     [
       {
         component: 'PaymentMethodContextProvider',
         exported: '@graphcommerce/magento-cart-payment-method',
         plugin: '@graphcommerce/mollie-magento-payment/plugins/AddMollieMethods',
+        enabled: true,
       },
       {
         component: 'PaymentMethodContextProvider',
         exported: '@graphcommerce/magento-cart-payment-method',
         plugin: '@graphcommerce/magento-payment-braintree/plugins/AddBraintreeMethods',
+        enabled: true,
       },
       {
         component: 'PaymentMethodContextProvider',
         exported: '@graphcommerce/magento-cart-payment-method',
         plugin: '@graphcommerce/magento-payment-included/plugins/AddIncludedMethods',
+        enabled: true,
       },
       {
         component: 'PaymentMethodContextProvider',
         exported: '@graphcommerce/magento-cart-payment-method',
         plugin: '@graphcommerce/magento-payment-paypal/plugins/AddPaypalMethods',
+        enabled: true,
       },
     ],
     resolve,

package/dist/config/commands/exportConfig.js

@@ -6,6 +6,7 @@ const exportConfigToEnv_1 = require("../utils/exportConfigToEnv");
 // eslint-disable-next-line @typescript-eslint/require-await
 async function exportConfig() {
     const conf = (0, loadConfig_1.loadConfig)(process.cwd());
+    // eslint-disable-next-line no-console
     console.log((0, exportConfigToEnv_1.exportConfigToEnv)(conf));
 }
 exports.exportConfig = exportConfig;

package/dist/config/loadConfig.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfig = void 0;
+/* eslint-disable no-console */
 // eslint-disable-next-line import/no-extraneous-dependencies
 const cosmiconfig_1 = require("cosmiconfig");
 const config_1 = require("../generated/config");

package/dist/config/utils/rewriteLegacyEnv.js

@@ -84,7 +84,7 @@ function rewriteLegacyEnv(schema, env, config = {}) {
                 config.storefront = [];
             config.storefront.forEach((storefront, index) => {
                 if (!inclTax.includes(storefront.locale))
-                    return null;
+                    return;
                 clonedEnv[`GC_STOREFRONT_${index}_CART_DISPLAY_PRICES_INCL_TAX`] = '1';
             });
             applied.push({

package/dist/interceptors/InterceptorPlugin.js

@@ -13,6 +13,7 @@ class InterceptorPlugin {
     constructor(config) {
         this.config = config;
         this.resolveDependency = (0, resolveDependency_1.resolveDependency)();
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const [plugins, errors] = (0, findPlugins_1.findPlugins)(this.config);
         this.interceptors = (0, generateInterceptors_1.generateInterceptors)(plugins, this.resolveDependency, this.config.debug);
         this.interceptorByDepependency = Object.fromEntries(Object.values(this.interceptors).map((i) => [i.dependency, i]));
@@ -22,6 +23,7 @@ class InterceptorPlugin {
         const logger = compiler.getInfrastructureLogger('InterceptorPlugin');
         // After the compilation has succeeded we watch all possible plugin locations.
         compiler.hooks.afterCompile.tap('InterceptorPlugin', (compilation) => {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const [plugins, errors] = (0, findPlugins_1.findPlugins)(this.config);
             plugins.forEach((p) => {
                 const absoluteFilePath = `${path_1.default.join(process.cwd(), this.resolveDependency(p.plugin).fromRoot)}.tsx`;

package/dist/interceptors/findPlugins.js

@@ -92,6 +92,7 @@ function findPlugins(config, cwd = process.cwd()) {
                 pluginLogs[key] = logStr;
             }
         });
+        // eslint-disable-next-line no-console
         console.log(toLog.join('\n\n'));
     }
     return [plugins, errors];

package/dist/utils/packageRoots.js

@@ -26,6 +26,6 @@ const packageRoots = (packagePaths) => {
         }
     });
     // 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);
+    return roots.filter((root, index, self) => self.findIndex((r) => r !== root && r.startsWith(`${root}/`)) === -1);
 };
 exports.packageRoots = packageRoots;

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.88",
+  "version": "6.2.0-canary.89",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/config/commands/exportConfig.ts

@@ -4,5 +4,6 @@ import { exportConfigToEnv } from '../utils/exportConfigToEnv'
 // eslint-disable-next-line @typescript-eslint/require-await
 export async function exportConfig() {
   const conf = loadConfig(process.cwd())
+  // eslint-disable-next-line no-console
   console.log(exportConfigToEnv(conf))
 }

package/src/config/loadConfig.ts

@@ -1,9 +1,10 @@
+/* eslint-disable no-console */
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { cosmiconfigSync } from 'cosmiconfig'
 import type { GraphCommerceConfig } from '../generated/config'
 import { GraphCommerceConfigSchema } from '../generated/config'
 import { demoConfig } from './demoConfig'
-import { filterEnv, formatAppliedEnv } from './utils/mergeEnvIntoConfig'
+import { formatAppliedEnv } from './utils/mergeEnvIntoConfig'
 import { rewriteLegacyEnv } from './utils/rewriteLegacyEnv'
 
 export * from './utils/configToImportMeta'

package/src/config/utils/mergeEnvIntoConfig.ts

@@ -15,6 +15,8 @@ import {
   ZodEffects,
   ZodRawShape,
   ZodEnum,
+  ZodTypeAny,
+  ZodAny,
 } from 'zod'
 import diff from './diff'
 
@@ -39,14 +41,15 @@ function isJSON(str: string | undefined): boolean {
 }
 
 export type ZodNode =
-  | ZodNullable<any>
-  | ZodOptional<any>
-  | ZodEffects<any>
-  | ZodObject<any>
-  | ZodArray<any>
+  | ZodNullable<ZodTypeAny>
+  | ZodOptional<ZodTypeAny>
+  | ZodEffects<ZodTypeAny>
+  | ZodObject<ZodRawShape>
+  | ZodArray<ZodTypeAny>
   | ZodString
   | ZodNumber
   | ZodBoolean
+  | ZodAny
 
 export function configToEnvSchema(schema: ZodNode) {
   const envSchema: ZodRawShape = {}

package/src/config/utils/rewriteLegacyEnv.ts

@@ -91,7 +91,7 @@ export function rewriteLegacyEnv(
 
       if (!config.storefront) config.storefront = []
       config.storefront.forEach((storefront, index) => {
-        if (!inclTax.includes(storefront.locale)) return null
+        if (!inclTax.includes(storefront.locale)) return
         clonedEnv[`GC_STOREFRONT_${index}_CART_DISPLAY_PRICES_INCL_TAX`] = '1'
       })
 

package/src/index.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import type React from 'react'
 
 export * from './utils/isMonorepo'

package/src/interceptors/InterceptorPlugin.ts

@@ -16,6 +16,7 @@ export class InterceptorPlugin {
   constructor(private config: GraphCommerceConfig) {
     this.resolveDependency = resolveDependency()
 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const [plugins, errors] = findPlugins(this.config)
     this.interceptors = generateInterceptors(plugins, this.resolveDependency, this.config.debug)
     this.interceptorByDepependency = Object.fromEntries(
@@ -30,6 +31,7 @@ export class InterceptorPlugin {
 
     // After the compilation has succeeded we watch all possible plugin locations.
     compiler.hooks.afterCompile.tap('InterceptorPlugin', (compilation) => {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
       const [plugins, errors] = findPlugins(this.config)
 
       plugins.forEach((p) => {

package/src/interceptors/findPlugins.ts

@@ -122,6 +122,7 @@ export function findPlugins(config: GraphCommerceConfig, cwd: string = process.c
       }
     })
 
+    // eslint-disable-next-line no-console
     console.log(toLog.join('\n\n'))
   }
 

package/src/interceptors/generateInterceptors.ts

@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { GraphCommerceConfig, GraphCommerceDebugConfig } from '../generated/config'
+import { GraphCommerceDebugConfig } from '../generated/config'
 import { ResolveDependency, ResolveDependencyReturn } from '../utils/resolveDependency'
 
 type PluginBaseConfig = {

package/src/utils/packageRoots.ts

@@ -30,6 +30,6 @@ export const packageRoots = (packagePaths: string[]): string[] => {
 
   // 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,
+    (root, index, self) => self.findIndex((r) => r !== root && r.startsWith(`${root  }/`)) === -1,
   )
 }