@graphcommerce/next-config 9.0.0-canary.98 → 9.0.0

package/src/interceptors/InterceptorPlugin.ts

@@ -1,9 +1,11 @@
 import path from 'path'
-import { Compiler } from 'webpack'
-import { GraphCommerceConfig } from '../generated/config'
-import { ResolveDependency, resolveDependency } from '../utils/resolveDependency'
+import type { Compiler } from 'webpack'
+import type { GraphCommerceConfig } from '../generated/config'
+import type { ResolveDependency } from '../utils/resolveDependency'
+import { resolveDependency } from '../utils/resolveDependency'
 import { findPlugins } from './findPlugins'
-import { generateInterceptors, GenerateInterceptorsReturn } from './generateInterceptors'
+import type { GenerateInterceptorsReturn } from './generateInterceptors'
+import { generateInterceptors } from './generateInterceptors'
 import { writeInterceptors } from './writeInterceptors'
 
 let interceptors: GenerateInterceptorsReturn | undefined
@@ -29,11 +31,11 @@ export class InterceptorPlugin {
   #generateInterceptors = async () => {
     if (generating) return {}
     generating = true
-    const start = Date.now()
+    // const start = Date.now()
 
     // console.log('Generating interceptors...')
 
-    const [plugins, errors] = findPlugins(this.config)
+    const [plugins] = findPlugins(this.config)
 
     // console.log(errors)
 
@@ -66,6 +68,7 @@ export class InterceptorPlugin {
     return generatedInterceptors
   }
 
+  /** @public */
   apply(compiler: Compiler): void {
     const logger = compiler.getInfrastructureLogger('InterceptorPlugin')
 
@@ -86,7 +89,7 @@ export class InterceptorPlugin {
 
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.#generateInterceptors().then((i) => {
-          Object.entries(i).forEach(([key, { sourcePath }]) => {
+          Object.entries(i).forEach(([, { sourcePath }]) => {
             const absoluteFilePath = path.join(process.cwd(), sourcePath)
             compilation.fileDependencies.add(absoluteFilePath)
           })

package/src/interceptors/RenameVisitor.ts

@@ -1,5 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import { Identifier } from '@swc/core'
+import type { Identifier } from '@swc/core'
 import { Visitor } from './Visitor'
 
 export class RenameVisitor extends Visitor {

package/src/interceptors/Visitor.ts

@@ -1,17 +1,10 @@
 /**
  * This is an implementation of
- * https://github.com/swc-project/swc/blob/main/node-swc/src/Visitor.ts
+ * https://github.com/swc-project/swc/blob/main/packages/core/src/Visitor.ts
  *
  * The JS API is deprecated, but there doesn't seem to be a valid alternative at this point.
  */
-
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable no-param-reassign */
-/* eslint-disable class-methods-use-this */
-/* eslint-disable consistent-return */
-// eslint-disable-next-line import/no-extraneous-dependencies
-import {
+import type {
   Accessibility,
   Argument,
   ArrayExpression,
@@ -54,9 +47,9 @@ import {
   ExportNamedDeclaration,
   ExportNamespaceSpecifier,
   ExportSpecifier,
-  ExprOrSpread,
   Expression,
   ExpressionStatement,
+  ExprOrSpread,
   Fn,
   ForInStatement,
   ForOfStatement,
@@ -71,10 +64,10 @@ import {
   ImportDefaultSpecifier,
   ImportNamespaceSpecifier,
   ImportSpecifier,
-  JSXAttrValue,
   JSXAttribute,
   JSXAttributeName,
   JSXAttributeOrSpread,
+  JSXAttrValue,
   JSXClosingElement,
   JSXClosingFragment,
   JSXElement,
@@ -188,8 +181,13 @@ import {
   YieldExpression,
 } from '@swc/types'
 
+/* eslint-disable no-param-reassign */
+/* eslint-disable class-methods-use-this */
+/* eslint-disable consistent-return */
+
 /**
  * @deprecated JavaScript API is deprecated. Please use Wasm plugin instead.
+ * @public
  */
 export class Visitor {
   visitProgram(n: Program): Program {
@@ -782,7 +780,6 @@ export class Visitor {
   }
 
   visitTsPropertySignature(n: TsPropertySignature): TsPropertySignature {
-    n.params = this.visitTsFnParameters(n.params)
     n.typeAnnotation = this.visitTsTypeAnnotation(n.typeAnnotation)
     return n
   }
@@ -873,7 +870,7 @@ export class Visitor {
   }
 
   visitTsFnParameters(params: TsFnParameter[]): TsFnParameter[] {
-    return params?.map(this.visitTsFnParameter.bind(this))
+    return params.map(this.visitTsFnParameter.bind(this))
   }
 
   visitTsFnParameter(n: TsFnParameter): TsFnParameter {
@@ -1843,5 +1840,3 @@ export class Visitor {
     return n
   }
 }
-
-export default Visitor

package/src/interceptors/commands/codegenInterceptors.ts

@@ -1,9 +1,9 @@
+import dotenv from 'dotenv'
 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()
 
@@ -11,7 +11,7 @@ dotenv.config()
 export async function codegenInterceptors() {
   const conf = loadConfig(process.cwd())
 
-  const [plugins, errors] = findPlugins(conf)
+  const [plugins] = findPlugins(conf)
 
   const generatedInterceptors = await generateInterceptors(
     plugins,

package/src/interceptors/extractExports.ts

@@ -1,4 +1,7 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
 /* eslint-disable no-continue */
+
 /* eslint-disable max-classes-per-file */
 import type {
   ArrayExpression,
@@ -15,8 +18,6 @@ import type {
   TemplateLiteral,
 } from '@swc/core'
 
-export class NoSuchDeclarationError extends Error {}
-
 function isIdentifier(node: Node): node is Identifier {
   return node.type === 'Identifier'
 }
@@ -57,35 +58,7 @@ function isTemplateLiteral(node: Node): node is TemplateLiteral {
   return node.type === 'TemplateLiteral'
 }
 
-export class UnsupportedValueError extends Error {
-  /** @example `config.runtime[0].value` */
-  path?: string
-
-  constructor(message: string, paths?: string[]) {
-    super(message)
-
-    // Generating "path" that looks like "config.runtime[0].value"
-    let codePath: string | undefined
-    if (Array.isArray(paths)) {
-      codePath = ''
-      for (const path of paths) {
-        if (path[0] === '[') {
-          // "array" + "[0]"
-          codePath += path
-        } else if (codePath === '') {
-          codePath = path
-        } else {
-          // "object" + ".key"
-          codePath += `.${path}`
-        }
-      }
-    }
-
-    this.path = codePath
-  }
-}
-
-export const RUNTIME_VALUE = Symbol('RUNTIME_VALUE')
+const RUNTIME_VALUE = Symbol('RUNTIME_VALUE')
 
 function extractValue(node: Node, path?: string[], optional: boolean = false): any {
   if (isNullLiteral(node)) {
@@ -113,7 +86,6 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
         return undefined
       default:
         return RUNTIME_VALUE
-      // throw new UnsupportedValueError(`Unknown identifier "${node.value}"`, path)
     }
   } else if (isArrayExpression(node)) {
     // e.g. [1, 2, 3]
@@ -124,10 +96,6 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
         if (elem.spread) {
           // e.g. [ ...a ]
           return RUNTIME_VALUE
-          // throw new UnsupportedValueError(
-          //   'Unsupported spread operator in the Array Expression',
-          //   path,
-          // )
         }
 
         arr.push(extractValue(elem.expression, path && [...path, `[${i}]`], optional))
@@ -145,10 +113,6 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
       if (!isKeyValueProperty(prop)) {
         // e.g. { ...a }
         return RUNTIME_VALUE
-        // throw new UnsupportedValueError(
-        //   'Unsupported spread operator in the Object Expression',
-        //   path,
-        // )
       }
 
       let key
@@ -160,10 +124,6 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
         key = prop.key.value
       } else {
         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])
@@ -175,7 +135,6 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
     if (node.expressions.length !== 0) {
       // TODO: should we add support for `${'e'}d${'g'}'e'`?
       return RUNTIME_VALUE
-      // throw new UnsupportedValueError('Unsupported template literal with expressions', path)
     }
 
     // When TemplateLiteral has 0 expressions, the length of quasis is always 1.
@@ -192,7 +151,6 @@ function extractValue(node: Node, path?: string[], optional: boolean = false): a
     return cooked ?? raw
   } else {
     return RUNTIME_VALUE
-    // throw new UnsupportedValueError(`Unsupported node type "${node.type}"`, path)
   }
 }
 

package/src/interceptors/findOriginalSource.ts

@@ -1,8 +1,8 @@
+import type { ExportAllDeclaration } from '@swc/core'
 import path from 'path'
-import { ResolveDependency, ResolveDependencyReturn } from '../utils/resolveDependency'
-import { PluginConfig } from './generateInterceptor'
+import type { ResolveDependency, ResolveDependencyReturn } from '../utils/resolveDependency'
+import type { PluginConfig } from './generateInterceptor'
 import { parseSync } from './swc'
-import { ExportAllDeclaration } from '@swc/core'
 
 function parseAndFindExport(
   resolved: ResolveDependencyReturn,
@@ -25,6 +25,7 @@ function parseAndFindExport(
               if (declaration.id.type === 'Identifier') {
                 if (declaration.id.value === findExport) return resolved
               } else {
+                // eslint-disable-next-line no-console
                 console.log(declaration)
               }
             }
@@ -81,7 +82,7 @@ function parseAndFindExport(
   return undefined
 }
 
-const cachedResults = new Map<string, ResolveDependencyReturn>()
+// const cachedResults = new Map<string, ResolveDependencyReturn>()
 
 export function findOriginalSource(
   plug: PluginConfig,

package/src/interceptors/findPlugins.ts

@@ -1,15 +1,16 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { parseFileSync } from '@swc/core'
-import chalk from 'chalk'
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { sync as globSync } from 'glob'
-import { GraphCommerceConfig } from '../generated/config'
+import type { GraphCommerceConfig } from '../generated/config'
 import { resolveDependenciesSync } from '../utils/resolveDependenciesSync'
-import { PluginConfig } from './generateInterceptor'
+import type { PluginConfig } from './generateInterceptor'
 import { parseStructure } from './parseStructure'
 
 const pluginLogs: Record<string, string> = {}
 
+// ANSI escape codes for console colors
+const GREEN = '\x1b[32m'
+const RESET = '\x1b[0m'
+
 export function findPlugins(config: GraphCommerceConfig, cwd: string = process.cwd()) {
   const dependencies = resolveDependenciesSync(cwd)
 
@@ -40,9 +41,7 @@ export function findPlugins(config: GraphCommerceConfig, cwd: string = process.c
   if (process.env.NODE_ENV === 'development' && debug) {
     const byExported = plugins.reduce(
       (acc, plugin) => {
-        const key = `🔌 ${chalk.greenBright(
-          `Plugins loaded for ${plugin.targetModule}#${plugin.targetExport}`,
-        )}`
+        const key = `🔌 ${GREEN}Plugins loaded for ${plugin.targetModule}#${plugin.targetExport}${RESET}`
         if (!acc[key]) acc[key] = []
         acc[key].push(plugin)
         return acc
@@ -65,7 +64,7 @@ export function findPlugins(config: GraphCommerceConfig, cwd: string = process.c
               : `${c.ifConfig}`
             : ''
 
-          return `${c.enabled ? `🟢` : `⚪️`} ${c.sourceModule} ${ifConfigStr}`
+          return `${c.enabled ? '🟢' : '⚪️'} ${c.sourceModule} ${ifConfigStr}`
         })
         .join('\n')
 

package/src/interceptors/generateInterceptor.ts

@@ -2,8 +2,8 @@
 import prettierConf from '@graphcommerce/prettier-config-pwa'
 // eslint-disable-next-line import/no-extraneous-dependencies
 import prettier from 'prettier'
-import { GraphCommerceDebugConfig } from '../generated/config'
-import { ResolveDependencyReturn } from '../utils/resolveDependency'
+import type { GraphCommerceDebugConfig } from '../generated/config'
+import type { ResolveDependencyReturn } from '../utils/resolveDependency'
 import { RenameVisitor } from './RenameVisitor'
 import { parseSync, printSync } from './swc'
 
@@ -14,9 +14,11 @@ type PluginBaseConfig = {
   sourceModule: string
   targetExport: string
   enabled: boolean
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ifConfig?: string | [string, any]
 }
 
+/** @public */
 export function isPluginBaseConfig(plugin: Partial<PluginBaseConfig>): plugin is PluginBaseConfig {
   return (
     typeof plugin.type === 'string' &&
@@ -30,6 +32,7 @@ type ReactPluginConfig = PluginBaseConfig & { type: 'component' }
 type MethodPluginConfig = PluginBaseConfig & { type: 'function' }
 type ReplacePluginConfig = PluginBaseConfig & { type: 'replace' }
 
+/** @public */
 export function isReactPluginConfig(
   plugin: Partial<PluginBaseConfig>,
 ): plugin is ReactPluginConfig {
@@ -37,6 +40,7 @@ export function isReactPluginConfig(
   return plugin.type === 'component'
 }
 
+/** @public */
 export function isMethodPluginConfig(
   plugin: Partial<PluginBaseConfig>,
 ): plugin is MethodPluginConfig {
@@ -44,6 +48,7 @@ export function isMethodPluginConfig(
   return plugin.type === 'function'
 }
 
+/** @public */
 export function isReplacePluginConfig(
   plugin: Partial<PluginBaseConfig>,
 ): plugin is ReactPluginConfig {
@@ -66,11 +71,10 @@ export type Interceptor = ResolveDependencyReturn & {
 
 export type MaterializedPlugin = Interceptor & { template: string }
 
-export const SOURCE_START = '/** Original source starts here (do not modify!): **/'
-export const SOURCE_END = '/** Original source ends here (do not modify!) **/'
+export const SOURCE_START = '/** SOURCE_START */'
+export const SOURCE_END = '/** SOURCE_END */'
 
 const originalSuffix = 'Original'
-const sourceSuffix = 'Plugin'
 const interceptorSuffix = 'Interceptor'
 const disabledSuffix = 'Disabled'
 const name = (plugin: PluginConfig) =>
@@ -103,9 +107,7 @@ const generateIdentifyer = (s: string) =>
     }, 0),
   ).toString()
 
-/**
- * The is on the first line, with the format: \/* hash:${identifer} *\/
- */
+/** The is on the first line, with the format: /* hash:${identifer} */
 function extractIdentifier(source: string | undefined) {
   if (!source) return null
   const match = source.match(/\/\* hash:(\d+) \*\//)
@@ -193,7 +195,7 @@ export async function generateInterceptor(
             result = `
               type ${interceptorPropsName(name(p))} = ${carryProps.join(' & ')} & OmitPrev<React.ComponentProps<typeof ${sourceName(name(p))}>, 'Prev'>
               
-              const ${interceptorName(name(p))} = (props: ${interceptorPropsName(name(p))}) => ${withBraces ? `{` : '('}
+              const ${interceptorName(name(p))} = (props: ${interceptorPropsName(name(p))}) => ${withBraces ? '{' : '('}
                 ${config.pluginStatus ? `logOnce(\`🔌 Rendering ${base} with plugin(s): ${wrapChain} wrapping <${base}/>\`)` : ''}
 
                 ${
@@ -202,8 +204,8 @@ 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.')`
                     : ''
                 }
-                ${withBraces ? `return` : ''} <${sourceName(name(p))} {...props} Prev={${carry}} />
-              ${withBraces ? `}` : ')'}`
+                ${withBraces ? 'return' : ''} <${sourceName(name(p))} {...props} Prev={${carry}} />
+              ${withBraces ? '}' : ')'}`
 
             carryProps = [interceptorPropsName(name(p))]
             pluginSee.push(`@see {${sourceName(name(p))}} for source of applied plugin`)
@@ -270,7 +272,7 @@ 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 as OmitPrev } from 'type-fest'`
+        ? "import type { DistributedOmit as OmitPrev } from 'type-fest'"
         : ''
     }
 
@@ -287,6 +289,7 @@ export async function generateInterceptor(
   try {
     templateFormatted = await prettier.format(template, { ...prettierConf, parser: 'typescript' })
   } catch (e) {
+    // eslint-disable-next-line no-console
     console.log('Error formatting interceptor: ', e, 'using raw template.')
     templateFormatted = template
   }

package/src/interceptors/generateInterceptors.ts

@@ -1,17 +1,11 @@
-import path from 'node:path'
-import fs from 'node:fs/promises'
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { GraphCommerceDebugConfig } from '../generated/config'
-import { ResolveDependency } from '../utils/resolveDependency'
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import type { GraphCommerceDebugConfig } from '../generated/config'
+import type { ResolveDependency } from '../utils/resolveDependency'
 import { findOriginalSource } from './findOriginalSource'
-import {
-  Interceptor,
-  MaterializedPlugin,
-  PluginConfig,
-  generateInterceptor,
-  isPluginConfig,
-  moveRelativeDown,
-} from './generateInterceptor'
+import type { Interceptor, MaterializedPlugin, PluginConfig } from './generateInterceptor'
+import { generateInterceptor, isPluginConfig, moveRelativeDown } from './generateInterceptor'
 
 export type GenerateInterceptorsReturn = Record<string, MaterializedPlugin>
 
@@ -30,7 +24,7 @@ export async function generateInterceptors(
       const { error, resolved } = findOriginalSource(plug, result, resolve)
 
       if (error) {
-        console.log(error.message)
+        console.error(error.message)
         return acc
       }
 

package/src/interceptors/parseStructure.ts

@@ -1,9 +1,9 @@
-import { Module } from '@swc/core'
+import type { Module } from '@swc/core'
 import get from 'lodash/get'
 import { z } from 'zod'
-import { GraphCommerceConfig } from '../generated/config'
+import type { GraphCommerceConfig } from '../generated/config'
 import { extractExports } from './extractExports'
-import { PluginConfig } from './generateInterceptor'
+import type { PluginConfig } from './generateInterceptor'
 
 const pluginConfigParsed = z.object({
   type: z.enum(['component', 'function', 'replace']),
@@ -20,7 +20,7 @@ const isObject = (input: unknown): input is Record<string, unknown> =>
 
 export function parseStructure(ast: Module, gcConfig: GraphCommerceConfig, sourceModule: string) {
   const [exports, errors] = extractExports(ast)
-  if (errors.length) console.error(`Plugin error for`, errors.join('\n'))
+  if (errors.length) console.error('Plugin error for', errors.join('\n'))
 
   const {
     config: moduleConfig,

package/src/interceptors/swc.ts

@@ -1,4 +1,5 @@
-import { Output, Program, parseSync as parseSyncCore, printSync as printSyncCode } from '@swc/core'
+import type { Output, Program } from '@swc/core'
+import { parseSync as parseSyncCore, printSync as printSyncCode } from '@swc/core'
 
 export function parseSync(src: string) {
   return parseSyncCore(src, {

package/src/interceptors/writeInterceptors.ts

@@ -1,9 +1,9 @@
-import fs from 'node:fs/promises'
-import path from 'path'
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { sync as globSync } from 'glob'
+import fs from 'node:fs/promises'
+import path from 'path'
 import { resolveDependenciesSync } from '../utils/resolveDependenciesSync'
-import { GenerateInterceptorsReturn } from './generateInterceptors'
+import type { GenerateInterceptorsReturn } from './generateInterceptors'
 
 function checkFileExists(file: string) {
   return fs

package/src/utils/TopologicalSort.ts

@@ -23,14 +23,17 @@ export class TopologicalSort<KeyType, ValueType> {
     this.addMultipleInternalNodes(nodes)
   }
 
+  /** @public */
   addNode(key: KeyType, node: ValueType) {
     return this.addInternalNode(key, node)
   }
 
+  /** @public */
   addNodes(nodes: Map<KeyType, ValueType>) {
     this.addMultipleInternalNodes(nodes)
   }
 
+  /** @public */
   addEdge(fromKey: KeyType, toKey: KeyType) {
     assert(this.#nodes.has(fromKey), `Source package with ${fromKey} key should exist`)
     assert(this.#nodes.has(toKey), `Target package with ${toKey} key should exist`)
@@ -58,6 +61,7 @@ export class TopologicalSort<KeyType, ValueType> {
     sourceNode!.children.set(toKey, targetNode!)
   }
 
+  /** @public */
   sort(): Map<KeyType, INodeWithChildren<KeyType, ValueType>> {
     this.#visitedNodes = new Set()
     this.#sortedKeysStack = []

package/src/utils/isMonorepo.ts

@@ -1,8 +1,49 @@
+import fs from 'node:fs'
 import path from 'node:path'
 
-export function isMonorepo() {
-  const root = process.cwd()
-  const meshDir = path.dirname(require.resolve('@graphcommerce/graphql-mesh'))
-  const relativePath = path.join(path.relative(meshDir, root), '/')
-  return relativePath.startsWith(`..${path.sep}..${path.sep}examples`)
+const debug = process.env.DEBUG === '1'
+// eslint-disable-next-line no-console
+const log = (message: string) => debug && console.log(`isMonorepo: ${message}`)
+
+function findPackageJson(directory: string): { name: string } | null {
+  try {
+    const packageJsonPath = path.join(directory, 'package.json')
+    const content = fs.readFileSync(packageJsonPath, 'utf8')
+    return JSON.parse(content)
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Finds the path of the parent @graphcommerce package if it exists Returns null if no parent
+ * package is found
+ */
+export function findParentPath(directory: string): string | null {
+  let currentDir = directory
+  log(`Starting directory: ${currentDir}`)
+
+  // Start from the parent directory
+  currentDir = path.dirname(currentDir)
+  log(`Looking for parent packages starting from: ${currentDir}`)
+
+  // Keep going up until we find a root package or hit the filesystem root
+  while (currentDir !== path.parse(currentDir).root) {
+    const packageJson = findPackageJson(currentDir)
+
+    if (packageJson) {
+      log(`Found package.json in: ${currentDir}`)
+      log(`Package name: ${packageJson.name}`)
+
+      if (packageJson.name.startsWith('@graphcommerce/')) {
+        log(`Found parent @graphcommerce package at: ${currentDir}`)
+        return currentDir
+      }
+    }
+
+    currentDir = path.dirname(currentDir)
+  }
+
+  log('No parent @graphcommerce package found')
+  return null
 }

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,
   )
 }

package/src/utils/resolveDependenciesSync.ts

@@ -2,6 +2,7 @@ import fs from 'node:fs'
 import path from 'node:path'
 import type { PackageJson } from 'type-fest'
 import { PackagesSort } from './PackagesSort'
+import { g, sig } from './sig'
 
 type PackageNames = Map<string, string>
 type DependencyStructure = Record<string, { dirName: string; dependencies: string[] }>
@@ -18,13 +19,19 @@ function resolveRecursivePackageJson(
   const fileName = require.resolve(path.join(dependencyPath, 'package.json'))
   const packageJsonFile = fs.readFileSync(fileName, 'utf-8').toString()
   const packageJson = JSON.parse(packageJsonFile) as PackageJson
+  const e = [atob('QGdyYXBoY29tbWVyY2UvYWRvYmUtY29tbWVyY2U=')].filter((n) =>
+    !globalThis.gcl ? true : !globalThis.gcl.includes(n),
+  )
 
   if (!packageJson.name) throw Error(`Package ${packageJsonFile} does not have a name field`)
 
   // Previously processed
   if (dependencyStructure[packageJson.name]) return dependencyStructure
 
-  if (!isRoot && !packageJson.name.includes('graphcommerce')) return dependencyStructure
+  // To have additional namespaces be considered as a graphcommerce package, set PRIVATE_PACKAGE_NAMESPACES
+  const namespaces = process.env.PRIVATE_PACKAGE_NAMESPACES?.split(',') ?? ['graphcommerce']
+  if (!isRoot && !namespaces.some((namespace) => packageJson.name?.includes(namespace)))
+    return dependencyStructure
 
   const dependencies = [
     ...new Set(
@@ -33,7 +40,11 @@ function resolveRecursivePackageJson(
         ...Object.keys(packageJson.devDependencies ?? []),
         ...additionalDependencies,
         ...Object.keys(packageJson.peerDependencies ?? {}),
-      ].filter((name) => name.includes('graphcommerce')),
+      ].filter((name) =>
+        name.includes('graphcommerce')
+          ? !(e.length >= 0 && e.some((v) => name.startsWith(v)))
+          : false,
+      ),
     ),
   ]
 
@@ -79,6 +90,7 @@ export function sortDependencies(dependencyStructure: DependencyStructure): Pack
 export function resolveDependenciesSync(root = process.cwd()) {
   const cached = resolveCache.get(root)
   if (cached) return cached
+  sig()
 
   const dependencyStructure = resolveRecursivePackageJson(
     root,