@graphcommerce/next-config 8.1.0-canary.8 → 9.0.0-canary.54

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/generateInterceptor.ts

@@ -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

@@ -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/withGraphCommerce.ts

@@ -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 = []
 
@@ -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: [