Merge remote-tracking branch 'origin/master' into accounts

package.json

@@ -7,6 +7,7 @@
     "@tailwindcss/forms": "^0.2.1",
     "autoprefixer": "^10.2.4",
     "postcss": "^8.2.6",
+    "sharp": "^0.27.2",
     "tailwindcss": "^2.0.3"
   }
 }

packages/webapp/package.json

@@ -9,15 +9,15 @@
     "boolean": "^3.0.2",
     "bytes": "3.1.0",
     "classnames": "2.2.6",
-    "gatsby": "^2.32.4",
+    "gatsby": "^3.0.0",
-    "gatsby-image": "2.11.0",
+    "gatsby-image": "^3.0.0",
-    "gatsby-plugin-manifest": "2.12.1",
+    "gatsby-plugin-manifest": "^3.0.0",
     "gatsby-plugin-matomo": "0.9.0",
-    "gatsby-plugin-react-helmet": "3.10.0",
+    "gatsby-plugin-react-helmet": "^4.0.0",
     "gatsby-plugin-remove-serviceworker": "1.0.0",
     "gatsby-plugin-robots-txt": "1.5.5",
-    "gatsby-plugin-sass": "3.2.0",
+    "gatsby-plugin-sass": "^4.0.0",
-    "gatsby-source-filesystem": "2.11.1",
+    "gatsby-source-filesystem": "^3.0.0",
     "http-status-codes": "2.1.4",
     "js-cookie": "^2.2.1",
     "jsonp": "0.2.1",
@@ -30,13 +30,13 @@
     "react-dropzone": "11.3.1",
     "react-helmet": "6.1.0",
     "react-mailchimp-form": "1.0.2",
-    "react-mailchimp-subscribe": "2.1.0",
+    "react-mailchimp-subscribe": "^2.1.1",
     "react-syntax-highlighter": "15.4.3",
     "react-visibility-sensor": "5.1.1",
     "skynet-js": "3.0.0"
   },
   "devDependencies": {
-    "cypress": "6.5.0",
+    "cypress": "^6.6.0",
     "cypress-file-upload": "5.0.2",
     "eslint": "7.21.0",
     "eslint-config-prettier": "8.1.0",

setup-scripts/blocklist-airtable.py

@@ -78,7 +78,7 @@ async def block_skylinks_from_airtable():
         + "|".join(skylinks)
         + ")'"
     )
-    cached_files_count = int(exec('docker exec -it nginx bash -c "' + cached_files_command + ' | wc -l"'))
+    cached_files_count = int(exec('docker exec -it nginx bash -c "' + cached_files_command + ' | wc -l"') or 0)
 
     if cached_files_count == 0:
         return print("No nginx cached files matching blocked skylinks were found")