Address PR feedback and resolve validation errors with name collisions.

magento · Jun 3, 2021 · b9de346 · b9de346
1 parent 5f025c7
commit b9de346
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -21,7 +21,7 @@ const config = {
     },
     overrides: [
         {
-            files: ['**/*.gql.js'],
+            files: ['**/*.gql*.js'],
             processor: '@graphql-eslint/graphql'
         },
         {

diff --git a/packages/peregrine/lib/talons/CartPage/GiftOptions/__tests__/useGiftOptions.spec.js b/packages/peregrine/lib/talons/CartPage/GiftOptions/__tests__/useGiftOptions.spec.js
@@ -12,11 +12,11 @@ import useGiftOptions from '../useGiftOptions';
 
 const GET_GIFT_OPTIONS = gql`
     query getGiftOptions($cartId: String!) {
-        cart(cart_id: $cartId) {
+        cart(cart_id: $cartId) @client {
             id
-            include_gift_receipt @client
-            include_printed_card @client
-            local_gift_message @client
+            include_gift_receipt
+            include_printed_card
+            local_gift_message
         }
     }
 `;

diff --git a/packages/peregrine/lib/talons/CartPage/ProductListing/product.gql.js b/packages/peregrine/lib/talons/CartPage/ProductListing/product.gql.js
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client';
 
-import { WishlistFragment } from './wishlistFragment';
+import { WishlistNameFragment } from './wishlistFragment';
 
 export const GET_CONFIGURABLE_THUMBNAIL_SOURCE = gql`
     query getConfigurableThumbnailSource {
@@ -35,11 +35,11 @@ export const ADD_TO_WISHLIST = gql`
             }
             wishlist {
                 id
-                ...WishlistFragment
+                ...WishlistNameFragment
             }
         }
     }
-    ${WishlistFragment}
+    ${WishlistNameFragment}
 `;
 
 export default {

diff --git a/packages/peregrine/lib/talons/CartPage/ProductListing/wishlistFragment.ce.js b/packages/peregrine/lib/talons/CartPage/ProductListing/wishlistFragment.ce.js
@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
-export const WishlistFragment = gql`
-    fragment WishlistFragment on Wishlist {
+export const WishlistNameFragment = gql`
+    fragment WishlistNameFragment on Wishlist {
         id
     }
 `;
diff --git a/packages/peregrine/lib/talons/CartPage/ProductListing/wishlistFragment.ee.js b/packages/peregrine/lib/talons/CartPage/ProductListing/wishlistFragment.ee.js
@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
-export const WishlistFragment = gql`
-    fragment WishlistFragment on Wishlist {
+export const WishlistNameFragment = gql`
+    fragment WishlistNameFragment on Wishlist {
         id
         name
     }

diff --git a/packages/peregrine/lib/talons/CheckoutPage/BillingAddress/billingAddress.gql.js b/packages/peregrine/lib/talons/CheckoutPage/BillingAddress/billingAddress.gql.js
@@ -5,9 +5,9 @@ import { AvailablePaymentMethodsFragment } from '../PaymentInformation/paymentIn
 
 export const GET_IS_BILLING_ADDRESS_SAME = gql`
     query getIsBillingAddressSame($cartId: String!) {
-        cart(cart_id: $cartId) {
+        cart(cart_id: $cartId) @client {
             id
-            isBillingAddressSame @client
+            isBillingAddressSame
         }
     }
 `;

diff --git a/packages/peregrine/lib/talons/CheckoutPage/PaymentInformation/creditCard.gql.js b/packages/peregrine/lib/talons/CheckoutPage/PaymentInformation/creditCard.gql.js
@@ -5,18 +5,18 @@ import { AvailablePaymentMethodsFragment } from './paymentInformation.gql';
 
 export const GET_IS_BILLING_ADDRESS_SAME = gql`
     query getIsBillingAddressSame($cartId: String!) {
-        cart(cart_id: $cartId) {
+        cart(cart_id: $cartId) @client {
             id
-            isBillingAddressSame @client
+            isBillingAddressSame
         }
     }
 `;
 
 export const GET_PAYMENT_NONCE = gql`
     query getPaymentNonce($cartId: String!) {
-        cart(cart_id: $cartId) {
+        cart(cart_id: $cartId) @client {
             id
-            paymentNonce @client
+            paymentNonce
         }
     }
 `;

diff --git a/packages/venia-concept/package.json b/packages/venia-concept/package.json
@@ -13,7 +13,7 @@
     "build": "yarn run build:prod",
     "build:analyze": "yarn run clean && mkdir dist && webpack -p --profile --no-progress --env.mode production --json > dist/build-stats.json && webpack-bundle-analyzer dist/build-stats.json",
     "build:debug": "node --inspect-brk ./node_modules/.bin/webpack --no-progress --env.mode development",
-    "build:dev": "yarn run clean && yarn run validate-queries && webpack --no-progress --env.mode development",
+    "build:dev": "yarn run clean && webpack --no-progress --env.mode development",
     "build:prod": "yarn run clean && webpack --no-progress --env.mode production",
     "build:report": "buildpack generate-build-report",
     "buildpack": "buildpack",

diff --git a/packages/venia-ui/lib/components/CartPage/PriceAdjustments/GiftOptions/giftOptions.gql.js b/packages/venia-ui/lib/components/CartPage/PriceAdjustments/GiftOptions/giftOptions.gql.js
@@ -7,11 +7,11 @@ import { gql } from '@apollo/client';
  */
 const GET_GIFT_OPTIONS = gql`
     query getGiftOptions($cartId: String!) {
-        cart(cart_id: $cartId) {
+        cart(cart_id: $cartId) @client {
             id
-            include_gift_receipt @client
-            include_printed_card @client
-            local_gift_message @client
+            include_gift_receipt
+            include_printed_card
+            local_gift_message
         }
     }
 `;

diff --git a/packages/venia-ui/lib/components/CheckoutPage/PaymentInformation/paymentInformation.gql.js b/packages/venia-ui/lib/components/CheckoutPage/PaymentInformation/paymentInformation.gql.js
@@ -40,9 +40,9 @@ export const GET_PAYMENT_INFORMATION = gql`
 
 export const GET_PAYMENT_NONCE = gql`
     query getPaymentNonce($cartId: String!) {
-        cart(cart_id: $cartId) {
+        cart(cart_id: $cartId) @client {
             id
-            paymentNonce @client
+            paymentNonce
         }
     }
 `;