@graphcommerce/next-config 7.0.0-canary.21 → 7.0.0

package/src/utils/packageRoots.ts

@@ -0,0 +1,35 @@
+type PathCount = { path: string; count: number }
+
+export const packageRoots = (packagePaths: string[]): string[] => {
+  const pathMap: { [key: string]: PathCount } = {}
+
+  // Iterate over each path in the array
+  packagePaths.forEach((singlePath) => {
+    const parts = singlePath.split('/')
+
+    // Iterate through each part of the path
+    for (let i = 1; i < parts.length; i++) {
+      const subPath = parts.slice(0, i + 1).join('/')
+
+      // Increment the count of this subPath
+      if (pathMap[subPath]) {
+        pathMap[subPath].count += 1
+      } else {
+        pathMap[subPath] = { path: subPath, count: 1 }
+      }
+    }
+  })
+
+  // Filter the paths that appear more than once
+  const roots: string[] = []
+  Object.values(pathMap).forEach(({ path, count }) => {
+    if (count > 1) {
+      roots.push(path)
+    }
+  })
+
+  // 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,
+  )
+}

package/src/withGraphCommerce.ts

@@ -2,7 +2,6 @@ import CircularDependencyPlugin from 'circular-dependency-plugin'
 import { DuplicatesPlugin } from 'inspectpack/plugin'
 import type { NextConfig } from 'next'
 import { DomainLocale } from 'next/dist/server/config'
-import { RemotePattern } from 'next/dist/shared/lib/image-config'
 import { DefinePlugin, Configuration } from 'webpack'
 import { loadConfig } from './config/loadConfig'
 import { configToImportMeta } from './config/utils/configToImportMeta'
@@ -18,10 +17,10 @@ function domains(config: GraphCommerceConfig): DomainLocale[] {
       if (!loc.domain) return acc
 
       acc[loc.domain] = {
-        defaultLocale: loc.defaultLocale ? loc.locale : acc[loc.domain]?.defaultLocale,
+        defaultLocale: loc.locale,
         locales: [...(acc[loc.domain]?.locales ?? []), loc.locale],
         domain: loc.domain,
-        http: true,
+        http: process.env.NODE_ENV === 'development' || undefined,
       } as DomainLocale
 
       return acc
@@ -29,15 +28,6 @@ function domains(config: GraphCommerceConfig): DomainLocale[] {
   )
 }
 
-function remotePatterns(url: string): RemotePattern {
-  const urlObj = new URL(url)
-  return {
-    hostname: urlObj.hostname,
-    protocol: urlObj.protocol as RemotePattern['protocol'],
-    port: urlObj.port,
-  }
-}
-
 /**
  * GraphCommerce configuration: .
  *
@@ -61,10 +51,12 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string): NextConf
   return {
     ...nextConfig,
     experimental: {
-      enableUndici: true,
       ...nextConfig.experimental,
+      scrollRestoration: true,
+      swcPlugins: [...(nextConfig.experimental?.swcPlugins ?? []), ['@lingui/swc-plugin', {}]],
     },
     i18n: {
+      ...nextConfig.i18n,
       defaultLocale:
         storefront.find((locale) => locale.defaultLocale)?.locale ?? storefront[0].locale,
       locales: storefront.map((locale) => locale.locale),
@@ -91,6 +83,7 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string): NextConf
             { source: '/product/downloadable/:url*', destination, permanent: true },
             { source: '/product/grouped/:url*', destination, permanent: true },
             { source: '/product/virtual/:url*', destination, permanent: true },
+            { source: '/customer/account', destination: '/account', permanent: true },
           ],
         )