diff --git a/components/CustomLink/CustomLink.js b/components/CustomLink/CustomLink.js
index 9708b74e3..d202799c2 100644
--- a/components/CustomLink/CustomLink.js
+++ b/components/CustomLink/CustomLink.js
@@ -19,6 +19,7 @@ function CustomLink({ Component: _Component, href, children, ...props }) {
 const WrappedComponent = React.forwardRef(({ Component, ...props }, ref) => (
   <Component ref={ref} {...props} />
 ));
+WrappedComponent.displayName = 'WrappedComponent';
 
 CustomLink.propTypes = {
   Component: PropTypes.oneOfType([
diff --git a/components/EventCallout/EventCallout.js b/components/EventCallout/EventCallout.js
index 9c3e42866..92f0bed46 100644
--- a/components/EventCallout/EventCallout.js
+++ b/components/EventCallout/EventCallout.js
@@ -23,6 +23,7 @@ function EventCallout({
         height="60px"
         width="60px"
         src={imageSrc}
+        alt={title || ''}
         rounded="xl"
         bg="neutrals.300"
         style={{ objectFit: 'cover' }}
diff --git a/components/HomeFeed/HomeFeed.js b/components/HomeFeed/HomeFeed.js
index 691f7698a..e8e3c03cc 100644
--- a/components/HomeFeed/HomeFeed.js
+++ b/components/HomeFeed/HomeFeed.js
@@ -320,7 +320,7 @@ function HomeFeedCTA({ authenticated, personaFeed }) {
         title={
           <>
             <Heading color="neutrals.900" variant="h2" fontWeight="800">
-              There's Something for Everyone
+              There&apos;s Something for Everyone
             </Heading>
           </>
         }
@@ -328,7 +328,7 @@ function HomeFeedCTA({ authenticated, personaFeed }) {
           mb: { xl: 'xxl' },
           mt: { _: 'm', lg: 0, xl: 'l' },
         }}
-        supertitle="Don't miss what God's doing this week!"
+        supertitle="Don&apos;t miss what God&apos;s doing this week!"
         description="From Sunday services to Wednesday night activities, there’s always a way to be a part of what God is doing every week at Long Hollow. Check out our weekly schedule for every member of your family, and mark your calendar for several upcoming events."
         actions={[
           {
diff --git a/components/Modals/AuthModal/AuthDetails.js b/components/Modals/AuthModal/AuthDetails.js
index ead761f92..4ff9fe5ea 100644
--- a/components/Modals/AuthModal/AuthDetails.js
+++ b/components/Modals/AuthModal/AuthDetails.js
@@ -16,8 +16,8 @@ function AuthDetails() {
     handleAuthIdentity,
   } = useAuthIdentity();
   const [_, dispatch] = useAuth();
-  const { values, handleSubmit, handleChange } = useForm(() => {
-    const age = getAge(values.birthDate);
+  const { values, handleSubmit, handleChange } = useForm(formValues => {
+    const age = getAge(formValues.birthDate);
     // Make sure they are at least 13 years of age.
     if (age < 13) {
       setError({
@@ -28,9 +28,9 @@ function AuthDetails() {
       dispatch(
         updateAuth({
           profile: {
-            ...values,
-            birthDate: new Date(values.birthDate),
-            gender: upperFirst(values.gender),
+            ...formValues,
+            birthDate: new Date(formValues.birthDate),
+            gender: upperFirst(formValues.gender),
           },
         })
       );
diff --git a/components/Modals/AuthModal/AuthIdentity.js b/components/Modals/AuthModal/AuthIdentity.js
index 5ff461231..f0ee98a80 100644
--- a/components/Modals/AuthModal/AuthIdentity.js
+++ b/components/Modals/AuthModal/AuthIdentity.js
@@ -12,10 +12,11 @@ function AuthIdentity() {
     setError,
     handleAuthIdentity,
   } = useAuthIdentity();
+  const identityRef = React.useRef('');
   const [checkIfUserExists] = useUserExists({
     fetchPolicy: 'network-only',
     onCompleted: async data => {
-      const identity = values.identity;
+      const identity = identityRef.current;
       const userExists = data?.userExists !== 'NONE';
       handleAuthIdentity({
         identity,
@@ -24,14 +25,15 @@ function AuthIdentity() {
       });
     },
   });
-  const { values, handleSubmit, handleChange } = useForm(() => {
-    const identity = values.identity;
+  const { values, handleSubmit, handleChange } = useForm(formValues => {
+    const identity = formValues.identity;
     const validEmail = validateEmail(identity);
     const validPhoneNumber = validatePhoneNumber(identity);
     const validIdentity = validEmail || validPhoneNumber;
     if (validIdentity) {
       setStatus('LOADING');
-      checkIfUserExists({ variables: { identity: values.identity } });
+      identityRef.current = identity;
+      checkIfUserExists({ variables: { identity } });
     } else {
       setStatus('ERROR');
       setError({ identity: 'That is not a valid email or phone number.' });
@@ -43,7 +45,7 @@ function AuthIdentity() {
   return (
     <>
       <Box as="p" color="subdued" mb="l">
-        Enter your phone number or email address to get started. We'll never
+        Enter your phone number or email address to get started. We&apos;ll never
         share your information or contact you (unless you ask!).
       </Box>
       <Box as="form" action="" onSubmit={handleSubmit} px={{ _: 0, lg: 'xl' }}>
diff --git a/components/Nav/Nav.js b/components/Nav/Nav.js
index 7a9f2d24f..6217a284f 100644
--- a/components/Nav/Nav.js
+++ b/components/Nav/Nav.js
@@ -47,7 +47,7 @@ function Nav({
     return () => {
       router.events.off('routeChangeStart', handleRouteChangeStart);
     };
-  }, []);
+  }, [router.events, setHoveredItem]);
 
   return (
     <Styled.Nav active={active}>
diff --git a/components/SEO/SEO.js b/components/SEO/SEO.js
index 61e0c9fe2..eb405b145 100644
--- a/components/SEO/SEO.js
+++ b/components/SEO/SEO.js
@@ -90,7 +90,7 @@ function SEO(props = {}) {
             src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GA_CODE}`}
           />
           <script
-            // eslint-disable-next-line react/no-danger
+             
             dangerouslySetInnerHTML={{
               __html: `
     window.dataLayer = window.dataLayer || [];
diff --git a/components/SinglePages/UniversalContentItem.js b/components/SinglePages/UniversalContentItem.js
index 16d066500..ed14343b5 100644
--- a/components/SinglePages/UniversalContentItem.js
+++ b/components/SinglePages/UniversalContentItem.js
@@ -35,15 +35,13 @@ export default function Page({
       }
     `
   );
-  if (authData?.currentUser?.id) {
-    const token = authData.currentUser.rock.authToken;
-    const html = data?.htmlContent || '';
-    const authedHTML = html.replace(
-      /"([^"]*my\.longhollow\.com[^"]*)"/g,
-      (match, p1) => `"${p1}?rckipid=${token}"`
-    );
-    data.htmlContent = authedHTML;
-  }
+  const token = authData?.currentUser?.rock?.authToken;
+  const htmlContent = token
+    ? (data?.htmlContent || '').replace(
+        /"([^"]*my\.longhollow\.com[^"]*)"/g,
+        (match, p1) => `"${p1}?rckipid=${token}"`
+      )
+    : data?.htmlContent;
 
   if (data?.loading || router.isFallback) {
     return null;
@@ -179,15 +177,15 @@ export default function Page({
         <Section
           mb={{
             _: 'l',
-            lg: data.htmlContent ? 'l' : 'xxl',
+            lg: htmlContent ? 'l' : 'xxl',
           }}
         >
           <MetadataCallout data={data} />
         </Section>
       ) : null}
-      {data.htmlContent && (
+      {htmlContent && (
         <Section mb={{ _: 'l', lg: 'xxl' }}>
-          <Longform dangerouslySetInnerHTML={{ __html: data.htmlContent }} />
+          <Longform dangerouslySetInnerHTML={{ __html: htmlContent }} />
         </Section>
       )}
       {data.ctaLinks?.length ? (
diff --git a/components/UserProfile/EditUserProfile.js b/components/UserProfile/EditUserProfile.js
index 40fa82110..90c185d85 100644
--- a/components/UserProfile/EditUserProfile.js
+++ b/components/UserProfile/EditUserProfile.js
@@ -56,46 +56,58 @@ function EditUserProfile(props = {}) {
     allowSMS,
   } = user;
 
-  function getCommunicationPreference(key, variable) {
-    const _isNil = isNil(values[key]) && isNil(variable);
+  function getCommunicationPreference(formValues, key, variable) {
+    const _isNil = isNil(formValues[key]) && isNil(variable);
     if (_isNil) return false;
-    if (!isNil(values[key])) return values[key];
+    if (!isNil(formValues[key])) return formValues[key];
     if (!isNil(variable)) return variable;
     return false;
   }
 
-  function onSubmit() {
+  function onSubmit(formValues) {
     try {
       updateCurrentPerson({
         variables: {
           profileFields: [
             {
               field: 'Gender',
-              value: startCase(values.gender) || startCase(gender) || 'Unknown',
+              value:
+                startCase(formValues.gender) || startCase(gender) || 'Unknown',
+            },
+            {
+              field: 'BirthDate',
+              value: formValues.birthdate || birthdate || '',
             },
-            { field: 'BirthDate', value: values.birthdate || birthdate || '' },
             {
               field: 'PhoneNumber',
-              value: values.phone || phone || '',
+              value: formValues.phone || phone || '',
             },
-            { field: 'Email', value: values.email || email || '' },
+            { field: 'Email', value: formValues.email || email || '' },
           ],
           address: {
-            street1: values.street || street || '',
+            street1: formValues.street || street || '',
             street2: '',
-            city: values.city || city || '',
-            state: values.state || state || '',
-            postalCode: values.zip || zip || '',
+            city: formValues.city || city || '',
+            state: formValues.state || state || '',
+            postalCode: formValues.zip || zip || '',
           },
-          campusId: values.campus || campusId || '',
+          campusId: formValues.campus || campusId || '',
           communicationPreferences: [
             {
               type: 'SMS',
-              allow: getCommunicationPreference('allowSMS', allowSMS),
+              allow: getCommunicationPreference(
+                formValues,
+                'allowSMS',
+                allowSMS
+              ),
             },
             {
               type: 'Email',
-              allow: getCommunicationPreference('allowEmail', allowEmail),
+              allow: getCommunicationPreference(
+                formValues,
+                'allowEmail',
+                allowEmail
+              ),
             },
           ],
         },
diff --git a/components/UserProfile/UserProfile.js b/components/UserProfile/UserProfile.js
index da60118f6..5ec71544e 100644
--- a/components/UserProfile/UserProfile.js
+++ b/components/UserProfile/UserProfile.js
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
 
 import { UserProfileProvider } from 'providers';
@@ -78,20 +78,20 @@ function UserProfile(props = {}) {
   const authDispatch = useAuthDispatch();
   const modalDispatch = useModalDispatch();
 
-  function handleSignInClick() {
+  const handleSignInClick = useCallback(() => {
     modalDispatch(showModal('Auth'));
-  }
+  }, [modalDispatch]);
 
-  function handleLogoutClick() {
+  const handleLogoutClick = useCallback(() => {
     authDispatch(logout());
     router.reload();
-  }
+  }, [authDispatch, router]);
 
   useEffect(() => {
     if (!props.loading && props.currentPerson?.length === 0) {
       handleSignInClick();
     }
-  }, []);
+  }, [handleSignInClick, props.currentPerson?.length, props.loading]);
 
   if (props.loading)
     return (
diff --git a/components/VideoPlayer/VideoJSPlayer.js b/components/VideoPlayer/VideoJSPlayer.js
index b985d152e..031b5a88c 100644
--- a/components/VideoPlayer/VideoJSPlayer.js
+++ b/components/VideoPlayer/VideoJSPlayer.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import videojs from 'video.js';
 import 'video.js/dist/video-js.css';
@@ -6,19 +6,22 @@ import styled, { css } from 'styled-components';
 import { Box, Heading } from 'ui-kit';
 import { themeGet } from '@styled-system/theme-get';
 
-// eslint-disable-next-line import/prefer-default-export
+ 
 const usePlayer = ({ src, controls, autoplay, fluid, onError }) => {
-  const options = {
-    fill: true,
-    preload: 'auto',
-    html5: {
-      hls: {
-        enableLowInitialPlaylist: true,
-        smoothQualityChange: true,
-        overrideNative: true,
+  const options = useMemo(
+    () => ({
+      fill: true,
+      preload: 'auto',
+      html5: {
+        hls: {
+          enableLowInitialPlaylist: true,
+          smoothQualityChange: true,
+          overrideNative: true,
+        },
       },
-    },
-  };
+    }),
+    []
+  );
   const videoRef = useRef(null);
   const [player, setPlayer] = useState(null);
 
@@ -40,7 +43,7 @@ const usePlayer = ({ src, controls, autoplay, fluid, onError }) => {
     }
 
     return () => player?.dispose();
-  }, [src]);
+  }, [autoplay, controls, fluid, onError, options, player, src]);
 
   return videoRef;
 };
diff --git a/components/VideoPlayer/VideoPlayer.js b/components/VideoPlayer/VideoPlayer.js
index f2566655c..2b4131b04 100644
--- a/components/VideoPlayer/VideoPlayer.js
+++ b/components/VideoPlayer/VideoPlayer.js
@@ -20,12 +20,6 @@ function VideoPlayer({ src, title, details, stopPropagation, ...props } = {}) {
     }
   }, [playing, videoRef]);
 
-  useEffect(() => {
-    if (videoRef.current) {
-      setDuration(videoRef.current.duration || 0);
-    }
-  }, [videoRef]);
-
   const VideoControl = playing ? PauseCircle : PlayCircle;
   return (
     <Box
diff --git a/eslint.config.js b/eslint.config.js
index 24a4bde68..86d53201a 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,14 +1,10 @@
-const { FlatCompat } = require('@eslint/eslintrc');
-
-const compat = new FlatCompat({
-  baseDirectory: __dirname,
-});
+const nextCoreWebVitals = require('eslint-config-next/core-web-vitals');
 
 module.exports = [
   {
     ignores: ['.next/**'],
   },
-  ...compat.extends('next/core-web-vitals'),
+  ...nextCoreWebVitals,
   {
     rules: {
       '@next/next/no-html-link-for-pages': 'warn',
diff --git a/lib/apolloClient/apolloClient.js b/lib/apolloClient/apolloClient.js
index 43905d6a7..72ffe2077 100644
--- a/lib/apolloClient/apolloClient.js
+++ b/lib/apolloClient/apolloClient.js
@@ -30,11 +30,23 @@ function createApolloClient() {
 
   const link = ApolloLink.from([errorLink, authLink, httpLink]);
 
+  const defaultOptions =
+    typeof window === 'undefined'
+      ? {
+          watchQuery: {
+            ssr: false,
+          },
+        }
+      : undefined;
+
   const client = new ApolloClient({
     ssrMode: typeof window === 'undefined',
     link,
     cache,
-    version: 'web-1.0.0',
+    clientAwareness: {
+      version: 'web-1.0.0',
+    },
+    defaultOptions,
   });
 
   client.onResetStore(() => cache.writeData({ data: {} }));
diff --git a/lib/apolloClient/httpLink.js b/lib/apolloClient/httpLink.js
index 4c93184d2..3662072e2 100644
--- a/lib/apolloClient/httpLink.js
+++ b/lib/apolloClient/httpLink.js
@@ -1,6 +1,20 @@
 import fetch from 'cross-fetch';
 import { HttpLink } from '@apollo/client';
 
+const SERVER_TIMEOUT_MS = 8000;
+const CLIENT_TIMEOUT_MS = 15000;
+
+function fetchWithTimeout(url, options) {
+  const controller = new AbortController();
+  const timeoutMs =
+    typeof window === 'undefined' ? SERVER_TIMEOUT_MS : CLIENT_TIMEOUT_MS;
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+
+  return fetch(url, { ...options, signal: controller.signal }).finally(() =>
+    clearTimeout(timeoutId)
+  );
+}
+
 const httpLink = new HttpLink({
   uri:
     process.env.NEXT_PUBLIC_APOLLOS_API || 'https://longhollow-cdn.global.ssl.fastly.net', // Server URL (must be absolute)
@@ -8,7 +22,7 @@ const httpLink = new HttpLink({
   fetch: (url, options) => {
     // Strip excess whitespace to help mitigate query length issue
     const compressedUrl = url.replace(/(%20)+/g, '%20');
-    return fetch(compressedUrl, options).then(async response => {
+    return fetchWithTimeout(compressedUrl, options).then(async response => {
       if (process.env.NODE_ENV !== 'production' && !response.ok) {
         let bodyText = null;
         try {
diff --git a/lib/apolloClient/index.js b/lib/apolloClient/index.js
index d2fd64282..a96584928 100644
--- a/lib/apolloClient/index.js
+++ b/lib/apolloClient/index.js
@@ -1,3 +1,4 @@
 import { initializeApollo, useApollo } from './apolloClient';
+import safeQuery from './safeQuery';
 
-export { initializeApollo, useApollo };
+export { initializeApollo, useApollo, safeQuery };
diff --git a/lib/apolloClient/safeQuery.js b/lib/apolloClient/safeQuery.js
new file mode 100644
index 000000000..e78e130c6
--- /dev/null
+++ b/lib/apolloClient/safeQuery.js
@@ -0,0 +1,21 @@
+const getQueryName = query => {
+  const definition = query?.definitions?.find(
+    item => item?.kind === 'OperationDefinition'
+  );
+  return definition?.name?.value || 'unknown';
+};
+
+const safeQuery = async (client, options = {}) => {
+  try {
+    return await client.query(options);
+  } catch (error) {
+    console.error('[ApolloQueryError]', {
+      query: getQueryName(options.query),
+      variables: options.variables || {},
+      error: error?.message || String(error),
+    });
+    return null;
+  }
+};
+
+export default safeQuery;
diff --git a/package-lock.json b/package-lock.json
index 871398671..406ebc839 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,8 +32,8 @@
         "@testing-library/dom": "^9.3.4",
         "@testing-library/jest-dom": "^6.9.1",
         "@testing-library/react": "^14.3.1",
-        "eslint": "^8.57.0",
-        "eslint-config-next": "14.2.5",
+        "eslint": "^9.39.2",
+        "eslint-config-next": "^16.1.0",
         "identity-obj-proxy": "^3.0.0",
         "jest": "^30.2.0",
         "jest-environment-jsdom": "^30.2.0",
@@ -937,25 +937,66 @@
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
+    "node_modules/@eslint/config-array": {
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
+      "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^2.1.7",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+      "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.17.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/core": {
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+      "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz",
+      "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
+        "js-yaml": "^4.1.1",
         "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -982,13 +1023,40 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
-      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+      "version": "9.39.2",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz",
+      "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      }
+    },
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+      "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
+      "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.17.0",
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@graphql-typed-document-node/core": {
@@ -1000,20 +1068,28 @@
         "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
-      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
-      "deprecated": "Use @eslint/config-array instead",
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.7",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.3",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=18.18.0"
       }
     },
     "node_modules/@humanwhocodes/module-importer": {
@@ -1030,13 +1106,19 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
     },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
@@ -2068,81 +2150,13 @@
       "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.5.tgz",
-      "integrity": "sha512-LY3btOpPh+OTIpviNojDpUdIbHW9j0JBYBjsIp8IxtDFfYFyORvw3yNq6N231FVqQA7n7lwaf7xHbVJlA1ED7g==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-16.1.0.tgz",
+      "integrity": "sha512-sooC/k0LCF4/jLXYHpgfzJot04lZQqsttn8XJpTguP8N3GhqXN3wSkh68no2OcZzS/qeGwKDFTqhZ8WofdXmmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "glob": "10.3.10"
-      }
-    },
-    "node_modules/@next/eslint-plugin-next/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@next/eslint-plugin-next/node_modules/glob": {
-      "version": "10.3.10",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
-      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.5",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@next/eslint-plugin-next/node_modules/jackspeak": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
-      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
-    "node_modules/@next/eslint-plugin-next/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "fast-glob": "3.3.1"
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
@@ -2368,13 +2382,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@rushstack/eslint-patch": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.15.0.tgz",
-      "integrity": "sha512-ojSshQPKwVvSMR8yT2L/QtUkV5SXi/IfDiJ4/8d6UbTPjiHVmxZzUAzGD8Tzks1b9+qQkZa0isUOvYObedITaw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@sinclair/typebox": {
       "version": "0.34.41",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.41.tgz",
@@ -2653,6 +2660,13 @@
         "@babel/types": "^7.28.2"
       }
     },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
@@ -2690,6 +2704,13 @@
         "parse5": "^7.0.0"
       }
     },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/json5": {
       "version": "0.0.29",
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -2751,61 +2772,160 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.50.0.tgz",
+      "integrity": "sha512-O7QnmOXYKVtPrfYzMolrCTfkezCJS9+ljLdKW/+DCvRsc3UAz+sbH6Xcsv7p30+0OwUbeWfUDAQE0vpabZ3QLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "8.50.0",
+        "@typescript-eslint/type-utils": "8.50.0",
+        "@typescript-eslint/utils": "8.50.0",
+        "@typescript-eslint/visitor-keys": "8.50.0",
+        "ignore": "^7.0.0",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^8.50.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.2.0.tgz",
-      "integrity": "sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.50.0.tgz",
+      "integrity": "sha512-6/cmF2piao+f6wSxUsJLZjck7OQsYyRtcOZS02k7XINSNlz93v6emM8WutDQSXnroG2xwYlEVHJI+cPA7CPM3Q==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.2.0",
-        "@typescript-eslint/types": "7.2.0",
-        "@typescript-eslint/typescript-estree": "7.2.0",
-        "@typescript-eslint/visitor-keys": "7.2.0",
+        "@typescript-eslint/scope-manager": "8.50.0",
+        "@typescript-eslint/types": "8.50.0",
+        "@typescript-eslint/typescript-estree": "8.50.0",
+        "@typescript-eslint/visitor-keys": "8.50.0",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.50.0.tgz",
+      "integrity": "sha512-Cg/nQcL1BcoTijEWyx4mkVC56r8dj44bFDvBdygifuS20f3OZCHmFbjF34DPSi07kwlFvqfv/xOLnJ5DquxSGQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.50.0",
+        "@typescript-eslint/types": "^8.50.0",
+        "debug": "^4.3.4"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
-      "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.50.0.tgz",
+      "integrity": "sha512-xCwfuCZjhIqy7+HKxBLrDVT5q/iq7XBVBXLn57RTIIpelLtEIZHXAF/Upa3+gaCpeV1NNS5Z9A+ID6jn50VD4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.2.0",
-        "@typescript-eslint/visitor-keys": "7.2.0"
+        "@typescript-eslint/types": "8.50.0",
+        "@typescript-eslint/visitor-keys": "8.50.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.50.0.tgz",
+      "integrity": "sha512-vxd3G/ybKTSlm31MOA96gqvrRGv9RJ7LGtZCn2Vrc5htA0zCDvcMqUkifcjrWNNKXHUU3WCkYOzzVSFBd0wa2w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.50.0.tgz",
+      "integrity": "sha512-7OciHT2lKCewR0mFoBrvZJ4AXTMe/sYOe87289WAViOocEmDjjv8MvIOT2XESuKj9jp8u3SZYUSh89QA4S1kQw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.50.0",
+        "@typescript-eslint/typescript-estree": "8.50.0",
+        "@typescript-eslint/utils": "8.50.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz",
-      "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.50.0.tgz",
+      "integrity": "sha512-iX1mgmGrXdANhhITbpp2QQM2fGehBse9LbTf0sidWK6yg/NE+uhV5dfU1g6EYPlcReYmkE9QLPq/2irKAmtS9w==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -2813,32 +2933,31 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz",
-      "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.50.0.tgz",
+      "integrity": "sha512-W7SVAGBR/IX7zm1t70Yujpbk+zdPq/u4soeFSknWFdXIFuWsBGBOUu/Tn/I6KHSKvSh91OiMuaSnYp3mtPt5IQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.2.0",
-        "@typescript-eslint/visitor-keys": "7.2.0",
+        "@typescript-eslint/project-service": "8.50.0",
+        "@typescript-eslint/tsconfig-utils": "8.50.0",
+        "@typescript-eslint/types": "8.50.0",
+        "@typescript-eslint/visitor-keys": "8.50.0",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "9.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "tinyglobby": "^0.2.15",
+        "ts-api-utils": "^2.1.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -2852,9 +2971,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -2867,24 +2986,61 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.50.0.tgz",
+      "integrity": "sha512-87KgUXET09CRjGCi2Ejxy3PULXna63/bMYv72tCAlDJC3Yqwln0HiFJ3VJMst2+mEtNtZu5oFvX4qJGjKsnAgg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.50.0",
+        "@typescript-eslint/types": "8.50.0",
+        "@typescript-eslint/typescript-estree": "8.50.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz",
-      "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==",
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.50.0.tgz",
+      "integrity": "sha512-Xzmnb58+Db78gT/CCj/PVCvK+zxbnsw6F+O1oheYszJbBSdEjVhQi3C/Xttzxgi/GLmpvOggRs1RFpiJ8+c34Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.2.0",
-        "eslint-visitor-keys": "^3.4.1"
+        "@typescript-eslint/types": "8.50.0",
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/@ungap/structured-clone": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
@@ -3514,16 +3670,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/array.prototype.findlast": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
@@ -4421,19 +4567,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
@@ -4749,81 +4882,84 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
-      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
-      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+      "version": "9.39.2",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz",
+      "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.1",
-        "@humanwhocodes/config-array": "^0.13.0",
+        "@eslint-community/eslint-utils": "^4.8.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.21.1",
+        "@eslint/config-helpers": "^0.4.2",
+        "@eslint/core": "^0.17.0",
+        "@eslint/eslintrc": "^3.3.1",
+        "@eslint/js": "9.39.2",
+        "@eslint/plugin-kit": "^0.4.1",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
+        "eslint-scope": "^8.4.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
+        "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
+        "file-entry-cache": "^8.0.0",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
+        "optionator": "^0.9.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-config-next": {
-      "version": "14.2.5",
-      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-14.2.5.tgz",
-      "integrity": "sha512-zogs9zlOiZ7ka+wgUnmcM0KBEDjo4Jis7kxN1jvC0N4wynQ2MIx/KBkg4mVF63J5EK4W0QMCn7xO3vNisjaAoA==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-16.1.0.tgz",
+      "integrity": "sha512-RlPb8E2uO/Ix/w3kizxz6+6ogw99WqtNzTG0ArRZ5NEkIYcsfRb8U0j7aTG7NjRvcrsak5QtUSuxGNN2UcA58g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@next/eslint-plugin-next": "14.2.5",
-        "@rushstack/eslint-patch": "^1.3.3",
-        "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0",
+        "@next/eslint-plugin-next": "16.1.0",
         "eslint-import-resolver-node": "^0.3.6",
         "eslint-import-resolver-typescript": "^3.5.2",
-        "eslint-plugin-import": "^2.28.1",
-        "eslint-plugin-jsx-a11y": "^6.7.1",
-        "eslint-plugin-react": "^7.33.2",
-        "eslint-plugin-react-hooks": "^4.5.0 || 5.0.0-canary-7118f5dd7-20230705"
+        "eslint-plugin-import": "^2.32.0",
+        "eslint-plugin-jsx-a11y": "^6.10.0",
+        "eslint-plugin-react": "^7.37.0",
+        "eslint-plugin-react-hooks": "^7.0.0",
+        "globals": "16.4.0",
+        "typescript-eslint": "^8.46.0"
       },
       "peerDependencies": {
-        "eslint": "^7.23.0 || ^8.0.0",
+        "eslint": ">=9.0.0",
         "typescript": ">=3.3.1"
       },
       "peerDependenciesMeta": {
@@ -4832,6 +4968,19 @@
         }
       }
     },
+    "node_modules/eslint-config-next/node_modules/globals": {
+      "version": "16.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.4.0.tgz",
+      "integrity": "sha512-ob/2LcVVaVGCYN+r14cnwnoDPUufjiYgSqRhiFD0Q1iI4Odora5RE8Iv1D24hAz5oMophRGkGz+yuvQmmUMnMw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint-import-resolver-node": {
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
@@ -5056,16 +5205,23 @@
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "5.0.0-canary-7118f5dd7-20230705",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0-canary-7118f5dd7-20230705.tgz",
-      "integrity": "sha512-AZYbMo/NW9chdL7vk6HQzQhT+PvTAEVqWk9ziruUoW2kAOcN5qNyelv70e0F1VNQAbvutOC9oc+xfWycI9FxDw==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz",
+      "integrity": "sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "hermes-parser": "^0.25.1",
+        "zod": "^3.25.0 || ^4.0.0",
+        "zod-validation-error": "^3.5.0 || ^4.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
       }
     },
     "node_modules/eslint-plugin-react/node_modules/resolve": {
@@ -5097,9 +5253,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -5107,7 +5263,7 @@
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -5126,26 +5282,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/eslint/node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -5159,6 +5295,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint/node_modules/find-up": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -5189,19 +5338,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/eslint/node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -5261,18 +5397,31 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.9.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -5394,9 +5543,9 @@
       "license": "MIT"
     },
     "node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5404,7 +5553,7 @@
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
+        "micromatch": "^4.0.4"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -5443,16 +5592,16 @@
       }
     },
     "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/fill-range": {
@@ -5489,18 +5638,17 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/flatted": {
@@ -5782,16 +5930,13 @@
       }
     },
     "node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -5814,27 +5959,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -5854,13 +5978,6 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "license": "ISC"
     },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/graphql": {
       "version": "15.4.0",
       "license": "MIT",
@@ -5980,6 +6097,23 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/hermes-estree": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
+      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hermes-parser": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
+      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hermes-estree": "0.25.1"
+      }
+    },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
       "license": "BSD-3-Clause",
@@ -6463,16 +6597,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
@@ -9179,16 +9303,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/phosphor-react": {
       "version": "1.1.2",
       "license": "MIT",
@@ -9609,23 +9723,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/rrweb-cssom": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
@@ -10392,13 +10489,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/tinyglobby": {
       "version": "0.2.15",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
@@ -10524,16 +10614,16 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
-      "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=16"
+        "node": ">=18.12"
       },
       "peerDependencies": {
-        "typescript": ">=4.2.0"
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/ts-invariant": {
@@ -10603,19 +10693,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/typed-array-buffer": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
@@ -10709,6 +10786,30 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/typescript-eslint": {
+      "version": "8.50.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.50.0.tgz",
+      "integrity": "sha512-Q1/6yNUmCpH94fbgMUMg2/BSAr/6U7GBk61kZTv1/asghQOWOjTlp9K8mixS5NcJmm2creY+UFfGeW/+OcA64A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "8.50.0",
+        "@typescript-eslint/parser": "8.50.0",
+        "@typescript-eslint/typescript-estree": "8.50.0",
+        "@typescript-eslint/utils": "8.50.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
@@ -11227,6 +11328,29 @@
       "dependencies": {
         "zen-observable": "0.8.15"
       }
+    },
+    "node_modules/zod": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.2.1.tgz",
+      "integrity": "sha512-0wZ1IRqGGhMP76gLqz8EyfBXKk0J2qo2+H3fi4mcUP/KtTocoX08nmIAHl1Z2kJIZbZee8KOpBCSNPRgauucjw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/zod-validation-error": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-4.0.2.tgz",
+      "integrity": "sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.0 || ^4.0.0"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 0a11c3ecd..fd205d7b3 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
     "@testing-library/dom": "^9.3.4",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^14.3.1",
-    "eslint": "^8.57.0",
-    "eslint-config-next": "14.2.5",
+    "eslint": "^9.39.2",
+    "eslint-config-next": "^16.1.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
diff --git a/pages/404.js b/pages/404.js
index 3e109023f..179f7eda9 100644
--- a/pages/404.js
+++ b/pages/404.js
@@ -7,7 +7,7 @@ export default function NotFound({ dropdownData }) {
       <Box mt="xl" textAlign="center">
         <Box as="h1">Not Found</Box>
         <Box as="p" fontSize="l">
-          Uh oh! We could not find the page you're looking for.
+          Uh oh! We could not find the page you&apos;re looking for.
         </Box>
       </Box>
     </Layout>
diff --git a/pages/_app.js b/pages/_app.js
index f13d72f2d..68cf483ab 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -24,7 +24,7 @@ function App({ Component, pageProps = {}, dropdownData }) {
     return () => {
       router.events.off('routeChangeComplete', handleRouteChangeComplete);
     };
-  }, []);
+  }, [router.events]);
 
   const { initialApolloState, ...componentProps } = pageProps;
 
diff --git a/pages/_document.js b/pages/_document.js
index 9f92b3e6a..c9afc52c6 100644
--- a/pages/_document.js
+++ b/pages/_document.js
@@ -1,3 +1,4 @@
+/* eslint-disable @next/next/no-css-tags */
 import Document, { Html, Head, Main, NextScript } from 'next/document';
 import { ServerStyleSheet } from 'styled-components';
 
diff --git a/pages/about/[page].js b/pages/about/[page].js
index 8f01c7ea6..a4f994a17 100644
--- a/pages/about/[page].js
+++ b/pages/about/[page].js
@@ -9,7 +9,7 @@ import { GET_CAMPUSES } from 'hooks/useCampuses';
 import { GET_CONTENT_CHANNEL } from 'hooks/useContentChannel';
 import { GET_MINISTRY_CONTENT } from 'hooks/useMinistryContent';
 import { GET_UNIVERSAL_CONTENT_ITEM_BY_SLUG } from 'hooks/useUniversalContentItemBySlug';
-import { initializeApollo } from 'lib/apolloClient';
+import { initializeApollo, safeQuery } from 'lib/apolloClient';
 import { useRouter } from 'next/router';
 import { useEffect } from 'react';
 import { CardGrid, Longform, Section } from 'ui-kit';
@@ -147,7 +147,7 @@ export default function Page({
 export async function getStaticProps(context) {
   const apolloClient = initializeApollo();
 
-  const pageResponse = await apolloClient.query({
+  const pageResponse = await safeQuery(apolloClient, {
     query: GET_UNIVERSAL_CONTENT_ITEM_BY_SLUG,
     variables: {
       slug: context.params.page,
@@ -155,21 +155,21 @@ export async function getStaticProps(context) {
   });
   const pageData = pageResponse?.data?.getContentBySlug;
 
-  const submenuLinks = await apolloClient.query({
+  const submenuLinks = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: getChannelId(IDS.ABOUT_PAGES),
     },
   });
 
-  const ministryResponse = await apolloClient.query({
+  const ministryResponse = await safeQuery(apolloClient, {
     query: GET_MINISTRY_CONTENT,
     variables: {
       ministry: pageData?.ministry,
     },
   });
 
-  const campusesResponse = await apolloClient.query({
+  const campusesResponse = await safeQuery(apolloClient, {
     query: GET_CAMPUSES,
   });
 
@@ -178,7 +178,7 @@ export async function getStaticProps(context) {
       initialApolloState: apolloClient.cache.extract(),
       data: pageData,
       submenuLinks:
-        submenuLinks?.data?.node?.childContentItemsConnection?.edges,
+        submenuLinks?.data?.node?.childContentItemsConnection?.edges || [],
       campuses: campusesResponse?.data?.campuses || [],
       relatedContent: ministryResponse?.data,
     },
@@ -189,16 +189,17 @@ export async function getStaticProps(context) {
 export async function getStaticPaths() {
   const apolloClient = initializeApollo();
 
-  const pagesResponse = await apolloClient.query({
+  const pagesResponse = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: `ContentChannel:${IDS.ABOUT_PAGES}`,
     },
   });
 
-  const aboutPages = pagesResponse?.data?.node?.childContentItemsConnection?.edges?.map(
-    ({ node }) => node
-  );
+  const aboutPages =
+    pagesResponse?.data?.node?.childContentItemsConnection?.edges?.map(
+      ({ node }) => node
+    ) || [];
 
   // Get the paths we want to pre-render
   const paths = aboutPages.map(({ sharing }) => ({
diff --git a/pages/connect/[page].js b/pages/connect/[page].js
index 0fcc6bf6a..03dc81285 100644
--- a/pages/connect/[page].js
+++ b/pages/connect/[page].js
@@ -14,7 +14,7 @@ import { GET_CONTENT_CHANNEL } from 'hooks/useContentChannel';
 // import { GET_STAFF } from 'hooks/useStaff';
 import { GET_MINISTRY_CONTENT } from 'hooks/useMinistryContent';
 import { GET_UNIVERSAL_CONTENT_ITEM_BY_SLUG } from 'hooks/useUniversalContentItemBySlug';
-import { initializeApollo } from 'lib/apolloClient';
+import { initializeApollo, safeQuery } from 'lib/apolloClient';
 import { useRouter } from 'next/router';
 import { Button, CardGrid, Longform, Section } from 'ui-kit';
 import {
@@ -203,7 +203,10 @@ export default function Page({
             alignItems="center"
           >
             {extraCTA.map(cta => (
-              <Button onClick={() => router.push(cta.buttonLink)}>
+              <Button
+                key={cta.id || cta.buttonLink || cta.buttonText}
+                onClick={() => router.push(cta.buttonLink)}
+              >
                 {cta.buttonText}
               </Button>
             ))}
@@ -225,7 +228,7 @@ export default function Page({
 export async function getStaticProps({ params }) {
   const apolloClient = initializeApollo();
 
-  const pageResponse = await apolloClient.query({
+  const pageResponse = await safeQuery(apolloClient, {
     query: GET_UNIVERSAL_CONTENT_ITEM_BY_SLUG,
     variables: {
       slug: params.page,
@@ -245,14 +248,14 @@ export async function getStaticProps({ params }) {
   //   });
   // }
 
-  const ministryResponse = await apolloClient.query({
+  const ministryResponse = await safeQuery(apolloClient, {
     query: GET_MINISTRY_CONTENT,
     variables: {
       ministry: pageData?.ministry,
     },
   });
 
-  const campusesResponse = await apolloClient.query({
+  const campusesResponse = await safeQuery(apolloClient, {
     query: GET_CAMPUSES,
   });
 
@@ -272,16 +275,17 @@ export async function getStaticProps({ params }) {
 export async function getStaticPaths() {
   const apolloClient = initializeApollo();
 
-  const pagesResponse = await apolloClient.query({
+  const pagesResponse = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: `ContentChannel:${IDS.CONNECT_PAGES}`,
     },
   });
 
-  const connectPages = pagesResponse?.data?.node?.childContentItemsConnection?.edges?.map(
-    ({ node }) => node
-  );
+  const connectPages =
+    pagesResponse?.data?.node?.childContentItemsConnection?.edges?.map(
+      ({ node }) => node
+    ) || [];
 
   // Get the paths we want to pre-render
   const paths = connectPages.map(({ sharing }) => ({
diff --git a/pages/index.js b/pages/index.js
index f33c4b1ae..8fd2681e5 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -1,4 +1,4 @@
-import { initializeApollo } from 'lib/apolloClient';
+import { initializeApollo, safeQuery } from 'lib/apolloClient';
 
 import { FeedFeaturesProvider } from 'providers';
 import { HomeFeed, Layout } from 'components';
@@ -22,7 +22,7 @@ export default function Home({ dropdownData, ...props } = {}) {
 export async function getStaticProps() {
   const apolloClient = initializeApollo();
 
-  const sermonsRequest = await apolloClient.query({
+  const sermonsRequest = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: getChannelId(IDS.MESSAGES.SUNDAY),
@@ -30,11 +30,11 @@ export async function getStaticProps() {
   });
 
   const sermons =
-    sermonsRequest?.data?.node?.childContentItemsConnection?.edges;
+    sermonsRequest?.data?.node?.childContentItemsConnection?.edges || [];
   const sermonVideos = sermons.filter(({ node }) => getMediaSource(node));
   const latestSermon = sermonVideos[0]?.node;
 
-  const sermonRequest = await apolloClient.query({
+  const sermonRequest = await safeQuery(apolloClient, {
     query: GET_CONTENT_ITEM,
     variables: {
       itemId: getItemId(getIdSuffix(latestSermon?.id)),
@@ -42,7 +42,7 @@ export async function getStaticProps() {
     skip: !latestSermon,
   });
 
-  const articles = await apolloClient.query({
+  const articles = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: getChannelId(IDS.CHANNELS.ARTICLES),
@@ -50,14 +50,16 @@ export async function getStaticProps() {
   });
 
   // sort events
-  const { data: eventsData } = await apolloClient.query({
+  const eventsRequest = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: getChannelId(IDS.CHANNELS.EVENTS),
     },
   });
-  const events =
-    [...eventsData?.node?.childContentItemsConnection?.edges] || [];
+  const eventsData = eventsRequest?.data;
+  const events = [
+    ...(eventsData?.node?.childContentItemsConnection?.edges || []),
+  ];
   events.sort((a, b) => {
     const date1 = a.node.dates?.split(',')[0];
     const date2 = b.node.dates?.split(',')[0];
diff --git a/pages/next-steps/[page].js b/pages/next-steps/[page].js
index de847e5f8..736e1f788 100644
--- a/pages/next-steps/[page].js
+++ b/pages/next-steps/[page].js
@@ -11,7 +11,7 @@ import { GET_CAMPUSES } from 'hooks/useCampuses';
 import { GET_CONTENT_CHANNEL } from 'hooks/useContentChannel';
 import { GET_MINISTRY_CONTENT } from 'hooks/useMinistryContent';
 import { GET_UNIVERSAL_CONTENT_ITEM_BY_SLUG } from 'hooks/useUniversalContentItemBySlug';
-import { initializeApollo } from 'lib/apolloClient';
+import { initializeApollo, safeQuery } from 'lib/apolloClient';
 import { useRouter } from 'next/router';
 import { CardGrid, Longform, Section } from 'ui-kit';
 import { getIdSuffix, getMetaData, getSlugFromURL } from 'utils';
@@ -139,7 +139,7 @@ export default function Page({
 export async function getStaticProps(context) {
   const apolloClient = initializeApollo();
 
-  const pageResponse = await apolloClient.query({
+  const pageResponse = await safeQuery(apolloClient, {
     query: GET_UNIVERSAL_CONTENT_ITEM_BY_SLUG,
     variables: {
       slug: context.params.page,
@@ -149,14 +149,14 @@ export async function getStaticProps(context) {
 
   const pageData = pageResponse?.data?.getContentBySlug;
 
-  const ministryResponse = await apolloClient.query({
+  const ministryResponse = await safeQuery(apolloClient, {
     query: GET_MINISTRY_CONTENT,
     variables: {
       ministry: pageData?.ministry,
     },
   });
 
-  const campusesResponse = await apolloClient.query({
+  const campusesResponse = await safeQuery(apolloClient, {
     query: GET_CAMPUSES,
   });
 
@@ -174,16 +174,17 @@ export async function getStaticProps(context) {
 export async function getStaticPaths() {
   const apolloClient = initializeApollo();
 
-  const pagesResponse = await apolloClient.query({
+  const pagesResponse = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: `ContentChannel:${IDS.NEXT_STEPS_PAGES}`,
     },
   });
 
-  const nextStepsPages = pagesResponse?.data?.node?.childContentItemsConnection?.edges?.map(
-    ({ node }) => node
-  );
+  const nextStepsPages =
+    pagesResponse?.data?.node?.childContentItemsConnection?.edges?.map(
+      ({ node }) => node
+    ) || [];
 
   // Get the paths we want to pre-render
   const paths = nextStepsPages.map(({ sharing }) => ({
diff --git a/pages/watch/[series]/[channel].js b/pages/watch/[series]/[channel].js
index eae26f7d3..c6a0c2668 100644
--- a/pages/watch/[series]/[channel].js
+++ b/pages/watch/[series]/[channel].js
@@ -6,9 +6,9 @@ import { format } from 'date-fns';
 import { GET_CONTENT_BY_SLUG } from 'hooks/useContentBySlug';
 import { GET_MESSAGE_CHANNEL } from 'hooks/useMessageChannel';
 import { GET_MESSAGE_SERIES } from 'hooks/useMessageSeries';
-import { initializeApollo } from 'lib/apolloClient';
+import { initializeApollo, safeQuery } from 'lib/apolloClient';
 import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useTheme } from 'styled-components';
 import { Box, Button, Longform, Section } from 'ui-kit';
 import { getChannelId, getIdSuffix, getMetaData, getSlugFromURL } from 'utils';
@@ -17,26 +17,20 @@ export default function Channel({ item, dropdownData, messageChannel } = {}) {
   const router = useRouter();
   const theme = useTheme();
 
-  const [videos, setVideos] = useState(
-    messageChannel?.childContentItemsConnection?.edges || []
-  );
-  const [cursor, setCursor] = useState(
-    messageChannel?.childContentItemsConnection?.pageInfo?.endCursor
-  );
-
-  const [fetchMore, { loading }] = useLazyQuery(GET_MESSAGE_CHANNEL, {
-    onCompleted: data => {
-      setVideos([...videos, ...data?.node?.childContentItemsConnection?.edges]);
-      setCursor(data?.node?.childContentItemsConnection?.pageInfo?.endCursor);
-    },
-  });
-
-  useEffect(() => {
-    setVideos(messageChannel?.childContentItemsConnection?.edges || []);
-    setCursor(
-      messageChannel?.childContentItemsConnection?.pageInfo?.endCursor || []
-    );
-  }, [messageChannel]);
+  const [extraByChannel, setExtraByChannel] = useState({});
+  const channelId = messageChannel?.id;
+  const baseVideos =
+    messageChannel?.childContentItemsConnection?.edges || [];
+  const baseCursor =
+    messageChannel?.childContentItemsConnection?.pageInfo?.endCursor;
+  const extraState = channelId ? extraByChannel[channelId] : null;
+  const videos = extraState
+    ? [...baseVideos, ...extraState.videos]
+    : baseVideos;
+  const cursor = extraState?.cursor || baseCursor;
+
+  const [fetchMore, { data: fetchMoreData, loading }] =
+    useLazyQuery(GET_MESSAGE_CHANNEL);
 
   if (router.isFallback) {
     return null;
@@ -88,10 +82,26 @@ export default function Channel({ item, dropdownData, messageChannel } = {}) {
       </Section>
       {totalVideoCount > videos?.length ? (
         <Button
-          onClick={() => {
-            fetchMore({
+          onClick={async () => {
+            const response = await fetchMore({
               variables: { itemId: item?.id, after: cursor },
             });
+            if (!channelId || response?.data?.node?.id !== channelId) return;
+            const newEdges =
+              response?.data?.node?.childContentItemsConnection?.edges || [];
+            const newCursor =
+              response?.data?.node?.childContentItemsConnection?.pageInfo
+                ?.endCursor;
+            setExtraByChannel(prev => {
+              const existing = prev[channelId]?.videos || [];
+              return {
+                ...prev,
+                [channelId]: {
+                  videos: [...existing, ...newEdges],
+                  cursor: newCursor,
+                },
+              };
+            });
           }}
           status={loading ? 'LOADING' : 'SUCCESS'}
           mx="auto"
@@ -107,16 +117,23 @@ export default function Channel({ item, dropdownData, messageChannel } = {}) {
 export async function getStaticProps(context) {
   const apolloClient = initializeApollo();
 
-  const itemResponse = await apolloClient.query({
+  const itemResponse = await safeQuery(apolloClient, {
     query: GET_CONTENT_BY_SLUG,
     variables: {
       slug: context.params.channel,
     },
   });
 
-  const item = itemResponse.data?.getContentBySlug;
+  const item = itemResponse?.data?.getContentBySlug;
+
+  if (!item) {
+    return {
+      notFound: true,
+      revalidate: 60,
+    };
+  }
 
-  const messageChannelResponse = await apolloClient.query({
+  const messageChannelResponse = await safeQuery(apolloClient, {
     query: GET_MESSAGE_CHANNEL,
     variables: {
       itemId: item?.id,
@@ -129,6 +146,7 @@ export async function getStaticProps(context) {
       item,
       messageChannel: messageChannelResponse?.data?.node,
     },
+    revalidate: 60,
   };
 }
 
@@ -140,7 +158,7 @@ export async function getStaticPaths() {
   const channels = (
     await Promise.all(
       series?.map(id =>
-        apolloClient.query({
+        safeQuery(apolloClient, {
           query: GET_MESSAGE_SERIES,
           variables: {
             itemId: getChannelId(id),
@@ -148,12 +166,14 @@ export async function getStaticPaths() {
         })
       )
     )
-  ).flatMap(({ data }) =>
-    data?.node?.childContentItemsConnection?.edges?.map(({ node }) => ({
-      channel: node,
-      seriesId: data?.node?.id,
-    }))
-  );
+  )
+    .filter(Boolean)
+    .flatMap(({ data }) =>
+      data?.node?.childContentItemsConnection?.edges?.map(({ node }) => ({
+        channel: node,
+        seriesId: data?.node?.id,
+      }))
+    );
 
   const paths = channels.map(({ channel, seriesId }) => ({
     params: {
diff --git a/pages/watch/[series]/index.js b/pages/watch/[series]/index.js
index 6114cd70c..bef473071 100644
--- a/pages/watch/[series]/index.js
+++ b/pages/watch/[series]/index.js
@@ -2,7 +2,7 @@ import { useLazyQuery } from '@apollo/client';
 import { LargeImage, Layout } from 'components';
 import IDS from 'config/ids';
 import { GET_MESSAGE_SERIES } from 'hooks/useMessageSeries';
-import { initializeApollo } from 'lib/apolloClient';
+import { initializeApollo, safeQuery } from 'lib/apolloClient';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
 import { Box, Button, Heading } from 'ui-kit';
@@ -18,12 +18,8 @@ export default function Series({ item, dropdownData } = {}) {
     item?.childContentItemsConnection?.pageInfo?.endCursor
   );
 
-  const [fetchMore, { loading }] = useLazyQuery(GET_MESSAGE_SERIES, {
-    onCompleted: data => {
-      setSeries([...series, ...data?.node?.childContentItemsConnection?.edges]);
-      setCursor(data?.node?.childContentItemsConnection?.pageInfo?.endCursor);
-    },
-  });
+  const [fetchMore, { data: fetchMoreData, loading }] =
+    useLazyQuery(GET_MESSAGE_SERIES);
 
   if (router.isFallback) {
     return null;
@@ -66,10 +62,17 @@ export default function Series({ item, dropdownData } = {}) {
       </Box>
       {totalSeriesCount > series?.length ? (
         <Button
-          onClick={() => {
-            fetchMore({
+          onClick={async () => {
+            const response = await fetchMore({
               variables: { itemId: item?.id, after: cursor },
             });
+            const newEdges =
+              response?.data?.node?.childContentItemsConnection?.edges || [];
+            const newCursor =
+              response?.data?.node?.childContentItemsConnection?.pageInfo
+                ?.endCursor;
+            setSeries(prev => [...prev, ...newEdges]);
+            setCursor(newCursor);
           }}
           status={loading ? 'LOADING' : 'SUCCESS'}
           mx="auto"
@@ -85,7 +88,7 @@ export default function Series({ item, dropdownData } = {}) {
 export async function getStaticProps(context) {
   const apolloClient = initializeApollo();
 
-  const seriesResponse = await apolloClient.query({
+  const seriesResponse = await safeQuery(apolloClient, {
     query: GET_MESSAGE_SERIES,
     variables: {
       itemId: getChannelId(context.params.series),
diff --git a/pages/watch/index.js b/pages/watch/index.js
index c69875abb..2adadfd0a 100644
--- a/pages/watch/index.js
+++ b/pages/watch/index.js
@@ -10,7 +10,8 @@ import { GET_CONTENT_BY_SLUG } from 'hooks/useContentBySlug';
 import { GET_CONTENT_CHANNEL } from 'hooks/useContentChannel';
 import useLiveStreams from 'hooks/useLiveStreams';
 import { GET_MESSAGE_SERIES } from 'hooks/useMessageSeries';
-import { initializeApollo } from 'lib/apolloClient';
+import { initializeApollo, safeQuery } from 'lib/apolloClient';
+import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { Box, CardGrid, Heading, Section } from 'ui-kit';
 import {
@@ -35,6 +36,8 @@ export default function Watch({
 
   const { prettyCountdown, liveStreams } = useLiveStreams();
   const live = liveStreams?.[0]?.isLive;
+  const primaryHref = liveStreams?.[0]?.webViewUrl || '/about/schedule';
+  const isPrimaryInternal = primaryHref.startsWith('/');
 
   return (
     <Layout dropdownData={dropdownData}>
@@ -45,22 +48,38 @@ export default function Watch({
         justifyText="center"
         backdrop={false}
         primaryButton={
-          <a
-            className="btn"
-            style={{
-              pointerEvents: 'auto',
-              marginRight: '16px',
-              zIndex: 10,
-              width: 'auto',
-              padding: '14px 28px',
-            }}
-            href={live ? liveStreams[0].webViewUrl : 'about/schedule'}
-          >
-            {live ? 'Watch Now' : 'Our Weekly Schedule'}
-          </a>
+          isPrimaryInternal ? (
+            <Link
+              className="btn"
+              style={{
+                pointerEvents: 'auto',
+                marginRight: '16px',
+                zIndex: 10,
+                width: 'auto',
+                padding: '14px 28px',
+              }}
+              href={primaryHref}
+            >
+              {live ? 'Watch Now' : 'Our Weekly Schedule'}
+            </Link>
+          ) : (
+            <a
+              className="btn"
+              style={{
+                pointerEvents: 'auto',
+                marginRight: '16px',
+                zIndex: 10,
+                width: 'auto',
+                padding: '14px 28px',
+              }}
+              href={primaryHref}
+            >
+              {live ? 'Watch Now' : 'Our Weekly Schedule'}
+            </a>
+          )
         }
         secondaryButton={
-          <a
+          <Link
             className="btn"
             style={{
               width: 'auto',
@@ -70,7 +89,7 @@ export default function Watch({
             href="/next-steps/join-us-online"
           >
             {live ? 'Other Ways to Watch' : 'How to Watch'}
-          </a>
+          </Link>
         }
       />
       <Section
@@ -255,53 +274,55 @@ export default function Watch({
 export async function getStaticProps() {
   const apolloClient = initializeApollo();
 
-  const sermons = await apolloClient.query({
+  const sermons = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: getChannelId(IDS.MESSAGES.SUNDAY),
     },
   });
 
-  const watchRequest = await apolloClient.query({
+  const watchRequest = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: getChannelId(IDS.WATCH_PAGES),
     },
   });
 
-  const sundaySeries = await apolloClient.query({
+  const sundaySeries = await safeQuery(apolloClient, {
     query: GET_MESSAGE_SERIES,
     variables: {
       itemId: getChannelId(IDS.SERIES.SUNDAY),
     },
   });
 
-  const baptismChannel = await apolloClient.query({
+  const baptismChannel = await safeQuery(apolloClient, {
     query: GET_CONTENT_BY_SLUG,
     variables: {
       slug: BAPTISMS_CHANNEL_SLUG,
     },
   });
-  const baptisms = (
-    baptismChannel?.data?.getContentBySlug?.childContentItemsConnection
-      ?.edges || []
-  ).map(node => ({
+
+  const baptismContent = baptismChannel?.data?.getContentBySlug;
+  const baptismEdges =
+    baptismContent?.childContentItemsConnection?.edges || [];
+  const baptisms = baptismEdges.map(node => ({
     node: {
       ...node.node,
-      coverImage: baptismChannel.data.getContentBySlug.coverImage,
+      coverImage: baptismContent?.coverImage,
     },
   }));
 
+  const sermonEdges =
+    sermons?.data?.node?.childContentItemsConnection?.edges || [];
+
   return {
     props: {
       initialApolloState: apolloClient.cache.extract(),
-      series: [sundaySeries?.data?.node],
+      series: sundaySeries?.data?.node ? [sundaySeries.data.node] : [],
       baptisms,
       watchPages:
         watchRequest?.data?.node?.childContentItemsConnection?.edges || [],
-      sermons: sermons?.data?.node?.childContentItemsConnection?.edges.filter(
-        ({ node }) => getMediaSource(node)
-      ),
+      sermons: sermonEdges.filter(({ node }) => getMediaSource(node)),
     },
     revalidate: 60, // In seconds
   };
diff --git a/providers/TrackPageViewProvider.js b/providers/TrackPageViewProvider.js
index 455a318b3..ad5a92597 100644
--- a/providers/TrackPageViewProvider.js
+++ b/providers/TrackPageViewProvider.js
@@ -1,6 +1,5 @@
-import React, { useEffect} from 'react';
-import { useRouter } from 'next/router'
-
+import React, { useEffect } from 'react';
+import { useRouter } from 'next/router';
 
 import useTrackPageView from 'hooks/useTrackPageView';
 import { useAuthState } from 'providers/AuthProvider';
@@ -12,29 +11,31 @@ function TrackPageViewProvider({ children }) {
   useEffect(() => {
     const handleRouteChange = () => {
       try {
-        if (authState.authenticated){
-          trackPageView({ variables: {
-            pageTitle: document.title,
-            pageUrl: window.location.toString()
-          }})
+        if (authState.authenticated) {
+          trackPageView({
+            variables: {
+              pageTitle: document.title,
+              pageUrl: window.location.toString(),
+            },
+          });
         }
       } catch (e) {
-        console.log(e, 'Tracking Page View failed')
+        console.log(e, 'Tracking Page View failed');
       }
-    }
+    };
 
     // Initial Load
-    handleRouteChange()
+    handleRouteChange();
 
     // Page change
-    router.events.on('routeChangeComplete', handleRouteChange)
+    router.events.on('routeChangeComplete', handleRouteChange);
 
     // If the component is unmounted, unsubscribe
     // from the event with the `off` method:
     return () => {
-      router.events.off('routeChangeComplete', handleRouteChange)
-    }
-  }, [authState])
+      router.events.off('routeChangeComplete', handleRouteChange);
+    };
+  }, [authState.authenticated, router.events, trackPageView]);
   return children
 }
 
diff --git a/ui-kit/Box/Box.js b/ui-kit/Box/Box.js
index a4d946203..08f35b5a3 100644
--- a/ui-kit/Box/Box.js
+++ b/ui-kit/Box/Box.js
@@ -6,6 +6,7 @@ import Styled from './Box.styles';
 const Box = forwardRef((props = {}, ref) => {
   return <Styled {...props} ref={ref} />;
 });
+Box.displayName = 'Box';
 
 Box.propTypes = {
   ...systemPropTypes,
diff --git a/ui-kit/_lib/system.js b/ui-kit/_lib/system.js
index a3a3af018..6fe727caf 100644
--- a/ui-kit/_lib/system.js
+++ b/ui-kit/_lib/system.js
@@ -1,4 +1,4 @@
-/* eslint-disable react/forbid-foreign-prop-types */
+ 
 
 import {
   compose,
diff --git a/utils/getDropdownData.js b/utils/getDropdownData.js
index 1481164c1..95cd8cbc6 100644
--- a/utils/getDropdownData.js
+++ b/utils/getDropdownData.js
@@ -1,26 +1,28 @@
 import IDS from 'config/ids';
 import { GET_CONTENT_CHANNEL } from 'hooks/useContentChannel';
+import { safeQuery } from 'lib/apolloClient';
 
 function getItems(content) {
-  const featuredItems = content
-    ?.filter(({ node }) => node.isFeatured)
-    ?.map(({ node }) => node);
-  const nonFeaturedItems = content
-    ?.filter(({ node }) => !node.isFeatured)
-    ?.map(({ node }) => node);
+  const featuredItems =
+    content?.filter(({ node }) => node.isFeatured)?.map(({ node }) => node) ||
+    [];
+  const nonFeaturedItems =
+    content
+      ?.filter(({ node }) => !node.isFeatured)
+      ?.map(({ node }) => node) || [];
 
   return { featuredItems, nonFeaturedItems };
 }
 
 async function getContent(apolloClient, id) {
-  const content = await apolloClient.query({
+  const content = await safeQuery(apolloClient, {
     query: GET_CONTENT_CHANNEL,
     variables: {
       itemId: `ContentChannel:${id}`,
     },
   });
 
-  return content?.data?.node?.childContentItemsConnection?.edges;
+  return content?.data?.node?.childContentItemsConnection?.edges || [];
 }
 
 const getDataGenerator = apolloClient => async id => {