Merge pull request #588 from reactioncommerce/release-v2.5.0

Release v2.5.0

.circleci/config.yml

@@ -94,15 +94,6 @@ jobs:
                 | xargs -t -I % \
                 docker push "$DOCKER_REPOSITORY:%"
 
-  deploy-to-ecs:
-    <<: *defaults
-    steps:
-      - checkout
-      - run:
-          name: Deploy new task definition and update service in ECS
-          command: |
-            .circleci/bin/ecs-deploy.sh
-
   lint-javascript:
     <<: *defaults
     steps:
@@ -149,51 +140,6 @@ jobs:
       - store_artifacts:
           path: reports
 
-  e2e-test:
-    <<: *defaults
-    steps:
-      - checkout
-      - setup_remote_docker
-      - attach_workspace:
-          at: docker-cache
-      - run:
-          name: Load Docker Image
-          command: |
-            docker load < docker-cache/docker-image.tar
-      - run:
-          name: Integration Test
-          command: |
-            docker run -e URL=${STAGING_URL} --env-file .env.example --name reaction_app_next_starterkit "$DOCKER_REPOSITORY:$CIRCLE_SHA1" yarn run test:integration
-      - run:
-          name: Install Broken Link Checker
-          command: |
-            yarn add broken-link-checker
-      - run:
-          name: Broken Link Test
-          command: |
-            ./node_modules/.bin/blc ${STAGING_URL} -ro -filter=3 -e
-
-  test-metrics:
-    <<: *defaults
-    steps:
-      - checkout
-      - run:
-          name: California
-          command: |
-            .circleci/bin/calibre-deploy.sh ${STAGING_URL} California
-      - run:
-          name: North Virginia
-          command: |
-            .circleci/bin/calibre-deploy.sh ${STAGING_URL} NorthVirginia
-      - run:
-          name: London
-          command: |
-            .circleci/bin/calibre-deploy.sh ${STAGING_URL} London
-      - run:
-          name: Frankfurt
-          command: |
-            .circleci/bin/calibre-deploy.sh ${STAGING_URL} Frankfurt
-
   snyk-security:
     <<: *defaults
     steps:
@@ -242,19 +188,7 @@ workflows:
           context: reaction-validation
           requires:
             - docker-build
-      - test-metrics:
-          requires:
-            - deploy-to-ecs
       - snyk-security:
           context: reaction-validation
           requires:
             - docker-build
-      - deploy-to-ecs:
-          requires:
-            - docker-push
-          filters:
-            branches:
-              only: /^develop$/
-      - e2e-test:
-          requires:
-            - deploy-to-ecs

.reaction/entrypoint.sh

@@ -18,7 +18,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")/.."
 usermod --uid "$(stat -c "%u" .)" --non-unique node |& grep -v "no changes" || true
 ./.reaction/fix-volumes.sh
 export NODE_ENV="${NODE_ENV:-production}"
