@graphcommerce/next-config 9.0.4-canary.0 → 9.0.4-canary.1

package/CHANGELOG.md

@@ -1,23 +1,13 @@
 # Change Log
 
+## 9.0.4-canary.1
+
 ## 9.0.4-canary.0
 
 ### Patch Changes
 
 - [#2472](https://github.com/graphcommerce-org/graphcommerce/pull/2472) [`905157b`](https://github.com/graphcommerce-org/graphcommerce/commit/905157bec2c9e1dcf51b6e6f7b6913aa9be7b609) - Solve issue with chalk compilation because we’re not migrated to esm modules. ([@paales](https://github.com/paales))
 
-## 9.0.3
-
-## 9.0.3-canary.0
-
-## 9.0.2
-
-## 9.0.2-canary.0
-
-## 9.0.1
-
-## 9.0.1-canary.1
-
 ## 9.0.0
 
 ### Major Changes

package/__tests__/commands/copyFiles.ts

@@ -31,6 +31,7 @@ global.performance = { now: mockPerformanceNow } as unknown as typeof performanc
 
 // Mock process.cwd
 const mockCwd = '/mock/cwd'
+// eslint-disable-next-line @typescript-eslint/unbound-method
 const originalCwd = process.cwd
 beforeAll(() => {
   process.cwd = jest.fn().mockReturnValue(mockCwd)
@@ -42,6 +43,7 @@ afterAll(() => {
 
 describe('copyFiles', () => {
   let consoleLog: jest.SpyInstance
+  let consoleInfo: jest.SpyInstance
   let consoleError: jest.SpyInstance
   let processExit: jest.SpyInstance
   let originalDebug: string | undefined
@@ -57,6 +59,7 @@ describe('copyFiles', () => {
       ]),
     )
     consoleLog = jest.spyOn(console, 'log').mockImplementation(() => {})
+    consoleInfo = jest.spyOn(console, 'info').mockImplementation(() => {})
     consoleError = jest.spyOn(console, 'error').mockImplementation(() => {})
     processExit = jest.spyOn(process, 'exit').mockImplementation(() => undefined as never)
 
@@ -205,7 +208,7 @@ describe('copyFiles', () => {
     expect(writeCall).toBeTruthy()
     const content = writeCall[1].toString()
     expect(content).toContain('new content')
-    expect(consoleLog).toHaveBeenCalledWith('Updated managed file: file.ts')
+    expect(consoleInfo).toHaveBeenCalledWith('Updated managed file: file.ts')
   })
 
   it('should create new files with management comments', async () => {
@@ -227,7 +230,7 @@ describe('copyFiles', () => {
 
     await copyFiles()
 
-    expect(consoleLog).toHaveBeenCalledWith(
+    expect(consoleInfo).toHaveBeenCalledWith(
       'Creating new file: new-file.ts\nSource: packages/package1/copy/new-file.ts',
     )
     expect(fs.writeFile).toHaveBeenCalledWith(path.join(mockCwd, 'new-file.ts'), expect.any(Buffer))
@@ -374,8 +377,8 @@ describe('copyFiles', () => {
 
     await copyFiles()
 
-    expect(consoleLog).toHaveBeenCalledWith('[copy-files]', 'Starting copyFiles')
-    expect(consoleLog).toHaveBeenCalledWith('[copy-files]', expect.stringContaining('Found'))
+    expect(consoleInfo).toHaveBeenCalledWith('[copy-files]', 'Starting copyFiles')
+    expect(consoleInfo).toHaveBeenCalledWith('[copy-files]', expect.stringContaining('Found'))
   })
 
   it('should handle unmanaged files', async () => {
@@ -397,7 +400,7 @@ describe('copyFiles', () => {
 
     await copyFiles()
 
-    expect(consoleLog).toHaveBeenCalledWith(
+    expect(consoleInfo).toHaveBeenCalledWith(
       expect.stringContaining('Note: File file.ts has been modified'),
     )
   })

package/__tests__/config/utils/mergeEnvIntoConfig.ts

@@ -6,6 +6,7 @@ import {
 import type { GraphCommerceConfig } from '../../../src/generated/config'
 import { GraphCommerceConfigSchema } from '../../../src/generated/config'
 import { removeColor } from './rewriteLegancyEnv'
+
 const env = {
   GC_ADVANCED_FILTERS: '0',
   GC_DEMO_MODE: '1',
@@ -101,7 +102,7 @@ it('converts an env schema to a config schema', () => {
      + GC_STOREFRONT => storefront
      ~ GC_STOREFRONT_0_LOCALE => storefront.[0].locale"
   `)
-    // Validate the resulting configura
+  // Validate the resulting configura
   const parsed = GraphCommerceConfigSchema().safeParse(mergedConfig)
   expect(parsed.success).toBe(true)
   if (parsed.success) {

package/__tests__/config/utils/rewriteLegancyEnv.ts

@@ -2,6 +2,7 @@ import { formatAppliedEnv } from '../../../src/config/utils/mergeEnvIntoConfig'
 import { rewriteLegacyEnv } from '../../../src/config/utils/rewriteLegacyEnv'
 import type { GraphCommerceConfig } from '../../../src/generated/config'
 import { GraphCommerceConfigSchema } from '../../../src/generated/config'
+
 export const removeColor = (str: string) =>
   str.replace(
     new RegExp(

package/__tests__/interceptors/findPlugins.ts

@@ -1,5 +1,6 @@
 import type { GraphCommerceConfig } from '../../src/generated/config'
 import { findPlugins } from '../../src/interceptors/findPlugins'
+
 const projectRoot = `${process.cwd()}/examples/magento-graphcms`
 it('finds plugins', () => {
   const fakeconfig = {

package/__tests__/interceptors/generateInterceptors.ts

@@ -5,6 +5,7 @@ import { generateInterceptors } from '../../src/interceptors/generateInterceptor
 import { parseStructure } from '../../src/interceptors/parseStructure'
 import { parseSync } from '../../src/interceptors/swc'
 import { resolveDependency } from '../../src/utils/resolveDependency'
+
 const projectRoot = `${process.cwd()}/examples/magento-graphcms`
 const startLocation = '/** @see {@link file://'
 const expectImport = (value: string | undefined): jest.JestMatchers<string> =>

package/__tests__/utils/resolveDependenciesSync.ts

@@ -1,4 +1,5 @@
 import { resolveDependenciesSync, sortDependencies } from '../../src/utils/resolveDependenciesSync'
+
 const projectRoot = `${process.cwd()}/examples/magento-graphcms`
 it('resolves dependences', () => {
   const dependencies = resolveDependenciesSync(projectRoot)

package/dist/commands/codegen.js

@@ -7,12 +7,12 @@ const copyFiles_1 = require("./copyFiles");
 /** Run all code generation steps in sequence */
 async function codegen() {
     // Copy files from packages to project
-    console.log('🔄 Copying files from packages to project...');
+    console.info('🔄 Copying files from packages to project...');
     await (0, copyFiles_1.copyFiles)();
     // Generate GraphCommerce config types
-    console.log('⚙️  Generating GraphCommerce config types...');
+    console.info('⚙️  Generating GraphCommerce config types...');
     await (0, generateConfig_1.generateConfig)();
     // Generate interceptors
-    console.log('🔌 Generating interceptors...');
+    console.info('🔌 Generating interceptors...');
     await (0, codegenInterceptors_1.codegenInterceptors)();
 }

package/dist/commands/copyFiles.js

@@ -12,7 +12,7 @@ const resolveDependenciesSync_1 = require("../utils/resolveDependenciesSync");
 // Add debug logging helper
 const debug = (...args) => {
     if (process.env.DEBUG)
-        console.log('[copy-files]', ...args);
+        console.info('[copy-files]', ...args);
 };
 // Add constants for the magic comments
 const MANAGED_BY_GC = '// managed by: graphcommerce';
@@ -28,6 +28,11 @@ const GITIGNORE_SECTION_END = '# end managed by: graphcommerce';
  * - Ensures the file ends with a newline
  */
 async function updateGitignore(managedFiles) {
+    const escapedFiles = managedFiles
+        .map((file) => 
+    // Escape special characters in file names
+    file.replace(/[*+?^${}()|[\]\\]/g, '\\$&'))
+        .sort();
     const gitignorePath = path_1.default.join(process.cwd(), '.gitignore');
     let content;
     try {
@@ -42,10 +47,10 @@ async function updateGitignore(managedFiles) {
     const sectionRegex = new RegExp(`${GITIGNORE_SECTION_START}[\\s\\S]*?${GITIGNORE_SECTION_END}\\n?`, 'g');
     content = content.replace(sectionRegex, '');
     // Only add new section if there are files to manage
-    if (managedFiles.length > 0) {
+    if (escapedFiles.length > 0) {
         const newSection = [
             GITIGNORE_SECTION_START,
-            ...managedFiles.sort(),
+            ...escapedFiles,
             GITIGNORE_SECTION_END,
             '', // Empty line at the end
         ].join('\n');
@@ -180,7 +185,7 @@ Found in packages:
                     return;
                 }
                 if (management === 'unmanaged') {
-                    console.log(`Note: File ${file} has been modified. Add '${MANAGED_LOCALLY.trim()}' at the top to manage it locally.`);
+                    console.info(`Note: File ${file} has been modified. Add '${MANAGED_LOCALLY.trim()}' at the top to manage it locally.`);
                     debug(`File ${file} doesn't have management comment, skipping`);
                     return;
                 }
@@ -192,7 +197,7 @@ Found in packages:
 Source: ${sourcePath}`);
                     process.exit(1);
                 }
-                console.log(`Creating new file: ${file}\nSource: ${sourcePath}`);
+                console.info(`Creating new file: ${file}\nSource: ${sourcePath}`);
                 debug('File does not exist yet');
             }
             // Skip if content is identical (including magic comment)
@@ -204,7 +209,7 @@ Source: ${sourcePath}`);
             // Copy the file with magic comment
             await promises_1.default.writeFile(targetPath, contentWithComment);
             if (targetContent) {
-                console.log(`Updated managed file: ${file}`);
+                console.info(`Updated managed file: ${file}`);
                 debug(`Overwrote existing file: ${file}`);
             }
             // If the file is managed by GraphCommerce (new or updated), add it to managedFiles
@@ -258,7 +263,7 @@ Source: ${sourcePath}`);
             // Then try to remove the file
             try {
                 await promises_1.default.unlink(filePath);
-                console.log(`Removed managed file: ${file}`);
+                console.info(`Removed managed file: ${file}`);
                 debug(`Removed file: ${file}`);
             }
             catch (err) {

package/dist/config/commands/generateConfig.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateConfig = generateConfig;
-// eslint-disable-next-line import/no-extraneous-dependencies
 const fs_1 = require("fs");
 const cli_1 = require("@graphql-codegen/cli");
 const core_1 = require("@swc/core");
@@ -51,7 +50,7 @@ async function generateConfig() {
     });
     const result = (0, core_1.transformFileSync)(targetTs, {
         module: { type: 'commonjs' },
-        env: { targets: { node: '16' } },
+        env: { targets: { node: '18' } },
     });
     (0, fs_1.writeFileSync)(targetJs, result.code);
 }

package/dist/config/utils/mergeEnvIntoConfig.js

@@ -150,9 +150,7 @@ function mergeEnvIntoConfig(schema, config, env) {
 function formatAppliedEnv(applyResult) {
     let hasError = false;
     let hasWarning = false;
-    const lines = applyResult.map(({ from, to, envValue, envVar, dotVar, error, warning }) => {
-        const fromFmt = chalk_1.default.red(JSON.stringify(from));
-        const toFmt = chalk_1.default.green(JSON.stringify(to));
+    const lines = applyResult.map(({ from, to, envVar, dotVar, error, warning }) => {
         const envVariableFmt = `${envVar}`;
         const dotVariableFmt = chalk_1.default.bold.underline(`${dotVar}`);
         const baseLog = `${envVariableFmt} => ${dotVariableFmt}`;

package/dist/generated/config.js

@@ -18,14 +18,18 @@ exports.definedNonNullAnySchema = zod_1.z.any().refine((v) => (0, exports.isDefi
 exports.CartPermissionsSchema = zod_1.z.enum(['CUSTOMER_ONLY', 'DISABLED', 'ENABLED']);
 exports.CompareVariantSchema = zod_1.z.enum(['CHECKBOX', 'ICON']);
 exports.ContainerSizingSchema = zod_1.z.enum(['BREAKPOINT', 'FULL_WIDTH']);
-exports.CustomerAccountPermissionsSchema = zod_1.z.enum(['DISABLED', 'DISABLE_REGISTRATION', 'ENABLED']);
+exports.CustomerAccountPermissionsSchema = zod_1.z.enum([
+    'DISABLED',
+    'DISABLE_REGISTRATION',
+    'ENABLED',
+]);
 exports.PaginationVariantSchema = zod_1.z.enum(['COMPACT', 'EXTENDED']);
 exports.ProductFiltersLayoutSchema = zod_1.z.enum(['DEFAULT', 'SIDEBAR']);
 exports.SidebarGalleryPaginationVariantSchema = zod_1.z.enum(['DOTS', 'THUMBNAILS_BOTTOM']);
 exports.WebsitePermissionsSchema = zod_1.z.enum(['ENABLED']);
 function DatalayerConfigSchema() {
     return zod_1.z.object({
-        coreWebVitals: zod_1.z.boolean().nullish()
+        coreWebVitals: zod_1.z.boolean().nullish(),
     });
 }
 function GraphCommerceConfigSchema() {
@@ -34,11 +38,11 @@ function GraphCommerceConfigSchema() {
         canonicalBaseUrl: zod_1.z.string().min(1),
         cartDisplayPricesInclTax: zod_1.z.boolean().nullish(),
         compare: zod_1.z.boolean().nullish(),
-        compareVariant: exports.CompareVariantSchema.default("ICON").nullish(),
+        compareVariant: exports.CompareVariantSchema.default('ICON').nullish(),
         configurableVariantForSimple: zod_1.z.boolean().default(false).nullish(),
         configurableVariantValues: MagentoConfigurableVariantValuesSchema().nullish(),
-        containerSizingContent: exports.ContainerSizingSchema.default("FULL_WIDTH").nullish(),
-        containerSizingShell: exports.ContainerSizingSchema.default("FULL_WIDTH").nullish(),
+        containerSizingContent: exports.ContainerSizingSchema.default('FULL_WIDTH').nullish(),
+        containerSizingShell: exports.ContainerSizingSchema.default('FULL_WIDTH').nullish(),
         crossSellsHideCartItems: zod_1.z.boolean().default(false).nullish(),
         crossSellsRedirectItems: zod_1.z.boolean().default(false).nullish(),
         customerAddressNoteEnable: zod_1.z.boolean().nullish(),
@@ -62,16 +66,16 @@ function GraphCommerceConfigSchema() {
         magentoVersion: zod_1.z.number(),
         permissions: GraphCommercePermissionsSchema().nullish(),
         previewSecret: zod_1.z.string().nullish(),
-        productFiltersLayout: exports.ProductFiltersLayoutSchema.default("DEFAULT").nullish(),
+        productFiltersLayout: exports.ProductFiltersLayoutSchema.default('DEFAULT').nullish(),
         productFiltersPro: zod_1.z.boolean().nullish(),
-        productListPaginationVariant: exports.PaginationVariantSchema.default("COMPACT").nullish(),
+        productListPaginationVariant: exports.PaginationVariantSchema.default('COMPACT').nullish(),
         productRoute: zod_1.z.string().nullish(),
         recentlyViewedProducts: RecentlyViewedProductsConfigSchema().nullish(),
         robotsAllow: zod_1.z.boolean().nullish(),
         sidebarGallery: SidebarGalleryConfigSchema().nullish(),
         storefront: zod_1.z.array(GraphCommerceStorefrontConfigSchema()),
         wishlistHideForGuests: zod_1.z.boolean().nullish(),
-        wishlistShowFeedbackMessage: zod_1.z.boolean().nullish()
+        wishlistShowFeedbackMessage: zod_1.z.boolean().nullish(),
     });
 }
 function GraphCommerceDebugConfigSchema() {
@@ -80,13 +84,13 @@ function GraphCommerceDebugConfigSchema() {
         pluginStatus: zod_1.z.boolean().nullish(),
         sessions: zod_1.z.boolean().nullish(),
         webpackCircularDependencyPlugin: zod_1.z.boolean().nullish(),
-        webpackDuplicatesPlugin: zod_1.z.boolean().nullish()
+        webpackDuplicatesPlugin: zod_1.z.boolean().nullish(),
     });
 }
 function GraphCommerceGooglePlaystoreConfigSchema() {
     return zod_1.z.object({
         packageName: zod_1.z.string().min(1),
-        sha256CertificateFingerprint: zod_1.z.string().min(1)
+        sha256CertificateFingerprint: zod_1.z.string().min(1),
     });
 }
 function GraphCommercePermissionsSchema() {
@@ -94,7 +98,7 @@ function GraphCommercePermissionsSchema() {
         cart: exports.CartPermissionsSchema.nullish(),
         checkout: exports.CartPermissionsSchema.nullish(),
         customerAccount: exports.CustomerAccountPermissionsSchema.nullish(),
-        website: exports.WebsitePermissionsSchema.nullish()
+        website: exports.WebsitePermissionsSchema.nullish(),
     });
 }
 function GraphCommerceStorefrontConfigSchema() {
@@ -112,24 +116,24 @@ function GraphCommerceStorefrontConfigSchema() {
         locale: zod_1.z.string().min(1),
         magentoStoreCode: zod_1.z.string().min(1),
         permissions: GraphCommercePermissionsSchema().nullish(),
-        robotsAllow: zod_1.z.boolean().nullish()
+        robotsAllow: zod_1.z.boolean().nullish(),
     });
 }
 function MagentoConfigurableVariantValuesSchema() {
     return zod_1.z.object({
         content: zod_1.z.boolean().nullish(),
         gallery: zod_1.z.boolean().nullish(),
-        url: zod_1.z.boolean().nullish()
+        url: zod_1.z.boolean().nullish(),
     });
 }
 function RecentlyViewedProductsConfigSchema() {
     return zod_1.z.object({
         enabled: zod_1.z.boolean().nullish(),
-        maxCount: zod_1.z.number().nullish()
+        maxCount: zod_1.z.number().nullish(),
     });
 }
 function SidebarGalleryConfigSchema() {
     return zod_1.z.object({
-        paginationVariant: exports.SidebarGalleryPaginationVariantSchema.nullish()
+        paginationVariant: exports.SidebarGalleryPaginationVariantSchema.nullish(),
     });
 }

package/dist/interceptors/writeInterceptors.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeInterceptors = writeInterceptors;
 // 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 glob_1 = require("glob");
 const resolveDependenciesSync_1 = require("../utils/resolveDependenciesSync");
 function checkFileExists(file) {
     return promises_1.default

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.4-canary.0",
+  "version": "9.0.4-canary.1",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -12,6 +12,7 @@
     "prepack": "tsc"
   },
   "dependencies": {
+    "@graphql-codegen/cli": "5.0.3",
     "@swc/core": "1.10.1",
     "@swc/wasm-web": "^1.10.1",
     "@types/circular-dependency-plugin": "^5.0.8",

package/src/commands/codegen.ts

@@ -5,14 +5,14 @@ import { copyFiles } from './copyFiles'
 /** Run all code generation steps in sequence */
 export async function codegen() {
   // Copy files from packages to project
-  console.log('🔄 Copying files from packages to project...')
+  console.info('🔄 Copying files from packages to project...')
   await copyFiles()
 
   // Generate GraphCommerce config types
-  console.log('⚙️  Generating GraphCommerce config types...')
+  console.info('⚙️  Generating GraphCommerce config types...')
   await generateConfig()
 
   // Generate interceptors
-  console.log('🔌 Generating interceptors...')
+  console.info('🔌 Generating interceptors...')
   await codegenInterceptors()
 }

package/src/commands/copyFiles.ts

@@ -6,7 +6,7 @@ import { resolveDependenciesSync } from '../utils/resolveDependenciesSync'
 
 // Add debug logging helper
 const debug = (...args: unknown[]) => {
-  if (process.env.DEBUG) console.log('[copy-files]', ...args)
+  if (process.env.DEBUG) console.info('[copy-files]', ...args)
 }
 
 // Add constants for the magic comments
@@ -25,6 +25,13 @@ const GITIGNORE_SECTION_END = '# end managed by: graphcommerce'
  * - Ensures the file ends with a newline
  */
 async function updateGitignore(managedFiles: string[]) {
+  const escapedFiles = managedFiles
+    .map((file) =>
+      // Escape special characters in file names
+      file.replace(/[*+?^${}()|[\]\\]/g, '\\$&'),
+    )
+    .sort()
+
   const gitignorePath = path.join(process.cwd(), '.gitignore')
   let content: string
 
@@ -44,10 +51,10 @@ async function updateGitignore(managedFiles: string[]) {
   content = content.replace(sectionRegex, '')
 
   // Only add new section if there are files to manage
-  if (managedFiles.length > 0) {
+  if (escapedFiles.length > 0) {
     const newSection = [
       GITIGNORE_SECTION_START,
-      ...managedFiles.sort(),
+      ...escapedFiles,
       GITIGNORE_SECTION_END,
       '', // Empty line at the end
     ].join('\n')
@@ -206,7 +213,7 @@ Found in packages:
             return
           }
           if (management === 'unmanaged') {
-            console.log(
+            console.info(
               `Note: File ${file} has been modified. Add '${MANAGED_LOCALLY.trim()}' at the top to manage it locally.`,
             )
             debug(`File ${file} doesn't have management comment, skipping`)
@@ -220,7 +227,7 @@ Found in packages:
 Source: ${sourcePath}`)
             process.exit(1)
           }
-          console.log(`Creating new file: ${file}\nSource: ${sourcePath}`)
+          console.info(`Creating new file: ${file}\nSource: ${sourcePath}`)
           debug('File does not exist yet')
         }
 
@@ -234,7 +241,7 @@ Source: ${sourcePath}`)
         // Copy the file with magic comment
         await fs.writeFile(targetPath, contentWithComment)
         if (targetContent) {
-          console.log(`Updated managed file: ${file}`)
+          console.info(`Updated managed file: ${file}`)
           debug(`Overwrote existing file: ${file}`)
         }
 
@@ -293,7 +300,7 @@ Source: ${sourcePath}`)
         // Then try to remove the file
         try {
           await fs.unlink(filePath)
-          console.log(`Removed managed file: ${file}`)
+          console.info(`Removed managed file: ${file}`)
           debug(`Removed file: ${file}`)
         } catch (err) {
           if ((err as { code?: string }).code !== 'ENOENT') {

package/src/config/commands/generateConfig.ts

@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { writeFileSync } from 'fs'
 import { generate } from '@graphql-codegen/cli'
 import { transformFileSync } from '@swc/core'
@@ -52,7 +51,7 @@ export async function generateConfig() {
 
   const result = transformFileSync(targetTs, {
     module: { type: 'commonjs' },
-    env: { targets: { node: '16' } },
+    env: { targets: { node: '18' } },
   })
 
   writeFileSync(targetJs, result.code)

package/src/config/utils/mergeEnvIntoConfig.ts

@@ -204,9 +204,7 @@ export function mergeEnvIntoConfig(
 export function formatAppliedEnv(applyResult: ApplyResult) {
   let hasError = false
   let hasWarning = false
-  const lines = applyResult.map(({ from, to, envValue, envVar, dotVar, error, warning }) => {
-    const fromFmt = chalk.red(JSON.stringify(from))
-    const toFmt = chalk.green(JSON.stringify(to))
+  const lines = applyResult.map(({ from, to, envVar, dotVar, error, warning }) => {
     const envVariableFmt = `${envVar}`
     const dotVariableFmt = chalk.bold.underline(`${dotVar}`)