@graphcommerce/next-config 8.1.0-canary.9 → 9.0.0-canary.100

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
@@ -78,7 +93,7 @@ export function findOriginalSource(
   if (!resolved?.source)
     return {
       resolved: undefined,
-      error: new Error(`Could not resolve ${plug.targetModule}`),
+      error: new Error(`Plugin: Can not find module ${plug.targetModule} for ${plug.sourceModule}`),
     }
 
   // const cacheKey = `${plug.targetModule}#${plug.targetExport}`
@@ -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/generateInterceptor.ts

@@ -14,7 +14,7 @@ type PluginBaseConfig = {
   sourceModule: string
   targetExport: string
   enabled: boolean
-  ifConfig?: string | [string, string]
+  ifConfig?: string | [string, any]
 }
 
 export function isPluginBaseConfig(plugin: Partial<PluginBaseConfig>): plugin is PluginBaseConfig {
@@ -74,7 +74,7 @@ const sourceSuffix = 'Plugin'
 const interceptorSuffix = 'Interceptor'
 const disabledSuffix = 'Disabled'
 const name = (plugin: PluginConfig) =>
-  `${plugin.sourceModule
+  `${plugin.sourceExport}${plugin.sourceModule
     .split('/')
     [plugin.sourceModule.split('/').length - 1].replace(/[^a-zA-Z0-9]/g, '')}`
 
@@ -180,9 +180,7 @@ export async function generateInterceptor(
               s.replace(originalSuffix, disabledSuffix),
             ).visitModule(ast)
 
-            carryProps.push(interceptorPropsName(name(p)))
-
-            result = `type ${interceptorPropsName(name(p))} = React.ComponentProps<typeof ${sourceName(name(p))}>`
+            carryProps.push(`React.ComponentProps<typeof ${sourceName(name(p))}>`)
 
             pluginSee.push(
               `@see {${sourceName(name(p))}} for replacement of the original source (original source not used)`,
@@ -225,7 +223,7 @@ 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}.`)
       }

package/src/interceptors/parseStructure.ts

@@ -9,7 +9,7 @@ const pluginConfigParsed = z.object({
   type: z.enum(['component', 'function', 'replace']),
   module: z.string(),
   export: z.string(),
-  ifConfig: z.union([z.string(), z.tuple([z.string(), z.string()])]).optional(),
+  ifConfig: z.union([z.string(), z.tuple([z.string(), z.unknown()])]).optional(),
 })
 
 function nonNullable<T>(value: T): value is NonNullable<T> {
@@ -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)
@@ -60,10 +62,17 @@ export function parseStructure(ast: Module, gcConfig: GraphCommerceConfig, sourc
       }
 
       let enabled = true
+
       if (parsed.data.ifConfig) {
-        enabled = Array.isArray(parsed.data.ifConfig)
-          ? get(gcConfig, parsed.data.ifConfig[0]) === parsed.data.ifConfig[1]
-          : Boolean(get(gcConfig, parsed.data.ifConfig))
+        if (Array.isArray(parsed.data.ifConfig)) {
+          const isBoolean = typeof parsed.data.ifConfig[1] === 'boolean'
+          let confValue = get(gcConfig, parsed.data.ifConfig[0])
+          confValue = isBoolean ? Boolean(confValue) : confValue
+
+          enabled = confValue === parsed.data.ifConfig[1]
+        } else {
+          enabled = Boolean(get(gcConfig, parsed.data.ifConfig))
+        }
       }
 
       const val: PluginConfig = {
@@ -79,4 +88,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

@@ -32,7 +32,7 @@ function resolveRecursivePackageJson(
         ...Object.keys(packageJson.dependencies ?? []),
         ...Object.keys(packageJson.devDependencies ?? []),
         ...additionalDependencies,
-        // ...Object.keys(packageJson.peerDependencies ?? {}),
+        ...Object.keys(packageJson.peerDependencies ?? {}),
       ].filter((name) => name.includes('graphcommerce')),
     ),
   ]

package/src/withGraphCommerce.ts

@@ -1,4 +1,4 @@
-import CircularDependencyPlugin from 'circular-dependency-plugin'
+// import CircularDependencyPlugin from 'circular-dependency-plugin'
 import { DuplicatesPlugin } from 'inspectpack/plugin'
 import type { NextConfig } from 'next'
 import { DomainLocale } from 'next/dist/server/config'
@@ -112,8 +112,19 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string): NextConf
     },
     transpilePackages,
     webpack: (config: Configuration, options) => {
-      // Allow importing yml/yaml files for graphql-mesh
-      config.module?.rules?.push({ test: /\.ya?ml$/, use: 'js-yaml-loader' })
+      if (!config.module) config.module = { rules: [] }
+
+      config.module = {
+        ...config.module,
+        rules: [
+          ...(config.module.rules ?? []),
+          // Allow importing yml/yaml files for graphql-mesh
+          { test: /\.ya?ml$/, use: 'js-yaml-loader' },
+          // @lingui .po file support
+          { test: /\.po/, use: '@lingui/loader' },
+        ],
+        exprContextCritical: false,
+      }
 
       if (!config.plugins) config.plugins = []
 
@@ -124,13 +135,13 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string): NextConf
       config.plugins.push(new DefinePlugin({ 'globalThis.__DEV__': options.dev }))
 
       if (!options.isServer) {
-        if (graphcommerceConfig.debug?.webpackCircularDependencyPlugin) {
-          config.plugins.push(
-            new CircularDependencyPlugin({
-              exclude: /readable-stream|duplexer2|node_modules\/next/,
-            }),
-          )
-        }
+        // if (graphcommerceConfig.debug?.webpackCircularDependencyPlugin) {
+        //   config.plugins.push(
+        //     new CircularDependencyPlugin({
+        //       exclude: /readable-stream|duplexer2|node_modules\/next/,
+        //     }),
+        //   )
+        // }
         if (graphcommerceConfig.debug?.webpackDuplicatesPlugin) {
           config.plugins.push(
             new DuplicatesPlugin({
@@ -148,9 +159,6 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string): NextConf
         }
       }
 
-      // @lingui .po file support
-      config.module?.rules?.push({ test: /\.po/, use: '@lingui/loader' })
-
       config.snapshot = {
         ...(config.snapshot ?? {}),
         managedPaths: [