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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 9.0.0-canary.105
+
+## 9.0.0-canary.104
+
+### Patch Changes
+
+- [#2423](https://github.com/graphcommerce-org/graphcommerce/pull/2423) [`dbf233b`](https://github.com/graphcommerce-org/graphcommerce/commit/dbf233bb6d11432a8effc38fd4672aaa0856e1aa) - Added graphql.config.ts to projects ([@paales](https://github.com/paales))
+
 ## 9.0.0-canary.103
 
 ### Patch Changes

package/__tests__/interceptors/generateInterceptors.ts

@@ -1,6 +1,6 @@
 import type { GraphCommerceConfig } from '../../src/generated/config'
 import { findOriginalSource } from '../../src/interceptors/findOriginalSource'
-import { SOURCE_START, SOURCE_END } from '../../src/interceptors/generateInterceptor'
+import { SOURCE_END, SOURCE_START } from '../../src/interceptors/generateInterceptor'
 import { generateInterceptors } from '../../src/interceptors/generateInterceptors'
 import { parseStructure } from '../../src/interceptors/parseStructure'
 import { parseSync } from '../../src/interceptors/swc'
@@ -121,14 +121,12 @@ it("resolves a 'root plugin' to be relative to the interceptor", async () => {
   expect(Object.keys(interceptors)[0]).toMatchInlineSnapshot(
     '"packages/magento-cart-payment-method/PaymentMethodContext/PaymentMethodContext"',
   )
-  expectImport(
+  expect(
     interceptors['packages/magento-cart-payment-method/PaymentMethodContext/PaymentMethodContext']
       ?.template,
-  ).toMatchInlineSnapshot(`
-    "import type { DistributedOmit as OmitPrev } from 'type-fest'
-
-    import { Plugin as PluginAddPaymentMethodEnhancer } from '../../../plugins/AddPaymentMethodEnhancer'"
-  `)
+  ).toContain(
+    "import { Plugin as PluginAddPaymentMethodEnhancer } from '../../../plugins/AddPaymentMethodEnhancer'",
+  )
 })
 
 it('it can apply multiple plugins to a single export', async () => {
@@ -157,13 +155,12 @@ it('it can apply multiple plugins to a single export', async () => {
   const result =
     interceptors['packages/magento-cart-payment-method/PaymentMethodContext/PaymentMethodContext']
       ?.template
-  expectImport(result).toMatchInlineSnapshot(`
-    "import type { DistributedOmit as OmitPrev } from 'type-fest'
-
-    import { Plugin as PluginAddAdyenMethods } from '@graphcommerce/magento-payment-adyen/plugins/AddAdyenMethods'
-    import { Plugin as PluginAddMollieMethods } from '@graphcommerce/mollie-magento-payment/plugins/AddMollieMethods'"
-  `)
-
+  expect(result).toContain(
+    "import { Plugin as PluginAddAdyenMethods } from '@graphcommerce/magento-payment-adyen/plugins/AddAdyenMethods'",
+  )
+  expect(result).toContain(
+    "import { Plugin as PluginAddMollieMethods } from '@graphcommerce/mollie-magento-payment/plugins/AddMollieMethods'",
+  )
   expectOriginal(result).toContain('PaymentMethodContextProviderOriginal')
 
   expectInterceptor(result).toMatchInlineSnapshot(`
@@ -351,12 +348,15 @@ it('generates method interceptors alognside component interceptors', async () =>
     resolve,
   )
 
-  expect(Object.keys(interceptors)).toMatchInlineSnapshot(`
+  expect(Object.keys(interceptors)).toMatchInlineSnapshot(
+    `
     [
       "packages/graphql/components/GraphQLProvider/GraphQLProvider",
       "packages/graphql/config",
     ]
-  `)
+  `,
+  )
+
   expect(
     interceptors['packages/graphql/components/GraphQLProvider/GraphQLProvider']?.template,
   ).toContain('MagentoGraphqlGraphqlProvider')
@@ -403,10 +403,11 @@ it('adds debug logging to interceptors for components', async () => {
   `)
 
   expectOriginal(interceptors['packages/graphql/config']?.template).toMatchInlineSnapshot(`
-    "import type { ApolloLink, TypePolicies } from '@apollo/client'
-    import type { GraphCommerceStorefrontConfig } from '@graphcommerce/next-config'
+    "import type { GraphCommerceStorefrontConfig } from '@graphcommerce/next-config'
+    import type { ApolloLink, TypePolicies } from '@apollo/client'
     import type { SetRequired } from 'type-fest'
     import type { MigrateCache } from './components/GraphQLProvider/migrateCache'
+
     export interface PreviewData {}
     export type PreviewConfig = {
       preview?: boolean
@@ -433,7 +434,6 @@ it('adds debug logging to interceptors for components', async () => {
       }
     }"
   `)
-
   expectInterceptor(interceptors['packages/graphql/config']?.template).toMatchInlineSnapshot(`
     "const logged: Set<string> = new Set()
     const logOnce = (log: string, ...additional: unknown[]) => {
@@ -535,8 +535,8 @@ it('Should apply overrides to the correct file', async () => {
   const result =
     interceptors['packages/magento-product/components/ProductStaticPaths/getProductStaticPaths']
       ?.template
-  expectImport(result).toMatchInlineSnapshot(
-    '"import { getProductStaticPaths as getProductStaticPathsreplaceGetProductStaticPaths } from \'../../../../plugins/replaceGetProductStaticPaths\'"',
+  expect(result).toContain(
+    "import { getProductStaticPaths as getProductStaticPathsreplaceGetProductStaticPaths } from '../../../../plugins/replaceGetProductStaticPaths'",
   )
 
   expectOriginal(result).toContain('getProductStaticPathsDisabled')
@@ -547,7 +547,7 @@ it('correctly reports an error for an incorrect export', async () => {
     googleRecaptchaKey: '123',
     googleAnalyticsId: '123',
     demoMode: true,
-  } as GraphCommerceConfig
+  } as unknown as GraphCommerceConfig
 
   const src = `
 import { getSitemapPaths as getSitemapPathsType } from '@graphcommerce/magento-product'
@@ -566,8 +566,7 @@ export const plugin: FunctionPlugin<typeof getSitemapPathsType> = (prev, ...args
   console.error = jest.fn()
   const plugins = parseStructure(parseSync(src), fakeconfig, './plugins/MyPlugin.tsx')
 
-  // @ts-expect-error mock not typed
-  expect(console.error.mock.calls[0][0]).toMatchInlineSnapshot(
+  expect((console.error as jest.Mock).mock.calls[0][0]).toMatchInlineSnapshot(
     '"Plugin configuration invalid! See ./plugins/MyPlugin.tsx"',
   )
 
@@ -616,7 +615,7 @@ export const Plugin = ConfigurableProductPageName
     demoMode: true,
     configurableVariantForSimple: true,
     configurableVariantValues: { content: true, gallery: true, url: true },
-  } as GraphCommerceConfig
+  } as unknown as GraphCommerceConfig
 
   const firstFile = parseStructure(parseSync(src1), config, './plugins/MyPlugin')
 
@@ -627,8 +626,8 @@ export const Plugin = ConfigurableProductPageName
   )
 
   const plugins = [...firstFile, ...secondFile]
-
-  expect(plugins).toMatchInlineSnapshot(`
+  expect(plugins).toMatchInlineSnapshot(
+    `
     [
       {
         "enabled": true,
@@ -649,8 +648,8 @@ export const Plugin = ConfigurableProductPageName
         "type": "component",
       },
     ]
-  `)
-
+  `,
+  )
   const interceptors = await generateInterceptors(plugins, resolveDependency(projectRoot))
 
   expect(Object.keys(interceptors)[0]).toMatchInlineSnapshot(
@@ -661,14 +660,14 @@ export const Plugin = ConfigurableProductPageName
     interceptors['packages/magento-product/components/ProductPageName/ProductPageName']?.template
 
   expectImport(result).toMatchInlineSnapshot(`
-    "import type { DistributedOmit as OmitPrev } from 'type-fest'
-
-    import { Plugin as PluginConfigurableProductPageName } from '@graphcommerce/magento-product-configurable/plugins/ConfigurableProductPage/ConfigurableProductPageName'
+    "import { Plugin as PluginConfigurableProductPageName } from '@graphcommerce/magento-product-configurable/plugins/ConfigurableProductPage/ConfigurableProductPageName'
+    import type { DistributedOmit as OmitPrev } from 'type-fest'
     import { ProductPageName as ProductPageNameMyPlugin } from '../../../../plugins/MyPlugin'"
   `)
 
   expectOriginal(result).toMatchInlineSnapshot(`
     "import type { ProductPageNameFragment } from './ProductPageName.gql'
+
     export type ProductPageNameProps = {
       product: ProductPageNameFragment
     }
@@ -737,12 +736,11 @@ it('Can correctly find exports that are default exports', async () => {
     export const iconChevronLeft = accessibilityHuman
     export const iconChevronRight = alarm
   `
-
   const config = {
     demoMode: true,
     configurableVariantForSimple: true,
     configurableVariantValues: { content: true, gallery: true, url: true },
-  } as GraphCommerceConfig
+  } as unknown as GraphCommerceConfig
 
   const plugins = parseStructure(parseSync(pluginSource), config, './plugins/MyProjectIcon')
 
@@ -752,8 +750,10 @@ it('Can correctly find exports that are default exports', async () => {
   const result = interceptors['packages/next-ui/icons']?.template
 
   expectImport(result).toMatchInlineSnapshot(`
-    "import { iconChevronLeft as iconChevronLeftMyProjectIcon } from '../../plugins/MyProjectIcon'
-    import { iconChevronRight as iconChevronRightMyProjectIcon } from '../../plugins/MyProjectIcon'"
+    "import {
+      iconChevronLeft as iconChevronLeftMyProjectIcon,
+      iconChevronRight as iconChevronRightMyProjectIcon,
+    } from '../../plugins/MyProjectIcon'"
   `)
 
   expectOriginal(result).toContain('iconChevronLeftDisabled')

package/dist/config/commands/generateConfig.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateConfig = generateConfig;
-const fs_1 = require("fs");
 // eslint-disable-next-line import/no-extraneous-dependencies
 const cli_1 = require("@graphql-codegen/cli");
 const core_1 = require("@swc/core");
 const dotenv_1 = __importDefault(require("dotenv"));
+const fs_1 = require("fs");
 const isMonorepo_1 = require("../../utils/isMonorepo");
 const resolveDependenciesSync_1 = require("../../utils/resolveDependenciesSync");
 const resolveDependency_1 = require("../../utils/resolveDependency");

package/dist/interceptors/Visitor.js

@@ -1,12 +1,9 @@
 "use strict";
-/**
- * This is an implementation of
- * https://github.com/swc-project/swc/blob/main/node-swc/src/Visitor.ts
- *
- * The JS API is deprecated, but there doesn't seem to be a valid alternative at this point.
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Visitor = void 0;
+/* 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.
  */
@@ -594,7 +591,7 @@ class Visitor {
         return n;
     }
     visitTsFnParameters(params) {
-        return params?.map(this.visitTsFnParameter.bind(this));
+        return params.map(this.visitTsFnParameter.bind(this));
     }
     visitTsFnParameter(n) {
         n.typeAnnotation = this.visitTsTypeAnnotation(n.typeAnnotation);

package/dist/interceptors/extractExports.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-explicit-any */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RUNTIME_VALUE = exports.UnsupportedValueError = exports.NoSuchDeclarationError = void 0;
 exports.extractExports = extractExports;

package/dist/interceptors/generateInterceptors.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateInterceptors = generateInterceptors;
+// eslint-disable-next-line import/no-extraneous-dependencies
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const findOriginalSource_1 = require("./findOriginalSource");

package/dist/interceptors/writeInterceptors.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeInterceptors = writeInterceptors;
-const promises_1 = __importDefault(require("node:fs/promises"));
-const path_1 = __importDefault(require("path"));
 // eslint-disable-next-line import/no-extraneous-dependencies
 const glob_1 = require("glob");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const path_1 = __importDefault(require("path"));
 const resolveDependenciesSync_1 = require("../utils/resolveDependenciesSync");
 function checkFileExists(file) {
     return promises_1.default

package/dist/withGraphCommerce.js

@@ -58,6 +58,7 @@ function withGraphCommerce(nextConfig, cwd) {
             remotePatterns: [
                 { hostname: new URL(graphcommerceConfig.magentoEndpoint).hostname },
                 { hostname: 'media.graphassets.com' },
+                { hostname: '*.graphcommerce.org' },
                 ...(nextConfig.images?.remotePatterns ?? []),
             ],
         },

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.103",
+  "version": "9.0.0-canary.105",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -30,7 +30,7 @@
     "lodash": "^4.17.21",
     "react": "^18.3.1",
     "typescript": "5.6.2",
-    "webpack": "~5.93.0",
+    "webpack": "^5.96.1",
     "znv": "^0.4.0",
     "zod": "^3.23.8"
   },

package/src/config/commands/generateConfig.ts

@@ -1,8 +1,8 @@
-import { writeFileSync } from 'fs'
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { generate } from '@graphql-codegen/cli'
 import { transformFileSync } from '@swc/core'
 import dotenv from 'dotenv'
+import { writeFileSync } from 'fs'
 import { isMonorepo } from '../../utils/isMonorepo'
 import { resolveDependenciesSync } from '../../utils/resolveDependenciesSync'
 import { resolveDependency } from '../../utils/resolveDependency'

package/src/config/demoConfig.ts

@@ -1,9 +1,9 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import type { PartialDeep } from 'type-fest'
-import type { GraphCommerceConfig } from '../generated/config'
+import type { GraphCommerceConfig, GraphCommerceStorefrontConfig } from '../generated/config'
 
 export const demoConfig: PartialDeep<GraphCommerceConfig, { recurseIntoArrays: true }> &
-  Record<string, unknown> = {
+  Record<string, unknown> & { storefront: PartialDeep<GraphCommerceStorefrontConfig>[] } = {
   canonicalBaseUrl: 'https://graphcommerce.vercel.app',
   hygraphEndpoint: 'https://eu-central-1.cdn.hygraph.com/content/ckhx7xadya6xs01yxdujt8i80/master',
   magentoEndpoint: 'https://backend.reachdigital.dev/graphql',

package/src/config/utils/mergeEnvIntoConfig.ts

@@ -1,21 +1,21 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { mergeDeep, cloneDeep } from '@apollo/client/utilities'
+import { cloneDeep, mergeDeep } 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 type { ZodAny, ZodRawShape, ZodTypeAny } from 'zod'
 import {
-  z,
-  ZodObject,
-  ZodBoolean,
   ZodArray,
-  ZodString,
-  ZodNumber,
-  ZodNullable,
-  ZodOptional,
+  ZodBoolean,
+  ZodDefault,
   ZodEffects,
   ZodEnum,
-  ZodDefault,
+  ZodNullable,
+  ZodNumber,
+  ZodObject,
+  ZodOptional,
+  ZodString,
+  z,
 } from 'zod'
 import diff from './diff'
 

package/src/interceptors/Visitor.ts

@@ -1,16 +1,9 @@
 /**
  * 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 type {
   Accessibility,
   Argument,
@@ -188,6 +181,10 @@ import type {
   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.
  */
@@ -872,7 +869,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 {

package/src/interceptors/extractExports.ts

@@ -1,5 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+
 /* eslint-disable no-continue */
+
 /* eslint-disable max-classes-per-file */
 import type {
   ArrayExpression,

package/src/interceptors/findOriginalSource.ts

@@ -1,5 +1,5 @@
-import path from 'path'
 import type { ExportAllDeclaration } from '@swc/core'
+import path from 'path'
 import type { ResolveDependency, ResolveDependencyReturn } from '../utils/resolveDependency'
 import type { PluginConfig } from './generateInterceptor'
 import { parseSync } from './swc'

package/src/interceptors/generateInterceptors.ts

@@ -1,6 +1,6 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
 import fs from 'node:fs/promises'
 import path from 'node:path'
-// eslint-disable-next-line import/no-extraneous-dependencies
 import type { GraphCommerceDebugConfig } from '../generated/config'
 import type { ResolveDependency } from '../utils/resolveDependency'
 import { findOriginalSource } from './findOriginalSource'

package/src/interceptors/writeInterceptors.ts

@@ -1,7 +1,7 @@
-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 type { GenerateInterceptorsReturn } from './generateInterceptors'
 

package/src/withGraphCommerce.ts

@@ -72,6 +72,7 @@ export function withGraphCommerce(nextConfig: NextConfig, cwd: string): NextConf
       remotePatterns: [
         { hostname: new URL(graphcommerceConfig.magentoEndpoint).hostname },
         { hostname: 'media.graphassets.com' },
+        { hostname: '*.graphcommerce.org' },
         ...(nextConfig.images?.remotePatterns ?? []),
       ],
     },