Merge branch 'develop' into jimothy/pwa-796_targetables-docs

magento · Jan 28, 2021 · 20020e8 · 20020e8
2 parents e92511d + c6fab8a
commit 20020e8
Show file tree

Hide file tree

Showing 144 changed files with 3,635 additions and 1,334 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Coverage Status](https://coveralls.io/repos/github/magento/pwa-studio/badge.svg?branch=develop)](https://coveralls.io/github/magento/pwa-studio?branch=develop)
+
 # PWA Studio
 
 Magento PWA Studio is a collection of tools that lets developers build complex Progressive Web Applications on top of Magento 2 stores.

diff --git a/packages/extensions/venia-sample-language-packs/i18n/fr_FR.json b/packages/extensions/venia-sample-language-packs/i18n/fr_FR.json
@@ -42,11 +42,9 @@
     "cartPage.signIn": "Se connecter",
     "cartPage.title": "Panier - {name}",
     "cartTrigger.ariaLabel": "Basculer le mini-panier. Vous avez {count} articles dans votre panier.",
-    "category.dataFetchError": "Erreur de récupération des données",
     "categoryContent.filter": "Filtre",
     "categoryContent.itemsSortedBy": "Articles triés par ",
     "categoryLeaf.allLabel": "Tout(e) {name}",
-    "categoryList.errorFetch": "Erreur de récupération des données: ",
     "categoryList.noResults": "Aucune catégorie enfant trouvée.",
     "checkoutPage.additionalText": "Vous recevrez également un courriel avec les détails et nous vous informerons lorsque votre commande aura été expédiée",
     "checkoutPage.accountSuccessfullyCreated": "Compte créé avec succès.",
@@ -94,7 +92,6 @@
     "checkoutPage.titleCheckout": "Paiement - {name}",
     "checkoutPage.titleReceipt": "Le reçu - {name}",
     "cms.shopByCategory": "Acheter par catégorie",
-    "cmsBlock.errorFetch": "Erreur de récupération des données",
     "cmsBlock.noBlocks": "Il n'y a aucun bloc à afficher",
     "communicationsPage.changesText": "Sauvegarder les modifications",
     "communicationsPage.communicationsText": "Les Communications",
@@ -258,7 +255,6 @@
     "priceSummary.lineItemLabel": "Sous-total",
     "priceSummary.total": "Total",
     "product.editItem": "Modifier l'article",
-    "product.errorFetch": "Erreur de récupération des données",
     "product.moveToFavorites": "Déplacer vers les favoris",
     "product.outOfStock": "En-rupture-de-stock",
     "product.outOfStockTryAgain": "Ce produit est actuellement en rupture de stock. Veuillez réessayer plus tard.",

diff --git a/packages/peregrine/lib/Apollo/attachClientToStore.js b/packages/peregrine/lib/Apollo/attachClientToStore.js
@@ -0,0 +1,7 @@
+import { extraArgument } from '../store/middleware/thunk';
+
+const attachClientToStore = apolloClient => {
+    Object.assign(extraArgument, { apolloClient });
+};
+
+export default attachClientToStore;
diff --git a/packages/peregrine/lib/Apollo/policies/__tests__/__snapshots__/index.spec.js.snap b/packages/peregrine/lib/Apollo/policies/__tests__/__snapshots__/index.spec.js.snap
@@ -67,6 +67,11 @@ Object {
     },
   },
   "CustomerPaymentTokens": Object {
+    "fields": Object {
+      "items": Object {
+        "merge": [Function],
+      },
+    },
     "keyFields": [Function],
   },
   "ProductImage": Object {

diff --git a/packages/peregrine/lib/Apollo/policies/index.js b/packages/peregrine/lib/Apollo/policies/index.js
@@ -144,7 +144,15 @@ const typePolicies = {
         }
     },
     CustomerPaymentTokens: {
-        keyFields: () => 'CustomerPaymentTokens'
+        keyFields: () => 'CustomerPaymentTokens',
+        fields: {
+            items: {
+                // eslint-disable-next-line no-unused-vars
+                merge(existing, incoming) {
+                    return incoming;
+                }
+            }
+        }
     },
     ProductImage: {
         keyFields: ['url']

diff --git a/packages/peregrine/lib/Page/__tests__/page.spec.js b/packages/peregrine/lib/Page/__tests__/page.spec.js
diff --git a/packages/peregrine/lib/Page/index.js b/packages/peregrine/lib/Page/index.js
diff --git a/packages/peregrine/lib/Page/page.js b/packages/peregrine/lib/Page/page.js
diff --git a/packages/peregrine/lib/Router/__mocks__/magentoRouteHandler.js b/packages/peregrine/lib/Router/__mocks__/magentoRouteHandler.js
diff --git a/packages/peregrine/lib/Router/__tests__/magentoRouteHandler.test.js b/packages/peregrine/lib/Router/__tests__/magentoRouteHandler.test.js
diff --git a/packages/peregrine/lib/Router/index.js b/packages/peregrine/lib/Router/index.js
@@ -1,4 +1,3 @@
-export { default as MagentoRouteHandler } from './magentoRouteHandler';
 export {
     default,
     Consumer as RouteConsumer,