@graphcommerce/next-config 9.0.0-canary.100 → 9.0.0-canary.103

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.100",
+  "version": "9.0.0-canary.103",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -13,27 +13,29 @@
   },
   "dependencies": {
     "@graphql-mesh/cli": "latest",
-    "@lingui/loader": "4.11.2",
+    "@lingui/loader": "4.11.4",
+    "@lingui/macro": "4.11.4",
+    "@lingui/react": "4.11.4",
     "@lingui/swc-plugin": "4.0.8",
-    "@swc/core": "1.6.13",
-    "@swc/wasm-web": "^1.6.7",
+    "@swc/core": "1.7.26",
+    "@swc/wasm-web": "^1.7.28",
+    "@types/circular-dependency-plugin": "^5.0.8",
+    "@types/lodash": "^4.17.10",
+    "babel-plugin-macros": "^3.1.0",
     "circular-dependency-plugin": "^5.2.2",
     "glob": "^10.4.5",
+    "graphql": "^16",
     "inspectpack": "^4.7.1",
     "js-yaml-loader": "^1.2.2",
     "lodash": "^4.17.21",
+    "react": "^18.3.1",
+    "typescript": "5.6.2",
+    "webpack": "~5.93.0",
     "znv": "^0.4.0",
     "zod": "^3.23.8"
   },
-  "devDependencies": {
-    "@types/circular-dependency-plugin": "^5.0.8",
-    "@types/lodash": "^4.17.7",
-    "typescript": "5.5.3"
-  },
   "peerDependencies": {
-    "@lingui/macro": "^4.2.1",
-    "graphql": "^16",
-    "next": "*",
-    "webpack": "~5.92.1"
+    "dotenv": "^16",
+    "next": "*"
   }
 }

package/src/config/commands/exportConfig.ts

@@ -1,6 +1,6 @@
+import dotenv from 'dotenv'
 import { loadConfig } from '../loadConfig'
 import { exportConfigToEnv } from '../utils/exportConfigToEnv'
-import dotenv from 'dotenv'
 
 dotenv.config()
 

package/src/config/demoConfig.ts

