Merge remote-tracking branch 'origin/trunk' into HEAD

Akarshit · Akarshit · commit ed24ad6ef77f · 2021-02-15T10:14:58.000-07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -48,6 +48,7 @@ jobs:
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true
+          version: 19.03.13
       - run:
           name: Lint Dockerfiles
           command: ${CI_SCRIPTS} lint-dockerfiles
@@ -82,6 +83,7 @@ jobs:
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true
+          version: 19.03.13
       - run:
           name: Build and push production Docker image
           command: ${CI_SCRIPTS} docker-build-tag-push . ${DOCKER_REPOSITORY}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,26 +1,53 @@
-# v3.2.0
+# v4.0.0
 
-## Refactors
+Example Storefront v4.0.0 adds major features and performance enhancements, and does contain breaking changes since v3.1.0
+
+_This is a reminder that starting with v3.x, all Reaction projects have begun tracking their versions independently, and this release **will** work with the latest releases of all other Reaction projects, even though the major version number may be different._
 
-- refactor: Configure `react-testing-library` and remove unnecessary testing dependencies [#686](https://github.com/reactioncommerce/example-storefront/pull/686)
+## BREAKING CHANGES
 
-This is a major update that introduces the following refactors in PR [#667](https://github.com/reactioncommerce/example-storefront/pull/667)
+- React hooks are introduced, and replace many HOC's, which have been removed: `withAddressBook`, `withAddressValidation`, `withAvailablePaymentMethods`, `withCart`, `withCatalogItemProduct`, `withOrder`, `withOrders`, `withShop`, `withTag`, `withViewer`.
 - Use React hooks for various parts of the application including orders, cart, shop, translations and more. This refactor remove various HOC that added unnecessary complexity to the app.
-- React context is now used and all previous uses of MobX have been removed. Using React context greatly simplifies local states management.
-- Simple translation helpers have been added to support multi-lingual shops. See the `useTranslation` React hook for more details.
-- Next.js has been update to use version 9.4.1, which includes support for [SSG](https://nextjs.org/blog/next-9-3#next-gen-static-site-generation-ssg-support)(Static Site Generation). By default product pages are re-regenerated every two minutes. Further, various other features, such as dynamic routes and API routes are now used, either a dynamic route or API
-as appropriate.
-- Various components form the Reaction component library have been removed in favor of using the new Reaction Catalyst design system. This is a stepping stone towards consolidating styling solutions use use only one.
+- MobX has been removed, and React context is now used in its place.
+- Next.js has been update to use version 9.4.1, which includes support for [SSG](https://nextjs.org/blog/next-9-3#next-gen-static-site-generation-ssg-support)(Static Site Generation). By default product pages are re-regenerated every two minutes. Further, various other features, such as dynamic routes and API routes are now used, either a dynamic route or API.
+- Various components from the Reaction component library have been removed in favor of using the new Reaction Catalyst design system. This is a stepping stone towards consolidating styling solutions use use only one.
+
+## Refactors
+
+- refactor: Storefront v2 ([#667](https://github.com/reactioncommerce/example-storefront/pull/667))
+- refactor: Revalidate index page, require instant revalidation if no shop is present during build ([#698](https://github.com/reactioncommerce/example-storefront/pull/698))
+- refactor: Return Not found if either product or shop are missing ([#696](https://github.com/reactioncommerce/example-storefront/pull/696))
+- refactor: Use CANONICAL_URL for sitemap route ([#690](https://github.com/reactioncommerce/example-storefront/pull/690))
+
+## Fixes
+
+- fix: Fix for 2 vulnerabilities ([#727](https://github.com/reactioncommerce/example-storefront/pull/727))
+- fix: don't execute unnecessary requests for anonymous cart on initial load ([#705](https://github.com/reactioncommerce/example-storefront/pull/705))
+- fix: Set _isMounted to true after component mounted ([#700](https://github.com/reactioncommerce/example-storefront/pull/700))
+- fix: docker production build ([#693](https://github.com/reactioncommerce/example-storefront/pull/693))
+- fix: fix broken unit test ([#682](https://github.com/reactioncommerce/example-storefront/pull/682))
+- fix: runtime build issues ([#685](https://github.com/reactioncommerce/example-storefront/pull/685))
+
+## Chores
+
+- chore(deps): Bump elliptic from 6.5.2 to 6.5.3 ([#717](https://github.com/reactioncommerce/example-storefront/pull/717))
+- chore: Bump lodash from 4.17.15 to 4.17.19 ([#706](https://github.com/reactioncommerce/example-storefront/pull/706))
+- chore: update README and CHANGELOG to reflect recent updates ([#687](https://github.com/reactioncommerce/example-storefront/pull/687))
+- chore: Setup react-testing-library and some clean up ([#686](https://github.com/reactioncommerce/example-storefront/pull/686))
+- chore: fix various eslint errors and warnings ([#684](https://github.com/reactioncommerce/example-storefront/pull/684))
+
+## Contributors
 
+Thanks to @janus-reith for contributing to this release! 🎉
 
 # v3.1.0
 
 This release of `example-storefront` is designed to work with v3.x of the Reaction API.
 
 ### Chores
 
-- chore: bump https-proxy-agent from 2.2.2 to 2.2.4 ([#669](http://github.com/reactioncommerce/reaction-admin/pull/669))
-- chore: switch to 3.0.0 Docker tag ([#659](http://github.com/reactioncommerce/reaction-admin/pull/659))
+- chore: bump https-proxy-agent from 2.2.2 to 2.2.4 ([#669](http://github.com/reactioncommerce/example-storefront/pull/669))
+- chore: switch to 3.0.0 Docker tag ([#659](http://github.com/reactioncommerce/example-storefront/pull/659))
 
 # v3.0.0
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,7 +13,7 @@ networks:
 
 services:
   web:
-    image: reactioncommerce/example-storefront:3.1.0
+    image: reactioncommerce/example-storefront:4.0.0
     env_file:
       - ./.env
     networks:
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-storefront",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "description": "The Example Storefront serves as a reference for implementing a web based storefront using the Reaction Commerce GraphQL API.",
   "keywords": [],
   "author": {
@@ -54,12 +54,12 @@
     "envalid": "~4.2.0",
     "express": "~4.16.4",
     "graphql": "~14.1.1",
-    "graphql-request": "^1.8.2",
+    "graphql-request": "^2.0.0",
     "graphql-tag": "~2.10.1",
     "isomorphic-unfetch": "^3.0.0",
     "js-cookie": "~2.2.0",
     "keymirror": "~0.1.1",
-    "lodash": "~4.17.19",
+    "lodash": "~4.17.20",
     "mdi-material-ui": "~5.9.0",
     "next": "9.4.1",
     "passport": "~0.4.0",
diff --git a/pages/_document.js b/pages/_document.js
@@ -4,7 +4,8 @@ import { ServerStyleSheet as StyledComponentSheets } from "styled-components";
 import { ServerStyleSheets as MaterialUiServerStyleSheets } from "@material-ui/styles";
 import favicons from "custom/favicons";
 import theme from "custom/reactionTheme";
-import analyticsProviders from "../custom/analytics";
+import definedPaymentMethods from "custom/paymentMethods";
+import analyticsProviders from "custom/analytics";
 
 /**
  * For details about the styled-components SSR code in this file, see https://www.styled-components.com/docs/advanced#nextjs
@@ -36,12 +37,14 @@ class HTMLDocument extends Document {
       ...analyticsProviders.map((provider) => ({
         type: "text/javascript",
         innerHTML: provider.renderScript()
-      })),
-      {
-        type: "text/javascript",
-        src: "https://js.stripe.com/v3/"
-      }
+      }))
     ];
+    definedPaymentMethods
+      .some((method) => method.name === "stripe_card")
+        && scripts.push({
+          type: "text/javascript",
+          src: "https://js.stripe.com/v3/"
+        });
 
     return (
       <Html lang="en">
diff --git a/yarn.lock b/yarn.lock
@@ -3693,14 +3693,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-fetch@2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.2.tgz#a47ff4f7fc712daba8f6a695a11c948440d45723"
-  integrity sha1-pH/09/xxLauo9qaVoRyUhEDUVyM=
-  dependencies:
-    node-fetch "2.1.2"
-    whatwg-fetch "2.0.4"
-
 cross-fetch@3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.4.tgz#7bef7020207e684a7638ef5f2f698e24d9eb283c"
@@ -4360,9 +4352,9 @@ element-resize-detector@1.1.13:
     batch-processor "^1.0.0"
 
 elliptic@^6.0.0, elliptic@^6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
-  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -5390,12 +5382,10 @@ graphlib@^2.1.1, graphlib@^2.1.5:
   dependencies:
     lodash "^4.17.15"
 
-graphql-request@^1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-1.8.2.tgz#398d10ae15c585676741bde3fc01d5ca948f8fbe"
-  integrity sha512-dDX2M+VMsxXFCmUX0Vo0TopIZIX4ggzOtiCsThgtrKR4niiaagsGTDIHj3fsOMFETpa064vzovI+4YV4QnMbcg==
-  dependencies:
-    cross-fetch "2.2.2"
+graphql-request@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-2.0.0.tgz#8dd12cf1eb2ce0c80f4114fd851741e091134862"
+  integrity sha512-Ww3Ax+G3l2d+mPT8w7HC9LfrKjutnCKtnDq7ZZp2ghVk5IQDjwAk3/arRF1ix17Ky15rm0hrSKVKxRhIVlSuoQ==
 
 graphql-tag@^2.10.2, graphql-tag@~2.10.1:
   version "2.10.3"
@@ -7249,11 +7239,16 @@ lodash.uniqueid@~4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.uniqueid/-/lodash.uniqueid-4.0.1.tgz#3268f26a7c88e4f4b1758d679271814e31fa5b26"
   integrity sha1-MmjyanyI5PSxdY1nknGBTjH6WyY=
 
-lodash@^4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.19:
+lodash@^4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
   version "4.17.19"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
   integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
 
+lodash@~4.17.20:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -7751,11 +7746,6 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
-node-fetch@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
-  integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=
-
 node-fetch@2.6.0, node-fetch@^2.2.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
@@ -11602,11 +11592,6 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
-  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
-
 whatwg-fetch@3.0.0, whatwg-fetch@>=0.10.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
