@graphcommerce/next-config 9.0.4-canary.8 → 9.0.4

package/__tests__/config/utils/mergeEnvIntoConfig.ts

@@ -6,7 +6,6 @@ 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',
@@ -23,13 +22,7 @@ const env = {
 }
 it('traverses a schema and returns a list of env variables that match', () => {
   const [envSchema] = configToEnvSchema(GraphCommerceConfigSchema())
-
-  const keys = Object.keys(envSchema.shape)
-
-  expect(keys.includes('GC_ADVANCED_FILTERS')).toBe(false)
-  expect(keys.includes('GC_STOREFRONT')).toBe(true)
-  expect(keys.includes('GC_STOREFRONT_0')).toBe(true)
-  expect(keys.includes('GC_STOREFRONT_1')).toBe(true)
+  expect(Object.keys(envSchema.shape)).toMatchSnapshot()
 })
 it('parses an env config object', () => {
   const [envSchema] = configToEnvSchema(GraphCommerceConfigSchema())
@@ -108,7 +101,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,7 +2,6 @@ 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,6 +1,5 @@
 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,7 +5,6 @@ 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,5 +1,4 @@
 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.info('🔄 Copying files from packages to project...');
+    console.log('🔄 Copying files from packages to project...');
     await (0, copyFiles_1.copyFiles)();
     // Generate GraphCommerce config types
-    console.info('⚙️  Generating GraphCommerce config types...');
+    console.log('⚙️  Generating GraphCommerce config types...');
     await (0, generateConfig_1.generateConfig)();
     // Generate interceptors
-    console.info('🔌 Generating interceptors...');
+    console.log('🔌 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.info('[copy-files]', ...args);
+        console.log('[copy-files]', ...args);
 };
 // Add constants for the magic comments
 const MANAGED_BY_GC = '// managed by: graphcommerce';
@@ -28,11 +28,6 @@ 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 {
@@ -47,10 +42,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 (escapedFiles.length > 0) {
+    if (managedFiles.length > 0) {
         const newSection = [
             GITIGNORE_SECTION_START,
-            ...escapedFiles,
+            ...managedFiles.sort(),
             GITIGNORE_SECTION_END,
             '', // Empty line at the end
         ].join('\n');
@@ -185,7 +180,7 @@ Found in packages:
                     return;
                 }
                 if (management === 'unmanaged') {
-                    console.info(`Note: File ${file} has been modified. Add '${MANAGED_LOCALLY.trim()}' at the top to manage it locally.`);
+                    console.log(`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;
                 }
@@ -197,7 +192,7 @@ Found in packages:
 Source: ${sourcePath}`);
                     process.exit(1);
                 }
-                console.info(`Creating new file: ${file}\nSource: ${sourcePath}`);
+                console.log(`Creating new file: ${file}\nSource: ${sourcePath}`);
                 debug('File does not exist yet');
             }
             // Skip if content is identical (including magic comment)
@@ -209,7 +204,7 @@ Source: ${sourcePath}`);
             // Copy the file with magic comment
             await promises_1.default.writeFile(targetPath, contentWithComment);
             if (targetContent) {
-                console.info(`Updated managed file: ${file}`);
+                console.log(`Updated managed file: ${file}`);
                 debug(`Overwrote existing file: ${file}`);
             }
             // If the file is managed by GraphCommerce (new or updated), add it to managedFiles
@@ -263,7 +258,7 @@ Source: ${sourcePath}`);
             // Then try to remove the file
             try {
                 await promises_1.default.unlink(filePath);
-                console.info(`Removed managed file: ${file}`);
+                console.log(`Removed managed file: ${file}`);
                 debug(`Removed file: ${file}`);
             }
             catch (err) {

package/dist/commands/copyRoutes.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = __importDefault(require("fs/promises"));
+// ... earlier code remains the same ...
+try {
+    targetContent = await promises_1.default.readFile(targetPath);
+}
+catch (err) {
+    if (err.code !== 'ENOENT')
+        throw err;
+    // File doesn't exist, log that we're creating it
+    console.log(`Creating new file: ${file}`);
+}
+// Skip if content is identical
+if (targetContent && Buffer.compare(sourceContent, targetContent) === 0)
+    return;
+// ... rest of the code remains the same ...

package/dist/config/commands/generateConfig.js

@@ -4,6 +4,7 @@ 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");
@@ -50,7 +51,7 @@ async function generateConfig() {
     });
     const result = (0, core_1.transformFileSync)(targetTs, {
         module: { type: 'commonjs' },
-        env: { targets: { node: '18' } },
+        env: { targets: { node: '16' } },
     });
     (0, fs_1.writeFileSync)(targetJs, result.code);
 }

package/dist/config/utils/mergeEnvIntoConfig.js

@@ -150,7 +150,9 @@ function mergeEnvIntoConfig(schema, config, env) {
 function formatAppliedEnv(applyResult) {
     let hasError = false;
     let hasWarning = false;
-    const lines = applyResult.map(({ from, to, envVar, dotVar, error, warning }) => {
+    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 envVariableFmt = `${envVar}`;
         const dotVariableFmt = chalk_1.default.bold.underline(`${dotVar}`);
         const baseLog = `${envVariableFmt} => ${dotVariableFmt}`;

package/dist/generated/config.js

@@ -18,18 +18,14 @@ 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() {
@@ -38,11 +34,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(),
@@ -57,7 +53,6 @@ function GraphCommerceConfigSchema() {
         googlePlaystore: GraphCommerceGooglePlaystoreConfigSchema().nullish(),
         googleRecaptchaKey: zod_1.z.string().nullish(),
         googleTagmanagerId: zod_1.z.string().nullish(),
-        graphqlMeshEditMode: zod_1.z.boolean().default(false).nullish(),
         hygraphEndpoint: zod_1.z.string().min(1),
         hygraphManagementApi: zod_1.z.string().nullish(),
         hygraphProjectId: zod_1.z.string().nullish(),
@@ -67,16 +62,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() {
@@ -85,13 +80,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() {
@@ -99,7 +94,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() {
@@ -117,24 +112,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.8",
+  "version": "9.0.4",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -12,13 +12,11 @@
     "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",
     "@types/lodash": "^4.17.13",
     "babel-plugin-macros": "^3.1.0",
-    "chalk": "^4",
     "circular-dependency-plugin": "^5.2.2",
     "fast-glob": "^3.3.2",
     "glob": "^10.4.5",

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.info('🔄 Copying files from packages to project...')
+  console.log('🔄 Copying files from packages to project...')
   await copyFiles()
 
   // Generate GraphCommerce config types
-  console.info('⚙️  Generating GraphCommerce config types...')
+  console.log('⚙️  Generating GraphCommerce config types...')
   await generateConfig()
 
   // Generate interceptors
-  console.info('🔌 Generating interceptors...')
+  console.log('🔌 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.info('[copy-files]', ...args)
+  if (process.env.DEBUG) console.log('[copy-files]', ...args)
 }
 
 // Add constants for the magic comments
@@ -25,13 +25,6 @@ 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
 
@@ -51,10 +44,10 @@ async function updateGitignore(managedFiles: string[]) {
   content = content.replace(sectionRegex, '')
 
   // Only add new section if there are files to manage
-  if (escapedFiles.length > 0) {
+  if (managedFiles.length > 0) {
     const newSection = [
       GITIGNORE_SECTION_START,
-      ...escapedFiles,
+      ...managedFiles.sort(),
       GITIGNORE_SECTION_END,
       '', // Empty line at the end
     ].join('\n')
@@ -213,7 +206,7 @@ Found in packages:
             return
           }
           if (management === 'unmanaged') {
-            console.info(
+            console.log(
               `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`)
@@ -227,7 +220,7 @@ Found in packages:
 Source: ${sourcePath}`)
             process.exit(1)
           }
-          console.info(`Creating new file: ${file}\nSource: ${sourcePath}`)
+          console.log(`Creating new file: ${file}\nSource: ${sourcePath}`)
           debug('File does not exist yet')
         }
 
@@ -241,7 +234,7 @@ Source: ${sourcePath}`)
         // Copy the file with magic comment
         await fs.writeFile(targetPath, contentWithComment)
         if (targetContent) {
-          console.info(`Updated managed file: ${file}`)
+          console.log(`Updated managed file: ${file}`)
           debug(`Overwrote existing file: ${file}`)
         }
 
@@ -300,7 +293,7 @@ Source: ${sourcePath}`)
         // Then try to remove the file
         try {
           await fs.unlink(filePath)
-          console.info(`Removed managed file: ${file}`)
+          console.log(`Removed managed file: ${file}`)
           debug(`Removed file: ${file}`)
         } catch (err) {
           if ((err as { code?: string }).code !== 'ENOENT') {

package/src/config/commands/generateConfig.ts

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

package/src/config/utils/mergeEnvIntoConfig.ts

@@ -204,7 +204,9 @@ export function mergeEnvIntoConfig(
 export function formatAppliedEnv(applyResult: ApplyResult) {
   let hasError = false
   let hasWarning = false
-  const lines = applyResult.map(({ from, to, envVar, dotVar, error, warning }) => {
+  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 envVariableFmt = `${envVar}`
     const dotVariableFmt = chalk.bold.underline(`${dotVar}`)