@@ -1,6 +1,6 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { PartialDeep } from 'type-fest'
-import { GraphCommerceConfig } from '../generated/config'
+import type { PartialDeep } from 'type-fest'
+import type { GraphCommerceConfig } from '../generated/config'
 
 export const demoConfig: PartialDeep<GraphCommerceConfig, { recurseIntoArrays: true }> &
   Record<string, unknown> = {

package/src/config/index.ts

@@ -1,5 +1,5 @@
 import type { Path, PathValue } from 'react-hook-form'
-import { GraphCommerceConfig } from '../generated/config'
+import type { GraphCommerceConfig } from '../generated/config'
 
 export * from './commands/generateConfig'
 export * from './commands/exportConfig'

package/src/config/utils/exportConfigToEnv.ts

@@ -1,4 +1,4 @@
-import { GraphCommerceConfig } from '../../generated/config'
+import type { GraphCommerceConfig } from '../../generated/config'
 import { toEnvStr } from './mergeEnvIntoConfig'
 
 const fmt = (value: string | number | boolean | object | null) => {

package/src/config/utils/mergeEnvIntoConfig.ts

@@ -3,6 +3,7 @@ import { mergeDeep, cloneDeep } from '@apollo/client/utilities'
 import chalk from 'chalk'
 import { get, set } from 'lodash'
 import snakeCase from 'lodash/snakeCase'
+import type { ZodRawShape, ZodTypeAny, ZodAny } from 'zod'
 import {
   z,
   ZodObject,
@@ -13,10 +14,7 @@ import {
   ZodNullable,
   ZodOptional,
   ZodEffects,
-  ZodRawShape,
   ZodEnum,
-  ZodTypeAny,
-  ZodAny,
   ZodDefault,
 } from 'zod'
 import diff from './diff'
@@ -69,7 +67,7 @@ export function configToEnvSchema(schema: ZodNode) {
         envSchema[toEnvStr(path)] = z
           .string()
           .optional()
-          .refine(isJSON, { message: `Invalid JSON` })
+          .refine(isJSON, { message: 'Invalid JSON' })
           .transform((val) => (val ? JSON.parse(val) : val))
         envToDot[toEnvStr(path)] = dotNotation(path)
       }
@@ -89,7 +87,7 @@ export function configToEnvSchema(schema: ZodNode) {
         envSchema[toEnvStr(path)] = z
           .string()
           .optional()
-          .refine(isJSON, { message: `Invalid JSON` })
+          .refine(isJSON, { message: 'Invalid JSON' })
           .transform((val) => (val ? JSON.parse(val) : val))
         envToDot[toEnvStr(path)] = dotNotation(path)
       }
@@ -232,11 +230,11 @@ export function formatAppliedEnv(applyResult: ApplyResult) {
     return ` ${chalk.yellowBright('~')} ${baseLog}: ${fromFmt} => ${toFmt}`
   })
 
-  let header = chalk.blueBright(`info`)
-  if (hasWarning) header = chalk.yellowBright(`warning`)
-  if (hasError) header = chalk.yellowBright(`error`)
+  let header = chalk.blueBright('info')
+  if (hasWarning) header = chalk.yellowBright('warning')
+  if (hasError) header = chalk.yellowBright('error')
 
-  header += `   - Loaded GraphCommerce env variables`
+  header += '   - Loaded GraphCommerce env variables'
 
   return [header, ...lines].join('\n')
 }

package/src/config/utils/replaceConfigInString.ts

@@ -1,4 +1,4 @@
-import { GraphCommerceConfig } from '../../generated/config'
+import type { GraphCommerceConfig } from '../../generated/config'
 import { configToImportMeta } from './configToImportMeta'
 
 export function replaceConfigInString(str: string, config: Partial<GraphCommerceConfig>) {

package/src/config/utils/rewriteLegacyEnv.ts

@@ -1,6 +1,7 @@
 import cloneDeep from 'lodash/cloneDeep'
-import { GraphCommerceConfig } from '../../generated/config'
-import { ApplyResult, mergeEnvIntoConfig, ZodNode } from './mergeEnvIntoConfig'
+import type { GraphCommerceConfig } from '../../generated/config'
+import type { ApplyResult, ZodNode } from './mergeEnvIntoConfig'
+import { mergeEnvIntoConfig } from './mergeEnvIntoConfig'
 
 export function rewriteLegacyEnv(
   schema: ZodNode,
@@ -24,7 +25,7 @@ export function rewriteLegacyEnv(
   function notUsed() {
     return (envVar: string, envValue: string) => {
       applied.push({
-        warning: [`should be removed`],
+        warning: ['should be removed'],
         envVar,
         envValue,
       })
@@ -38,7 +39,7 @@ export function rewriteLegacyEnv(
     IMAGE_DOMAINS: (envVar: string, envValue: string) => {
       applied.push({
         warning: [
-          `should be removed: will automatically add the Magento/Hygraph URL. For more advanced configurations, see: https://nextjs.org/docs/api-reference/next/image#configuration-options`,
+          'should be removed: will automatically add the Magento/Hygraph URL. For more advanced configurations, see: https://nextjs.org/docs/api-reference/next/image#configuration-options',
         ],
         envVar,
         envValue,

package/src/generated/config.ts

@@ -369,6 +369,7 @@ export type GraphCommerceDebugConfig = {
   webpackDuplicatesPlugin?: InputMaybe<Scalars['Boolean']['input']>;
 };
 
+/** Permissions input */
 export type GraphCommercePermissions = {
   /** Changes the availability of the add to cart buttons and the cart page to either customer only or completely disables it. */
   cart?: InputMaybe<CartPermissions>;
@@ -376,6 +377,7 @@ export type GraphCommercePermissions = {
   checkout?: InputMaybe<CartPermissions>;
   /** Enables / disabled the account section of the website. DISABLE_REGISTRATION will only disable the registration page. */
   customerAccount?: InputMaybe<CustomerAccountPermissions>;
+  /** Allows the option to require login or completely disable the site. */
   website?: InputMaybe<WebsitePermissions>;
 };
 

package/src/index.ts

@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type React from 'react'
 import type { Path, PathValue } from 'react-hook-form'
-import { GraphCommerceConfig } from './generated/config'
+import type { GraphCommerceConfig } from './generated/config'
+
 export * from './utils/isMonorepo'
 export * from './utils/resolveDependenciesSync'
 export * from './utils/packageRoots'

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)
 
@@ -86,7 +88,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

@@ -11,7 +11,7 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable consistent-return */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import {
+import type {
   Accessibility,
   Argument,
   ArrayExpression,
@@ -782,7 +782,6 @@ export class Visitor {
   }
 
   visitTsPropertySignature(n: TsPropertySignature): TsPropertySignature {
-    n.params = this.visitTsFnParameters(n.params)
     n.typeAnnotation = this.visitTsTypeAnnotation(n.typeAnnotation)
     return n
   }

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,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-continue */
 /* eslint-disable max-classes-per-file */
 import type {

package/src/interceptors/findOriginalSource.ts

@@ -1,8 +1,8 @@
 import path from 'path'
-import { ResolveDependency, ResolveDependencyReturn } from '../utils/resolveDependency'
-import { PluginConfig } from './generateInterceptor'
+import type { ExportAllDeclaration } from '@swc/core'
+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,6 +14,7 @@ type PluginBaseConfig = {
   sourceModule: string
   targetExport: string
   enabled: boolean
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ifConfig?: string | [string, any]
 }
 
@@ -70,7 +71,6 @@ 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 = 'Plugin'
 const interceptorSuffix = 'Interceptor'
 const disabledSuffix = 'Disabled'
 const name = (plugin: PluginConfig) =>
@@ -193,7 +193,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 +202,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 +270,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 +287,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'
+import path from 'node:path'
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { GraphCommerceDebugConfig } from '../generated/config'
-import { ResolveDependency } from '../utils/resolveDependency'
+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

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

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

@@ -24,7 +24,10 @@ function resolveRecursivePackageJson(
   // 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(

package/src/withGraphCommerce.ts

@@ -1,11 +1,12 @@
 // import CircularDependencyPlugin from 'circular-dependency-plugin'
 import { DuplicatesPlugin } from 'inspectpack/plugin'
 import type { NextConfig } from 'next'
-import { DomainLocale } from 'next/dist/server/config'
-import { DefinePlugin, Configuration } from 'webpack'
+import type { DomainLocale } from 'next/dist/server/config'
+import type { Configuration } from 'webpack'
+import { DefinePlugin } from 'webpack'
 import { loadConfig } from './config/loadConfig'
 import { configToImportMeta } from './config/utils/configToImportMeta'
-import { GraphCommerceConfig } from './generated/config'
+import type { GraphCommerceConfig } from './generated/config'
 import { InterceptorPlugin } from './interceptors/InterceptorPlugin'
 import { resolveDependenciesSync } from './utils/resolveDependenciesSync'