From e5caec0f700d1d8b97204d8df2f515da7f27824b Mon Sep 17 00:00:00 2001
From: Jerel Miller <jerelmiller@gmail.com>
Date: Mon, 29 Jun 2020 12:41:34 -0700
Subject: [PATCH 1/3] chore: disable prop types validation in wrap-page-element

---
 gatsby/wrap-page-element.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gatsby/wrap-page-element.js b/gatsby/wrap-page-element.js
index 445496a8c..b2f7d907d 100644
--- a/gatsby/wrap-page-element.js
+++ b/gatsby/wrap-page-element.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/prop-types */
 import React from 'react';
 import { BreadcrumbContext } from '../src/components/BreadcrumbContext';
 import { PageContext } from '../src/components/PageContext';

From b09e543c2e60f757c83cf53f0b6f2f9320bb36f9 Mon Sep 17 00:00:00 2001
From: Jerel Miller <jerelmiller@gmail.com>
Date: Mon, 29 Jun 2020 12:41:47 -0700
Subject: [PATCH 2/3] fix: Ensure current page is always bolded

---
 src/components/NavigationItems.module.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NavigationItems.module.scss b/src/components/NavigationItems.module.scss
index 6ebd0dc5f..336cee330 100644
--- a/src/components/NavigationItems.module.scss
+++ b/src/components/NavigationItems.module.scss
@@ -86,7 +86,7 @@ button.navLink {
 }
 
 .isCurrentPage {
-  font-weight: bold;
+  font-weight: bold !important;
 }
 
 .filterOn {

From 62a21ed9ead249a628a208e6be4cf021595a324d Mon Sep 17 00:00:00 2001
From: Jerel Miller <jerelmiller@gmail.com>
Date: Mon, 29 Jun 2020 12:42:09 -0700
Subject: [PATCH 3/3] fix: Ensure urls with trailing slashes are matched
 properly when creating breadcrumbs

---
 src/utils/create-breadcrumbs.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/utils/create-breadcrumbs.js b/src/utils/create-breadcrumbs.js
index 8127b9b3e..9b9e9d235 100644
--- a/src/utils/create-breadcrumbs.js
+++ b/src/utils/create-breadcrumbs.js
@@ -1,3 +1,5 @@
+const URL_WITH_TRAILING_SLASH = /(.+)\/$/;
+
 /**
  * Create a flat array of breadcrumbs for a given relative url given the
  * site structure (sidenav). Returns an empty array if no match found. NOTE:
@@ -20,7 +22,11 @@ const createBreadcrumbs = (url, links, result = []) => {
   }
 
   // check to see if any of the links at this level match the path
-  const match = links.find((link) => link.url === url);
+  const match = links.find(
+    (link) =>
+      link.url === url ||
+      link.url === url.replace(URL_WITH_TRAILING_SLASH, '$1')
+  );
 
   // if we have a link, return the displayName at the end of the result
   if (match) {