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

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 9.1.0-canary.19
+
+### Patch Changes
+
+- [#2499](https://github.com/graphcommerce-org/graphcommerce/pull/2499) [`9cf0450`](https://github.com/graphcommerce-org/graphcommerce/commit/9cf0450a41c4c74292b96f5795c7428f9d6a930c) - Remove the 'ignored' string when loading the graphcommerce config env variable loading, as that isn't always correct ([@paales](https://github.com/paales))
+
+## 9.1.0-canary.18
+
+### Patch Changes
+
+- [`62b71d5`](https://github.com/graphcommerce-org/graphcommerce/commit/62b71d5ed1d482fdb5b76dc19ac4d55fc41fb191) - Solve issue: TypeError: InMemoryLRUCache is not a constructor ([@paales](https://github.com/paales))
+
 ## 9.1.0-canary.17
 
 ## 9.1.0-canary.16

package/__tests__/interceptors/findPlugins.ts

@@ -215,6 +215,30 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-product",
         "type": "component",
       },
+      {
+        "enabled": true,
+        "sourceExport": "OrderItem",
+        "sourceModule": "@graphcommerce/magento-product-downloadable/plugins/DownloadableOrderItem",
+        "targetExport": "OrderItem",
+        "targetModule": "@graphcommerce/magento-customer",
+        "type": "component",
+      },
+      {
+        "enabled": true,
+        "sourceExport": "InvoiceItem",
+        "sourceModule": "@graphcommerce/magento-product-downloadable/plugins/DownloadableInvoiceItem",
+        "targetExport": "InvoiceItem",
+        "targetModule": "@graphcommerce/magento-customer",
+        "type": "component",
+      },
+      {
+        "enabled": true,
+        "sourceExport": "CreditMemoItem",
+        "sourceModule": "@graphcommerce/magento-product-downloadable/plugins/DownloadableCreditMemoItem",
+        "targetExport": "CreditMemoItem",
+        "targetModule": "@graphcommerce/magento-customer",
+        "type": "component",
+      },
       {
         "enabled": true,
         "sourceExport": "CartItemActionCard",
@@ -231,6 +255,54 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-customer",
         "type": "component",
       },
+      {
+        "enabled": true,
+        "sourceExport": "cartItemToCartItemInput",
+        "sourceModule": "@graphcommerce/magento-product-bundle/plugins/Bundle_cartItemToCartItemInput",
+        "targetExport": "cartItemToCartItemInput",
+        "targetModule": "@graphcommerce/magento-cart-items",
+        "type": "function",
+      },
+      {
+        "enabled": true,
+        "sourceExport": "ShipmentItem",
+        "sourceModule": "@graphcommerce/magento-product-bundle/plugins/BundleShipmentItem",
+        "targetExport": "ShipmentItem",
+        "targetModule": "@graphcommerce/magento-customer",
+        "type": "component",
+      },
+      {
+        "enabled": true,
+        "sourceExport": "ProductPagePrice",
+        "sourceModule": "@graphcommerce/magento-product-bundle/plugins/BundleProductPagePrice",
+        "targetExport": "ProductPagePrice",
+        "targetModule": "@graphcommerce/magento-product",
+        "type": "component",
+      },
+      {
+        "enabled": true,
+        "sourceExport": "OrderItem",
+        "sourceModule": "@graphcommerce/magento-product-bundle/plugins/BundleOrderItem",
+        "targetExport": "OrderItem",
+        "targetModule": "@graphcommerce/magento-customer",
+        "type": "component",
+      },
+      {
+        "enabled": true,
+        "sourceExport": "InvoiceItem",
+        "sourceModule": "@graphcommerce/magento-product-bundle/plugins/BundleInvoiceItem",
+        "targetExport": "InvoiceItem",
+        "targetModule": "@graphcommerce/magento-customer",
+        "type": "component",
+      },
+      {
+        "enabled": true,
+        "sourceExport": "CreditMemoItem",
+        "sourceModule": "@graphcommerce/magento-product-bundle/plugins/BundleCreditMemoItem",
+        "targetExport": "CreditMemoItem",
+        "targetModule": "@graphcommerce/magento-customer",
+        "type": "component",
+      },
       {
         "enabled": true,
         "sourceExport": "CartItemActionCard",
@@ -247,6 +319,14 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-cart-items",
         "type": "component",
       },
+      {
+        "enabled": true,
+        "sourceExport": "AccountMenuItem",
+        "sourceModule": "@graphcommerce/magento-payment-tokens/plugins/PaymentTokensAccountMenuItem",
+        "targetExport": "AccountMenuItem",
+        "targetModule": "@graphcommerce/magento-customer",
+        "type": "component",
+      },
       {
         "enabled": true,
         "sourceExport": "PaymentMethodContextProvider",
@@ -468,6 +548,14 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-product-configurable",
         "type": "component",
       },
+      {
+        "enabled": true,
+        "sourceExport": "cartItemToCartItemInput",
+        "sourceModule": "@graphcommerce/magento-product-configurable/plugins/Configurable_cartItemToCartItemInput",
+        "targetExport": "cartItemToCartItemInput",
+        "targetModule": "@graphcommerce/magento-cart-items",
+        "type": "function",
+      },
       {
         "enabled": true,
         "sourceExport": "CartItemActionCard",

package/__tests__/utils/resolveDependenciesSync.ts

@@ -1,5 +1,4 @@
 import { resolveDependenciesSync, sortDependencies } from '../../src/utils/resolveDependenciesSync'
-
 const projectRoot = `${process.cwd()}/examples/magento-graphcms`
 it('It resolves and sorts dependencies beginning with the root example package and ending with the the packages used everywhere.', () => {
   const dependencies = resolveDependenciesSync(projectRoot)
@@ -23,6 +22,7 @@ it('It resolves and sorts dependencies beginning with the root example package a
       "@graphcommerce/magento-product-downloadable" => "packages/magento-product-downloadable",
       "@graphcommerce/magento-product-bundle" => "packages/magento-product-bundle",
       "@graphcommerce/magento-product-virtual" => "packages/magento-product-virtual",
+      "@graphcommerce/magento-payment-tokens" => "packages/magento-payment-tokens",
       "@graphcommerce/magento-payment-included" => "packages/magento-payment-included",
       "@graphcommerce/magento-newsletter" => "packages/magento-newsletter",
       "@graphcommerce/magento-graphql-rest" => "packages/magento-graphql-rest",
@@ -32,7 +32,6 @@ it('It resolves and sorts dependencies beginning with the root example package a
       "@graphcommerce/magento-cart-email" => "packages/magento-cart-email",
       "@graphcommerce/magento-cart-checkout" => "packages/magento-cart-checkout",
       "@graphcommerce/magento-cart-coupon" => "packages/magento-cart-coupon",
-      "@graphcommerce/magento-cart-billing-address" => "packages/magento-cart-billing-address",
       "@graphcommerce/hygraph-dynamic-rows" => "packages/hygraph-dynamic-rows",
       "@graphcommerce/hygraph-ui" => "packages/hygraph-ui",
       "@graphcommerce/googletagmanager" => "packages/googletagmanager",

package/dist/index.js

@@ -330,175 +330,145 @@ const demoConfig = {
   previewSecret: "SECRET"
 };
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
-
-
 var __assign = function() {
-  __assign = Object.assign || function __assign(t) {
-      for (var s, i = 1, n = arguments.length; i < n; i++) {
-          s = arguments[i];
-          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-      return t;
+  __assign = Object.assign || function __assign2(t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
   };
   return __assign.apply(this, arguments);
 };
-
 function __spreadArray(to, from, pack) {
   if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-      if (ar || !(i in from)) {
-          if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-          ar[i] = from[i];
-      }
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 }
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
   var e = new Error(message);
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
 function isNonNullObject(obj) {
-    return obj !== null && typeof obj === "object";
+  return obj !== null && typeof obj === "object";
 }
 
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 function mergeDeep() {
-    var sources = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        sources[_i] = arguments[_i];
-    }
-    return mergeDeepArray(sources);
-}
-// In almost any situation where you could succeed in getting the
-// TypeScript compiler to infer a tuple type for the sources array, you
-// could just use mergeDeep instead of mergeDeepArray, so instead of
-// trying to convert T[] to an intersection type we just infer the array
-// element type, which works perfectly when the sources array has a
-// consistent element type.
+  var sources = [];
+  for (var _i = 0; _i < arguments.length; _i++) {
+    sources[_i] = arguments[_i];
+  }
+  return mergeDeepArray(sources);
+}
 function mergeDeepArray(sources) {
-    var target = sources[0] || {};
-    var count = sources.length;
-    if (count > 1) {
-        var merger = new DeepMerger();
-        for (var i = 1; i < count; ++i) {
-            target = merger.merge(target, sources[i]);
-        }
+  var target = sources[0] || {};
+  var count = sources.length;
+  if (count > 1) {
+    var merger = new DeepMerger();
+    for (var i = 1; i < count; ++i) {
+      target = merger.merge(target, sources[i]);
     }
-    return target;
+  }
+  return target;
 }
-var defaultReconciler = function (target, source, property) {
-    return this.merge(target[property], source[property]);
+var defaultReconciler = function(target, source, property) {
+  return this.merge(target[property], source[property]);
 };
-var DeepMerger = /** @class */ (function () {
-    function DeepMerger(reconciler) {
-        if (reconciler === void 0) { reconciler = defaultReconciler; }
-        this.reconciler = reconciler;
-        this.isObject = isNonNullObject;
-        this.pastCopies = new Set();
-    }
-    DeepMerger.prototype.merge = function (target, source) {
-        var _this = this;
-        var context = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            context[_i - 2] = arguments[_i];
-        }
-        if (isNonNullObject(source) && isNonNullObject(target)) {
-            Object.keys(source).forEach(function (sourceKey) {
-                if (hasOwnProperty.call(target, sourceKey)) {
-                    var targetValue = target[sourceKey];
-                    if (source[sourceKey] !== targetValue) {
-                        var result = _this.reconciler.apply(_this, __spreadArray([target,
-                            source,
-                            sourceKey], context, false));
-                        // A well-implemented reconciler may return targetValue to indicate
-                        // the merge changed nothing about the structure of the target.
-                        if (result !== targetValue) {
-                            target = _this.shallowCopyForMerge(target);
-                            target[sourceKey] = result;
-                        }
-                    }
-                }
-                else {
-                    // If there is no collision, the target can safely share memory with
-                    // the source, and the recursion can terminate here.
-                    target = _this.shallowCopyForMerge(target);
-                    target[sourceKey] = source[sourceKey];
-                }
-            });
-            return target;
-        }
-        // If source (or target) is not an object, let source replace target.
-        return source;
-    };
-    DeepMerger.prototype.shallowCopyForMerge = function (value) {
-        if (isNonNullObject(value)) {
-            if (!this.pastCopies.has(value)) {
-                if (Array.isArray(value)) {
-                    value = value.slice(0);
-                }
-                else {
-                    value = __assign({ __proto__: Object.getPrototypeOf(value) }, value);
-                }
-                this.pastCopies.add(value);
+var DeepMerger = (
+  /** @class */
+  function() {
+    function DeepMerger2(reconciler) {
+      if (reconciler === void 0) {
+        reconciler = defaultReconciler;
+      }
+      this.reconciler = reconciler;
+      this.isObject = isNonNullObject;
+      this.pastCopies = /* @__PURE__ */ new Set();
+    }
+    DeepMerger2.prototype.merge = function(target, source) {
+      var _this = this;
+      var context = [];
+      for (var _i = 2; _i < arguments.length; _i++) {
+        context[_i - 2] = arguments[_i];
+      }
+      if (isNonNullObject(source) && isNonNullObject(target)) {
+        Object.keys(source).forEach(function(sourceKey) {
+          if (hasOwnProperty.call(target, sourceKey)) {
+            var targetValue = target[sourceKey];
+            if (source[sourceKey] !== targetValue) {
+              var result = _this.reconciler.apply(_this, __spreadArray([
+                target,
+                source,
+                sourceKey
+              ], context, false));
+              if (result !== targetValue) {
+                target = _this.shallowCopyForMerge(target);
+                target[sourceKey] = result;
+              }
             }
+          } else {
+            target = _this.shallowCopyForMerge(target);
+            target[sourceKey] = source[sourceKey];
+          }
+        });
+        return target;
+      }
+      return source;
+    };
+    DeepMerger2.prototype.shallowCopyForMerge = function(value) {
+      if (isNonNullObject(value)) {
+        if (!this.pastCopies.has(value)) {
+          if (Array.isArray(value)) {
+            value = value.slice(0);
+          } else {
+            value = __assign({ __proto__: Object.getPrototypeOf(value) }, value);
+          }
+          this.pastCopies.add(value);
         }
-        return value;
+      }
+      return value;
     };
-    return DeepMerger;
-}());
+    return DeepMerger2;
+  }()
+);
 
 var toString = Object.prototype.toString;
-/**
- * Deeply clones a value to create a new instance.
- */
 function cloneDeep(value) {
-    return cloneDeepHelper(value);
+  return cloneDeepHelper(value);
 }
 function cloneDeepHelper(val, seen) {
-    switch (toString.call(val)) {
-        case "[object Array]": {
-            seen = seen || new Map();
-            if (seen.has(val))
-                return seen.get(val);
-            var copy_1 = val.slice(0);
-            seen.set(val, copy_1);
-            copy_1.forEach(function (child, i) {
-                copy_1[i] = cloneDeepHelper(child, seen);
-            });
-            return copy_1;
-        }
-        case "[object Object]": {
-            seen = seen || new Map();
-            if (seen.has(val))
-                return seen.get(val);
-            // High fidelity polyfills of Object.create and Object.getPrototypeOf are
-            // possible in all JS environments, so we will assume they exist/work.
-            var copy_2 = Object.create(Object.getPrototypeOf(val));
-            seen.set(val, copy_2);
-            Object.keys(val).forEach(function (key) {
-                copy_2[key] = cloneDeepHelper(val[key], seen);
-            });
-            return copy_2;
-        }
-        default:
-            return val;
+  switch (toString.call(val)) {
+    case "[object Array]": {
+      seen = seen || /* @__PURE__ */ new Map();
+      if (seen.has(val))
+        return seen.get(val);
+      var copy_1 = val.slice(0);
+      seen.set(val, copy_1);
+      copy_1.forEach(function(child, i) {
+        copy_1[i] = cloneDeepHelper(child, seen);
+      });
+      return copy_1;
+    }
+    case "[object Object]": {
+      seen = seen || /* @__PURE__ */ new Map();
+      if (seen.has(val))
+        return seen.get(val);
+      var copy_2 = Object.create(Object.getPrototypeOf(val));
+      seen.set(val, copy_2);
+      Object.keys(val).forEach(function(key) {
+        copy_2[key] = cloneDeepHelper(val[key], seen);
+      });
+      return copy_2;
     }
+    default:
+      return val;
+  }
 }
 
 function isObject$1(val) {
@@ -648,7 +618,7 @@ function formatAppliedEnv(applyResult) {
       return `${chalk.yellowBright(` \u203C ${envVariableFmt}`)} => ${warning.join(", ")}`;
     }
     if (!dotVar) return chalk.red(`${envVariableFmt} => ignored (no matching config)`);
-    if (from === void 0 && to === void 0) return ` = ${baseLog}: (ignored)`;
+    if (from === void 0 && to === void 0) return ` = ${baseLog}`;
     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}`;

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.17",
+  "version": "9.1.0-canary.19",
   "type": "module",
   "types": "./src/index.ts",
   "exports": {
@@ -19,7 +19,7 @@
     "prepack": "pkgroll --clean-dist"
   },
   "dependencies": {
-    "@graphql-codegen/cli": "5.0.3",
+    "@graphql-codegen/cli": "5.0.5",
     "@swc/core": "1.10.1",
     "@swc/wasm-web": "^1.10.1",
     "@types/circular-dependency-plugin": "^5.0.8",
@@ -43,7 +43,7 @@
     "zod": "^3.24.1"
   },
   "peerDependencies": {
-    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.17",
+    "@graphcommerce/prettier-config-pwa": "^9.1.0-canary.19",
     "@lingui/loader": "*",
     "@lingui/macro": "*",
     "@lingui/react": "*",

package/src/config/utils/mergeEnvIntoConfig.ts

@@ -223,7 +223,7 @@ export function formatAppliedEnv(applyResult: ApplyResult) {
 
     if (!dotVar) return chalk.red(`${envVariableFmt} => ignored (no matching config)`)
 
-    if (from === undefined && to === undefined) return ` = ${baseLog}: (ignored)`
+    if (from === undefined && to === undefined) return ` = ${baseLog}`
     if (from === undefined && to !== undefined) return ` ${chalk.green('+')} ${baseLog}`
     if (from !== undefined && to === undefined) return ` ${chalk.red('-')} ${baseLog}`
     return ` ${chalk.yellowBright('~')} ${baseLog}`