@graphcommerce/next-config 9.1.0-canary.15 → 9.1.0-canary.17

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 9.1.0-canary.17
+
+## 9.1.0-canary.16
+
 ## 9.1.0-canary.15
 
 ## 9.0.4-canary.14

package/__tests__/interceptors/findPlugins.ts

@@ -297,7 +297,14 @@ it('finds plugins', () => {
       },
       {
         "enabled": true,
-        "ifConfig": "googleRecaptchaKey",
+        "sourceExport": "meshConfig",
+        "sourceModule": "@graphcommerce/googlerecaptcha/plugins/meshRecaptcha",
+        "targetExport": "meshConfig",
+        "targetModule": "@graphcommerce/graphql-mesh/meshConfig",
+        "type": "function",
+      },
+      {
+        "enabled": true,
         "sourceExport": "GraphQLProvider",
         "sourceModule": "@graphcommerce/googlerecaptcha/plugins/GrecaptchaGraphQLProvider",
         "targetExport": "GraphQLProvider",
@@ -306,7 +313,6 @@ it('finds plugins', () => {
       },
       {
         "enabled": true,
-        "ifConfig": "googleRecaptchaKey",
         "sourceExport": "ApolloErrorSnackbar",
         "sourceModule": "@graphcommerce/googlerecaptcha/plugins/GrecaptchaApolloErrorSnackbar",
         "targetExport": "ApolloErrorSnackbar",
@@ -315,7 +321,6 @@ it('finds plugins', () => {
       },
       {
         "enabled": true,
-        "ifConfig": "googleRecaptchaKey",
         "sourceExport": "ApolloErrorFullPage",
         "sourceModule": "@graphcommerce/googlerecaptcha/plugins/GrecaptchaApolloErrorFullPage",
         "targetExport": "ApolloErrorFullPage",
@@ -324,7 +329,6 @@ it('finds plugins', () => {
       },
       {
         "enabled": true,
-        "ifConfig": "googleRecaptchaKey",
         "sourceExport": "ApolloErrorAlert",
         "sourceModule": "@graphcommerce/googlerecaptcha/plugins/GrecaptchaApolloErrorAlert",
         "targetExport": "ApolloErrorAlert",
@@ -548,6 +552,14 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/graphql",
         "type": "component",
       },
+      {
+        "enabled": true,
+        "sourceExport": "meshConfig",
+        "sourceModule": "@graphcommerce/magento-store/plugins/meshMagentoStore",
+        "targetExport": "meshConfig",
+        "targetModule": "@graphcommerce/graphql-mesh/meshConfig",
+        "type": "function",
+      },
       {
         "enabled": true,
         "sourceExport": "graphqlConfig",
@@ -556,6 +568,22 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/graphql",
         "type": "function",
       },
+      {
+        "enabled": true,
+        "sourceExport": "getPrivateQueryContext",
+        "sourceModule": "@graphcommerce/magento-store/plugins/magentoCurrencyCode",
+        "targetExport": "getPrivateQueryContext",
+        "targetModule": "@graphcommerce/graphql",
+        "type": "function",
+      },
+      {
+        "enabled": true,
+        "sourceExport": "usePrivateQueryContext",
+        "sourceModule": "@graphcommerce/magento-store/plugins/magentoCurrencyCode",
+        "targetExport": "usePrivateQueryContext",
+        "targetModule": "@graphcommerce/graphql",
+        "type": "function",
+      },
       {
         "enabled": true,
         "sourceExport": "meshConfig",

package/dist/generated/config.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-const isDefinedNonNullAny = (v) => v !== undefined && v !== null;
+const isDefinedNonNullAny = (v) => v !== void 0 && v !== null;
 const definedNonNullAnySchema = z.any().refine((v) => isDefinedNonNullAny(v));
 const CartPermissionsSchema = z.enum(["CUSTOMER_ONLY", "DISABLED", "ENABLED"]);
 const CompareVariantSchema = z.enum(["CHECKBOX", "ICON"]);

package/dist/index.js

@@ -1,6 +1,5 @@
-import fs from 'node:fs';
+import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import fs from 'node:fs';
 import path from 'node:path';
-import { createRequire } from 'module';
 import assert from 'assert';
 import crypto from 'crypto';
 import webpack from 'webpack';
@@ -54,12 +53,6 @@ function findParentPath(directory) {
   return null;
 }
 
-var require$1 = (
-			true
-				? /* @__PURE__ */ createRequire(import.meta.url)
-				: require
-		);
-
 class TopologicalSort {
   #nodes;
   #visitedNodes;
@@ -83,12 +76,12 @@ class TopologicalSort {
     const sourceNode = this.#nodes.get(fromKey);
     const targetNode = this.#nodes.get(toKey);
     assert.strictEqual(
-      sourceNode !== undefined,
+      sourceNode !== void 0,
       true,
       `Source package with key ${fromKey} doesn't exist`
     );
     assert.strictEqual(
-      targetNode !== undefined,
+      targetNode !== void 0,
       true,
       `Target package with key ${toKey} doesn't exist`
     );
@@ -176,7 +169,7 @@ function sig() {
 
 const resolveCache = /* @__PURE__ */ new Map();
 function findPackageJson(id, root) {
-  let dir = id.startsWith("/") ? id : require$1.resolve(id);
+  let dir = id.startsWith("/") ? id : require.resolve(id);
   let packageJsonLocation = path.join(dir, "package.json");
   while (!fs.existsSync(packageJsonLocation)) {
     dir = path.dirname(dir);
@@ -189,7 +182,7 @@ function resolveRecursivePackageJson(dependencyPath, dependencyStructure, root,
   const isRoot = dependencyPath === root;
   let fileName;
   try {
-    fileName = require$1.resolve(path.join(dependencyPath, "package.json"));
+    fileName = require.resolve(path.join(dependencyPath, "package.json"));
   } catch (e2) {
     fileName = findPackageJson(dependencyPath, root);
   }
@@ -414,7 +407,7 @@ var defaultReconciler = function (target, source, property) {
 };
 var DeepMerger = /** @class */ (function () {
     function DeepMerger(reconciler) {
-        if (reconciler === undefined) { reconciler = defaultReconciler; }
+        if (reconciler === void 0) { reconciler = defaultReconciler; }
         this.reconciler = reconciler;
         this.isObject = isNonNullObject;
         this.pastCopies = new Set();
@@ -521,7 +514,7 @@ function diff(item1, item2) {
   if (!isSame) return item2;
   if (isArray(item1) && isArray(item2)) {
     const res = item1.map((val, idx) => diff(val, item2[idx])).filter((val) => !!val);
-    return res.length ? res : undefined;
+    return res.length ? res : void 0;
   }
   if (isObject$1(item1) && isObject$1(item2)) {
     const entriesRight = Object.fromEntries(
@@ -531,9 +524,9 @@ function diff(item1, item2) {
       Object.entries(item2).map(([key, val]) => [key, diff(item1[key], val)]).filter((entry) => !!entry[1])
     );
     const entries = { ...entriesRight, ...entriesLeft };
-    return Object.keys(entries).length ? entries : undefined;
+    return Object.keys(entries).length ? entries : void 0;
   }
-  return item2 === item1 ? undefined : item2;
+  return item2 === item1 ? void 0 : item2;
 }
 
 const fmt$1 = (s) => s.split(/(\d+)/).map((v) => lodash.snakeCase(v)).join("");
@@ -621,7 +614,7 @@ function mergeEnvIntoConfig(schema, config, env) {
       const envValue = filteredEnv[envVar];
       applyResult.push({ envVar, envValue, dotVar, error });
     });
-    return [undefined, applyResult];
+    return [void 0, applyResult];
   }
   Object.entries(result.data).forEach(([envVar, value]) => {
     const dotVar = envToDot[envVar];
@@ -655,9 +648,9 @@ function formatAppliedEnv(applyResult) {
       return `${chalk.yellowBright(` \u203C ${envVariableFmt}`)} => ${warning.join(", ")}`;
     }
     if (!dotVar) return chalk.red(`${envVariableFmt} => ignored (no matching config)`);
-    if (from === undefined && to === undefined) return ` = ${baseLog}: (ignored)`;
-    if (from === undefined && to !== undefined) return ` ${chalk.green("+")} ${baseLog}`;
-    if (from !== undefined && to === undefined) return ` ${chalk.red("-")} ${baseLog}`;
+    if (from === void 0 && to === void 0) return ` = ${baseLog}: (ignored)`;
+    if (from === void 0 && to !== void 0) return ` ${chalk.green("+")} ${baseLog}`;
+    if (from !== void 0 && to === void 0) return ` ${chalk.red("-")} ${baseLog}`;
     return ` ${chalk.yellowBright("~")} ${baseLog}`;
   });
   let header = chalk.blueBright("info");
@@ -668,7 +661,7 @@ function formatAppliedEnv(applyResult) {
 }
 
 function flattenKeys(value, initialPathPrefix, stringify) {
-  if (value === null || value === undefined || typeof value === "number") {
+  if (value === null || value === void 0 || typeof value === "number") {
     return { [initialPathPrefix]: value };
   }
   if (typeof value === "string") {
@@ -848,7 +841,7 @@ function extractValue(node, path, optional = false) {
   if (isIdentifier(node)) {
     switch (node.value) {
       case "undefined":
-        return undefined;
+        return void 0;
       default:
         return RUNTIME_VALUE;
     }
@@ -862,7 +855,7 @@ function extractValue(node, path, optional = false) {
         }
         arr.push(extractValue(elem.expression, path, optional));
       } else {
-        arr.push(undefined);
+        arr.push(void 0);
       }
     }
     return arr;
@@ -913,7 +906,7 @@ function extractExports(module) {
           case "VariableDeclaration":
             moduleItem.declaration.declarations.forEach((decl) => {
               if (isIdentifier(decl.id) && decl.init) {
-                exports[decl.id.value] = extractValue(decl.init, undefined, true);
+                exports[decl.id.value] = extractValue(decl.init, void 0, true);
               }
             });
             break;
@@ -930,7 +923,7 @@ const pluginConfigParsed = z.object({
   ifConfig: z.union([z.string(), z.tuple([z.string(), z.unknown()])]).optional()
 });
 function nonNullable(value) {
-  return value !== null && value !== undefined;
+  return value !== null && value !== void 0;
 }
 const isObject = (input) => typeof input === "object" && input !== null && !Array.isArray(input);
 function parseStructure(ast, gcConfig, sourceModule) {
@@ -965,7 +958,7 @@ function parseStructure(ast, gcConfig, sourceModule) {
     if (!parsed.success) {
       if (errors.length)
         console.error(parsed.error.errors.map((e) => `${e.path} ${e.message}`).join("\n"));
-      return undefined;
+      return void 0;
     }
     let enabled = true;
     if (parsed.data.ifConfig) {
@@ -1062,7 +1055,7 @@ function printSync(m) {
 }
 
 function parseAndFindExport(resolved, findExport, resolve) {
-  if (!resolved?.source) return undefined;
+  if (!resolved?.source) return void 0;
   const ast = parseSync(resolved.source);
   for (const node of ast.body) {
     if (node.type === "ExportDeclaration") {
@@ -1108,24 +1101,24 @@ function parseAndFindExport(resolved, findExport, resolve) {
       if (newResolved && resolved.dependency !== newResolved.dependency) return newResolved;
     }
   }
-  return undefined;
+  return void 0;
 }
 function findOriginalSource(plug, resolved, resolve) {
   if (!resolved?.source)
     return {
-      resolved: undefined,
+      resolved: void 0,
       error: new Error(`Plugin: Can not find module ${plug.targetModule} for ${plug.sourceModule}`)
     };
   const newResolved = parseAndFindExport(resolved, plug.targetExport, resolve);
   if (!newResolved) {
     return {
-      resolved: undefined,
+      resolved: void 0,
       error: new Error(
         `Plugin target not found ${plug.targetModule}#${plug.sourceExport} for plugin ${plug.sourceModule}#${plug.sourceExport}`
       )
     };
   }
-  return { resolved: newResolved, error: undefined };
+  return { resolved: newResolved, error: void 0 };
 }
 
 class Visitor {
@@ -2747,7 +2740,7 @@ async function generateInterceptors(plugins, resolve, config, force) {
     await Promise.all(
       Object.entries(byTargetModuleAndExport).map(async ([target, interceptor]) => {
         const file = `${interceptor.fromRoot}.interceptor.tsx`;
-        const originalSource = !force && await fs$1.access(file, fs$1.constants.F_OK).then(() => true).catch(() => false) ? (await fs$1.readFile(file)).toString() : undefined;
+        const originalSource = !force && await fs$1.access(file, fs$1.constants.F_OK).then(() => true).catch(() => false) ? (await fs$1.readFile(file)).toString() : void 0;
         return [
           target,
           await generateInterceptor(interceptor, config ?? {}, originalSource)
@@ -2885,7 +2878,7 @@ function domains(config) {
           defaultLocale: loc.locale,
           locales: [...acc[loc.domain]?.locales ?? [], loc.locale],
           domain: loc.domain,
-          http: process.env.NODE_ENV === "development" || undefined
+          http: process.env.NODE_ENV === "development" || void 0
         };
         return acc;
       },
@@ -2920,7 +2913,7 @@ function withGraphCommerce(nextConfig, cwd = process.cwd()) {
       remotePatterns: [
         "magentoEndpoint" in graphcommerceConfig ? {
           hostname: new URL(graphcommerceConfig.magentoEndpoint).hostname
-        } : undefined,
+        } : void 0,
         { hostname: "**.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.1.0-canary.15",
+  "version": "9.1.0-canary.17",
   "type": "module",
   "types": "./src/index.ts",
   "exports": {
@@ -43,7 +43,7 @@
     "zod": "^3.24.1"
   },
   "peerDependencies": {
-    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.15",
+    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.17",
     "@lingui/loader": "*",
     "@lingui/macro": "*",
     "@lingui/react": "*",