From bf4873c87beaa1c6b47c9bbeb59b7dd236dea525 Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <peterbe@github.com>
Date: Mon, 17 Oct 2022 14:26:45 +0200
Subject: [PATCH 1/2] simplify 'items' in TableOfContents prop (#31683)

---
 components/landing/TableOfContents.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/landing/TableOfContents.tsx b/components/landing/TableOfContents.tsx
index d1011c1f4a..05419deb0c 100644
--- a/components/landing/TableOfContents.tsx
+++ b/components/landing/TableOfContents.tsx
@@ -12,15 +12,13 @@ type Props = {
 export const TableOfContents = (props: Props) => {
   const { items, variant = 'expanded' } = props
 
-  const actionItems = (items || []).filter((item) => typeof item !== 'undefined')
-
   return (
     <ul
       data-testid="table-of-contents"
       className={cx(variant === 'compact' ? 'list-style-outside pl-2' : '')}
     >
       {variant === 'expanded' &&
-        actionItems.map((item) => {
+        items.map((item) => {
           const { fullPath: href, title, intro } = item
 
           return (
@@ -43,7 +41,7 @@ export const TableOfContents = (props: Props) => {
 
       {variant === 'compact' && (
         <ActionList>
-          {actionItems.map((item) => {
+          {items.map((item) => {
             const { fullPath: href, title, childTocItems } = item
             return (
               <React.Fragment key={href}>

From 2e957dbd91cf5fcdd8e1ea80f0b04dda23925deb Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <peterbe@github.com>
Date: Mon, 17 Oct 2022 14:35:51 +0200
Subject: [PATCH 2/2] keep language prefix when doing client-side refresh
 (#31686)

Co-authored-by: Robert Sese <734194+rsese@users.noreply.github.com>
---
 components/ClientSideRefresh.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/ClientSideRefresh.tsx b/components/ClientSideRefresh.tsx
index 88699e48a2..156c68c827 100644
--- a/components/ClientSideRefresh.tsx
+++ b/components/ClientSideRefresh.tsx
@@ -11,7 +11,11 @@ export default function ClientSideRefresh() {
   useSWR(
     router.asPath,
     () => {
-      router.replace(router.asPath, undefined, { scroll: false })
+      // Remember, in NextJS, the `router.locale` is never including the
+      // `router.asPath`. So we have to make sure it's always there
+      // otherwise, after this hook runs, you lose that `/en` prefix
+      // in the URL on the address bar.
+      router.replace(`/${router.locale}${router.asPath}`, undefined, { scroll: false })
     },
     {
       // Implied here is that `revalidateOnFocus: true` which the default