Merge branch 'dev' into ADAPT-2726-focal-point

* dev:
  ADAPT-000: GraphQL error and storyblok-js-client fixup (#231)
  ADAPT-3147 | @mattanglin | pipeline status checks (#221)

# Conflicts:
#	package-lock.json
#	src/components/media/aspectRatioImage.js
#	src/components/media/fullWidthImage.js
#	src/components/media/storyImage.js
#	src/utilities/transformImage.js

gatsby-config.js

@@ -15,6 +15,22 @@ require("dotenv").config({
   path: `.env.${activeEnv}`,
 });
 
+// Support for Gatsby CLI
+let siteUrl = 'http://localhost:8000';
+
+// Support for Production site builds.
+if (process.env.CONTEXT === 'production') {
+  siteUrl = process.env.URL;
+}
+// Support for non-production netlify builds (branch/preview)
+else if (process.env.CONTEXT !== 'production' && process.env.NETLIFY) {
+  siteUrl = process.env.DEPLOY_PRIME_URL;
+}
+// Support for Netlify CLI.
+else if (process.env.NETLIFY_DEV === true) {
+  siteUrl = 'http://localhost:64946';
+}
+
 /**
  * Resolve relations for storyblok.
  */
@@ -115,6 +131,7 @@ module.exports = {
         accessToken: process.env.GATSBY_STORYBLOK_ACCESS_TOKEN,
         homeSlug: "home",
         resolveRelations: storyblokRelations,
+        resolveLinks: 'url',
         version: process.env.NODE_ENV == "production" ? "published" : "draft", // show only published on the front end site
         // version: 'draft'  // would show any including drafts
       },

package.json

@@ -40,6 +40,7 @@
     "react-slick": "^0.28.1",
     "sanitize-html": "^2.3.3",
     "slick-carousel": "^1.8.1",
+    "storyblok-js-client": "4.1.3",
     "storyblok-react": "^0.1.2",
     "tabbable": "^5.2.0",
     "trim": "^1.0.1"