Fix broken builds for netlify and patch fonts

Vets-Who-Code · Nov 30, 2020 · bd7cb03 · bd7cb03
1 parent df38961
commit bd7cb03
Show file tree

Hide file tree

Showing 7 changed files with 1,575 additions and 2,272 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x]
+        node-version: [12.x, 14.x, 15.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -27,4 +27,4 @@ jobs:
     - run: yarn test
 
       env:
-        CI: true
+        CI: true
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-10.16.0
+14
diff --git a/font-preload-cache.json b/font-preload-cache.json
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -40,23 +40,26 @@ const gatsbyConfig = {
         logo: `${__dirname}/src/images/favicon.png`,
       },
     },
+    `gatsby-plugin-preload-fonts`,
     {
-      resolve: `gatsby-plugin-prefetch-google-fonts`,
+      resolve: `gatsby-plugin-webfonts`,
       options: {
-        fonts: [
-          {
-            family: `Roboto Slab`,
-            variants: [`100`, `300`, `400`, `700`],
-          },
-          {
-            family: `Open Sans`,
-            variants: [`300`, `300i`, `400`, `400i`, `800`],
-          },
-          {
-            family: `Lato`,
-            variants: [`300`, `400`, `700`, `900`],
-          },
-        ],
+        fonts: {
+          google: [
+            {
+              family: `Roboto Slab`,
+              variants: [`100`, `300`, `400`, `700`],
+            },
+            {
+              family: `Open Sans`,
+              variants: [`300`, `300i`, `400`, `400i`, `800`],
+            },
+            {
+              family: `Lato`,
+              variants: [`300`, `400`, `700`, `900`],
+            },
+          ],
+        },
       },
     },
   ],

diff --git a/gatsby-ssr.js b/gatsby-ssr.js
@@ -2,7 +2,7 @@ const React = require('react')
 const Layout = require('./src/components/Layout').default
 
 exports.onRenderBody = ({ setPostBodyComponents, setPreBodyComponents }) => {
-  setPreBodyComponents(<MagicScriptTag />)
+  setPreBodyComponents(<MagicScriptTag key="magic-script-tag" />)
   setPostBodyComponents([
     <script key="https://linked.chat/web/a9LB63" src="https://linked.chat/web/a9LB63" defer />,
   ])
@@ -38,5 +38,5 @@ const MagicScriptTag = () => {
     root.setAttribute("color-mode", colorMode === "light" ? "light" : "dark")
   })()`
   // eslint-disable-next-line react/no-danger
-  return <script key="magic-script-tag" dangerouslySetInnerHTML={{ __html: codeToRunOnClient }} />
+  return <script dangerouslySetInnerHTML={{ __html: codeToRunOnClient }} />
 }
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "repository": "Vets-Who-Code/vwc-site",
   "dependencies": {
+    "@contentful/rich-text-react-renderer": "14.1.1",
     "@hot-loader/react-dom": "17.0.0",
     "babel-preset-gatsby": "0.5.14",
     "dotenv": "8.2.0",
@@ -14,9 +15,11 @@
     "gatsby-plugin-favicon": "3.1.6",
     "gatsby-plugin-gtag": "^1.0.13",
     "gatsby-plugin-mailchimp": "5.2.2",
-    "gatsby-plugin-prefetch-google-fonts": "1.4.3",
+    "gatsby-plugin-preload-fonts": "1.4.0",
     "gatsby-plugin-react-helmet": "3.3.14",
     "gatsby-plugin-sharp": "2.6.43",
+    "gatsby-plugin-webfonts": "1.1.3",
+    "gatsby-source-contentful": "3.0.3",
     "gatsby-source-filesystem": "2.3.35",
     "gatsby-transformer-sharp": "2.5.19",
     "generate": "0.14.0",
@@ -46,6 +49,7 @@
     "build": "gatsby build",
     "build:prod": "yarn enable:contentful && yarn && gatsby build",
     "clean": "gatsby clean",
+    "preload-fonts": "gatsby-preload-fonts",
     "develop": "node ./scripts/pre-start",
     "disable:contentful": "node -e 'require(\"./scripts/disable-contentful-modules.js\").resetConfig()'",
     "enable:contentful": "node -e 'require(\"./scripts/enable-contentful-modules.js\").enableContentfulContent()'",