@graphcommerce/next-config 8.1.0-canary.5 → 8.1.0-canary.50

package/src/generated/config.ts

@@ -104,6 +104,8 @@ export type DatalayerConfig = {
  * Below is a list of all possible configurations that can be set by GraphCommerce.
  */
 export type GraphCommerceConfig = {
+  /** Configuration for the SidebarGallery component */
+  breadcrumbs?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * The canonical base URL is used for SEO purposes.
    *
@@ -157,14 +159,17 @@ export type GraphCommerceConfig = {
    * Default: 'false'
    */
   crossSellsRedirectItems?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Enables the shipping notes field in the checkout */
+  customerAddressNoteEnable?: InputMaybe<Scalars['Boolean']['input']>;
   /**
-   * Due to a limitation in the GraphQL API of Magento 2, we need to know if the
-   * customer requires email confirmation.
-   *
-   * This value should match Magento 2's configuration value for
-   * `customer/create_account/confirm` and should be removed once we can query
+   * Enables company fields inside the checkout:
+   * - Company name
+   * - VAT ID
    */
-  customerRequireEmailConfirmation?: InputMaybe<Scalars['Boolean']['input']>;
+  customerCompanyFieldsEnable?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Enable customer account deletion through the account section */
+  customerDeleteEnabled?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Datalayer config */
   dataLayer?: InputMaybe<DatalayerConfig>;
   /** Debug configuration for GraphCommerce */
   debug?: InputMaybe<GraphCommerceDebugConfig>;
@@ -275,6 +280,12 @@ export type GraphCommerceConfig = {
    * - https://magento2.test/graphql
    */
   magentoEndpoint: Scalars['String']['input'];
+  /**
+   * Version of the Magento backend.
+   *
+   * Values: 245, 246, 247 for Magento 2.4.5, 2.4.6, 2.4.7 respectively.
+   */
+  magentoVersion: Scalars['Int']['input'];
   /** To enable next.js' preview mode, configure the secret you'd like to use. */
   previewSecret?: InputMaybe<Scalars['String']['input']>;
   /**
@@ -285,6 +296,13 @@ export type GraphCommerceConfig = {
   productFiltersLayout?: InputMaybe<ProductFiltersLayout>;
   /** Product filters with better UI for mobile and desktop. */
   productFiltersPro?: InputMaybe<Scalars['Boolean']['input']>;
+  /**
+   * Pagination variant for the product listings.
+   *
+   * COMPACT means: "< Page X of Y >"
+   * EXTENDED means: "< 1 2 ... 4 [5] 6 ... 10 11 >"
+   */
+  productListPaginationVariant?: InputMaybe<PaginationVariant>;
   /**
    * By default we route products to /p/[url] but you can change this to /product/[url] if you wish.
    *
@@ -345,6 +363,12 @@ export type GraphCommerceStorefrontConfig = {
   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']['input']>;
+  /**
+   * Enables company fields inside the checkout:
+   * - Company name
+   * - VAT ID
+   */
+  customerCompanyFieldsEnable?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * There can only be one entry with defaultLocale set to true.
    * - If there are more, the first one is used.
@@ -365,11 +389,7 @@ export type GraphCommerceStorefrontConfig = {
   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']['input']>>;
-  /**
-   * Specify a custom locale for to load translations. Must be lowercase valid locale.
-   *
-   * This value is also used for the Intl.
-   */
+  /** Custom locale used to load the .po files. Must be a valid locale, also used for Intl functions. */
   linguiLocale?: InputMaybe<Scalars['String']['input']>;
   /**
    * Must be a [locale string](https://www.unicode.org/reports/tr35/tr35-59/tr35.html#Identifiers) for automatic redirects to work.
@@ -388,6 +408,11 @@ export type GraphCommerceStorefrontConfig = {
    * - b2b-us
    */
   magentoStoreCode: 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']['input']>;
 };
 
 /** Options to configure which values will be replaced when a variant is selected on the product page. */
@@ -407,6 +432,10 @@ export type MagentoConfigurableVariantValues = {
   url?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
+export type PaginationVariant =
+  | 'COMPACT'
+  | 'EXTENDED';
+
 export type ProductFiltersLayout =
   | 'DEFAULT'
   | 'SIDEBAR';
@@ -443,6 +472,8 @@ export const definedNonNullAnySchema = z.any().refine((v) => isDefinedNonNullAny
 
 export const CompareVariantSchema = z.enum(['CHECKBOX', 'ICON']);
 
+export const PaginationVariantSchema = z.enum(['COMPACT', 'EXTENDED']);
+
 export const ProductFiltersLayoutSchema = z.enum(['DEFAULT', 'SIDEBAR']);
 
 export const SidebarGalleryPaginationVariantSchema = z.enum(['DOTS', 'THUMBNAILS_BOTTOM']);
@@ -455,18 +486,21 @@ export function DatalayerConfigSchema(): z.ZodObject<Properties<DatalayerConfig>
 
 export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerceConfig>> {
   return z.object({
+    breadcrumbs: z.boolean().default(false).nullish(),
     canonicalBaseUrl: z.string().min(1),
     cartDisplayPricesInclTax: z.boolean().nullish(),
     compare: z.boolean().nullish(),
-    compareVariant: CompareVariantSchema.nullish(),
-    configurableVariantForSimple: z.boolean().nullish(),
+    compareVariant: CompareVariantSchema.default("ICON").nullish(),
+    configurableVariantForSimple: z.boolean().default(false).nullish(),
     configurableVariantValues: MagentoConfigurableVariantValuesSchema().nullish(),
-    crossSellsHideCartItems: z.boolean().nullish(),
-    crossSellsRedirectItems: z.boolean().nullish(),
-    customerRequireEmailConfirmation: z.boolean().nullish(),
+    crossSellsHideCartItems: z.boolean().default(false).nullish(),
+    crossSellsRedirectItems: z.boolean().default(false).nullish(),
+    customerAddressNoteEnable: z.boolean().nullish(),
+    customerCompanyFieldsEnable: z.boolean().nullish(),
+    customerDeleteEnabled: z.boolean().nullish(),
     dataLayer: DatalayerConfigSchema().nullish(),
     debug: GraphCommerceDebugConfigSchema().nullish(),
-    demoMode: z.boolean().nullish(),
+    demoMode: z.boolean().default(true).nullish(),
     enableGuestCheckoutLogin: z.boolean().nullish(),
     googleAnalyticsId: z.string().nullish(),
     googleRecaptchaKey: z.string().nullish(),
@@ -478,9 +512,11 @@ export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerc
     hygraphWriteAccessToken: z.string().nullish(),
     limitSsg: z.boolean().nullish(),
     magentoEndpoint: z.string().min(1),
+    magentoVersion: z.number(),
     previewSecret: z.string().nullish(),
-    productFiltersLayout: ProductFiltersLayoutSchema.nullish(),
+    productFiltersLayout: ProductFiltersLayoutSchema.default("DEFAULT").nullish(),
     productFiltersPro: z.boolean().nullish(),
+    productListPaginationVariant: PaginationVariantSchema.default("COMPACT").nullish(),
     productRoute: z.string().nullish(),
     recentlyViewedProducts: RecentlyViewedProductsConfigSchema().nullish(),
     robotsAllow: z.boolean().nullish(),
@@ -504,6 +540,7 @@ export function GraphCommerceStorefrontConfigSchema(): z.ZodObject<Properties<Gr
   return z.object({
     canonicalBaseUrl: z.string().nullish(),
     cartDisplayPricesInclTax: z.boolean().nullish(),
+    customerCompanyFieldsEnable: z.boolean().nullish(),
     defaultLocale: z.boolean().nullish(),
     domain: z.string().nullish(),
     googleAnalyticsId: z.string().nullish(),
@@ -512,7 +549,8 @@ export function GraphCommerceStorefrontConfigSchema(): z.ZodObject<Properties<Gr
     hygraphLocales: z.array(z.string().min(1)).nullish(),
     linguiLocale: z.string().nullish(),
     locale: z.string().min(1),
-    magentoStoreCode: z.string().min(1)
+    magentoStoreCode: z.string().min(1),
+    robotsAllow: z.boolean().nullish()
   })
 }
 

package/src/index.ts

@@ -9,6 +9,7 @@ export * from './withGraphCommerce'
 export * from './generated/config'
 export * from './config'
 export * from './runtimeCachingOptimizations'
+export * from './interceptors/commands/codegenInterceptors'
 
 export type PluginProps<P extends Record<string, unknown> = Record<string, unknown>> = P & {
   Prev: React.FC<P>

package/src/interceptors/commands/codegenInterceptors.ts

@@ -0,0 +1,27 @@
+import { loadConfig } from '../../config/loadConfig'
+import { resolveDependency } from '../../utils/resolveDependency'
+import { findPlugins } from '../findPlugins'
+import { generateInterceptors } from '../generateInterceptors'
+import { writeInterceptors } from '../writeInterceptors'
+import dotenv from 'dotenv'
+
+dotenv.config()
+
+// eslint-disable-next-line @typescript-eslint/require-await
+export async function codegenInterceptors() {
+  const conf = loadConfig(process.cwd())
+
+  const [plugins, errors] = findPlugins(conf)
+
+  const generatedInterceptors = await generateInterceptors(
+    plugins,
+    resolveDependency(),
+    conf.debug,
+    true,
+  )
+
+  // const generated = Date.now()
+  // console.log('Generated interceptors in', generated - found, 'ms')
+
+  await writeInterceptors(generatedInterceptors)
+}

package/src/interceptors/extractExports.ts

@@ -112,8 +112,8 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
       case 'undefined':
         return undefined
       default:
-        if (optional) return RUNTIME_VALUE
-        throw new UnsupportedValueError(`Unknown identifier "${node.value}"`, path)
+        return RUNTIME_VALUE
+      // throw new UnsupportedValueError(`Unknown identifier "${node.value}"`, path)
     }
   } else if (isArrayExpression(node)) {
     // e.g. [1, 2, 3]
@@ -123,11 +123,11 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
       if (elem) {
         if (elem.spread) {
           // e.g. [ ...a ]
-          if (optional) return RUNTIME_VALUE
-          throw new UnsupportedValueError(
-            'Unsupported spread operator in the Array Expression',
-            path,
-          )
+          return RUNTIME_VALUE
+          // throw new UnsupportedValueError(
+          //   'Unsupported spread operator in the Array Expression',
+          //   path,
+          // )
         }
 
         arr.push(extractValue(elem.expression, path && [...path, `[${i}]`], optional))
@@ -144,11 +144,11 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
     for (const prop of node.properties) {
       if (!isKeyValueProperty(prop)) {
         // e.g. { ...a }
-        if (optional) return RUNTIME_VALUE
-        throw new UnsupportedValueError(
-          'Unsupported spread operator in the Object Expression',
-          path,
-        )
+        return RUNTIME_VALUE
+        // throw new UnsupportedValueError(
+        //   'Unsupported spread operator in the Object Expression',
+        //   path,
+        // )
       }
 
       let key
@@ -159,11 +159,11 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
         // e.g. { "a": 1, "b": 2 }
         key = prop.key.value
       } else {
-        if (optional) return RUNTIME_VALUE
-        throw new UnsupportedValueError(
-          `Unsupported key type "${prop.key.type}" in the Object Expression`,
-          path,
-        )
+        return RUNTIME_VALUE
+        // throw new UnsupportedValueError(
+        //   `Unsupported key type "${prop.key.type}" in the Object Expression`,
+        //   path,
+        // )
       }
 
       obj[key] = extractValue(prop.value, path && [...path, key])
@@ -174,8 +174,8 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
     // e.g. `abc`
     if (node.expressions.length !== 0) {
       // TODO: should we add support for `${'e'}d${'g'}'e'`?
-      if (optional) return RUNTIME_VALUE
-      throw new UnsupportedValueError('Unsupported template literal with expressions', path)
+      return RUNTIME_VALUE
+      // throw new UnsupportedValueError('Unsupported template literal with expressions', path)
     }
 
     // When TemplateLiteral has 0 expressions, the length of quasis is always 1.
@@ -191,8 +191,8 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
 
     return cooked ?? raw
   } else {
-    if (optional) return RUNTIME_VALUE
-    throw new UnsupportedValueError(`Unsupported node type "${node.type}"`, path)
+    return RUNTIME_VALUE
+    // throw new UnsupportedValueError(`Unsupported node type "${node.type}"`, path)
   }
 }
 

package/src/interceptors/findOriginalSource.ts

@@ -32,6 +32,21 @@ function parseAndFindExport(
           break
       }
     }
+
+    if (node.type === 'ExportNamedDeclaration') {
+      for (const specifier of node.specifiers) {
+        if (specifier.type === 'ExportSpecifier') {
+          if (specifier.exported?.value === findExport) return resolved
+        } else if (specifier.type === 'ExportDefaultSpecifier') {
+          // todo
+        } else if (specifier.type === 'ExportNamespaceSpecifier') {
+          // todo
+        }
+      }
+    }
+
+    // todo: if (node.type === 'ExportDefaultDeclaration') {}
+    // todo: if (node.type === 'ExportDefaultExpression') {}
   }
 
   const exports = ast.body
@@ -95,7 +110,7 @@ export function findOriginalSource(
     return {
       resolved: undefined,
       error: new Error(
-        `Can not find ${plug.targetModule}#${plug.sourceExport} for plugin ${plug.sourceModule}`,
+        `Plugin target not found ${plug.targetModule}#${plug.sourceExport} for plugin ${plug.sourceModule}#${plug.sourceExport}`,
       ),
     }
   }

package/src/interceptors/findPlugins.ts

@@ -17,10 +17,14 @@ export function findPlugins(config: GraphCommerceConfig, cwd: string = process.c
 
   const errors: string[] = []
   const plugins: PluginConfig[] = []
-  dependencies.forEach((dependency, path) => {
-    const files = globSync(`${dependency}/plugins/**/*.{ts,tsx}`, { dotRelative: true })
+  dependencies.forEach((filePath, packageName) => {
+    const files = globSync(`${filePath}/plugins/**/*.{ts,tsx}`)
     files.forEach((file) => {
-      const sourceModule = file.replace(dependency, path).replace('.tsx', '').replace('.ts', '')
+      let sourceModule = file.replace('.tsx', '').replace('.ts', '')
+      if (file.startsWith(filePath))
+        sourceModule = `${packageName}/${sourceModule.slice(filePath.length + 1)}`
+
+      if (packageName === '.' && !sourceModule.startsWith('.')) sourceModule = `./${sourceModule}`
 
       try {
         const ast = parseFileSync(file, { syntax: 'typescript', tsx: true })

package/src/interceptors/generateInterceptor.ts

@@ -66,11 +66,11 @@ export type Interceptor = ResolveDependencyReturn & {
 
 export type MaterializedPlugin = Interceptor & { template: string }
 
-export const SOURCE_START = '/** ❗️ Original (modified) source starts here **/'
-export const SOURCE_END = '/** ❗️ Original (modified) source ends here **/'
+export const SOURCE_START = '/** Original source starts here (do not modify!): **/'
+export const SOURCE_END = '/** Original source ends here (do not modify!) **/'
 
 const originalSuffix = 'Original'
-const sourceSuffix = 'Source'
+const sourceSuffix = 'Plugin'
 const interceptorSuffix = 'Interceptor'
 const disabledSuffix = 'Disabled'
 const name = (plugin: PluginConfig) =>
@@ -81,9 +81,9 @@ const name = (plugin: PluginConfig) =>
 const fileName = (plugin: PluginConfig) => `${plugin.sourceModule}#${plugin.sourceExport}`
 
 const originalName = (n: string) => `${n}${originalSuffix}`
-const sourceName = (n: string) => `${n}${sourceSuffix}`
+const sourceName = (n: string) => `${n}`
 const interceptorName = (n: string) => `${n}${interceptorSuffix}`
-const interceptorPropsName = (n: string) => `${interceptorName(n)}Props`
+const interceptorPropsName = (n: string) => `${n}Props`
 
 export function moveRelativeDown(plugins: PluginConfig[]) {
   return [...plugins].sort((a, b) => {
@@ -153,7 +153,12 @@ export async function generateInterceptor(
       const duplicateInterceptors = new Set()
 
       let carry = originalName(base)
-      const carryProps: string[] = []
+      let carryProps: string[] = []
+      const pluginSee: string[] = []
+
+      pluginSee.push(
+        `@see {@link file://${interceptor.sourcePathRelative}} for original source file`,
+      )
 
       const pluginStr = plugins
         .reverse()
@@ -175,17 +180,20 @@ export async function generateInterceptor(
               s.replace(originalSuffix, disabledSuffix),
             ).visitModule(ast)
 
-            carryProps.push(interceptorPropsName(name(p)))
+            carryProps.push(`React.ComponentProps<typeof ${sourceName(name(p))}>`)
 
-            result = `type ${interceptorPropsName(name(p))} = React.ComponentProps<typeof ${sourceName(name(p))}>`
+            pluginSee.push(
+              `@see {${sourceName(name(p))}} for replacement of the original source (original source not used)`,
+            )
           }
 
           if (isReactPluginConfig(p)) {
-            carryProps.push(interceptorPropsName(name(p)))
+            const withBraces = config.pluginStatus || process.env.NODE_ENV === 'development'
 
             result = `
-              type ${interceptorPropsName(name(p))} = DistributedOmit<React.ComponentProps<typeof ${sourceName(name(p))}>, 'Prev'>
-              const ${interceptorName(name(p))} = (props: ${carryProps.join(' & ')}) => {
+              type ${interceptorPropsName(name(p))} = ${carryProps.join(' & ')} & OmitPrev<React.ComponentProps<typeof ${sourceName(name(p))}>, 'Prev'>
+              
+              const ${interceptorName(name(p))} = (props: ${interceptorPropsName(name(p))}) => ${withBraces ? `{` : '('}
                 ${config.pluginStatus ? `logOnce(\`🔌 Rendering ${base} with plugin(s): ${wrapChain} wrapping <${base}/>\`)` : ''}
 
                 ${
@@ -194,8 +202,11 @@ export async function generateInterceptor(
                   logOnce('${fileName(p)} does not spread props to prev: <Prev {...props}/>. This will cause issues if multiple plugins are applied to this component.')`
                     : ''
                 }
-                return <${sourceName(name(p))} {...props} Prev={${carry} as React.FC} />
-              }`
+                ${withBraces ? `return` : ''} <${sourceName(name(p))} {...props} Prev={${carry}} />
+              ${withBraces ? `}` : ')'}`
+
+            carryProps = [interceptorPropsName(name(p))]
+            pluginSee.push(`@see {${sourceName(name(p))}} for source of applied plugin`)
           }
 
           if (isMethodPluginConfig(p)) {
@@ -203,6 +214,7 @@ export async function generateInterceptor(
                 ${config.pluginStatus ? `logOnce(\`🔌 Calling ${base} with plugin(s): ${wrapChain} wrapping ${base}()\`)` : ''}
                 return ${sourceName(name(p))}(${carry}, ...args)
               }`
+            pluginSee.push(`@see {${sourceName(name(p))}} for source of applied plugin`)
           }
 
           carry = p.type === 'replace' ? sourceName(name(p)) : interceptorName(name(p))
@@ -211,13 +223,23 @@ export async function generateInterceptor(
         .filter((v) => !!v)
         .join('\n')
 
-      const isComponent = plugins.every((p) => isReplacePluginConfig(p) || isReactPluginConfig(p))
+      const isComponent = plugins.every((p) => isReactPluginConfig(p))
       if (isComponent && plugins.some((p) => isMethodPluginConfig(p))) {
         throw new Error(`Cannot mix React and Method plugins for ${base} in ${dependency}.`)
       }
 
+      const seeString = `
+      /**
+       * Here you see the 'interceptor' that is applying all the configured plugins.
+       *
+       * This file is NOT meant to be modified directly and is auto-generated if the plugins or the original source changes.
+       * 
+       ${pluginSee.map((s) => `* ${s}`).join('\n')}
+       */`
+
       if (process.env.NODE_ENV === 'development' && isComponent) {
         return `${pluginStr}
+          ${seeString}
           export const ${base}: typeof ${carry} = (props) => {
             return <${carry} {...props} data-plugin />
           }`
@@ -225,6 +247,7 @@ export async function generateInterceptor(
 
       return `
         ${pluginStr}
+        ${seeString}
         export const ${base} = ${carry}
       `
     })
@@ -247,12 +270,13 @@ export async function generateInterceptor(
     /* This file is automatically generated for ${dependency} */
     ${
       Object.values(targetExports).some((t) => t.some((p) => p.type === 'component'))
-        ? `import type { DistributedOmit } from 'type-fest'`
+        ? `import type { DistributedOmit as OmitPrev } from 'type-fest'`
         : ''
     }
 
     ${pluginImports}
 
+    /** @see {@link file://${interceptor.sourcePathRelative}} for source of original */
     ${SOURCE_START}
     ${printSync(ast).code}
     ${SOURCE_END}

package/src/interceptors/generateInterceptors.ts

@@ -19,6 +19,7 @@ export async function generateInterceptors(
   plugins: PluginConfig[],
   resolve: ResolveDependency,
   config?: GraphCommerceDebugConfig | null | undefined,
+  force?: boolean,
 ): Promise<GenerateInterceptorsReturn> {
   const byTargetModuleAndExport = moveRelativeDown(plugins).reduce<Record<string, Interceptor>>(
     (acc, plug) => {
@@ -68,12 +69,14 @@ export async function generateInterceptors(
       Object.entries(byTargetModuleAndExport).map(async ([target, interceptor]) => {
         const file = `${interceptor.fromRoot}.interceptor.tsx`
 
-        const originalSource = (await fs
-          .access(file, fs.constants.F_OK)
-          .then(() => true)
-          .catch(() => false))
-          ? (await fs.readFile(file)).toString()
-          : undefined
+        const originalSource =
+          !force &&
+          (await fs
+            .access(file, fs.constants.F_OK)
+            .then(() => true)
+            .catch(() => false))
+            ? (await fs.readFile(file)).toString()
+            : undefined
 
         return [
           target,

package/src/interceptors/parseStructure.ts

@@ -34,10 +34,11 @@ export function parseStructure(ast: Module, gcConfig: GraphCommerceConfig, sourc
   } = exports
 
   const exportVals = Object.keys(rest)
+
   if (component && !moduleConfig) exportVals.push('Plugin')
   if (func && !moduleConfig) exportVals.push('plugin')
 
-  return exportVals
+  const pluginConfigs = exportVals
     .map((exportVal) => {
       let config = isObject(moduleConfig) ? moduleConfig : {}
 
@@ -49,6 +50,7 @@ export function parseStructure(ast: Module, gcConfig: GraphCommerceConfig, sourc
         config = { ...moduleConfig, export: exportVal }
       } else {
         console.error(`Plugin configuration invalid! See ${sourceModule}`)
+        return null
       }
 
       const parsed = pluginConfigParsed.safeParse(config)
@@ -79,4 +81,15 @@ export function parseStructure(ast: Module, gcConfig: GraphCommerceConfig, sourc
       return val
     })
     .filter(nonNullable)
+
+  const newPluginConfigs = pluginConfigs.reduce<PluginConfig[]>((acc, pluginConfig) => {
+    if (
+      !acc.find((accPluginConfig) => accPluginConfig.sourceExport === pluginConfig.sourceExport)
+    ) {
+      acc.push(pluginConfig)
+    }
+    return acc
+  }, [])
+
+  return newPluginConfigs
 }

package/src/interceptors/writeInterceptors.ts

@@ -17,24 +17,24 @@ export async function writeInterceptors(
   cwd: string = process.cwd(),
 ) {
   const dependencies = resolveDependenciesSync(cwd)
-  const existing: string[] = []
+  const existing = new Set<string>()
   dependencies.forEach((dependency) => {
     const files = globSync(
       [`${dependency}/**/*.interceptor.tsx`, `${dependency}/**/*.interceptor.ts`],
       { cwd },
     )
-    existing.push(...files)
+    files.forEach((file) => existing.add(file))
   })
 
   const written = Object.entries(interceptors).map(async ([, plugin]) => {
     const extension = plugin.sourcePath.endsWith('.tsx') ? '.tsx' : '.ts'
     const relativeFile = `${plugin.fromRoot}.interceptor${extension}`
 
-    if (existing.includes(relativeFile)) {
-      delete existing[existing.indexOf(relativeFile)]
+    if (existing.has(relativeFile)) {
+      existing.delete(relativeFile)
     }
-    if (existing.includes(`./${relativeFile}`)) {
-      delete existing[existing.indexOf(`./${relativeFile}`)]
+    if (existing.has(`./${relativeFile}`)) {
+      existing.delete(`./${relativeFile}`)
     }
 
     const fileToWrite = path.join(cwd, relativeFile)
@@ -47,7 +47,7 @@ export async function writeInterceptors(
   })
 
   // Cleanup unused interceptors
-  const cleaned = existing.map(
+  const cleaned = [...existing].map(
     async (file) => (await checkFileExists(file)) && (await fs.unlink(file)),
   )
 

package/src/utils/resolveDependenciesSync.ts

@@ -12,6 +12,7 @@ function resolveRecursivePackageJson(
   dependencyPath: string,
   dependencyStructure: DependencyStructure,
   root: string,
+  additionalDependencies: string[] = [],
 ) {
   const isRoot = dependencyPath === root
   const fileName = require.resolve(path.join(dependencyPath, 'package.json'))
@@ -28,8 +29,9 @@ function resolveRecursivePackageJson(
   const dependencies = [
     ...new Set(
       [
-        ...Object.keys(packageJson.dependencies ?? {}),
-        ...Object.keys(packageJson.devDependencies ?? {}),
+        ...Object.keys(packageJson.dependencies ?? []),
+        ...Object.keys(packageJson.devDependencies ?? []),
+        ...additionalDependencies,
         // ...Object.keys(packageJson.peerDependencies ?? {}),
       ].filter((name) => name.includes('graphcommerce')),
     ),
@@ -77,7 +79,13 @@ export function sortDependencies(dependencyStructure: DependencyStructure): Pack
 export function resolveDependenciesSync(root = process.cwd()) {
   const cached = resolveCache.get(root)
   if (cached) return cached
-  const dependencyStructure = resolveRecursivePackageJson(root, {}, root)
+
+  const dependencyStructure = resolveRecursivePackageJson(
+    root,
+    {},
+    root,
+    process.env.PRIVATE_ADDITIONAL_DEPENDENCIES?.split(',') ?? [],
+  )
 
   const sorted = sortDependencies(dependencyStructure)
   resolveCache.set(root, sorted)

package/src/utils/resolveDependency.ts

@@ -11,6 +11,7 @@ export type ResolveDependencyReturn =
       fromModule: string
       source: string
       sourcePath: string
+      sourcePathRelative: string
     }
 
 export type ResolveDependency = (
@@ -31,6 +32,7 @@ export const resolveDependency = (cwd: string = process.cwd()) => {
       root: '.',
       source: '',
       sourcePath: '',
+      sourcePathRelative: '',
       dependency,
       fromRoot: dependency,
       fromModule: dependency,
@@ -73,6 +75,10 @@ export const resolveDependency = (cwd: string = process.cwd()) => {
           ? '.'
           : `./${relative.split('/')[relative.split('/').length - 1]}`
 
+        const sourcePathRelative = !sourcePath
+          ? '.'
+          : `./${sourcePath.split('/')[sourcePath.split('/').length - 1]}`
+
         if (dependency.startsWith('./')) fromModule = `.${relative}`
 
         dependencyPaths = {
@@ -83,6 +89,7 @@ export const resolveDependency = (cwd: string = process.cwd()) => {
           fromModule,
           source,
           sourcePath,
+          sourcePathRelative,
         }
       }
     })