-command=(node .)
+command=(./bin/start)
 if [[ $# -gt 0 ]]; then
   command=($@)
 fi

CHANGELOG.md

@@ -1,3 +1,20 @@
+# v2.5.0
+
+Example Storefront v2.5.0 is a minor update to keep this project in sync with [Reaction v2.5.0](https://github.com/reactioncommerce/reaction) and [reaction-hydra v2.5.0](https://github.com/reactioncommerce/reaction-hydra)
+
+## Fixes
+
+fix: Make sure development entry-point runs bin/start by default
+fix: Cannot edit checkout address ([#494](https://github.com/reactioncommerce/example-storefront/issues/494))
+
+## Chores
+
+chore: Remove inactive end-to-end propel/calibre tests
+
+## Breaking Changes
+
+None
+
 # v2.4.0
 
 Example Storefront v2.4.0 is a minor update to keep this project in sync with [Reaction v2.4.0](https://github.com/reactioncommerce/reaction) and [reaction-hydra v2.4.0](https://github.com/reactioncommerce/reaction-hydra)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "example-storefront",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "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": [],
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@material-ui/core": "~3.9.2",
-    "@reactioncommerce/components": "~0.64.0",
+    "@reactioncommerce/components": "~0.67.2",
     "@reactioncommerce/components-context": "~1.2.0",
     "@segment/snippet": "~4.4.0",
     "apollo-cache-inmemory": "~1.4.2",
@@ -64,16 +64,16 @@
     "next-routes": "~1.4.2",
     "passport": "~0.4.0",
     "passport-oauth2": "~1.4.0",
-    "prop-types": "~15.6.2",
-    "react": "~16.7.0",
+    "prop-types": "~15.7.2",
+    "react": "~16.8.6",
     "react-apollo": "~2.4.1",
     "react-container-query": "~0.11.0",
-    "react-dom": "~16.7.0",
+    "react-dom": "~16.8.6",
     "react-helmet": "~5.2.0",
     "react-jss": "~8.6.1",
     "react-stripe-elements": "~2.0.3",
     "react-tracking": "~5.6.0",
-    "reacto-form": "~0.0.2",
+    "reacto-form": "~1.4.0",
     "styled-components": "~3.4.10",
     "subscriptions-transport-ws": "~0.9.15"
   },

src/components/OrderCardFulfillmentGroup/OrderCardFulfillmentGroup.js

@@ -49,9 +49,9 @@ class OrderCardFulfillmentGroup extends Component {
 
   static defaultProps = {
     hasMoreCartItems: false,
-    loadMoreCartItems() {},
-    onChangeCartItemsQuantity() {},
-    onRemoveCartItems() {}
+    loadMoreCartItems() { },
+    onChangeCartItemsQuantity() { },
+    onRemoveCartItems() { }
   }
 
   handleItemQuantityChange = (quantity, cartItemId) => {
@@ -103,7 +103,7 @@ class OrderCardFulfillmentGroup extends Component {
               spacing={24}
             >
               <Grid item xs={6}>
-                <Typography className={classes.fulfillmentGroupCount} variant="subheading">Shipment {currentGroupCount} of {totalGroupsCount}</Typography>
+                <Typography className={classes.fulfillmentGroupCount} variant="subtitle1">Shipment {currentGroupCount} of {totalGroupsCount}</Typography>
               </Grid>
               <Grid item xs={6} className={classes.fulfillmentGroupHeaderRightColumn}>
                 {fulfillmentGroup.tracking ?

src/components/OrderCardHeader/OrderCardHeader.js

@@ -83,18 +83,18 @@ class OrderCardHeader extends Component {
 
     // If more than one payment method, display amount for each
     if (Array.isArray(payments) && payments.length > 1) {
-      return payments.map((payment) => <Typography variant="caption">{payment.displayName} {payment.amount.displayAmount}</Typography>);
+      return payments.map((payment, index) => <Typography key={index} variant="caption">{payment.displayName} {payment.amount.displayAmount}</Typography>);
     }
 
     // If only one payment method, do not display amount
-    return payments.map((payment) => <Typography variant="caption">{payment.displayName}</Typography>);
+    return payments.map((payment, index) => <Typography key={index} variant="caption">{payment.displayName}</Typography>);
   }
 
   renderOrderShipments() {
     const { order: { fulfillmentGroups } } = this.props;
 
     if (Array.isArray(fulfillmentGroups) && fulfillmentGroups.length) {
-      return fulfillmentGroups.map((fulfillmentGroup) => <Typography variant="caption">{fulfillmentGroup.selectedFulfillmentOption.fulfillmentMethod.carrier} - {fulfillmentGroup.selectedFulfillmentOption.fulfillmentMethod.displayName}</Typography>); // eslint-disable-line
+      return fulfillmentGroups.map((fulfillmentGroup, index) => <Typography key={index} variant="caption">{fulfillmentGroup.selectedFulfillmentOption.fulfillmentMethod.carrier} - {fulfillmentGroup.selectedFulfillmentOption.fulfillmentMethod.displayName}</Typography>); // eslint-disable-line
     }
 
     return null;
@@ -167,7 +167,7 @@ class OrderCardHeader extends Component {
               </Grid>
             </Grid>
           </section>
-          : null }
+          : null}
       </div>
     );
   }

src/components/ProfileAddressBook/ProfileAddressBook.js

@@ -68,7 +68,7 @@ class ProfileAddressBook extends Component {
     return (
       <Grid className={classes.profileAddressBookContainer} container>
         <Grid className={classes.profileAddressBookTitle} item xs={12} md={12}>
-          <Typography variant="title">Address Book</Typography>
+          <Typography variant="h6">Address Book</Typography>
         </Grid>
         {this.renderAddressBook()}
       </Grid>

src/components/ProfileOrders/ProfileOrders.js

@@ -136,7 +136,7 @@ class ProfileOrders extends Component {
     return (
       <Grid className={classes.profileOrdersContainer} container>
         <Grid className={classes.profileOrdersTitle} item xs={12} md={12}>
-          <Typography variant="title">Orders</Typography>
+          <Typography variant="h6">Orders</Typography>
         </Grid>
         <Grid className={classes.profileOrdersSelect} item xs={12} md={12}>
           {this.renderOrderTypeSelect()}

src/pages/checkoutComplete.js

@@ -63,7 +63,7 @@ class CheckoutComplete extends Component {
           <Grid item xs={false} md={3} /> {/* MUI grid doesn't have an offset. Use blank grid item instead. */}
           <Grid item xs={12} md={6}>
             <Grid item className={classes.orderThankYou} xs={12} md={12}>
-              <Typography className={classes.title} variant="title">Thank you for your order</Typography>
+              <Typography className={classes.title} variant="h6">Thank you for your order</Typography>
               <Typography variant="body1">
                 {"Your order ID is:"} <strong>{order.referenceId}</strong>
               </Typography>