@graphcommerce/next-config 8.1.0-canary.5 → 8.1.0-canary.52

package/dist/interceptors/commands/generateIntercetors.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.exportConfig = void 0;
+const loadConfig_1 = require("../../config/loadConfig");
+// eslint-disable-next-line @typescript-eslint/require-await
+async function exportConfig() {
+    const conf = (0, loadConfig_1.loadConfig)(process.cwd());
+}
+exports.exportConfig = exportConfig;

package/dist/interceptors/extractExports.js

@@ -87,9 +87,8 @@ function extractValue(node, path, optional = false) {
             case 'undefined':
                 return undefined;
             default:
-                if (optional)
-                    return exports.RUNTIME_VALUE;
-                throw new UnsupportedValueError(`Unknown identifier "${node.value}"`, path);
+                return exports.RUNTIME_VALUE;
+            // throw new UnsupportedValueError(`Unknown identifier "${node.value}"`, path)
         }
     }
     else if (isArrayExpression(node)) {
@@ -100,9 +99,11 @@ function extractValue(node, path, optional = false) {
             if (elem) {
                 if (elem.spread) {
                     // e.g. [ ...a ]
-                    if (optional)
-                        return exports.RUNTIME_VALUE;
-                    throw new UnsupportedValueError('Unsupported spread operator in the Array Expression', path);
+                    return exports.RUNTIME_VALUE;
+                    // throw new UnsupportedValueError(
+                    //   'Unsupported spread operator in the Array Expression',
+                    //   path,
+                    // )
                 }
                 arr.push(extractValue(elem.expression, path && [...path, `[${i}]`], optional));
             }
@@ -120,9 +121,11 @@ function extractValue(node, path, optional = false) {
         for (const prop of node.properties) {
             if (!isKeyValueProperty(prop)) {
                 // e.g. { ...a }
-                if (optional)
-                    return exports.RUNTIME_VALUE;
-                throw new UnsupportedValueError('Unsupported spread operator in the Object Expression', path);
+                return exports.RUNTIME_VALUE;
+                // throw new UnsupportedValueError(
+                //   'Unsupported spread operator in the Object Expression',
+                //   path,
+                // )
             }
             let key;
             if (isIdentifier(prop.key)) {
@@ -134,9 +137,11 @@ function extractValue(node, path, optional = false) {
                 key = prop.key.value;
             }
             else {
-                if (optional)
-                    return exports.RUNTIME_VALUE;
-                throw new UnsupportedValueError(`Unsupported key type "${prop.key.type}" in the Object Expression`, path);
+                return exports.RUNTIME_VALUE;
+                // throw new UnsupportedValueError(
+                //   `Unsupported key type "${prop.key.type}" in the Object Expression`,
+                //   path,
+                // )
             }
             obj[key] = extractValue(prop.value, path && [...path, key]);
         }
@@ -146,9 +151,8 @@ function extractValue(node, path, optional = false) {
         // e.g. `abc`
         if (node.expressions.length !== 0) {
             // TODO: should we add support for `${'e'}d${'g'}'e'`?
-            if (optional)
-                return exports.RUNTIME_VALUE;
-            throw new UnsupportedValueError('Unsupported template literal with expressions', path);
+            return exports.RUNTIME_VALUE;
+            // throw new UnsupportedValueError('Unsupported template literal with expressions', path)
         }
         // When TemplateLiteral has 0 expressions, the length of quasis is always 1.
         // Because when parsing TemplateLiteral, the parser yields the first quasi,
@@ -163,9 +167,8 @@ function extractValue(node, path, optional = false) {
         return cooked ?? raw;
     }
     else {
-        if (optional)
-            return exports.RUNTIME_VALUE;
-        throw new UnsupportedValueError(`Unsupported node type "${node.type}"`, path);
+        return exports.RUNTIME_VALUE;
+        // throw new UnsupportedValueError(`Unsupported node type "${node.type}"`, path)
     }
 }
 function extractExports(module) {

package/dist/interceptors/findOriginalSource.js

@@ -33,6 +33,22 @@ function parseAndFindExport(resolved, findExport, resolve) {
                     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
         .filter((node) => node.type === 'ExportAllDeclaration')
@@ -78,7 +94,7 @@ function findOriginalSource(plug, resolved, resolve) {
     if (!newResolved) {
         return {
             resolved: undefined,
-            error: new Error(`Can not find ${plug.targetModule}#${plug.sourceExport} for plugin ${plug.sourceModule}`),
+            error: new Error(`Plugin target not found ${plug.targetModule}#${plug.sourceExport} for plugin ${plug.sourceModule}#${plug.sourceExport}`),
         };
     }
     // cachedResults.set(cacheKey, newResolved)

package/dist/interceptors/findPlugins.js

@@ -17,10 +17,14 @@ function findPlugins(config, cwd = process.cwd()) {
     const debug = Boolean(config.debug?.pluginStatus);
     const errors = [];
     const plugins = [];
-    dependencies.forEach((dependency, path) => {
-        const files = (0, glob_1.sync)(`${dependency}/plugins/**/*.{ts,tsx}`, { dotRelative: true });
+    dependencies.forEach((filePath, packageName) => {
+        const files = (0, glob_1.sync)(`${filePath}/plugins/**/*.{ts,tsx}`);
         files.forEach((file) => {
-            const sourceModule = file.replace(dependency, path).replace('.tsx', '').replace('.ts', '');
+            let sourceModule = file.replace('.tsx', '').replace('.ts', '');
+            if (file.startsWith(filePath))
+                sourceModule = `${packageName}/${sourceModule.slice(filePath.length + 1)}`;
+            if (packageName === '.' && !sourceModule.startsWith('.'))
+                sourceModule = `./${sourceModule}`;
             try {
                 const ast = (0, core_1.parseFileSync)(file, { syntax: 'typescript', tsx: true });
                 (0, parseStructure_1.parseStructure)(ast, config, sourceModule).forEach((result) => {

package/dist/interceptors/generateInterceptor.js

@@ -39,19 +39,19 @@ function isPluginConfig(plugin) {
     return isPluginBaseConfig(plugin);
 }
 exports.isPluginConfig = isPluginConfig;
-exports.SOURCE_START = '/** ❗️ Original (modified) source starts here **/';
-exports.SOURCE_END = '/** ❗️ Original (modified) source ends here **/';
+exports.SOURCE_START = '/** Original source starts here (do not modify!): **/';
+exports.SOURCE_END = '/** Original source ends here (do not modify!) **/';
 const originalSuffix = 'Original';
-const sourceSuffix = 'Source';
+const sourceSuffix = 'Plugin';
 const interceptorSuffix = 'Interceptor';
 const disabledSuffix = 'Disabled';
 const name = (plugin) => `${plugin.sourceExport}${plugin.sourceModule
     .split('/')[plugin.sourceModule.split('/').length - 1].replace(/[^a-zA-Z0-9]/g, '')}`;
 const fileName = (plugin) => `${plugin.sourceModule}#${plugin.sourceExport}`;
 const originalName = (n) => `${n}${originalSuffix}`;
-const sourceName = (n) => `${n}${sourceSuffix}`;
+const sourceName = (n) => `${n}`;
 const interceptorName = (n) => `${n}${interceptorSuffix}`;
-const interceptorPropsName = (n) => `${interceptorName(n)}Props`;
+const interceptorPropsName = (n) => `${n}Props`;
 function moveRelativeDown(plugins) {
     return [...plugins].sort((a, b) => {
         if (a.sourceModule.startsWith('.') && !b.sourceModule.startsWith('.'))
@@ -102,7 +102,9 @@ async function generateInterceptor(interceptor, config, oldInterceptorSource) {
         .map(([base, plugins]) => {
         const duplicateInterceptors = new Set();
         let carry = originalName(base);
-        const carryProps = [];
+        let carryProps = [];
+        const pluginSee = [];
+        pluginSee.push(`@see {@link file://${interceptor.sourcePathRelative}} for original source file`);
         const pluginStr = plugins
             .reverse()
             .filter((p) => {
@@ -119,46 +121,60 @@ async function generateInterceptor(interceptor, config, oldInterceptorSource) {
                 .join(' wrapping ');
             if (isReplacePluginConfig(p)) {
                 new RenameVisitor_1.RenameVisitor([originalName(p.targetExport)], (s) => 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)`);
             }
             if (isReactPluginConfig(p)) {
-                carryProps.push(interceptorPropsName(name(p)));
+                const withBraces = config.pluginStatus || process.env.NODE_ENV === 'development';
                 result = `
-              type ${interceptorPropsName(name(p))} = DistributedOmit<React.ComponentProps<typeof ${sourceName(name(p))}>, 'Prev'>
-              const ${interceptorName(name(p))} = (props: ${carryProps.join(' & ')}) => {
+              type ${interceptorPropsName(name(p))} = ${carryProps.join(' & ')} & OmitPrev<React.ComponentProps<typeof ${sourceName(name(p))}>, 'Prev'>
+              
+              const ${interceptorName(name(p))} = (props: ${interceptorPropsName(name(p))}) => ${withBraces ? `{` : '('}
                 ${config.pluginStatus ? `logOnce(\`🔌 Rendering ${base} with plugin(s): ${wrapChain} wrapping <${base}/>\`)` : ''}
 
                 ${process.env.NODE_ENV === 'development'
                     ? `if(!props['data-plugin'])
                   logOnce('${fileName(p)} does not spread props to prev: <Prev {...props}/>. This will cause issues if multiple plugins are applied to this component.')`
                     : ''}
-                return <${sourceName(name(p))} {...props} Prev={${carry} as React.FC} />
-              }`;
+                ${withBraces ? `return` : ''} <${sourceName(name(p))} {...props} Prev={${carry}} />
+              ${withBraces ? `}` : ')'}`;
+                carryProps = [interceptorPropsName(name(p))];
+                pluginSee.push(`@see {${sourceName(name(p))}} for source of applied plugin`);
             }
             if (isMethodPluginConfig(p)) {
                 result = `const ${interceptorName(name(p))}: typeof ${carry} = (...args) => {
                 ${config.pluginStatus ? `logOnce(\`🔌 Calling ${base} with plugin(s): ${wrapChain} wrapping ${base}()\`)` : ''}
                 return ${sourceName(name(p))}(${carry}, ...args)
               }`;
+                pluginSee.push(`@see {${sourceName(name(p))}} for source of applied plugin`);
             }
             carry = p.type === 'replace' ? sourceName(name(p)) : interceptorName(name(p));
             return result;
         })
             .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}.`);
         }
+        const seeString = `
+      /**
+       * Here you see the 'interceptor' that is applying all the configured plugins.
+       *
+       * This file is NOT meant to be modified directly and is auto-generated if the plugins or the original source changes.
+       * 
+       ${pluginSee.map((s) => `* ${s}`).join('\n')}
+       */`;
         if (process.env.NODE_ENV === 'development' && isComponent) {
             return `${pluginStr}
+          ${seeString}
           export const ${base}: typeof ${carry} = (props) => {
             return <${carry} {...props} data-plugin />
           }`;
         }
         return `
         ${pluginStr}
+        ${seeString}
         export const ${base} = ${carry}
       `;
     })
@@ -177,11 +193,12 @@ async function generateInterceptor(interceptor, config, oldInterceptorSource) {
     /* eslint-disable */
     /* This file is automatically generated for ${dependency} */
     ${Object.values(targetExports).some((t) => t.some((p) => p.type === 'component'))
-        ? `import type { DistributedOmit } from 'type-fest'`
+        ? `import type { DistributedOmit as OmitPrev } from 'type-fest'`
         : ''}
 
     ${pluginImports}
 
+    /** @see {@link file://${interceptor.sourcePathRelative}} for source of original */
     ${exports.SOURCE_START}
     ${(0, swc_1.printSync)(ast).code}
     ${exports.SOURCE_END}

package/dist/interceptors/generateInterceptors.js

@@ -8,7 +8,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const promises_1 = __importDefault(require("node:fs/promises"));
 const findOriginalSource_1 = require("./findOriginalSource");
 const generateInterceptor_1 = require("./generateInterceptor");
-async function generateInterceptors(plugins, resolve, config) {
+async function generateInterceptors(plugins, resolve, config, force) {
     const byTargetModuleAndExport = (0, generateInterceptor_1.moveRelativeDown)(plugins).reduce((acc, plug) => {
         let { sourceModule: pluginPath } = plug;
         if (!(0, generateInterceptor_1.isPluginConfig)(plug) || !plug.enabled)
@@ -40,10 +40,11 @@ async function generateInterceptors(plugins, resolve, config) {
     }, {});
     return Object.fromEntries(await Promise.all(Object.entries(byTargetModuleAndExport).map(async ([target, interceptor]) => {
         const file = `${interceptor.fromRoot}.interceptor.tsx`;
-        const originalSource = (await promises_1.default
-            .access(file, promises_1.default.constants.F_OK)
-            .then(() => true)
-            .catch(() => false))
+        const originalSource = !force &&
+            (await promises_1.default
+                .access(file, promises_1.default.constants.F_OK)
+                .then(() => true)
+                .catch(() => false))
             ? (await promises_1.default.readFile(file)).toString()
             : undefined;
         return [

package/dist/interceptors/parseStructure.js

@@ -27,7 +27,7 @@ function parseStructure(ast, gcConfig, sourceModule) {
         exportVals.push('Plugin');
     if (func && !moduleConfig)
         exportVals.push('plugin');
-    return exportVals
+    const pluginConfigs = exportVals
         .map((exportVal) => {
         let config = isObject(moduleConfig) ? moduleConfig : {};
         if (!moduleConfig && component) {
@@ -41,6 +41,7 @@ function parseStructure(ast, gcConfig, sourceModule) {
         }
         else {
             console.error(`Plugin configuration invalid! See ${sourceModule}`);
+            return null;
         }
         const parsed = pluginConfigParsed.safeParse(config);
         if (!parsed.success) {
@@ -67,5 +68,12 @@ function parseStructure(ast, gcConfig, sourceModule) {
         return val;
     })
         .filter(nonNullable);
+    const newPluginConfigs = pluginConfigs.reduce((acc, pluginConfig) => {
+        if (!acc.find((accPluginConfig) => accPluginConfig.sourceExport === pluginConfig.sourceExport)) {
+            acc.push(pluginConfig);
+        }
+        return acc;
+    }, []);
+    return newPluginConfigs;
 }
 exports.parseStructure = parseStructure;

package/dist/interceptors/writeInterceptors.js

@@ -17,19 +17,19 @@ function checkFileExists(file) {
 }
 async function writeInterceptors(interceptors, cwd = process.cwd()) {
     const dependencies = (0, resolveDependenciesSync_1.resolveDependenciesSync)(cwd);
-    const existing = [];
+    const existing = new Set();
     dependencies.forEach((dependency) => {
         const files = (0, glob_1.sync)([`${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_1.default.join(cwd, relativeFile);
         const isSame = (await checkFileExists(fileToWrite)) &&
@@ -38,7 +38,7 @@ async function writeInterceptors(interceptors, cwd = process.cwd()) {
             await promises_1.default.writeFile(fileToWrite, plugin.template);
     });
     // Cleanup unused interceptors
-    const cleaned = existing.map(async (file) => (await checkFileExists(file)) && (await promises_1.default.unlink(file)));
+    const cleaned = [...existing].map(async (file) => (await checkFileExists(file)) && (await promises_1.default.unlink(file)));
     await Promise.all(written);
     await Promise.all(cleaned);
 }

package/dist/utils/resolveDependenciesSync.js

@@ -8,7 +8,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const PackagesSort_1 = require("./PackagesSort");
 const resolveCache = new Map();
-function resolveRecursivePackageJson(dependencyPath, dependencyStructure, root) {
+function resolveRecursivePackageJson(dependencyPath, dependencyStructure, root, additionalDependencies = []) {
     const isRoot = dependencyPath === root;
     const fileName = require.resolve(node_path_1.default.join(dependencyPath, 'package.json'));
     const packageJsonFile = node_fs_1.default.readFileSync(fileName, 'utf-8').toString();
@@ -22,8 +22,9 @@ function resolveRecursivePackageJson(dependencyPath, dependencyStructure, root)
         return dependencyStructure;
     const dependencies = [
         ...new Set([
-            ...Object.keys(packageJson.dependencies ?? {}),
-            ...Object.keys(packageJson.devDependencies ?? {}),
+            ...Object.keys(packageJson.dependencies ?? []),
+            ...Object.keys(packageJson.devDependencies ?? []),
+            ...additionalDependencies,
             // ...Object.keys(packageJson.peerDependencies ?? {}),
         ].filter((name) => name.includes('graphcommerce'))),
     ];
@@ -63,7 +64,7 @@ function resolveDependenciesSync(root = process.cwd()) {
     const cached = resolveCache.get(root);
     if (cached)
         return cached;
-    const dependencyStructure = resolveRecursivePackageJson(root, {}, root);
+    const dependencyStructure = resolveRecursivePackageJson(root, {}, root, process.env.PRIVATE_ADDITIONAL_DEPENDENCIES?.split(',') ?? []);
     const sorted = sortDependencies(dependencyStructure);
     resolveCache.set(root, sorted);
     return sorted;

package/dist/utils/resolveDependency.js

@@ -14,6 +14,7 @@ const resolveDependency = (cwd = process.cwd()) => {
             root: '.',
             source: '',
             sourcePath: '',
+            sourcePathRelative: '',
             dependency,
             fromRoot: dependency,
             fromModule: dependency,
@@ -45,6 +46,9 @@ const resolveDependency = (cwd = process.cwd()) => {
                 let fromModule = !relative
                     ? '.'
                     : `./${relative.split('/')[relative.split('/').length - 1]}`;
+                const sourcePathRelative = !sourcePath
+                    ? '.'
+                    : `./${sourcePath.split('/')[sourcePath.split('/').length - 1]}`;
                 if (dependency.startsWith('./'))
                     fromModule = `.${relative}`;
                 dependencyPaths = {
@@ -55,6 +59,7 @@ const resolveDependency = (cwd = process.cwd()) => {
                     fromModule,
                     source,
                     sourcePath,
+                    sourcePathRelative,
                 };
             }
         });

package/dist/withGraphCommerce.js

@@ -94,15 +94,26 @@ function withGraphCommerce(nextConfig, cwd) {
         },
         transpilePackages,
         webpack: (config, 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 = [];
             // Make import.meta.graphCommerce available for usage.
             config.plugins.push(new webpack_1.DefinePlugin(importMetaPaths));
             // To properly properly treeshake @apollo/client we need to define the __DEV__ property
+            config.plugins.push(new webpack_1.DefinePlugin({ 'globalThis.__DEV__': options.dev }));
             if (!options.isServer) {
-                config.plugins.push(new webpack_1.DefinePlugin({ __DEV__: options.dev }));
                 if (graphcommerceConfig.debug?.webpackCircularDependencyPlugin) {
                     config.plugins.push(new circular_dependency_plugin_1.default({
                         exclude: /readable-stream|duplexer2|node_modules\/next/,
@@ -122,8 +133,6 @@ function withGraphCommerce(nextConfig, cwd) {
                     }));
                 }
             }
-            // @lingui .po file support
-            config.module?.rules?.push({ test: /\.po/, use: '@lingui/loader' });
             config.snapshot = {
                 ...(config.snapshot ?? {}),
                 managedPaths: [

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "8.1.0-canary.5",
+  "version": "8.1.0-canary.52",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/config/commands/exportConfig.ts

@@ -1,5 +1,8 @@
 import { loadConfig } from '../loadConfig'
 import { exportConfigToEnv } from '../utils/exportConfigToEnv'
+import dotenv from 'dotenv'
+
+dotenv.config()
 
 // eslint-disable-next-line @typescript-eslint/require-await
 export async function exportConfig() {

package/src/config/commands/generateConfig.ts

@@ -2,10 +2,13 @@ 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 { isMonorepo } from '../../utils/isMonorepo'
 import { resolveDependenciesSync } from '../../utils/resolveDependenciesSync'
 import { resolveDependency } from '../../utils/resolveDependency'
 
+dotenv.config()
+
 const packages = [...resolveDependenciesSync().values()].filter((p) => p !== '.')
 
 const resolve = resolveDependency()

package/src/config/demoConfig.ts

@@ -7,6 +7,7 @@ export const demoConfig: PartialDeep<GraphCommerceConfig, { recurseIntoArrays: t
   canonicalBaseUrl: 'https://graphcommerce.vercel.app',
   hygraphEndpoint: 'https://eu-central-1.cdn.hygraph.com/content/ckhx7xadya6xs01yxdujt8i80/master',
   magentoEndpoint: 'https://backend.reachdigital.dev/graphql',
+  magentoVersion: 246,
   storefront: [
     { locale: 'en', magentoStoreCode: 'en_US', defaultLocale: true },
     {
@@ -37,6 +38,7 @@ export const demoConfig: PartialDeep<GraphCommerceConfig, { recurseIntoArrays: t
   ],
   productFiltersPro: true,
   productFiltersLayout: 'DEFAULT',
+  productListPaginationVariant: 'COMPACT',
   compareVariant: 'ICON',
   robotsAllow: false,
 
@@ -47,4 +49,7 @@ export const demoConfig: PartialDeep<GraphCommerceConfig, { recurseIntoArrays: t
   configurableVariantForSimple: true,
   configurableVariantValues: { url: true, content: true, gallery: true },
   recentlyViewedProducts: { enabled: true, maxCount: 20 },
+  breadcrumbs: false,
+  customerDeleteEnabled: true,
+  previewSecret: 'SECRET',
 }

package/src/config/utils/mergeEnvIntoConfig.ts

@@ -17,6 +17,7 @@ import {
   ZodEnum,
   ZodTypeAny,
   ZodAny,
+  ZodDefault,
 } from 'zod'
 import diff from './diff'
 
@@ -61,6 +62,7 @@ export function configToEnvSchema(schema: ZodNode) {
     if (node instanceof ZodEffects) node = node.innerType()
     if (node instanceof ZodOptional) node = node.unwrap()
     if (node instanceof ZodNullable) node = node.unwrap()
+    if (node instanceof ZodDefault) node = node.removeDefault()
 
     if (node instanceof ZodObject) {
       if (path.length > 0) {
@@ -99,7 +101,13 @@ export function configToEnvSchema(schema: ZodNode) {
       return
     }
 
-    if (node instanceof ZodString || node instanceof ZodNumber || node instanceof ZodEnum) {
+    if (node instanceof ZodNumber) {
+      envSchema[toEnvStr(path)] = z.coerce.number().optional()
+      envToDot[toEnvStr(path)] = dotNotation(path)
+      return
+    }
+
+    if (node instanceof ZodString || node instanceof ZodEnum) {
       envSchema[toEnvStr(path)] = node.optional()
       envToDot[toEnvStr(path)] = dotNotation(path)
       return