Merge branch 'develop' into release-v3.0.0

reactioncommerce · Dec 20, 2019 · 168055f · 168055f
2 parents 748aa60 + 552ab26
commit 168055f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# v3.0.0-alpha
+
+This is a major update to keep this project in sync with
+[reaction v3.0.0-alpha](https://github.com/reactioncommerce/reaction),
+[example-storefront v3.0.0-alpha](https://github.com/reactioncommerce/example-storefront),
+and [reaction-platform v3.0.0-alpha](https://github.com/reactioncommerce/reaction-platform).
+
+## Fixes
+
+- Fix params for withTag API query [#621](https://github.com/reactioncommerce/example-storefront/pull/621)
+
+## Refactors
+
+- Update token name `cartToken` [#616](https://github.com/reactioncommerce/example-storefront/pull/616)
+
 # v2.9.0
 
 Example Storefront v2.9.0 is a minor update to keep this project in sync with [Reaction v2.9.0](https://github.com/reactioncommerce/reaction) and [reaction-hydra v2.9.0](https://github.com/reactioncommerce/reaction-hydra)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-storefront",
-  "version": "2.9.0",
+  "version": "3.0.0-alpha",
   "description": "The Example Storefront serves as a reference for implementing a web based storefront using the Reaction Commerce GraphQL API.",
   "main": "./src/server.js",
   "keywords": [],

diff --git a/src/containers/cart/queries.gql b/src/containers/cart/queries.gql
@@ -1,8 +1,8 @@
 #import "./fragments.gql"
 
 # Get an anonymous cart by the anonymous cartId and and an anonymous cart token
-query anonymousCartByCartIdQuery($cartId: ID!, $token: String!, $itemsAfterCursor: ConnectionCursor) {
-  cart: anonymousCartByCartId(cartId: $cartId, token: $token) {
+query anonymousCartByCartIdQuery($cartId: ID!, $cartToken: String!, $itemsAfterCursor: ConnectionCursor) {
+  cart: anonymousCartByCartId(cartId: $cartId, cartToken: $cartToken) {
     ...CartQueryFragment
   }
 }

diff --git a/src/containers/cart/withCart.js b/src/containers/cart/withCart.js
@@ -161,7 +161,7 @@ export default function withCart(Component) {
         const { anonymousCartId, anonymousCartToken } = cartStore;
 
         // Add items to an existing anonymous cart
-        input.token = anonymousCartToken;
+        input.cartToken = anonymousCartToken;
         input.cartId = anonymousCartId;
       } else if (!isCreating && authStore.isAuthenticated && cartStore.hasAccountCart) {
         // With an account and an account cart, set the accountCartId on the input object