From 9e7e0f3dbbdd8ae59b0bad2287cdfb9cfef9eef2 Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Thu, 26 Sep 2024 07:32:42 -0400
Subject: [PATCH 01/26] ARB rules will overcome the stream3 meiio path variant,
 instead of relying on AEM-sensitive logic.

---
 graphql/mappers/my-dashboard.ts | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/graphql/mappers/my-dashboard.ts b/graphql/mappers/my-dashboard.ts
index 592ac971f..96768562b 100644
--- a/graphql/mappers/my-dashboard.ts
+++ b/graphql/mappers/my-dashboard.ts
@@ -137,13 +137,7 @@ export async function getMyDashboardContent() {
                     id: item.scId,
                     title: item.scLinkTextEn,
                     areaLabel: item.scLinkTextAssistiveEn,
-                    link: buildLink(
-                      item.schURLType,
-                      process.env.ENVIRONMENT === 'development' &&
-                        item.scDestinationURL3En !== null
-                        ? item.scDestinationURL3En
-                        : item.scDestinationURLEn,
-                    ),
+                    link: buildLink(item.schURLType, item.scDestinationURLEn),
                     icon: item.scIconCSS,
                     betaPopUp: item.schBetaPopUp,
                   }
@@ -196,13 +190,7 @@ export async function getMyDashboardContent() {
                     id: item.scId,
                     title: item.scLinkTextFr,
                     areaLabel: item.scLinkTextAssistiveFr,
-                    link: buildLink(
-                      item.schURLType,
-                      process.env.ENVIRONMENT === 'development' &&
-                        item.scDestinationURL3Fr !== null
-                        ? item.scDestinationURL3Fr
-                        : item.scDestinationURLFr,
-                    ),
+                    link: buildLink(item.schURLType, item.scDestinationURLFr),
                     icon: item.scIconCSS,
                     betaPopUp: item.schBetaPopUp,
                   }

From 5367aa564a0d800c171fbecfea0ed19d3ceadd63 Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Thu, 26 Sep 2024 09:00:15 -0400
Subject: [PATCH 02/26] cleanup schLists Array

---
 graphql/mappers/my-dashboard.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/graphql/mappers/my-dashboard.ts b/graphql/mappers/my-dashboard.ts
index 96768562b..0d277598a 100644
--- a/graphql/mappers/my-dashboard.ts
+++ b/graphql/mappers/my-dashboard.ts
@@ -70,8 +70,6 @@ interface GetSchMyDashboardV2 {
                 schURLType?: string
                 scDestinationURLEn: string
                 scDestinationURLFr: string
-                scDestinationURL3En?: string | null
-                scDestinationURL3Fr?: string | null
                 scIconCSS: string
                 schBetaPopUp: boolean
               }>

From d61ef97376d4969455f338ffb3d429b261210cc3 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Tue, 8 Oct 2024 15:07:50 -0600
Subject: [PATCH 03/26] Use next/script and move AA script out of Head

---
 components/MetaData.tsx | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/components/MetaData.tsx b/components/MetaData.tsx
index 790dda73e..9e8a0c9b2 100644
--- a/components/MetaData.tsx
+++ b/components/MetaData.tsx
@@ -1,4 +1,5 @@
 import Head from 'next/head'
+import Script from 'next/script'
 
 interface Content {
   title: string
@@ -57,16 +58,19 @@ const MetaData = ({ language, data }: MetaDataProps) => {
         <meta name="dcterms.creator" content={d.creator} />
         <meta name="dcterms.accessRights" content={d.accessRights} />
         <meta name="dcterms.service" content={d.service} />
-        {/* eslint-disable */}
-
-        {process.env.ENVIRONMENT === 'production' ? (
-          <script src="//assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-59d77766b86a.min.js"></script>
-        ) : (
-          <script src="https://assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-cad75bf2f0d2-staging.min.js"></script>
-        )}
-
-        {/*eslint-enable */}
       </Head>
+
+      {process.env.ENVIRONMENT === 'production' ? (
+        <Script
+          strategy="afterInteractive"
+          src="//assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-59d77766b86a.min.js"
+        />
+      ) : (
+        <Script
+          strategy="afterInteractive"
+          src="https://assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-cad75bf2f0d2-staging.min.js"
+        />
+      )}
     </>
   )
 }

From fd81954813477af926cd869ba54fe08243ef8295 Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Thu, 10 Oct 2024 12:07:32 -0400
Subject: [PATCH 04/26] Reduce replicaCount and minReplicas to 1 for dev
 environments.

---
 .../secure-client-hub/dev/secure-client-hub.yaml.gotmpl       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl b/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl
index c25ab38dd..7a16f6eb9 100644
--- a/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl
+++ b/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl
@@ -144,7 +144,7 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
-replicaCount: 2
+replicaCount: 1
 resources:
   requests:
     cpu: 300m
@@ -194,7 +194,7 @@ secrets:
 autoscaling:
   enabled: true
   name: service-canada-client-hub
-  minReplicas: 2
+  minReplicas: 1
   maxReplicas: {{ env "HPA_MAX_REPLICAS" | default 40}}
   targetCPUUtilization: 85
   labels:

From 723b54e53df49a816e57bf3752302d6767a26011 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Thu, 17 Oct 2024 15:07:12 -0600
Subject: [PATCH 05/26] Load AA script before interactive to see if there's a
 race condition

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

diff --git a/components/MetaData.tsx b/components/MetaData.tsx
index 9e8a0c9b2..b29811b5c 100644
--- a/components/MetaData.tsx
+++ b/components/MetaData.tsx
@@ -62,12 +62,12 @@ const MetaData = ({ language, data }: MetaDataProps) => {
 
       {process.env.ENVIRONMENT === 'production' ? (
         <Script
-          strategy="afterInteractive"
+          strategy="beforeInteractive"
           src="//assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-59d77766b86a.min.js"
         />
       ) : (
         <Script
-          strategy="afterInteractive"
+          strategy="beforeInteractive"
           src="https://assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-cad75bf2f0d2-staging.min.js"
         />
       )}

From 64308ca72d7aa4cefe410057843acda0a01ae2d7 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Fri, 18 Oct 2024 11:07:25 -0600
Subject: [PATCH 06/26] Tests for AA script duplication and comment for why
 script needs to be loaded beforeInteractive

---
 components/MetaData.tsx            | 25 ++++++++++++++-----------
 cypress/e2e/ContactUs.cy.js        | 10 ++++++++++
 cypress/e2e/ContactUsCPP.cy.js     | 10 ++++++++++
 cypress/e2e/ContactUsEI.cy.js      | 10 ++++++++++
 cypress/e2e/ContactUsOAS.cy.js     | 11 ++++++++++-
 cypress/e2e/DecisionReviews.cy.js  | 10 ++++++++++
 cypress/e2e/Login.cy.js            | 10 ++++++++++
 cypress/e2e/Profile.cy.js          | 10 ++++++++++
 cypress/e2e/SecuritySettings.cy.js | 10 ++++++++++
 cypress/e2e/dashboard.cy.js        |  9 +++++++++
 10 files changed, 103 insertions(+), 12 deletions(-)

diff --git a/components/MetaData.tsx b/components/MetaData.tsx
index b29811b5c..87a779f7d 100644
--- a/components/MetaData.tsx
+++ b/components/MetaData.tsx
@@ -60,17 +60,20 @@ const MetaData = ({ language, data }: MetaDataProps) => {
         <meta name="dcterms.service" content={d.service} />
       </Head>
 
-      {process.env.ENVIRONMENT === 'production' ? (
-        <Script
-          strategy="beforeInteractive"
-          src="//assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-59d77766b86a.min.js"
-        />
-      ) : (
-        <Script
-          strategy="beforeInteractive"
-          src="https://assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-cad75bf2f0d2-staging.min.js"
-        />
-      )}
+      {
+        // AA script must be loaded before the pageLoad event fires
+        process.env.ENVIRONMENT === 'production' ? (
+          <Script
+            strategy="beforeInteractive"
+            src="//assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-59d77766b86a.min.js"
+          />
+        ) : (
+          <Script
+            strategy="beforeInteractive"
+            src="https://assets.adobedtm.com/be5dfd287373/9b9cb7867b5b/launch-cad75bf2f0d2-staging.min.js"
+          />
+        )
+      }
     </>
   )
 }
diff --git a/cypress/e2e/ContactUs.cy.js b/cypress/e2e/ContactUs.cy.js
index ba057ce3a..bae71af5b 100644
--- a/cypress/e2e/ContactUs.cy.js
+++ b/cypress/e2e/ContactUs.cy.js
@@ -2,6 +2,10 @@
 
 describe('Validate Contact Us Landing page', () => {
   beforeEach(() => {
+    cy.intercept({
+      method: 'GET',
+      hostname: 'assets.adobedtm.com'
+    }).as('adobeAnalytics')
     cy.visit('/contact-us')
   })
 
@@ -45,4 +49,10 @@ describe('Validate Contact Us Landing page', () => {
     cy.location('pathname', { timeout: 10000 })
     .should('equal', '/en/contact-us')
   })
+
+  it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
+    cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
+    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('@analyticsScript').its('length').should('eq', 1)
+  })
 })
diff --git a/cypress/e2e/ContactUsCPP.cy.js b/cypress/e2e/ContactUsCPP.cy.js
index 1ec38c355..638490358 100644
--- a/cypress/e2e/ContactUsCPP.cy.js
+++ b/cypress/e2e/ContactUsCPP.cy.js
@@ -3,6 +3,10 @@
 describe('Validate Contact Canada Pension Plan page', () => {
 
   beforeEach(() => {
+    cy.intercept({
+      method: 'GET',
+      hostname: 'assets.adobedtm.com'
+    }).as('adobeAnalytics')
     cy.visit('/contact-us/contact-canada-pension-plan')
   })
 
@@ -79,4 +83,10 @@ describe('Validate Contact Canada Pension Plan page', () => {
     })
   })
 
+  it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
+    cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
+    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('@analyticsScript').its('length').should('eq', 1)
+  })
+
 })
\ No newline at end of file
diff --git a/cypress/e2e/ContactUsEI.cy.js b/cypress/e2e/ContactUsEI.cy.js
index 2244e635d..73715a05e 100644
--- a/cypress/e2e/ContactUsEI.cy.js
+++ b/cypress/e2e/ContactUsEI.cy.js
@@ -3,6 +3,10 @@
 describe('Validate EI Contact Us Landing page', () => {
 
   beforeEach(() => {
+    cy.intercept({
+      method: 'GET',
+      hostname: 'assets.adobedtm.com'
+    }).as('adobeAnalytics')
     cy.visit('/contact-us/contact-employment-insurance')
   })
 
@@ -79,4 +83,10 @@ describe('Validate EI Contact Us Landing page', () => {
     })
   })
 
+  it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
+    cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
+    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('@analyticsScript').its('length').should('eq', 1)
+  })
+
 })
diff --git a/cypress/e2e/ContactUsOAS.cy.js b/cypress/e2e/ContactUsOAS.cy.js
index d32c7e067..ae347a942 100644
--- a/cypress/e2e/ContactUsOAS.cy.js
+++ b/cypress/e2e/ContactUsOAS.cy.js
@@ -4,6 +4,10 @@
 describe('Validate Contact Old Age Security page', () => {
 
   beforeEach(() => {
+    cy.intercept({
+      method: 'GET',
+      hostname: 'assets.adobedtm.com'
+    }).as('adobeAnalytics')
     cy.visit('/contact-us/contact-old-age-security')
   })
 
@@ -79,5 +83,10 @@ describe('Validate Contact Old Age Security page', () => {
        .should('be.visible')
     })
   })
-
+  
+  it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
+    cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
+    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('@analyticsScript').its('length').should('eq', 1)
+  })
 })
\ No newline at end of file
diff --git a/cypress/e2e/DecisionReviews.cy.js b/cypress/e2e/DecisionReviews.cy.js
index 37da0d5cb..5caebfc0a 100644
--- a/cypress/e2e/DecisionReviews.cy.js
+++ b/cypress/e2e/DecisionReviews.cy.js
@@ -2,6 +2,10 @@
 
 describe('Validate Request a review of a decision page', () => {
   beforeEach(() => {
+    cy.intercept({
+      method: 'GET',
+      hostname: 'assets.adobedtm.com'
+    }).as('adobeAnalytics')
     cy.visit('/en/decision-reviews')
   })
   it('Request a review has no detectable a11y violations on load', () => {
@@ -52,4 +56,10 @@ describe('Validate Request a review of a decision page', () => {
     cy.get('[data-cy="breadcrumb-My dashboard"]').click()
     cy.url().should('include', '/my-dashboard')
   })
+
+  it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
+    cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
+    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('@analyticsScript').its('length').should('eq', 1)
+  })
 })
diff --git a/cypress/e2e/Login.cy.js b/cypress/e2e/Login.cy.js
index a941e39d5..71b54abd9 100644
--- a/cypress/e2e/Login.cy.js
+++ b/cypress/e2e/Login.cy.js
@@ -2,6 +2,10 @@
 It does not test the authentication functionality currently since those endpoints are on prem only at this time. **/
 
 beforeEach(() => {
+  cy.intercept({
+    method: 'GET',
+    hostname: 'assets.adobedtm.com'
+  }).as('adobeAnalytics')
   cy.visit('/auth/login')
 })
 
@@ -36,4 +40,10 @@ describe('Validate login page', () => {
       })
       cy.get('[data-cy="loading-spinner"]').should('not.exist')
   })
+
+  it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
+    cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
+    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('@analyticsScript').its('length').should('eq', 1)
+  })
 })
diff --git a/cypress/e2e/Profile.cy.js b/cypress/e2e/Profile.cy.js
index 9e1ad1045..f9386feb1 100644
--- a/cypress/e2e/Profile.cy.js
+++ b/cypress/e2e/Profile.cy.js
@@ -2,6 +2,10 @@
 
 describe('Validate Profile page', () => {
   beforeEach(() => {
+    cy.intercept({
+      method: 'GET',
+      hostname: 'assets.adobedtm.com'
+    }).as('adobeAnalytics')
     cy.visit('/profile')
   })
 
@@ -142,4 +146,10 @@ describe('Validate Profile page', () => {
         .and('not.have.attr', 'href', '#undefined')
     })
   })
+
+  it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
+    cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
+    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('@analyticsScript').its('length').should('eq', 1)
+  })
 })
diff --git a/cypress/e2e/SecuritySettings.cy.js b/cypress/e2e/SecuritySettings.cy.js
index 4d52d80a2..82e2301a9 100644
--- a/cypress/e2e/SecuritySettings.cy.js
+++ b/cypress/e2e/SecuritySettings.cy.js
@@ -2,6 +2,10 @@
 
 describe('Validate Security Settings page', () => {
   beforeEach(() => {
+    cy.intercept({
+      method: 'GET',
+      hostname: 'assets.adobedtm.com'
+    }).as('adobeAnalytics')
     cy.visit('/security-settings')
   })
 
@@ -81,4 +85,10 @@ describe('Validate Security Settings page', () => {
       .should('be.visible')
       .and('have.text', 'Profil')
   })
+
+  it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
+    cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
+    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('@analyticsScript').its('length').should('eq', 1)
+  })
 })
diff --git a/cypress/e2e/dashboard.cy.js b/cypress/e2e/dashboard.cy.js
index fea1c00e6..fe53cc995 100644
--- a/cypress/e2e/dashboard.cy.js
+++ b/cypress/e2e/dashboard.cy.js
@@ -2,6 +2,10 @@
 
 describe('Validate dashboard page', () => {
   beforeEach(() => {
+    cy.intercept({
+      method: 'GET',
+      hostname: 'assets.adobedtm.com'
+    }).as('adobeAnalytics')
     cy.visit('/my-dashboard')
   })
 
@@ -369,4 +373,9 @@ describe('Validate dashboard page', () => {
     })
   })
   
+  it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
+    cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
+    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('@analyticsScript').its('length').should('eq', 1)
+  })
 })

From e9c70a965d67dcf846851e7ed9b558fbd27e606c Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Fri, 18 Oct 2024 12:31:09 -0600
Subject: [PATCH 07/26] Fix tests

---
 cypress/e2e/ContactUs.cy.js        | 5 +++--
 cypress/e2e/ContactUsCPP.cy.js     | 5 +++--
 cypress/e2e/ContactUsEI.cy.js      | 5 +++--
 cypress/e2e/ContactUsOAS.cy.js     | 5 +++--
 cypress/e2e/DecisionReviews.cy.js  | 5 +++--
 cypress/e2e/Login.cy.js            | 5 +++--
 cypress/e2e/Profile.cy.js          | 5 +++--
 cypress/e2e/SecuritySettings.cy.js | 5 +++--
 cypress/e2e/dashboard.cy.js        | 5 +++--
 9 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/cypress/e2e/ContactUs.cy.js b/cypress/e2e/ContactUs.cy.js
index bae71af5b..99a24f627 100644
--- a/cypress/e2e/ContactUs.cy.js
+++ b/cypress/e2e/ContactUs.cy.js
@@ -4,7 +4,8 @@ describe('Validate Contact Us Landing page', () => {
   beforeEach(() => {
     cy.intercept({
       method: 'GET',
-      hostname: 'assets.adobedtm.com'
+      hostname: 'assets.adobedtm.com',
+      path: /.*\/launch-.*/,
     }).as('adobeAnalytics')
     cy.visit('/contact-us')
   })
@@ -52,7 +53,7 @@ describe('Validate Contact Us Landing page', () => {
 
   it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
     cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
-    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('script[src*="adobedtm"]').filter('[src*="launch-"]').as('analyticsScript')
     cy.get('@analyticsScript').its('length').should('eq', 1)
   })
 })
diff --git a/cypress/e2e/ContactUsCPP.cy.js b/cypress/e2e/ContactUsCPP.cy.js
index 638490358..9b4d41355 100644
--- a/cypress/e2e/ContactUsCPP.cy.js
+++ b/cypress/e2e/ContactUsCPP.cy.js
@@ -5,7 +5,8 @@ describe('Validate Contact Canada Pension Plan page', () => {
   beforeEach(() => {
     cy.intercept({
       method: 'GET',
-      hostname: 'assets.adobedtm.com'
+      hostname: 'assets.adobedtm.com',
+      path: /.*\/launch-.*/,
     }).as('adobeAnalytics')
     cy.visit('/contact-us/contact-canada-pension-plan')
   })
@@ -85,7 +86,7 @@ describe('Validate Contact Canada Pension Plan page', () => {
 
   it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
     cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
-    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('script[src*="adobedtm"]').filter('[src*="launch-"]').as('analyticsScript')
     cy.get('@analyticsScript').its('length').should('eq', 1)
   })
 
diff --git a/cypress/e2e/ContactUsEI.cy.js b/cypress/e2e/ContactUsEI.cy.js
index 73715a05e..8d1cb5848 100644
--- a/cypress/e2e/ContactUsEI.cy.js
+++ b/cypress/e2e/ContactUsEI.cy.js
@@ -5,7 +5,8 @@ describe('Validate EI Contact Us Landing page', () => {
   beforeEach(() => {
     cy.intercept({
       method: 'GET',
-      hostname: 'assets.adobedtm.com'
+      hostname: 'assets.adobedtm.com',
+      path: /.*\/launch-.*/,
     }).as('adobeAnalytics')
     cy.visit('/contact-us/contact-employment-insurance')
   })
@@ -85,7 +86,7 @@ describe('Validate EI Contact Us Landing page', () => {
 
   it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
     cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
-    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('script[src*="adobedtm"]').filter('[src*="launch-"]').as('analyticsScript')
     cy.get('@analyticsScript').its('length').should('eq', 1)
   })
 
diff --git a/cypress/e2e/ContactUsOAS.cy.js b/cypress/e2e/ContactUsOAS.cy.js
index ae347a942..ca4c66b7c 100644
--- a/cypress/e2e/ContactUsOAS.cy.js
+++ b/cypress/e2e/ContactUsOAS.cy.js
@@ -6,7 +6,8 @@ describe('Validate Contact Old Age Security page', () => {
   beforeEach(() => {
     cy.intercept({
       method: 'GET',
-      hostname: 'assets.adobedtm.com'
+      hostname: 'assets.adobedtm.com',
+      path: /.*\/launch-.*/,
     }).as('adobeAnalytics')
     cy.visit('/contact-us/contact-old-age-security')
   })
@@ -86,7 +87,7 @@ describe('Validate Contact Old Age Security page', () => {
   
   it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
     cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
-    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('script[src*="adobedtm"]').filter('[src*="launch-"]').as('analyticsScript')
     cy.get('@analyticsScript').its('length').should('eq', 1)
   })
 })
\ No newline at end of file
diff --git a/cypress/e2e/DecisionReviews.cy.js b/cypress/e2e/DecisionReviews.cy.js
index 5caebfc0a..c407a4b5e 100644
--- a/cypress/e2e/DecisionReviews.cy.js
+++ b/cypress/e2e/DecisionReviews.cy.js
@@ -4,7 +4,8 @@ describe('Validate Request a review of a decision page', () => {
   beforeEach(() => {
     cy.intercept({
       method: 'GET',
-      hostname: 'assets.adobedtm.com'
+      hostname: 'assets.adobedtm.com',
+      path: /.*\/launch-.*/,
     }).as('adobeAnalytics')
     cy.visit('/en/decision-reviews')
   })
@@ -59,7 +60,7 @@ describe('Validate Request a review of a decision page', () => {
 
   it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
     cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
-    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('script[src*="adobedtm"]').filter('[src*="launch-"]').as('analyticsScript')
     cy.get('@analyticsScript').its('length').should('eq', 1)
   })
 })
diff --git a/cypress/e2e/Login.cy.js b/cypress/e2e/Login.cy.js
index 71b54abd9..85fc380ba 100644
--- a/cypress/e2e/Login.cy.js
+++ b/cypress/e2e/Login.cy.js
@@ -4,7 +4,8 @@ It does not test the authentication functionality currently since those endpoint
 beforeEach(() => {
   cy.intercept({
     method: 'GET',
-    hostname: 'assets.adobedtm.com'
+    hostname: 'assets.adobedtm.com',
+    path: /.*\/launch-.*/,
   }).as('adobeAnalytics')
   cy.visit('/auth/login')
 })
@@ -43,7 +44,7 @@ describe('Validate login page', () => {
 
   it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
     cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
-    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('script[src*="adobedtm"]').filter('[src*="launch-"]').as('analyticsScript')
     cy.get('@analyticsScript').its('length').should('eq', 1)
   })
 })
diff --git a/cypress/e2e/Profile.cy.js b/cypress/e2e/Profile.cy.js
index f9386feb1..51a4332c4 100644
--- a/cypress/e2e/Profile.cy.js
+++ b/cypress/e2e/Profile.cy.js
@@ -4,7 +4,8 @@ describe('Validate Profile page', () => {
   beforeEach(() => {
     cy.intercept({
       method: 'GET',
-      hostname: 'assets.adobedtm.com'
+      hostname: 'assets.adobedtm.com',
+      path: /.*\/launch-.*/,
     }).as('adobeAnalytics')
     cy.visit('/profile')
   })
@@ -149,7 +150,7 @@ describe('Validate Profile page', () => {
 
   it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
     cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
-    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('script[src*="adobedtm"]').filter('[src*="launch-"]').as('analyticsScript')
     cy.get('@analyticsScript').its('length').should('eq', 1)
   })
 })
diff --git a/cypress/e2e/SecuritySettings.cy.js b/cypress/e2e/SecuritySettings.cy.js
index 82e2301a9..f945839c4 100644
--- a/cypress/e2e/SecuritySettings.cy.js
+++ b/cypress/e2e/SecuritySettings.cy.js
@@ -4,7 +4,8 @@ describe('Validate Security Settings page', () => {
   beforeEach(() => {
     cy.intercept({
       method: 'GET',
-      hostname: 'assets.adobedtm.com'
+      hostname: 'assets.adobedtm.com',
+      path: /.*\/launch-.*/,
     }).as('adobeAnalytics')
     cy.visit('/security-settings')
   })
@@ -88,7 +89,7 @@ describe('Validate Security Settings page', () => {
 
   it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
     cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
-    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('script[src*="adobedtm"]').filter('[src*="launch-"]').as('analyticsScript')
     cy.get('@analyticsScript').its('length').should('eq', 1)
   })
 })
diff --git a/cypress/e2e/dashboard.cy.js b/cypress/e2e/dashboard.cy.js
index fe53cc995..7ab9324ce 100644
--- a/cypress/e2e/dashboard.cy.js
+++ b/cypress/e2e/dashboard.cy.js
@@ -4,7 +4,8 @@ describe('Validate dashboard page', () => {
   beforeEach(() => {
     cy.intercept({
       method: 'GET',
-      hostname: 'assets.adobedtm.com'
+      hostname: 'assets.adobedtm.com',
+      path: /.*\/launch-.*/,
     }).as('adobeAnalytics')
     cy.visit('/my-dashboard')
   })
@@ -375,7 +376,7 @@ describe('Validate dashboard page', () => {
   
   it('Validate there is exactly one copy of the AA script and it was only loaded once', () => {
     cy.get('@adobeAnalytics.all').its('length').should('eq', 1)
-    cy.get('script[src*="adobedtm"]').as('analyticsScript')
+    cy.get('script[src*="adobedtm"]').filter('[src*="launch-"]').as('analyticsScript')
     cy.get('@analyticsScript').its('length').should('eq', 1)
   })
 })

From 3a5c874ada0b948d2f17c324b51ab8a238a25a81 Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Tue, 22 Oct 2024 08:06:24 -0400
Subject: [PATCH 08/26] Summary of changes:

snyk-upgrade-cb204b73d59b3d19b62537100d36a959 fix: upgrade @typescript-eslint/parser from 7.13.0 to 7.18.0

From <https://github.com/DTS-STN/secure-client-hub/commit/94d878287571835e89b12d679f605c9ff5cf0324>

Can be ignored in favour of snyk-fix-a178732dbebb6661bf0aaebf29ab0f32 which bumps to newer version

snyk-upgrade-d73d8c1f28d36cfc616fb5fe7d2ffb18 fix: upgrade @typescript-eslint/eslint-plugin from 7.13.0 to 7.18.0

From <https://github.com/DTS-STN/secure-client-hub/commit/231026e49ae1f1907c8bc29f02f49d9524654f86>

Can be ignored in favour of snyk-fix-a178732dbebb6661bf0aaebf29ab0f32 which bumps to newer version

snyk-upgrade-68699eacb379c203d23a09b77a003321 fix: upgrade jose from 5.4.0 to 5.6.3

From <https://github.com/DTS-STN/secure-client-hub/commit/f9f0b390dcb005098f0ad8e165b1e04cecc0a0c2>

There is a newer version of jose available (5.9.4), which is applied herein.

snyk-upgrade-8bb8cff1a2003752b53569666b1bb65a fix: upgrade prettier-plugin-tailwindcss from 0.6.1 to 0.6.5

From <https://github.com/DTS-STN/secure-client-hub/commit/bfa4758a7ab4007e80aa8861df1faa2616d16f7b>

There is a newer version of prettier-plugin-tailwindcss available (0.6.8).

dependabot/npm_and_yarn/multi-1ffb7181fc build(deps): bump micromatch and lint-staged

From <https://github.com/DTS-STN/secure-client-hub/commit/f95daa59beae0e7d3acb0fa88641711823a2e57c>

Bump micromatch to version 4.0.8 (confirmed as latest stable on Oct 17, 2024).

Bump lint-staged to 15.2.9. There is a newer version available (15.2.10), which is applied herein.

snyk-fix-a178732dbebb6661bf0aaebf29ab0f32 fix: package.json & package-lock.json to reduce vulnerabilities

From <https://github.com/DTS-STN/secure-client-hub/commit/e456e05c142de42efafa3505ae9f315f35fa6031>

Bump @typescript-eslint/parser & @typescript-eslint/eslint-plugin from 7.13.0 to 7.18.0

There is a newer version of @typescript-eslint/parser & @typescript-eslint/eslint-plugin (8.9.0), which were applied herein.

snyk-fix-e6b5f98af68a8a34c582666985ebab4d fix: Dockerfile to reduce vulnerabilities

From <https://github.com/DTS-STN/secure-client-hub/commit/8f869335b7e6ebb234c2b451d10bc0af8741eb2b>

(bumps alpine from node:20.16.0-alpine3.20 to node:20.17.0-alpine3.20)

dependabot/npm_and_yarn/next-14.2.12 build(deps): bump next from 14.2.3 to 14.2.12

From <https://github.com/DTS-STN/secure-client-hub/commit/4f8d893ce668ab63f000f1b588f3c1a13bee0624>

There is a newer version of next (14.2.15), which is applied herein.

snyk-fix-1f110fc99dd4cef50d65f92f79d45809 fix: package.json & package-lock.json to reduce vulnerabilities

From <https://github.com/DTS-STN/secure-client-hub/commit/a257f418d35624db2faba11f83022e600aa2ffdb>

This would bump next from 14.2.3 to 14.2.10 - can be ignored in favour of dependabot/npm_and_yarn/next-14.2.12

snyk-fix-e4e101aaf6d39081ba40be5f31c706c6 fix: package.json & package-lock.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-NEXT-8186172

From <https://github.com/DTS-STN/secure-client-hub/pull/740/commits>

This would bump next from 14.2.3 to 14.2.10 - can be ignored in favour of dependabot/npm_and_yarn/next-14.2.12

tailwindcss upgraded to 3.4.14

fast-glob upgraded to 3.3.2 wherever possible

@jest/code upgraded to 29.7.0 wherever possible
---
 Dockerfile        |    4 +-
 package-lock.json | 1055 ++++++++++++++++-----------------------------
 package.json      |   19 +-
 3 files changed, 381 insertions(+), 697 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b5801f0e3..d652c2863 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.16.0-alpine3.20 AS base
+FROM node:20.17.0-alpine3.20 AS base
 WORKDIR /base
 COPY package*.json ./
 RUN npm ci && npm cache clean --force
@@ -42,7 +42,7 @@ xargs > \
 chmod 644  /etc/ssl/certs/root.crt && \
 npm run build
 
-FROM node:20.16.0-alpine3.20 AS production
+FROM node:20.17.0-alpine3.20 AS production
 ENV NODE_ENV=production
 
 ARG user=nodeuser
diff --git a/package-lock.json b/package-lock.json
index aa72a8972..4d83a84b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,26 +14,29 @@
         "@fortawesome/free-regular-svg-icons": "^6.5.2",
         "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@fortawesome/react-fontawesome": "^0.2.2",
+        "@jest/core": "^29.7.0",
         "@opentelemetry/api": "^1.9.0",
         "@opentelemetry/exporter-jaeger": "^1.25.1",
         "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.0",
         "@opentelemetry/sdk-node": "^0.52.0",
-        "@typescript-eslint/eslint-plugin": "^7.13.0",
-        "@typescript-eslint/parser": "^7.13.0",
+        "@typescript-eslint/eslint-plugin": "^7.18.0",
+        "@typescript-eslint/parser": "^7.18.0",
         "axios": "^1.7.4",
         "babel-plugin-macros": "^3.1.0",
         "cachified": "^3.5.4",
         "cross-env": "^7.0.3",
-        "jose": "^5.4.0",
+        "fast-glob": "^3.3.2",
+        "jose": "^5.9.4",
         "lodash.throttle": "^4.1.1",
         "lru-cache": "^10.2.2",
         "markdown-to-jsx": "^7.4.7",
-        "next": "^14.2.3",
+        "micromatch": "^4.0.8",
+        "next": "^14.2.15",
         "next-auth": "^4.24.7",
         "next-i18next": "^13.3.0",
         "pino": "^8.21.0",
         "pino-pretty": "^10.3.1",
-        "prettier-plugin-tailwindcss": "^0.6.1",
+        "prettier-plugin-tailwindcss": "^0.6.8",
         "prom-client": "^12.0.0",
         "prop-types": "^15.8.1",
         "react": "^18.3.1",
@@ -62,14 +65,14 @@
         "cypress": "^13.8.1",
         "cypress-axe": "^1.5.0",
         "cypress-multi-reporters": "^1.6.4",
-        "eslint": "^8.56.0",
+        "eslint": "^8.57.1",
         "eslint-config-next": "^14.1.0",
         "husky": "^8.0.3",
         "identity-obj-proxy": "^3.0.0",
         "jest": "^29.7.0",
         "jest-axe": "^8.0.0",
         "jest-environment-jsdom": "^29.7.0",
-        "lint-staged": "^15.2.2",
+        "lint-staged": "^15.2.10",
         "mocha": "^10.3.0",
         "mochawesome": "^7.1.3",
         "mochawesome-merge": "^4.3.0",
@@ -81,7 +84,7 @@
         "react-test-renderer": "^18.2.0",
         "start-server-and-test": "^2.0.3",
         "tailwind-merge": "^2.2.1",
-        "tailwindcss": "^3.4.1",
+        "tailwindcss": "^3.4.14",
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
         "typescript": "^5.3.3"
@@ -117,7 +120,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
       "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -142,7 +144,6 @@
       "version": "7.23.5",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz",
       "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -151,7 +152,6 @@
       "version": "7.23.9",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
       "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
-      "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.23.5",
@@ -181,7 +181,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
       "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.23.6",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -208,7 +207,6 @@
       "version": "7.23.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
       "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
-      "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.23.5",
         "@babel/helper-validator-option": "^7.23.5",
@@ -224,7 +222,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
       "dependencies": {
         "yallist": "^3.0.2"
       }
@@ -233,7 +230,6 @@
       "version": "7.22.20",
       "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
       "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -242,7 +238,6 @@
       "version": "7.23.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
       "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
       "dependencies": {
         "@babel/template": "^7.22.15",
         "@babel/types": "^7.23.0"
@@ -255,7 +250,6 @@
       "version": "7.22.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
       "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -267,7 +261,6 @@
       "version": "7.22.15",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
       "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.22.15"
       },
@@ -279,7 +272,6 @@
       "version": "7.23.3",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
       "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-module-imports": "^7.22.15",
@@ -298,7 +290,6 @@
       "version": "7.22.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
       "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -307,7 +298,6 @@
       "version": "7.22.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
       "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -319,7 +309,6 @@
       "version": "7.22.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
       "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -331,7 +320,6 @@
       "version": "7.23.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
       "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -348,7 +336,6 @@
       "version": "7.23.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
       "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -357,7 +344,6 @@
       "version": "7.23.9",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz",
       "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==",
-      "dev": true,
       "dependencies": {
         "@babel/template": "^7.23.9",
         "@babel/traverse": "^7.23.9",
@@ -384,7 +370,6 @@
       "version": "7.23.9",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
       "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
-      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -396,7 +381,6 @@
       "version": "7.8.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -408,7 +392,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -420,7 +403,6 @@
       "version": "7.12.13",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -432,7 +414,6 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -444,7 +425,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -456,7 +436,6 @@
       "version": "7.23.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz",
       "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
       },
@@ -471,7 +450,6 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -483,7 +461,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -495,7 +472,6 @@
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -507,7 +483,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -519,7 +494,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -531,7 +505,6 @@
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -543,7 +516,6 @@
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -558,7 +530,6 @@
       "version": "7.23.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz",
       "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
       },
@@ -669,7 +640,6 @@
       "version": "7.23.9",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz",
       "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==",
-      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
         "@babel/parser": "^7.23.9",
@@ -683,7 +653,6 @@
       "version": "7.23.9",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz",
       "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==",
-      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.23.5",
         "@babel/generator": "^7.23.6",
@@ -704,7 +673,6 @@
       "version": "7.23.9",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz",
       "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.23.4",
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -717,8 +685,7 @@
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
     },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
@@ -734,7 +701,7 @@
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
       "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "0.3.9"
       },
@@ -746,7 +713,7 @@
       "version": "0.3.9",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
       "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -905,9 +872,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
@@ -1015,11 +982,12 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "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",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -1060,9 +1028,10 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-      "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw=="
+      "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/@isaacs/cliui": {
       "version": "8.0.2",
@@ -1158,7 +1127,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -1174,7 +1142,6 @@
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1183,7 +1150,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -1200,7 +1166,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -1215,7 +1180,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -1231,7 +1195,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -1242,14 +1205,12 @@
     "node_modules/@jest/console/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/@jest/console/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1258,7 +1219,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -1270,7 +1230,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
       "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
-      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/reporters": "^29.7.0",
@@ -1317,7 +1276,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -1332,7 +1290,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -1348,7 +1305,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -1359,14 +1315,12 @@
     "node_modules/@jest/core/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/@jest/core/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1375,7 +1329,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -1389,7 +1342,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -1400,14 +1352,12 @@
     "node_modules/@jest/core/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/@jest/core/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -1419,7 +1369,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
       "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==",
-      "dev": true,
       "dependencies": {
         "@jest/fake-timers": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -1434,7 +1383,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
-      "dev": true,
       "dependencies": {
         "expect": "^29.7.0",
         "jest-snapshot": "^29.7.0"
@@ -1447,7 +1395,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
       "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-      "dev": true,
       "dependencies": {
         "jest-get-type": "^29.6.3"
       },
@@ -1459,7 +1406,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz",
       "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@sinonjs/fake-timers": "^10.0.2",
@@ -1476,7 +1422,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
       "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
-      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -1491,7 +1436,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
       "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
-      "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^29.7.0",
@@ -1534,7 +1478,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -1549,7 +1492,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -1565,7 +1507,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -1576,14 +1517,12 @@
     "node_modules/@jest/reporters/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/@jest/reporters/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1592,7 +1531,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz",
       "integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==",
-      "dev": true,
       "dependencies": {
         "@babel/core": "^7.23.9",
         "@babel/parser": "^7.23.9",
@@ -1608,7 +1546,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -1620,7 +1557,6 @@
       "version": "7.6.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
       "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -1635,7 +1571,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -1646,14 +1581,12 @@
     "node_modules/@jest/reporters/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
       "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
-      "dev": true,
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
       },
@@ -1665,7 +1598,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
       "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
@@ -1679,7 +1611,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
-      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -1694,7 +1625,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
-      "dev": true,
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
@@ -1709,7 +1639,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
       "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
-      "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/types": "^29.6.3",
@@ -1735,7 +1664,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -1750,7 +1678,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -1766,7 +1693,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -1777,14 +1703,12 @@
     "node_modules/@jest/transform/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/@jest/transform/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1793,7 +1717,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -1805,7 +1728,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
       "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -1822,7 +1744,6 @@
       "version": "17.0.32",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
       "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
-      "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -1831,7 +1752,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -1846,7 +1766,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -1862,7 +1781,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -1873,14 +1791,12 @@
     "node_modules/@jest/types/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/@jest/types/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1889,7 +1805,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -1901,7 +1816,6 @@
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
       "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -1915,7 +1829,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -1924,7 +1837,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
       "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-      "dev": true,
       "engines": {
         "node": ">=6.0.0"
       }
@@ -1932,14 +1844,12 @@
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.22",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
       "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -1955,10 +1865,9 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.3.tgz",
-      "integrity": "sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==",
-      "license": "MIT"
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.15.tgz",
+      "integrity": "sha512-S1qaj25Wru2dUpcIZMjxeMVSwkt8BK4dmWHHiBuRstcIyOsMapqT4A4jSB6onvqeygkSSmOkyny9VVx8JIGamQ=="
     },
     "node_modules/@next/eslint-plugin-next": {
       "version": "14.1.0",
@@ -1992,13 +1901,12 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz",
-      "integrity": "sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.15.tgz",
+      "integrity": "sha512-Rvh7KU9hOUBnZ9TJ28n2Oa7dD9cvDBKua9IKx7cfQQ0GoYUwg9ig31O2oMwH3wm+pE3IkAQ67ZobPfEgurPZIA==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -2008,13 +1916,12 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz",
-      "integrity": "sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.15.tgz",
+      "integrity": "sha512-5TGyjFcf8ampZP3e+FyCax5zFVHi+Oe7sZyaKOngsqyaNEpOgkKB3sqmymkZfowy3ufGA/tUgDPPxpQx931lHg==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -2024,13 +1931,12 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz",
-      "integrity": "sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.15.tgz",
+      "integrity": "sha512-3Bwv4oc08ONiQ3FiOLKT72Q+ndEMyLNsc/D3qnLMbtUYTQAmkx9E/JRu0DBpHxNddBmNT5hxz1mYBphJ3mfrrw==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2040,13 +1946,12 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz",
-      "integrity": "sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.15.tgz",
+      "integrity": "sha512-k5xf/tg1FBv/M4CMd8S+JL3uV9BnnRmoe7F+GWC3DxkTCD9aewFRH1s5rJ1zkzDa+Do4zyN8qD0N8c84Hu96FQ==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2056,13 +1961,12 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz",
-      "integrity": "sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.15.tgz",
+      "integrity": "sha512-kE6q38hbrRbKEkkVn62reLXhThLRh6/TvgSP56GkFNhU22TbIrQDEMrO7j0IcQHcew2wfykq8lZyHFabz0oBrA==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2072,13 +1976,12 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz",
-      "integrity": "sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.15.tgz",
+      "integrity": "sha512-PZ5YE9ouy/IdO7QVJeIcyLn/Rc4ml9M2G4y3kCM9MNf1YKvFY4heg3pVa/jQbMro+tP6yc4G2o9LjAz1zxD7tQ==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2088,13 +1991,12 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz",
-      "integrity": "sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.15.tgz",
+      "integrity": "sha512-2raR16703kBvYEQD9HNLyb0/394yfqzmIeyp2nDzcPV4yPjqNUG3ohX6jX00WryXz6s1FXpVhsCo3i+g4RUX+g==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -2104,13 +2006,12 @@
       }
     },
     "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz",
-      "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.15.tgz",
+      "integrity": "sha512-fyTE8cklgkyR1p03kJa5zXEaZ9El+kDNM5A+66+8evQS5e/6v0Gk28LqA0Jet8gKSOyP+OTm/tJHzMlGdQerdQ==",
       "cpu": [
         "ia32"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -2120,13 +2021,12 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz",
-      "integrity": "sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.15.tgz",
+      "integrity": "sha512-SzqGbsLsP9OwKNUG9nekShTwhj6JSB9ZLMWQ8g1gG6hdE5gQLncbnbymrwy2yVmH9nikSLYRYxYMFu78Ggp7/g==",
       "cpu": [
         "x64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -2729,14 +2629,12 @@
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA=="
     },
     "node_modules/@sinonjs/commons": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
       "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
-      "dev": true,
       "dependencies": {
         "type-detect": "4.0.8"
       }
@@ -2745,7 +2643,6 @@
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz",
       "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==",
-      "dev": true,
       "dependencies": {
         "@sinonjs/commons": "^3.0.0"
       }
@@ -3017,25 +2914,25 @@
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
       "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
       "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
       "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@tsconfig/node16": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
       "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/@types/aria-query": {
       "version": "5.0.4",
@@ -3047,7 +2944,6 @@
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "dev": true,
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -3060,7 +2956,6 @@
       "version": "7.6.8",
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
       "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
@@ -3069,7 +2964,6 @@
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-      "dev": true,
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
@@ -3079,7 +2973,6 @@
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
       "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
-      "dev": true,
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
@@ -3088,7 +2981,6 @@
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
       "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
-      "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -3105,14 +2997,12 @@
     "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",
-      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
-      "dev": true
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
-      "dev": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -3121,7 +3011,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
-      "dev": true,
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
@@ -3290,8 +3179,7 @@
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-      "dev": true
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
     },
     "node_modules/@types/tough-cookie": {
       "version": "4.0.5",
@@ -3302,8 +3190,7 @@
     "node_modules/@types/yargs-parser": {
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-      "dev": true
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
     },
     "node_modules/@types/yauzl": {
       "version": "2.10.3",
@@ -3316,15 +3203,15 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.13.0.tgz",
-      "integrity": "sha512-FX1X6AF0w8MdVFLSdqwqN/me2hyhuQg4ykN6ZpVhh1ij/80pTvDKclX1sZB9iqex8SjQfVhwMKs3JtnnMLzG9w==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
+      "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.13.0",
-        "@typescript-eslint/type-utils": "7.13.0",
-        "@typescript-eslint/utils": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/type-utils": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -3348,12 +3235,12 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.13.0.tgz",
-      "integrity": "sha512-ZrMCe1R6a01T94ilV13egvcnvVJ1pxShkE0+NDjDzH4nvG1wXpwsVI5bZCvE7AEDH1mXEx5tJSVR68bLgG7Dng==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0"
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -3364,9 +3251,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-QWuwm9wcGMAuTsxP+qz6LBBd3Uq8I5Nv8xb0mk54jmNoCyDspnMvVsOxI6IsMmway5d1S9Su2+sCKv1st2l6eA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
       },
@@ -3376,11 +3263,11 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.13.0.tgz",
-      "integrity": "sha512-nxn+dozQx+MK61nn/JP+M4eCkHDSxSLDpgE3WcQo0+fkjEolnaB5jswvIKC4K56By8MMgIho7f1PVxERHEo8rw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
+        "@typescript-eslint/types": "7.18.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -3392,14 +3279,14 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.13.0.tgz",
-      "integrity": "sha512-EjMfl69KOS9awXXe83iRN7oIEXy9yYdqWfqdrFAYAAr6syP8eLEFI7ZE4939antx2mNgPRW/o1ybm2SFYkbTVA==",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "7.13.0",
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/typescript-estree": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
+      "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3419,12 +3306,12 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.13.0.tgz",
-      "integrity": "sha512-ZrMCe1R6a01T94ilV13egvcnvVJ1pxShkE0+NDjDzH4nvG1wXpwsVI5bZCvE7AEDH1mXEx5tJSVR68bLgG7Dng==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0"
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -3435,9 +3322,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-QWuwm9wcGMAuTsxP+qz6LBBd3Uq8I5Nv8xb0mk54jmNoCyDspnMvVsOxI6IsMmway5d1S9Su2+sCKv1st2l6eA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
       },
@@ -3447,12 +3334,12 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.13.0.tgz",
-      "integrity": "sha512-cAvBvUoobaoIcoqox1YatXOnSl3gx92rCZoMRPzMNisDiM12siGilSM4+dJAekuuHTibI2hVC2fYK79iSFvWjw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3474,11 +3361,11 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.13.0.tgz",
-      "integrity": "sha512-nxn+dozQx+MK61nn/JP+M4eCkHDSxSLDpgE3WcQo0+fkjEolnaB5jswvIKC4K56By8MMgIho7f1PVxERHEo8rw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
+        "@typescript-eslint/types": "7.18.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -3532,12 +3419,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.13.0.tgz",
-      "integrity": "sha512-xMEtMzxq9eRkZy48XuxlBFzpVMDurUAfDu5Rz16GouAtXm0TaAoTFzqWUFPPuQYXI/CDaH/Bgx/fk/84t/Bc9A==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.13.0",
-        "@typescript-eslint/utils": "7.13.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -3558,9 +3445,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-QWuwm9wcGMAuTsxP+qz6LBBd3Uq8I5Nv8xb0mk54jmNoCyDspnMvVsOxI6IsMmway5d1S9Su2+sCKv1st2l6eA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
       },
@@ -3570,12 +3457,12 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.13.0.tgz",
-      "integrity": "sha512-cAvBvUoobaoIcoqox1YatXOnSl3gx92rCZoMRPzMNisDiM12siGilSM4+dJAekuuHTibI2hVC2fYK79iSFvWjw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3597,11 +3484,11 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.13.0.tgz",
-      "integrity": "sha512-nxn+dozQx+MK61nn/JP+M4eCkHDSxSLDpgE3WcQo0+fkjEolnaB5jswvIKC4K56By8MMgIho7f1PVxERHEo8rw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
+        "@typescript-eslint/types": "7.18.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -3712,14 +3599,14 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.13.0.tgz",
-      "integrity": "sha512-jceD8RgdKORVnB4Y6BqasfIkFhl4pajB1wVxrF4akxD2QPM8GNYjgGwEzYS+437ewlqqrg7Dw+6dhdpjMpeBFQ==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.13.0",
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/typescript-estree": "7.13.0"
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -3733,12 +3620,12 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.13.0.tgz",
-      "integrity": "sha512-ZrMCe1R6a01T94ilV13egvcnvVJ1pxShkE0+NDjDzH4nvG1wXpwsVI5bZCvE7AEDH1mXEx5tJSVR68bLgG7Dng==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0"
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -3749,9 +3636,9 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-QWuwm9wcGMAuTsxP+qz6LBBd3Uq8I5Nv8xb0mk54jmNoCyDspnMvVsOxI6IsMmway5d1S9Su2+sCKv1st2l6eA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
       },
@@ -3761,12 +3648,12 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.13.0.tgz",
-      "integrity": "sha512-cAvBvUoobaoIcoqox1YatXOnSl3gx92rCZoMRPzMNisDiM12siGilSM4+dJAekuuHTibI2hVC2fYK79iSFvWjw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3788,11 +3675,11 @@
       }
     },
     "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.13.0.tgz",
-      "integrity": "sha512-nxn+dozQx+MK61nn/JP+M4eCkHDSxSLDpgE3WcQo0+fkjEolnaB5jswvIKC4K56By8MMgIho7f1PVxERHEo8rw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
+        "@typescript-eslint/types": "7.18.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -3909,7 +3796,7 @@
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
       "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -3975,7 +3862,6 @@
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -4015,7 +3901,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -4054,7 +3939,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -4415,7 +4299,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
       "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
-      "dev": true,
       "dependencies": {
         "@jest/transform": "^29.7.0",
         "@types/babel__core": "^7.1.14",
@@ -4436,7 +4319,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -4451,7 +4333,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -4467,7 +4348,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4478,14 +4358,12 @@
     "node_modules/babel-jest/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/babel-jest/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -4494,7 +4372,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4506,7 +4383,6 @@
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -4522,7 +4398,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
       "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
-      "dev": true,
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -4551,7 +4426,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
       "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "dev": true,
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
@@ -4574,7 +4448,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
       "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
-      "dev": true,
       "dependencies": {
         "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
@@ -4673,7 +4546,6 @@
       "version": "4.23.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
       "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -4717,7 +4589,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
       "dependencies": {
         "node-int64": "^0.4.0"
       }
@@ -4758,8 +4629,7 @@
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
     "node_modules/bufrw": {
       "version": "1.4.0",
@@ -4830,7 +4700,6 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -4885,7 +4754,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -4942,7 +4810,6 @@
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
       "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -5032,7 +4899,6 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "dev": true,
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -5041,8 +4907,7 @@
     "node_modules/collect-v8-coverage": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-      "dev": true
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
@@ -5099,8 +4964,7 @@
     "node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
     "node_modules/cookie": {
       "version": "0.5.0",
@@ -5235,7 +5099,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
       "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/cross-env": {
       "version": "7.0.3",
@@ -5604,7 +5468,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz",
       "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==",
-      "dev": true,
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
       },
@@ -5655,7 +5518,6 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5714,7 +5576,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
       "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -5743,7 +5604,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
       "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -5819,14 +5679,12 @@
     "node_modules/electron-to-chromium": {
       "version": "1.4.673",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.673.tgz",
-      "integrity": "sha512-zjqzx4N7xGdl5468G+vcgzDhaHkaYgVcf9MqgexcTqsl2UHSCmOj/Bi3HAprg4BZCpC7HyD8a6nZl6QAZf72gw==",
-      "dev": true
+      "integrity": "sha512-zjqzx4N7xGdl5468G+vcgzDhaHkaYgVcf9MqgexcTqsl2UHSCmOj/Bi3HAprg4BZCpC7HyD8a6nZl6QAZf72gw=="
     },
     "node_modules/emittery": {
       "version": "0.13.1",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
       "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -5886,6 +5744,18 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/environment": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
+      "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/error": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz",
@@ -6113,15 +5983,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "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.",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -6767,7 +6638,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true,
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -6855,6 +6725,12 @@
       "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
       "dev": true
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+      "dev": true
+    },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
@@ -6907,7 +6783,6 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
       "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -6916,7 +6791,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
-      "dev": true,
       "dependencies": {
         "@jest/expect-utils": "^29.7.0",
         "jest-get-type": "^29.6.3",
@@ -7032,7 +6906,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "dev": true,
       "dependencies": {
         "bser": "2.1.1"
       }
@@ -7087,7 +6960,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -7254,7 +7126,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -7309,7 +7180,6 @@
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
@@ -7323,9 +7193,9 @@
       }
     },
     "node_modules/get-east-asian-width": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz",
-      "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
       "dev": true,
       "engines": {
         "node": ">=18"
@@ -7364,7 +7234,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true,
       "engines": {
         "node": ">=8.0.0"
       }
@@ -7499,7 +7368,6 @@
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -7703,8 +7571,7 @@
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
     },
     "node_modules/html-parse-stringify": {
       "version": "3.0.1",
@@ -8147,7 +8014,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -8293,7 +8159,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -8417,7 +8282,6 @@
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8426,7 +8290,6 @@
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
       "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dev": true,
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -8442,7 +8305,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dev": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -8456,7 +8318,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8465,7 +8326,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8477,7 +8337,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dev": true,
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -8491,7 +8350,6 @@
       "version": "3.1.7",
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dev": true,
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -8717,7 +8575,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
       "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
-      "dev": true,
       "dependencies": {
         "execa": "^5.0.0",
         "jest-util": "^29.7.0",
@@ -8731,7 +8588,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dev": true,
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -8754,7 +8610,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -8766,7 +8621,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
       "engines": {
         "node": ">=10.17.0"
       }
@@ -8775,7 +8629,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -8790,7 +8643,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
       "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
-      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -8821,7 +8673,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8836,7 +8687,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8852,7 +8702,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8863,14 +8712,12 @@
     "node_modules/jest-circus/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-circus/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -8879,7 +8726,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -8894,7 +8740,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -8908,7 +8753,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -8919,14 +8763,12 @@
     "node_modules/jest-circus/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/jest-circus/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9041,7 +8883,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
       "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-      "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/test-sequencer": "^29.7.0",
@@ -9086,7 +8927,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9101,7 +8941,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9117,7 +8956,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9128,14 +8966,12 @@
     "node_modules/jest-config/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-config/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9144,7 +8980,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -9158,7 +8993,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -9169,14 +9003,12 @@
     "node_modules/jest-config/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/jest-config/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9188,7 +9020,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
       "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "diff-sequences": "^29.6.3",
@@ -9203,7 +9034,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9218,7 +9048,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9234,7 +9063,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9245,14 +9073,12 @@
     "node_modules/jest-diff/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-diff/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9261,7 +9087,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -9275,7 +9100,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -9286,14 +9110,12 @@
     "node_modules/jest-diff/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/jest-diff/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9305,7 +9127,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
       "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-      "dev": true,
       "dependencies": {
         "detect-newline": "^3.0.0"
       },
@@ -9317,7 +9138,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
       "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -9333,7 +9153,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9348,7 +9167,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9364,7 +9182,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9375,14 +9192,12 @@
     "node_modules/jest-each/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-each/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9391,7 +9206,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -9405,7 +9219,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -9416,14 +9229,12 @@
     "node_modules/jest-each/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/jest-each/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9462,7 +9273,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
       "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
-      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -9479,7 +9289,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
       "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-      "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -9488,7 +9297,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
       "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
@@ -9513,7 +9321,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
       "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
-      "dev": true,
       "dependencies": {
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.7.0"
@@ -9526,7 +9333,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -9538,7 +9344,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -9551,14 +9356,12 @@
     "node_modules/jest-leak-detector/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/jest-matcher-utils": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
       "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "jest-diff": "^29.7.0",
@@ -9573,7 +9376,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9588,7 +9390,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9604,7 +9405,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9615,14 +9415,12 @@
     "node_modules/jest-matcher-utils/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-matcher-utils/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9631,7 +9429,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -9645,7 +9442,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -9656,14 +9452,12 @@
     "node_modules/jest-matcher-utils/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/jest-matcher-utils/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9675,7 +9469,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
       "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-      "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.12.13",
         "@jest/types": "^29.6.3",
@@ -9695,7 +9488,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9710,7 +9502,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9726,7 +9517,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9737,14 +9527,12 @@
     "node_modules/jest-message-util/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-message-util/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9753,7 +9541,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -9767,7 +9554,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -9778,14 +9564,12 @@
     "node_modules/jest-message-util/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/jest-message-util/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9797,7 +9581,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
       "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -9811,7 +9594,6 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       },
@@ -9828,7 +9610,6 @@
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
       "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-      "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -9837,7 +9618,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
       "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.9",
@@ -9857,7 +9637,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
       "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
-      "dev": true,
       "dependencies": {
         "jest-regex-util": "^29.6.3",
         "jest-snapshot": "^29.7.0"
@@ -9870,7 +9649,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9885,7 +9663,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9901,7 +9678,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9912,14 +9688,12 @@
     "node_modules/jest-resolve/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-resolve/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -9928,7 +9702,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -9940,7 +9713,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
       "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
-      "dev": true,
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/environment": "^29.7.0",
@@ -9972,7 +9744,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9987,7 +9758,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -10003,7 +9773,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10014,14 +9783,12 @@
     "node_modules/jest-runner/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-runner/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10030,7 +9797,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -10045,7 +9811,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10057,7 +9822,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
       "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-      "dev": true,
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -10090,7 +9854,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10105,7 +9868,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -10121,7 +9883,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10132,14 +9893,12 @@
     "node_modules/jest-runtime/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-runtime/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10148,7 +9907,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10160,7 +9918,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
       "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-      "dev": true,
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
@@ -10191,7 +9948,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10206,7 +9962,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -10222,7 +9977,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10233,14 +9987,12 @@
     "node_modules/jest-snapshot/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-snapshot/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10249,7 +10001,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -10261,7 +10012,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -10275,7 +10025,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -10286,14 +10035,12 @@
     "node_modules/jest-snapshot/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/jest-snapshot/node_modules/semver": {
       "version": "7.6.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
       "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -10308,7 +10055,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10319,14 +10065,12 @@
     "node_modules/jest-snapshot/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/jest-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
       "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -10343,7 +10087,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10358,7 +10101,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -10374,7 +10116,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10385,14 +10126,12 @@
     "node_modules/jest-util/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-util/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10401,7 +10140,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10413,7 +10151,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
       "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
-      "dev": true,
       "dependencies": {
         "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
@@ -10430,7 +10167,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10445,7 +10181,6 @@
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -10457,7 +10192,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -10473,7 +10207,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10484,14 +10217,12 @@
     "node_modules/jest-validate/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-validate/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10500,7 +10231,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
       "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -10514,7 +10244,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -10525,14 +10254,12 @@
     "node_modules/jest-validate/node_modules/react-is": {
       "version": "18.2.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/jest-validate/node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10544,7 +10271,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
       "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
-      "dev": true,
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -10563,7 +10289,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10578,7 +10303,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -10594,7 +10318,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10605,14 +10328,12 @@
     "node_modules/jest-watcher/node_modules/color-name": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/jest-watcher/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10621,7 +10342,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10633,7 +10353,6 @@
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
       "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-      "dev": true,
       "dependencies": {
         "@types/node": "*",
         "jest-util": "^29.7.0",
@@ -10648,7 +10367,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -10657,7 +10375,6 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -10691,10 +10408,9 @@
       }
     },
     "node_modules/jose": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-5.4.0.tgz",
-      "integrity": "sha512-6rpxTHPAQyWMb9A35BroFl1Sp0ST3DpPcm5EVIxZxdH+e0Hv9fwhyB3XLKFUcHNpdSDnETmBfuPPTTlYz5+USw==",
-      "license": "MIT",
+      "version": "5.9.4",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-5.9.4.tgz",
+      "integrity": "sha512-WBBl6au1qg6OHj67yCffCgFR3BADJBXN8MdRvCgJDuMv3driV2nHr7jdGvaKX9IolosAsn+M0XRArqLXUhyJHQ==",
       "funding": {
         "url": "https://github.com/sponsors/panva"
       }
@@ -10716,7 +10432,6 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -10793,7 +10508,6 @@
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -10835,7 +10549,6 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -10932,7 +10645,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -10950,12 +10662,15 @@
       }
     },
     "node_modules/lilconfig": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz",
-      "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
       "dev": true,
       "engines": {
         "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
       }
     },
     "node_modules/lines-and-columns": {
@@ -10964,21 +10679,21 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "node_modules/lint-staged": {
-      "version": "15.2.2",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.2.tgz",
-      "integrity": "sha512-TiTt93OPh1OZOsb5B7k96A/ATl2AjIZo+vnzFZ6oHK5FuTk63ByDtxGQpHm+kFETjEWqgkF95M8FRXKR/LEBcw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "5.3.0",
-        "commander": "11.1.0",
-        "debug": "4.3.4",
-        "execa": "8.0.1",
-        "lilconfig": "3.0.0",
-        "listr2": "8.0.1",
-        "micromatch": "4.0.5",
-        "pidtree": "0.6.0",
-        "string-argv": "0.3.2",
-        "yaml": "2.3.4"
+      "version": "15.2.10",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz",
+      "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "~5.3.0",
+        "commander": "~12.1.0",
+        "debug": "~4.3.6",
+        "execa": "~8.0.1",
+        "lilconfig": "~3.1.2",
+        "listr2": "~8.2.4",
+        "micromatch": "~4.0.8",
+        "pidtree": "~0.6.0",
+        "string-argv": "~0.3.2",
+        "yaml": "~2.5.0"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
@@ -10991,24 +10706,24 @@
       }
     },
     "node_modules/lint-staged/node_modules/ansi-escapes": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz",
-      "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
+      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^3.0.0"
+        "environment": "^1.0.0"
       },
       "engines": {
-        "node": ">=14.16"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/lint-staged/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -11042,15 +10757,15 @@
       }
     },
     "node_modules/lint-staged/node_modules/cli-cursor": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz",
-      "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
+      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
       "dev": true,
       "dependencies": {
-        "restore-cursor": "^4.0.0"
+        "restore-cursor": "^5.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -11073,24 +10788,35 @@
       }
     },
     "node_modules/lint-staged/node_modules/commander": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz",
-      "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
       "dev": true,
       "engines": {
-        "node": ">=16"
+        "node": ">=18"
       }
     },
-    "node_modules/lint-staged/node_modules/emoji-regex": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
-      "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==",
-      "dev": true
+    "node_modules/lint-staged/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/lint-staged/node_modules/eventemitter3": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+    "node_modules/lint-staged/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
       "dev": true
     },
     "node_modules/lint-staged/node_modules/execa": {
@@ -11162,16 +10888,16 @@
       }
     },
     "node_modules/lint-staged/node_modules/listr2": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.1.tgz",
-      "integrity": "sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz",
+      "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==",
       "dev": true,
       "dependencies": {
         "cli-truncate": "^4.0.0",
         "colorette": "^2.0.20",
         "eventemitter3": "^5.0.1",
-        "log-update": "^6.0.0",
-        "rfdc": "^1.3.0",
+        "log-update": "^6.1.0",
+        "rfdc": "^1.4.1",
         "wrap-ansi": "^9.0.0"
       },
       "engines": {
@@ -11179,14 +10905,14 @@
       }
     },
     "node_modules/lint-staged/node_modules/log-update": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz",
-      "integrity": "sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
+      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
       "dev": true,
       "dependencies": {
-        "ansi-escapes": "^6.2.0",
-        "cli-cursor": "^4.0.0",
-        "slice-ansi": "^7.0.0",
+        "ansi-escapes": "^7.0.0",
+        "cli-cursor": "^5.0.0",
+        "slice-ansi": "^7.1.0",
         "strip-ansi": "^7.1.0",
         "wrap-ansi": "^9.0.0"
       },
@@ -11240,6 +10966,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/lint-staged/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
     "node_modules/lint-staged/node_modules/npm-run-path": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz",
@@ -11283,51 +11015,36 @@
       }
     },
     "node_modules/lint-staged/node_modules/restore-cursor": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz",
-      "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
+      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
       "dev": true,
       "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
+        "onetime": "^7.0.0",
+        "signal-exit": "^4.1.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lint-staged/node_modules/restore-cursor/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/lint-staged/node_modules/restore-cursor/node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
       "dev": true,
       "dependencies": {
-        "mimic-fn": "^2.1.0"
+        "mimic-function": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lint-staged/node_modules/restore-cursor/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
     "node_modules/lint-staged/node_modules/signal-exit": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
@@ -11357,9 +11074,9 @@
       }
     },
     "node_modules/lint-staged/node_modules/string-width": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz",
-      "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "dependencies": {
         "emoji-regex": "^10.3.0",
@@ -11400,18 +11117,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lint-staged/node_modules/type-fest": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz",
-      "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/lint-staged/node_modules/wrap-ansi": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
@@ -11430,10 +11135,13 @@
       }
     },
     "node_modules/lint-staged/node_modules/yaml": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
-      "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
+      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
       "dev": true,
+      "bin": {
+        "yaml": "bin.mjs"
+      },
       "engines": {
         "node": ">= 14"
       }
@@ -11469,7 +11177,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -11752,7 +11459,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dev": true,
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -11767,7 +11473,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -11779,7 +11484,6 @@
       "version": "7.6.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
       "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -11793,20 +11497,18 @@
     "node_modules/make-dir/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "node_modules/make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
       "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dev": true,
       "dependencies": {
         "tmpl": "1.0.5"
       }
@@ -11831,8 +11533,7 @@
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
     "node_modules/merge2": {
       "version": "1.4.1",
@@ -11843,11 +11544,11 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -11877,11 +11578,22 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/mimic-function": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
+      "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -12521,12 +12233,11 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
     },
     "node_modules/next": {
-      "version": "14.2.3",
-      "resolved": "https://registry.npmjs.org/next/-/next-14.2.3.tgz",
-      "integrity": "sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==",
-      "license": "MIT",
+      "version": "14.2.15",
+      "resolved": "https://registry.npmjs.org/next/-/next-14.2.15.tgz",
+      "integrity": "sha512-h9ctmOokpoDphRvMGnwOJAedT6zKhwqyZML9mDtspgf4Rh3Pn7UTYKqePNoDvhsWBAO5GoPNYshnAUGIazVGmw==",
       "dependencies": {
-        "@next/env": "14.2.3",
+        "@next/env": "14.2.15",
         "@swc/helpers": "0.5.5",
         "busboy": "1.6.0",
         "caniuse-lite": "^1.0.30001579",
@@ -12541,15 +12252,15 @@
         "node": ">=18.17.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "14.2.3",
-        "@next/swc-darwin-x64": "14.2.3",
-        "@next/swc-linux-arm64-gnu": "14.2.3",
-        "@next/swc-linux-arm64-musl": "14.2.3",
-        "@next/swc-linux-x64-gnu": "14.2.3",
-        "@next/swc-linux-x64-musl": "14.2.3",
-        "@next/swc-win32-arm64-msvc": "14.2.3",
-        "@next/swc-win32-ia32-msvc": "14.2.3",
-        "@next/swc-win32-x64-msvc": "14.2.3"
+        "@next/swc-darwin-arm64": "14.2.15",
+        "@next/swc-darwin-x64": "14.2.15",
+        "@next/swc-linux-arm64-gnu": "14.2.15",
+        "@next/swc-linux-arm64-musl": "14.2.15",
+        "@next/swc-linux-x64-gnu": "14.2.15",
+        "@next/swc-linux-x64-musl": "14.2.15",
+        "@next/swc-win32-arm64-msvc": "14.2.15",
+        "@next/swc-win32-ia32-msvc": "14.2.15",
+        "@next/swc-win32-x64-msvc": "14.2.15"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.1.0",
@@ -12692,14 +12403,12 @@
     "node_modules/node-releases": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12717,7 +12426,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -12905,7 +12613,6 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -12997,7 +12704,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -13012,7 +12718,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -13039,7 +12744,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -13259,7 +12963,6 @@
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
       "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
-      "dev": true,
       "engines": {
         "node": ">= 6"
       }
@@ -13529,10 +13232,9 @@
       }
     },
     "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.1.tgz",
-      "integrity": "sha512-AnbeYZu0WGj+QgKciUgdMnRxrqcxltleZPgdwfA5104BHM3siBLONN/HLW1yS2HvzSNkzpQ/JAj+LN0jcJO+0w==",
-      "license": "MIT",
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.8.tgz",
+      "integrity": "sha512-dGu3kdm7SXPkiW4nzeWKCl3uoImdd5CTZEJGxyypEPL37Wj0HT2pLqjrvSei1nTeuQfO4PUfjeW5cTUNRLZ4sA==",
       "engines": {
         "node": ">=14.21.3"
       },
@@ -13548,6 +13250,7 @@
         "prettier-plugin-import-sort": "*",
         "prettier-plugin-jsdoc": "*",
         "prettier-plugin-marko": "*",
+        "prettier-plugin-multiline-arrays": "*",
         "prettier-plugin-organize-attributes": "*",
         "prettier-plugin-organize-imports": "*",
         "prettier-plugin-sort-imports": "*",
@@ -13585,6 +13288,9 @@
         "prettier-plugin-marko": {
           "optional": true
         },
+        "prettier-plugin-multiline-arrays": {
+          "optional": true
+        },
         "prettier-plugin-organize-attributes": {
           "optional": true
         },
@@ -13767,7 +13473,6 @@
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz",
       "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==",
-      "dev": true,
       "funding": [
         {
           "type": "individual",
@@ -14287,7 +13992,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -14305,7 +14009,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
       "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -14333,9 +14036,9 @@
       }
     },
     "node_modules/rfdc": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz",
-      "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true
     },
     "node_modules/rimraf": {
@@ -14480,7 +14183,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "bin": {
         "semver": "bin/semver.js"
       }
@@ -14574,8 +14276,7 @@
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
@@ -14650,7 +14351,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -14667,7 +14367,6 @@
       "version": "0.5.13",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dev": true,
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -14684,8 +14383,7 @@
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
     "node_modules/sshpk": {
       "version": "1.18.0",
@@ -14715,7 +14413,6 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
-      "dev": true,
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -14727,7 +14424,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -14850,7 +14546,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dev": true,
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -14996,7 +14691,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -15005,7 +14699,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -15150,9 +14843,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz",
-      "integrity": "sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==",
+      "version": "3.4.14",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz",
+      "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==",
       "dev": true,
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
@@ -15163,7 +14856,7 @@
         "fast-glob": "^3.3.0",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.19.1",
+        "jiti": "^1.21.0",
         "lilconfig": "^2.1.0",
         "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
@@ -15253,7 +14946,6 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -15267,7 +14959,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -15277,7 +14968,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -15379,14 +15069,12 @@
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -15547,7 +15235,7 @@
       "version": "10.9.2",
       "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
       "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
-      "dev": true,
+      "devOptional": true,
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -15590,13 +15278,13 @@
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/ts-node/node_modules/diff": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=0.3.1"
       }
@@ -15670,7 +15358,6 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -15679,7 +15366,6 @@
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -15806,7 +15492,6 @@
       "version": "1.0.13",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
       "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -15908,13 +15593,12 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
       "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/v8-to-istanbul": {
       "version": "9.2.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz",
       "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==",
-      "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -15990,7 +15674,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dev": true,
       "dependencies": {
         "makeerror": "1.0.12"
       }
@@ -16254,7 +15937,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
       "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
-      "dev": true,
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
@@ -16323,8 +16005,7 @@
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/yaml": {
       "version": "1.10.2",
@@ -16430,7 +16111,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
+      "devOptional": true,
       "engines": {
         "node": ">=6"
       }
diff --git a/package.json b/package.json
index cf7720f6a..b2d6e54ee 100644
--- a/package.json
+++ b/package.json
@@ -29,26 +29,29 @@
     "@fortawesome/free-regular-svg-icons": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
+    "@jest/core": "^29.7.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-jaeger": "^1.25.1",
     "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.0",
     "@opentelemetry/sdk-node": "^0.52.0",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "axios": "^1.7.4",
     "babel-plugin-macros": "^3.1.0",
     "cachified": "^3.5.4",
     "cross-env": "^7.0.3",
-    "jose": "^5.4.0",
+    "fast-glob": "^3.3.2",
+    "jose": "^5.9.4",
     "lodash.throttle": "^4.1.1",
     "lru-cache": "^10.2.2",
     "markdown-to-jsx": "^7.4.7",
-    "next": "^14.2.3",
+    "micromatch": "^4.0.8",
+    "next": "^14.2.15",
     "next-auth": "^4.24.7",
     "next-i18next": "^13.3.0",
     "pino": "^8.21.0",
     "pino-pretty": "^10.3.1",
-    "prettier-plugin-tailwindcss": "^0.6.1",
+    "prettier-plugin-tailwindcss": "^0.6.8",
     "prom-client": "^12.0.0",
     "prop-types": "^15.8.1",
     "react": "^18.3.1",
@@ -77,14 +80,14 @@
     "cypress": "^13.8.1",
     "cypress-axe": "^1.5.0",
     "cypress-multi-reporters": "^1.6.4",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.1",
     "eslint-config-next": "^14.1.0",
     "husky": "^8.0.3",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^29.7.0",
     "jest-axe": "^8.0.0",
     "jest-environment-jsdom": "^29.7.0",
-    "lint-staged": "^15.2.2",
+    "lint-staged": "^15.2.10",
     "mocha": "^10.3.0",
     "mochawesome": "^7.1.3",
     "mochawesome-merge": "^4.3.0",
@@ -96,7 +99,7 @@
     "react-test-renderer": "^18.2.0",
     "start-server-and-test": "^2.0.3",
     "tailwind-merge": "^2.2.1",
-    "tailwindcss": "^3.4.1",
+    "tailwindcss": "^3.4.14",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"

From bdac7b7056005dc18010a8f5de1ed238aa17ac83 Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Tue, 22 Oct 2024 13:51:51 -0400
Subject: [PATCH 09/26] cypress e2e test revision to increase count of cards to
 6, reflecting the addition of CDCP in production this morning.

---
 cypress/e2e/dashboard.cy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/e2e/dashboard.cy.js b/cypress/e2e/dashboard.cy.js
index fea1c00e6..e9a7efb90 100644
--- a/cypress/e2e/dashboard.cy.js
+++ b/cypress/e2e/dashboard.cy.js
@@ -53,7 +53,7 @@ describe('Validate dashboard page', () => {
   cy.get('[data-testid="myDashboardContent-test"]')
   .children('[data-cy="cards"]')
   .should('be.visible')
-  .and('have.length', 5)
+  .and('have.length', 6)
 })
 
   it('validate the "My dashboard" page doesnt have breadcrumbs', () => {

From 38c77eb7a7e332c6db3bde5ccced9f1e71e174b7 Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Tue, 22 Oct 2024 14:25:11 -0400
Subject: [PATCH 10/26] more accuracy on the e2e tests for dashboard card
 titles

---
 cypress/e2e/dashboard.cy.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/dashboard.cy.js b/cypress/e2e/dashboard.cy.js
index e9a7efb90..cdc7df4ce 100644
--- a/cypress/e2e/dashboard.cy.js
+++ b/cypress/e2e/dashboard.cy.js
@@ -36,8 +36,9 @@ describe('Validate dashboard page', () => {
   })
  
 
-  it('Validate 5 Cards (EI,CPP,OAS,SIN,CAL) Card titles are Visible', () => {
+  it('Validate 6 Cards (CDCP, EI,CPP,OAS,SIN,CAL) Card titles are Visible', () => {
     const cardTitles = [
+      'Canadian Dental Care Plan',
       'Employment Insurance',
       'Canada Pension Plan',
       'Old Age Security and Guaranteed Income Supplement',
@@ -63,6 +64,7 @@ describe('Validate dashboard page', () => {
   // EN This tests all of the most requested items and links.
   it('should iterate through cards, verfiying Most Requested section and links EN', () => {
     const cardTitles = [
+      'Canadian Dental Care Plan',
       'Employment Insurance',
       'Canada Pension Plan',
       'Old Age Security and Guaranteed Income Supplement',
@@ -207,7 +209,7 @@ describe('Validate dashboard page', () => {
   // EN Tests the Links for Profile page in EI, CPP and OAS but not SIN and Cal
   it('Iterates through EI, CPP and OAS task lists for Profile page EN', () => {
     const cardTitles = [
-      // 'Canadian Dental Care Plan',
+      'Canadian Dental Care Plan',
       'Employment Insurance',
       'Canada Pension Plan',
       'Old Age Security and Guaranteed Income Supplement',

From ab3ce2a298485acbd919b9189733a92a27cfe1bf Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Tue, 22 Oct 2024 14:33:08 -0400
Subject: [PATCH 11/26] cdcp has no stuff below most requested. test updated
 accordingly

---
 cypress/e2e/dashboard.cy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/e2e/dashboard.cy.js b/cypress/e2e/dashboard.cy.js
index cdc7df4ce..115987586 100644
--- a/cypress/e2e/dashboard.cy.js
+++ b/cypress/e2e/dashboard.cy.js
@@ -209,7 +209,7 @@ describe('Validate dashboard page', () => {
   // EN Tests the Links for Profile page in EI, CPP and OAS but not SIN and Cal
   it('Iterates through EI, CPP and OAS task lists for Profile page EN', () => {
     const cardTitles = [
-      'Canadian Dental Care Plan',
+      //'Canadian Dental Care Plan',
       'Employment Insurance',
       'Canada Pension Plan',
       'Old Age Security and Guaranteed Income Supplement',

From d6390139a367c6551059b177ab4beb9a1de5881e Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Tue, 22 Oct 2024 15:18:19 -0400
Subject: [PATCH 12/26] revert @jest/core. it is only needed as indirect
 dependency, and installing it as a direct dependency raises an issue with
 snyk due to inflight missing resource after effective lifetime (see CWE-772: 
 The software does not release a resource after its effective lifetime has
 ended, i.e., after the resource is no longer needed. When a resource is not
 released after use, it can allow attackers to cause a denial of service.)

---
 package-lock.json | 1 -
 package.json      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4d83a84b3..155088f56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,6 @@
         "@fortawesome/free-regular-svg-icons": "^6.5.2",
         "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@fortawesome/react-fontawesome": "^0.2.2",
-        "@jest/core": "^29.7.0",
         "@opentelemetry/api": "^1.9.0",
         "@opentelemetry/exporter-jaeger": "^1.25.1",
         "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.0",
diff --git a/package.json b/package.json
index b2d6e54ee..2eb99bc14 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,6 @@
     "@fortawesome/free-regular-svg-icons": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
-    "@jest/core": "^29.7.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-jaeger": "^1.25.1",
     "@opentelemetry/exporter-metrics-otlp-proto": "^0.52.0",

From b38baf49b655347b68c588dfcea6d48478dda568 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Wed, 23 Oct 2024 09:28:18 -0600
Subject: [PATCH 13/26] Add analytics tags for error pages and don't fire the
 pageLoad beacon on them

---
 components/MetaData.tsx | 46 ++++++++++++++++++++++++++++++++++++++++-
 pages/404.tsx           |  2 ++
 pages/500.tsx           |  2 ++
 pages/_app.js           | 24 ---------------------
 4 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/components/MetaData.tsx b/components/MetaData.tsx
index 87a779f7d..9e0eda947 100644
--- a/components/MetaData.tsx
+++ b/components/MetaData.tsx
@@ -1,5 +1,7 @@
 import Head from 'next/head'
+import router from 'next/router'
 import Script from 'next/script'
+import { useEffect } from 'react'
 
 interface Content {
   title: string
@@ -9,6 +11,7 @@ interface Content {
   creator: string
   accessRights: string
   service: string
+  statusCode: string
 }
 
 interface Data {
@@ -21,8 +24,45 @@ interface MetaDataProps {
   data: Data
 }
 
+// To help prevent double firing of adobe analytics pageLoad event
+let appPreviousLocationPathname = ''
+
+/* eslint-disable */
+// make typescript happy
+declare global {
+  interface Window {
+    adobeDataLayer: any
+  }
+}
+/* eslint-enable */
+
 const MetaData = ({ language, data }: MetaDataProps) => {
   const d = language === 'en' ? data.data_en : data.data_fr
+  const isErrorPage = typeof d.statusCode !== 'undefined'
+  /** Web Analytics - taken from Google Analytics example
+   *  @see https://github.com/vercel/next.js/blob/canary/examples/with-google-analytics
+   * */
+  useEffect(() => {
+    const handleRouteChange = () => {
+      // only push event if pathname is different
+      if (window.location.pathname !== appPreviousLocationPathname) {
+        window.adobeDataLayer?.push?.({ event: 'pageLoad' })
+        appPreviousLocationPathname = window.location.pathname
+      }
+    }
+    if (isErrorPage) {
+      // Suppress the pageLoad entirely on error pages
+      return
+    }
+
+    handleRouteChange()
+    router.events.on('routeChangeComplete', handleRouteChange)
+    router.events.on('hashChangeComplete', handleRouteChange)
+    return () => {
+      router.events.off('routeChangeComplete', handleRouteChange)
+      router.events.off('hashChangeComplete', handleRouteChange)
+    }
+  }, [router.events])
 
   return (
     <>
@@ -42,8 +82,12 @@ const MetaData = ({ language, data }: MetaDataProps) => {
             }
           `}
         </style>
+        {isErrorPage ? (
+          <title data-gc-analytics-error={d.statusCode}>{d.title}</title>
+        ) : (
+          <title>{d.title}</title>
+        )}
 
-        <title>{d.title}</title>
         <meta charSet="utf-8" />
         <meta name="description" content={d.desc} />
         <meta name="author" content={d.author} />
diff --git a/pages/404.tsx b/pages/404.tsx
index cbefa921a..9c112e63b 100644
--- a/pages/404.tsx
+++ b/pages/404.tsx
@@ -60,6 +60,7 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       service: 'ESDC-EDSC_MSCA-MSDC-SCH',
       creator: 'Employment and Social Development Canada',
       accessRights: '1',
+      statusCode: '404',
     },
     data_fr: {
       title: `Nous ne pouvons trouver cette page Web - 404 - Mon dossier Service Canada`,
@@ -69,6 +70,7 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       service: 'ESDC-EDSC_MSCA-MSDC-SCH',
       creator: 'Emploi et Développement social Canada',
       accessRights: '1',
+      statusCode: '404',
     },
   }
   return {
diff --git a/pages/500.tsx b/pages/500.tsx
index 509f7642e..f372cbb13 100644
--- a/pages/500.tsx
+++ b/pages/500.tsx
@@ -60,6 +60,7 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       service: 'ESDC-EDSC_MSCA-MSDC-SCH',
       creator: 'Employment and Social Development Canada',
       accessRights: '1',
+      statusCode: '500',
     },
     data_fr: {
       title: `Nous ne pouvons trouver cette page Web - 500 - Mon dossier Service Canada`,
@@ -69,6 +70,7 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       service: 'ESDC-EDSC_MSCA-MSDC-SCH',
       creator: 'Emploi et Développement social Canada',
       accessRights: '1',
+      statusCode: '500',
     },
   }
   return {
diff --git a/pages/_app.js b/pages/_app.js
index a274b4519..4f31fb0c3 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -8,9 +8,6 @@ import ErrorBoundary from '../components/ErrorBoundary'
 import { useEffect } from 'react'
 config.autoAddCss = false
 
-// To help prevent double firing of adobe analytics pageLoad event
-let appPreviousLocationPathname = ''
-
 export default function MyApp({ Component, pageProps, router }) {
   /* istanbul ignore next */
   if (Component.getLayout) {
@@ -20,27 +17,6 @@ export default function MyApp({ Component, pageProps, router }) {
   Modal.setAppElement('#__next')
   const display = { hideBanner: pageProps.hideBanner }
 
-  /** Web Analytics - taken from Google Analytics example
-   *  @see https://github.com/vercel/next.js/blob/canary/examples/with-google-analytics
-   * */
-  useEffect(() => {
-    const handleRouteChange = () => {
-      // only push event if pathname is different
-      if (window.location.pathname !== appPreviousLocationPathname) {
-        window.adobeDataLayer?.push?.({ event: 'pageLoad' })
-        appPreviousLocationPathname = window.location.pathname
-      }
-    }
-
-    handleRouteChange()
-    router.events.on('routeChangeComplete', handleRouteChange)
-    router.events.on('hashChangeComplete', handleRouteChange)
-    return () => {
-      router.events.off('routeChangeComplete', handleRouteChange)
-      router.events.off('hashChangeComplete', handleRouteChange)
-    }
-  }, [router.events])
-
   /* istanbul ignore next */
   return (
     <ErrorBoundary>

From 53086d1275bcc3f2f86dafca99aaa4658a3b496d Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Wed, 23 Oct 2024 09:44:18 -0600
Subject: [PATCH 14/26] Make statusCode optional

---
 components/MetaData.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/MetaData.tsx b/components/MetaData.tsx
index 9e0eda947..11966a8fa 100644
--- a/components/MetaData.tsx
+++ b/components/MetaData.tsx
@@ -11,7 +11,7 @@ interface Content {
   creator: string
   accessRights: string
   service: string
-  statusCode: string
+  statusCode?: string
 }
 
 interface Data {

From f58bc0806a1045b4f6ac756d62ae40b861079a98 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Wed, 23 Oct 2024 10:50:22 -0600
Subject: [PATCH 15/26] fix router and tests

---
 __tests__/components/Layout.test.js       |  4 ++++
 __tests__/pages/contact-us-pages.test.js  |  4 ++++
 __tests__/pages/decision-reviews.test.js  | 12 ++++++++----
 __tests__/pages/index.test.js             |  4 ++++
 __tests__/pages/login.test.js             |  4 ++++
 __tests__/pages/logout.test.js            |  4 ++++
 __tests__/pages/my-dashboard.test.js      |  4 ++++
 __tests__/pages/profile.test.js           |  8 ++++++--
 __tests__/pages/security-settings.test.js | 10 +++++++---
 components/Layout.js                      |  2 --
 components/MetaData.tsx                   |  3 ++-
 11 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/__tests__/components/Layout.test.js b/__tests__/components/Layout.test.js
index 467dc53a9..816e3029c 100644
--- a/__tests__/components/Layout.test.js
+++ b/__tests__/components/Layout.test.js
@@ -73,6 +73,10 @@ describe('Layout with default text', () => {
   useRouter.mockImplementation(() => ({
     pathname: '/',
     asPath: '/',
+    events: {
+      on: jest.fn(),
+      off: jest.fn(),
+    },
   }))
 
   it.skip('Layout contains Symbol of GoC', () => {
diff --git a/__tests__/pages/contact-us-pages.test.js b/__tests__/pages/contact-us-pages.test.js
index 7c8ae61a4..ca7632c4a 100644
--- a/__tests__/pages/contact-us-pages.test.js
+++ b/__tests__/pages/contact-us-pages.test.js
@@ -57,6 +57,10 @@ describe.skip('Dynamic Contact Us Page', () => {
     useRouter.mockImplementation(() => ({
       pathname: '/',
       asPath: '/',
+      events: {
+        on: jest.fn(),
+        off: jest.fn(),
+      },
     }))
   })
 
diff --git a/__tests__/pages/decision-reviews.test.js b/__tests__/pages/decision-reviews.test.js
index 93a311dbf..f15430d65 100644
--- a/__tests__/pages/decision-reviews.test.js
+++ b/__tests__/pages/decision-reviews.test.js
@@ -81,6 +81,10 @@ describe('Decision Reviews page', () => {
     useRouter.mockImplementation(() => ({
       pathname: '/',
       asPath: '/',
+      events: {
+        on: jest.fn(),
+        off: jest.fn(),
+      },
     }))
   })
 
@@ -94,10 +98,10 @@ describe('Decision Reviews page', () => {
         meta={{}}
         breadCrumbItems={content.breadcrumb}
         langToggleLink={''}
-      />
+      />,
     )
     const DecisionReviewsDiv = screen.getByTestId(
-      'decision-reviewsContent-test'
+      'decision-reviewsContent-test',
     )
     expect(DecisionReviewsDiv).toBeInTheDocument()
   })
@@ -112,10 +116,10 @@ describe('Decision Reviews page', () => {
         meta={{}}
         breadCrumbItems={content.breadcrumb}
         langToggleLink={''}
-      />
+      />,
     )
     const DecisionReviewsDiv = screen.getByTestId(
-      'decision-reviewsContent-test'
+      'decision-reviewsContent-test',
     )
     expect(DecisionReviewsDiv).toBeInTheDocument()
   })
diff --git a/__tests__/pages/index.test.js b/__tests__/pages/index.test.js
index 97da85f80..e1b53bc51 100644
--- a/__tests__/pages/index.test.js
+++ b/__tests__/pages/index.test.js
@@ -33,6 +33,10 @@ describe('index page', () => {
     useRouter.mockImplementation(() => ({
       pathname: '/',
       asPath: '/',
+      events: {
+        on: jest.fn(),
+        off: jest.fn(),
+      },
     }))
   })
 
diff --git a/__tests__/pages/login.test.js b/__tests__/pages/login.test.js
index 14ebc0f64..d14720ae9 100644
--- a/__tests__/pages/login.test.js
+++ b/__tests__/pages/login.test.js
@@ -39,6 +39,10 @@ describe('login page', () => {
     useRouter.mockImplementation(() => ({
       pathname: '/auth/login',
       asPath: '/auth/login',
+      events: {
+        on: jest.fn(),
+        off: jest.fn(),
+      },
     }))
   })
 
diff --git a/__tests__/pages/logout.test.js b/__tests__/pages/logout.test.js
index daf1b28bb..a86a06546 100644
--- a/__tests__/pages/logout.test.js
+++ b/__tests__/pages/logout.test.js
@@ -43,6 +43,10 @@ describe('logout page', () => {
     useRouter.mockImplementation(() => ({
       pathname: '/auth/logout',
       asPath: '/auth/logout',
+      events: {
+        on: jest.fn(),
+        off: jest.fn(),
+      },
     }))
   })
 
diff --git a/__tests__/pages/my-dashboard.test.js b/__tests__/pages/my-dashboard.test.js
index 7cc7cebe8..b696f2a5c 100644
--- a/__tests__/pages/my-dashboard.test.js
+++ b/__tests__/pages/my-dashboard.test.js
@@ -65,6 +65,10 @@ describe('My Dashboard page', () => {
     useRouter.mockImplementation(() => ({
       pathname: '/',
       asPath: '/',
+      events: {
+        on: jest.fn(),
+        off: jest.fn(),
+      },
     }))
   })
 
diff --git a/__tests__/pages/profile.test.js b/__tests__/pages/profile.test.js
index d8e0b8d0a..9d8d341b2 100644
--- a/__tests__/pages/profile.test.js
+++ b/__tests__/pages/profile.test.js
@@ -69,6 +69,10 @@ describe('My Profile page', () => {
     useRouter.mockImplementation(() => ({
       pathname: '/',
       asPath: '/',
+      events: {
+        on: jest.fn(),
+        off: jest.fn(),
+      },
     }))
   })
 
@@ -86,7 +90,7 @@ describe('My Profile page', () => {
         popupContentNA={popupContent}
         breadCrumbItems={[]}
         langToggleLink={''}
-      />
+      />,
     )
     const profileDiv = screen.getByTestId('profileContent-test')
     expect(profileDiv).toBeInTheDocument()
@@ -106,7 +110,7 @@ describe('My Profile page', () => {
         popupContentNA={popupContent}
         breadCrumbItems={[]}
         langToggleLink={''}
-      />
+      />,
     )
     const profileDiv = screen.getByTestId('profileContent-test')
     expect(profileDiv).toBeInTheDocument()
diff --git a/__tests__/pages/security-settings.test.js b/__tests__/pages/security-settings.test.js
index 35f92bf94..df1f79d30 100644
--- a/__tests__/pages/security-settings.test.js
+++ b/__tests__/pages/security-settings.test.js
@@ -50,6 +50,10 @@ describe('Security Settings page', () => {
     useRouter.mockImplementation(() => ({
       pathname: '/',
       asPath: '/',
+      events: {
+        on: jest.fn(),
+        off: jest.fn(),
+      },
     }))
   })
 
@@ -63,7 +67,7 @@ describe('Security Settings page', () => {
         meta={{}}
         breadCrumbItems={content.breadcrumb}
         langToggleLink={''}
-      />
+      />,
     )
     const SecuritySettingsDiv = screen.getByTestId('securityContent-test')
     expect(SecuritySettingsDiv).toBeInTheDocument()
@@ -79,7 +83,7 @@ describe('Security Settings page', () => {
         meta={{}}
         breadCrumbItems={content.breadcrumb}
         langToggleLink={''}
-      />
+      />,
     )
     const SecuritySettingsDiv = screen.getByTestId('securityContent-test')
     expect(SecuritySettingsDiv).toBeInTheDocument()
@@ -95,7 +99,7 @@ describe('Security Settings page', () => {
         meta={{}}
         breadCrumbItems={content.breadcrumb}
         langToggleLink={''}
-      />
+      />,
     )
     const securityQuestionsLink = screen.getByTestId('securityQuestionsLink')
     expect(securityQuestionsLink).toBeInTheDocument()
diff --git a/components/Layout.js b/components/Layout.js
index 884528104..01dfcc762 100644
--- a/components/Layout.js
+++ b/components/Layout.js
@@ -6,7 +6,6 @@ import MetaData from './MetaData'
 import en from '../locales/en'
 import fr from '../locales/fr'
 import { lato, notoSans } from '../utils/fonts'
-import { useRouter } from 'next/router'
 import throttle from 'lodash.throttle'
 import IdleTimeout from './IdleTimeout'
 import { signOut } from 'next-auth/react'
@@ -15,7 +14,6 @@ import getConfig from 'next/config'
 export default function Layout(props) {
   const t = props.locale === 'en' ? en : fr
   const [response, setResponse] = useState()
-  const router = useRouter()
   const defaultBreadcrumbs = []
   const contactLink =
     props.locale === 'en' ? '/en/contact-us' : '/fr/contactez-nous'
diff --git a/components/MetaData.tsx b/components/MetaData.tsx
index 11966a8fa..5abfffd68 100644
--- a/components/MetaData.tsx
+++ b/components/MetaData.tsx
@@ -1,5 +1,5 @@
 import Head from 'next/head'
-import router from 'next/router'
+import { useRouter } from 'next/router'
 import Script from 'next/script'
 import { useEffect } from 'react'
 
@@ -37,6 +37,7 @@ declare global {
 /* eslint-enable */
 
 const MetaData = ({ language, data }: MetaDataProps) => {
+  const router = useRouter()
   const d = language === 'en' ? data.data_en : data.data_fr
   const isErrorPage = typeof d.statusCode !== 'undefined'
   /** Web Analytics - taken from Google Analytics example

From 91bcdd3c4d33a4a811a0decbce9d483b95e45668 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Wed, 23 Oct 2024 11:01:57 -0600
Subject: [PATCH 16/26] fix layout

---
 components/Layout.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/Layout.js b/components/Layout.js
index 01dfcc762..884528104 100644
--- a/components/Layout.js
+++ b/components/Layout.js
@@ -6,6 +6,7 @@ import MetaData from './MetaData'
 import en from '../locales/en'
 import fr from '../locales/fr'
 import { lato, notoSans } from '../utils/fonts'
+import { useRouter } from 'next/router'
 import throttle from 'lodash.throttle'
 import IdleTimeout from './IdleTimeout'
 import { signOut } from 'next-auth/react'
@@ -14,6 +15,7 @@ import getConfig from 'next/config'
 export default function Layout(props) {
   const t = props.locale === 'en' ? en : fr
   const [response, setResponse] = useState()
+  const router = useRouter()
   const defaultBreadcrumbs = []
   const contactLink =
     props.locale === 'en' ? '/en/contact-us' : '/fr/contactez-nous'

From 7ce24a5cc4652092a70159c8a130a5aa59f37621 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Wed, 23 Oct 2024 13:44:15 -0600
Subject: [PATCH 17/26] push error event

---
 components/MetaData.tsx | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/MetaData.tsx b/components/MetaData.tsx
index 5abfffd68..030540ad5 100644
--- a/components/MetaData.tsx
+++ b/components/MetaData.tsx
@@ -47,14 +47,19 @@ const MetaData = ({ language, data }: MetaDataProps) => {
     const handleRouteChange = () => {
       // only push event if pathname is different
       if (window.location.pathname !== appPreviousLocationPathname) {
-        window.adobeDataLayer?.push?.({ event: 'pageLoad' })
+        if (isErrorPage) {
+          window.adobeDataLayer?.push?.({
+            event: 'error',
+            error: {
+              name: d.statusCode,
+            },
+          })
+        } else {
+          window.adobeDataLayer?.push?.({ event: 'pageLoad' })
+        }
         appPreviousLocationPathname = window.location.pathname
       }
     }
-    if (isErrorPage) {
-      // Suppress the pageLoad entirely on error pages
-      return
-    }
 
     handleRouteChange()
     router.events.on('routeChangeComplete', handleRouteChange)

From b107e5230b1f59b490a5729ad535ec0cd1eef292 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Wed, 23 Oct 2024 14:14:53 -0600
Subject: [PATCH 18/26] fix aa on language toggle and menus

---
 pages/404.tsx | 2 ++
 pages/500.tsx | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pages/404.tsx b/pages/404.tsx
index 9c112e63b..2ce49e915 100644
--- a/pages/404.tsx
+++ b/pages/404.tsx
@@ -80,6 +80,8 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       langToggleLink,
       meta,
       isAuth: process.env.AUTH_DISABLED ?? true,
+      aaPrefix: `ESDC-EDSC_MSCA-MSDC-SCH:404 Error`,
+      aaMenuPrefix: `ESDC-EDSC_MSCA-MSDC-SCH:Nav Menu`,
     },
   }
 }
diff --git a/pages/500.tsx b/pages/500.tsx
index f372cbb13..d4fce38b5 100644
--- a/pages/500.tsx
+++ b/pages/500.tsx
@@ -80,6 +80,8 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       langToggleLink,
       meta,
       isAuth: process.env.AUTH_DISABLED ?? true,
+      aaPrefix: `ESDC-EDSC_MSCA-MSDC-SCH:500 Error`,
+      aaMenuPrefix: `ESDC-EDSC_MSCA-MSDC-SCH:Nav Menu`,
     },
   }
 }

From acb725e36bb6af41332bd5307830ebf8d8bdacd9 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Fri, 25 Oct 2024 09:24:42 -0600
Subject: [PATCH 19/26] fix aa tags on cdcp

---
 lib/acronym.js | 4 ++++
 pages/_app.js  | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/acronym.js b/lib/acronym.js
index fee935321..e0059f547 100644
--- a/lib/acronym.js
+++ b/lib/acronym.js
@@ -29,6 +29,10 @@ export const acronym = (longText) => {
       return 'CALSC'
     case 'prêt canadien aux apprentis':
       return 'CALSC'
+    case 'canadian dental care plan':
+      return 'CDCP'
+    case 'régime canadien de soins dentaires':
+      return 'CDCP'
     default:
       return 'UND'
   }
diff --git a/pages/_app.js b/pages/_app.js
index 4f31fb0c3..cb6f8cd17 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -5,7 +5,6 @@ import { config } from '@fortawesome/fontawesome-svg-core'
 import '@fortawesome/fontawesome-svg-core/styles.css'
 import Modal from 'react-modal'
 import ErrorBoundary from '../components/ErrorBoundary'
-import { useEffect } from 'react'
 config.autoAddCss = false
 
 export default function MyApp({ Component, pageProps, router }) {

From 4b34c990ccfbc61e1ac2a6561512956dfbca0157 Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Wed, 30 Oct 2024 08:45:53 -0400
Subject: [PATCH 20/26] accomodate cert chain for raoidc sade environments on
 new 10 dot star IP range

---
 Dockerfile                                          | 13 +++++++++++++
 .../dev/secure-client-hub.yaml.gotmpl               |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index d652c2863..070b68fcc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,8 @@ ARG HOSTALIAS_CERT
 ENV HOSTALIAS_CERT=$HOSTALIAS_CERT
 ARG HOSTALIAS_ROOT_CERT
 ENV HOSTALIAS_ROOT_CERT=$HOSTALIAS_ROOT_CERT
+ARG AUTH_ECAS_CA
+ENV AUTH_ECAS_CA=$AUTH_ECAS_CA
 ARG LOGGING_LEVEL=info
 ENV LOGGING_LEVEL=$LOGGING_LEVEL
 ARG AEM_GRAPHQL_ENDPOINT=https://www.canada.ca/graphql/execute.json/decd-endc/
@@ -34,6 +36,11 @@ sed 's/\\n/\n/g' | \
 xargs > \
 /usr/local/share/ca-certificates/env.crt && \
 chmod 644 /usr/local/share/ca-certificates/env.crt && \
+echo ${AUTH_ECAS_CA} | \
+sed 's/\\n/\n/g' | \
+xargs > \
+/usr/local/share/ca-certificates/ecas_env.crt && \
+chmod 644 /usr/local/share/ca-certificates/ecas_env.crt && \
 mkdir -p  /etc/ssl/certs/ && \
 echo ${HOSTALIAS_ROOT_CERT} | \
 sed 's/\\n/\n/g' | \
@@ -52,6 +59,9 @@ ARG home=/srv/app
 ARG MSCA_NG_CERT_LOCATION=/usr/local/share/ca-certificates/env.crt
 ENV MSCA_NG_CERT_LOCATION=$MSCA_NG_CERT_LOCATION
 
+ARG ECAS_CERT_LOCATION=/usr/local/share/ca-certificates/ecas_env.crt
+ENV ECAS_CERT_LOCATION=$ECAS_CERT_LOCATION
+
 RUN addgroup \
     -S ${group} \
     --gid 1001 && \
@@ -67,6 +77,7 @@ WORKDIR ${home}
 
 COPY --from=build /etc/ssl/certs/root.crt /etc/ssl/certs/root.crt
 COPY --from=build --chown=${user}:${group} /usr/local/share/ca-certificates/env.crt ${MSCA_NG_CERT_LOCATION}
+COPY --from=build --chown=${user}:${group} /usr/local/share/ca-certificates/ecas_env.crt ${ECAS_CERT_LOCATION}
 
 RUN apk update && \
 apk add ca-certificates && \
@@ -131,6 +142,8 @@ ENV AUTH_DISABLED=$AUTH_DISABLED
 
 ARG AUTH_ECAS_GLOBAL_LOGOUT_URL
 ENV AUTH_ECAS_GLOBAL_LOGOUT_URL=$AUTH_ECAS_GLOBAL_LOGOUT_URL
+
+ENV NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/ecas_env.crt
 # ECAS/next-auth env end
 
 ARG PORT=3000
diff --git a/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl b/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl
index 7a16f6eb9..73de9be2f 100644
--- a/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl
+++ b/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl
@@ -56,6 +56,8 @@ extraEnv:
     value: {{ env "AUTH_ECAS_REFRESH_ENDPOINT" }} 
   - name: MSCA_NG_USER_ENDPOINT
     value: {{ env "MSCA_NG_USER_ENDPOINT" }}
+  - name: AUTH_ECAS_CA
+    value: {{ env "AUTH_ECAS_CA" }}
   - name: AUTH_PRIVATE
     valueFrom:
       secretKeyRef:
@@ -180,6 +182,7 @@ secrets:
       HOSTALIAS_HOSTNAME: {{ env "HOSTALIAS_HOSTNAME" }}
       HOSTALIAS_CERT: {{ env "HOSTALIAS_CERT" }}
       MSCA_NG_CREDS: {{ env "MSCA_NG_CREDS" }}
+      AUTH_ECAS_CA: {{ env "AUTH_ECAS_CA" }}
 
   msca-d-frontend-auth-{{ requiredEnv "BRANCH" | lower }}:
     labels:

From decdd4c89dde9d333672f29c5d3ceac57b8a9205 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Thu, 31 Oct 2024 10:49:41 -0600
Subject: [PATCH 21/26] revert AA error event changes

---
 components/MetaData.tsx | 53 ++---------------------------------------
 pages/404.tsx           |  2 --
 pages/500.tsx           |  2 --
 pages/_app.js           | 25 +++++++++++++++++++
 4 files changed, 27 insertions(+), 55 deletions(-)

diff --git a/components/MetaData.tsx b/components/MetaData.tsx
index 030540ad5..a368af3c8 100644
--- a/components/MetaData.tsx
+++ b/components/MetaData.tsx
@@ -1,7 +1,5 @@
 import Head from 'next/head'
-import { useRouter } from 'next/router'
 import Script from 'next/script'
-import { useEffect } from 'react'
 
 interface Content {
   title: string
@@ -11,7 +9,6 @@ interface Content {
   creator: string
   accessRights: string
   service: string
-  statusCode?: string
 }
 
 interface Data {
@@ -24,51 +21,8 @@ interface MetaDataProps {
   data: Data
 }
 
-// To help prevent double firing of adobe analytics pageLoad event
-let appPreviousLocationPathname = ''
-
-/* eslint-disable */
-// make typescript happy
-declare global {
-  interface Window {
-    adobeDataLayer: any
-  }
-}
-/* eslint-enable */
-
 const MetaData = ({ language, data }: MetaDataProps) => {
-  const router = useRouter()
   const d = language === 'en' ? data.data_en : data.data_fr
-  const isErrorPage = typeof d.statusCode !== 'undefined'
-  /** Web Analytics - taken from Google Analytics example
-   *  @see https://github.com/vercel/next.js/blob/canary/examples/with-google-analytics
-   * */
-  useEffect(() => {
-    const handleRouteChange = () => {
-      // only push event if pathname is different
-      if (window.location.pathname !== appPreviousLocationPathname) {
-        if (isErrorPage) {
-          window.adobeDataLayer?.push?.({
-            event: 'error',
-            error: {
-              name: d.statusCode,
-            },
-          })
-        } else {
-          window.adobeDataLayer?.push?.({ event: 'pageLoad' })
-        }
-        appPreviousLocationPathname = window.location.pathname
-      }
-    }
-
-    handleRouteChange()
-    router.events.on('routeChangeComplete', handleRouteChange)
-    router.events.on('hashChangeComplete', handleRouteChange)
-    return () => {
-      router.events.off('routeChangeComplete', handleRouteChange)
-      router.events.off('hashChangeComplete', handleRouteChange)
-    }
-  }, [router.events])
 
   return (
     <>
@@ -88,11 +42,8 @@ const MetaData = ({ language, data }: MetaDataProps) => {
             }
           `}
         </style>
-        {isErrorPage ? (
-          <title data-gc-analytics-error={d.statusCode}>{d.title}</title>
-        ) : (
-          <title>{d.title}</title>
-        )}
+
+        <title>{d.title}</title>
 
         <meta charSet="utf-8" />
         <meta name="description" content={d.desc} />
diff --git a/pages/404.tsx b/pages/404.tsx
index 2ce49e915..8acba606c 100644
--- a/pages/404.tsx
+++ b/pages/404.tsx
@@ -60,7 +60,6 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       service: 'ESDC-EDSC_MSCA-MSDC-SCH',
       creator: 'Employment and Social Development Canada',
       accessRights: '1',
-      statusCode: '404',
     },
     data_fr: {
       title: `Nous ne pouvons trouver cette page Web - 404 - Mon dossier Service Canada`,
@@ -70,7 +69,6 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       service: 'ESDC-EDSC_MSCA-MSDC-SCH',
       creator: 'Emploi et Développement social Canada',
       accessRights: '1',
-      statusCode: '404',
     },
   }
   return {
diff --git a/pages/500.tsx b/pages/500.tsx
index d4fce38b5..f5033234d 100644
--- a/pages/500.tsx
+++ b/pages/500.tsx
@@ -60,7 +60,6 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       service: 'ESDC-EDSC_MSCA-MSDC-SCH',
       creator: 'Employment and Social Development Canada',
       accessRights: '1',
-      statusCode: '500',
     },
     data_fr: {
       title: `Nous ne pouvons trouver cette page Web - 500 - Mon dossier Service Canada`,
@@ -70,7 +69,6 @@ export const getStaticProps: GetStaticProps = async ({ locale }) => {
       service: 'ESDC-EDSC_MSCA-MSDC-SCH',
       creator: 'Emploi et Développement social Canada',
       accessRights: '1',
-      statusCode: '500',
     },
   }
   return {
diff --git a/pages/_app.js b/pages/_app.js
index cb6f8cd17..a274b4519 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -5,8 +5,12 @@ import { config } from '@fortawesome/fontawesome-svg-core'
 import '@fortawesome/fontawesome-svg-core/styles.css'
 import Modal from 'react-modal'
 import ErrorBoundary from '../components/ErrorBoundary'
+import { useEffect } from 'react'
 config.autoAddCss = false
 
+// To help prevent double firing of adobe analytics pageLoad event
+let appPreviousLocationPathname = ''
+
 export default function MyApp({ Component, pageProps, router }) {
   /* istanbul ignore next */
   if (Component.getLayout) {
@@ -16,6 +20,27 @@ export default function MyApp({ Component, pageProps, router }) {
   Modal.setAppElement('#__next')
   const display = { hideBanner: pageProps.hideBanner }
 
+  /** Web Analytics - taken from Google Analytics example
+   *  @see https://github.com/vercel/next.js/blob/canary/examples/with-google-analytics
+   * */
+  useEffect(() => {
+    const handleRouteChange = () => {
+      // only push event if pathname is different
+      if (window.location.pathname !== appPreviousLocationPathname) {
+        window.adobeDataLayer?.push?.({ event: 'pageLoad' })
+        appPreviousLocationPathname = window.location.pathname
+      }
+    }
+
+    handleRouteChange()
+    router.events.on('routeChangeComplete', handleRouteChange)
+    router.events.on('hashChangeComplete', handleRouteChange)
+    return () => {
+      router.events.off('routeChangeComplete', handleRouteChange)
+      router.events.off('hashChangeComplete', handleRouteChange)
+    }
+  }, [router.events])
+
   /* istanbul ignore next */
   return (
     <ErrorBoundary>

From 7e42be00d494ba701cfb2405164e00f15b434aa2 Mon Sep 17 00:00:00 2001
From: jhslater <james.slater@hrsdc-rhdcc.gc.ca>
Date: Tue, 5 Nov 2024 06:49:45 -0500
Subject: [PATCH 22/26] accomodate an additional hostalias in helm

---
 helm/charts/secure-client-hub/templates/deployment.yaml    | 7 +++++++
 helm/charts/secure-client-hub/values.yaml                  | 3 +++
 .../secure-client-hub/dev/secure-client-hub.yaml.gotmpl    | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/helm/charts/secure-client-hub/templates/deployment.yaml b/helm/charts/secure-client-hub/templates/deployment.yaml
index 35b846fb7..555c4531f 100644
--- a/helm/charts/secure-client-hub/templates/deployment.yaml
+++ b/helm/charts/secure-client-hub/templates/deployment.yaml
@@ -32,6 +32,13 @@ spec:
         {{- range .Values.hostAliases.hostnames }}
         - {{ . | quote }}
         {{- end }}
+        {{- if .Values.raoidcAlias.enabled }}
+      - ip: "{{ .Values.raoidcAlias.ip }}"
+        hostnames:
+        {{- range .Values.raoidcAlias.hostnames }}
+        - {{ . | quote }}
+        {{- end }}
+      {{- end }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
diff --git a/helm/charts/secure-client-hub/values.yaml b/helm/charts/secure-client-hub/values.yaml
index 568521247..66a6b4cb8 100644
--- a/helm/charts/secure-client-hub/values.yaml
+++ b/helm/charts/secure-client-hub/values.yaml
@@ -73,4 +73,7 @@ oauth:
   enabled: false
 
 hostAliases:
+  enabled: false
+
+raoidcAlias:
   enabled: false
\ No newline at end of file
diff --git a/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl b/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl
index 73de9be2f..51676453b 100644
--- a/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl
+++ b/helmfile/overrides/secure-client-hub/dev/secure-client-hub.yaml.gotmpl
@@ -274,3 +274,10 @@ hostAliases:
   hostnames:
     - {{ env "HOSTALIAS_HOSTNAME" }}
 {{- end }}
+{{- if env "RAOIDC_HOSTALIAS_ENABLED" }}
+raoidcAlias:
+  enabled: {{ env "RAOIDC_HOSTALIAS_ENABLED" }}
+  ip: "{{ env "RAOIDC_HOSTALIAS_IP" }}"
+  hostnames:
+    - {{ env "RAOIDC_HOSTALIAS_HOSTNAME" }}
+{{- end }}
\ No newline at end of file

From 03853656d64406198b61c2c7c08917771cf7b160 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Tue, 5 Nov 2024 12:30:03 -0700
Subject: [PATCH 23/26] Switch from defaultProps to default parameters. Any
 string parameter which should not be empty is now defaulted to
 mscaPlaceholder.

---
 components/BackToButton.tsx               |  6 +-
 components/BenefitTasks.tsx               | 18 +-----
 components/Breadcrumb.tsx                 |  6 +-
 components/Button.tsx                     | 61 ++++++++---------
 components/Card.tsx                       | 29 ++++-----
 components/Collapse.tsx                   | 14 ++--
 components/Date.tsx                       |  2 +-
 components/ErrorPage.tsx                  | 12 +---
 components/Footer.tsx                     | 55 +++++++---------
 components/Header.tsx                     | 79 ++++++++++++++---------
 components/Heading.tsx                    |  2 +-
 components/IdleTimeout.tsx                |  2 +-
 components/InfoMessage.tsx                |  6 +-
 components/Language.tsx                   | 15 ++---
 components/Layout.js                      | 70 ++++++++++----------
 components/Menu.tsx                       |  8 ++-
 components/MostReqTasks.tsx               | 41 +++++-------
 components/PageLink.tsx                   | 18 +++---
 components/ProfileTasks.tsx               | 26 +++-----
 components/TopNav.tsx                     | 30 ++++-----
 components/ViewMoreLessButton.tsx         |  8 +--
 components/contact/ContactProvince.tsx    |  6 +-
 components/contact/ContactProvinceRow.tsx |  2 +-
 components/contact/ContactSection.tsx     |  4 +-
 components/contact/ContactSectionRow.tsx  |  6 +-
 25 files changed, 245 insertions(+), 281 deletions(-)

diff --git a/components/BackToButton.tsx b/components/BackToButton.tsx
index 5623789a2..4572a1e80 100644
--- a/components/BackToButton.tsx
+++ b/components/BackToButton.tsx
@@ -12,8 +12,8 @@ const BackToButton = ({
   buttonHref,
   buttonId,
   buttonLinkText,
-  refPageAA,
-  id,
+  refPageAA = 'mscaPlaceholder',
+  id = 'mscaPlaceholder',
 }: BackToButtonProps) => {
   return (
     <>
@@ -21,7 +21,7 @@ const BackToButton = ({
         <Link
           href={buttonHref}
           id={buttonId}
-          className="inline-block my-4 py-2.5 px-3.5 font-display text-xl rounded bg-gray-30a text-deep-blue-60b hover:bg-gray-50a hover:cursor-pointer focus:ring focus:ring-offset-4 ring-deep-blue-60f"
+          className="my-4 inline-block rounded bg-gray-30a px-3.5 py-2.5 font-display text-xl text-deep-blue-60b ring-deep-blue-60f hover:cursor-pointer hover:bg-gray-50a focus:ring focus:ring-offset-4"
           data-gc-analytics-customclick={`${refPageAA}:${id}`}
         >
           {buttonLinkText}
diff --git a/components/BenefitTasks.tsx b/components/BenefitTasks.tsx
index 2a1be706d..321e3d6ca 100644
--- a/components/BenefitTasks.tsx
+++ b/components/BenefitTasks.tsx
@@ -29,8 +29,8 @@ const BenefitTasks = ({
   locale,
   taskList,
   dataCy,
-  refPageAA,
-  acronym,
+  refPageAA = 'mscaPlaceholder',
+  acronym = 'mscaPlaceholder',
 }: BenefitTasksProps) => {
   const newTabTaskExceptions = [
     'https://www.canada.ca/en/services/benefits/ei/employment-insurance-reporting.html',
@@ -48,7 +48,7 @@ const BenefitTasks = ({
 
   return (
     <div className="inline-block w-full" data-testid="benefitTasks-test">
-      <h3 className="text-xl font-bold " data-cy={dataCy}>
+      <h3 className="text-xl font-bold" data-cy={dataCy}>
         {taskList.title}
       </h3>
       <ul
@@ -104,16 +104,4 @@ const BenefitTasks = ({
     </div>
   )
 }
-
-BenefitTasks.defaultProps = {
-  taskList: [
-    {
-      tasks: [
-        {
-          icon: 'question-circle', // To ensure a value is used for FontAwesome icons
-        },
-      ],
-    },
-  ],
-}
 export default BenefitTasks
diff --git a/components/Breadcrumb.tsx b/components/Breadcrumb.tsx
index bf0cc9ed4..d05e81e60 100644
--- a/components/Breadcrumb.tsx
+++ b/components/Breadcrumb.tsx
@@ -13,7 +13,11 @@ export interface BreadcrumbProps {
   refPageAA: string
 }
 
-const Breadcrumb = ({ id, items, refPageAA }: BreadcrumbProps) => {
+const Breadcrumb = ({
+  id, // TODO: Provide a default value once this is actually mapped in
+  items,
+  refPageAA = 'mscaPlaceholder',
+}: BreadcrumbProps) => {
   return (
     <nav className="py-6" aria-label="Breadcrumb-Fil d’ariane" id={id}>
       <ul className="block font-body text-base leading-[23px] text-deep-blue-dark">
diff --git a/components/Button.tsx b/components/Button.tsx
index 1cef61855..ef62835e6 100644
--- a/components/Button.tsx
+++ b/components/Button.tsx
@@ -6,7 +6,7 @@ interface ButtonProps {
   style?: 'supertask' | 'primary' | 'secondary' | 'danger' | 'link' | 'none'
   text: string
   icon?: string
-  iconAltText: string
+  iconAltText?: string
   iconEnd?: boolean
   href?: string
   type?: 'submit' | 'reset' | 'button'
@@ -19,20 +19,20 @@ interface ButtonProps {
 }
 
 const Button = ({
-  id,
-  style,
-  text,
+  id = 'mscaPlaceholder',
+  style = 'supertask',
+  text = 'mscaPlaceholder',
   icon,
-  iconAltText,
+  iconAltText = 'mscaPlaceholder',
   iconEnd,
-  href,
+  href = 'no ref',
   type,
   onClick,
   disabled,
   className,
   attributes,
   children,
-  refPageAA,
+  refPageAA = 'mscaPlaceholder',
 }: ButtonProps) => {
   const primary =
     'text-white bg-blue-primary text-xl hover:bg-deep-blue-focus active:bg-blue-pressed rounded focus:ring focus:ring-offset-4 focus:ring-deep-blue-60f focus:ring-bg-deep-blue-focus'
@@ -49,20 +49,20 @@ const Button = ({
     style === 'primary'
       ? primary
       : style === 'secondary'
-      ? secondary
-      : style === 'supertask'
-      ? supertask
-      : style === 'danger'
-      ? danger
-      : style === 'link'
-      ? link
-      : ''
+        ? secondary
+        : style === 'supertask'
+          ? supertask
+          : style === 'danger'
+            ? danger
+            : style === 'link'
+              ? link
+              : ''
 
   return href === 'no ref' ? (
     <button
       className={`flex flex-row ${buttonStyle} ${
         disabled ? 'cursor-not-allowed' : ''
-      } py-1.5 px-3.5 rounded focus:ring focus:ring-offset-4 ${className} `}
+      } rounded px-3.5 py-1.5 focus:ring focus:ring-offset-4 ${className} `}
       onClick={onClick}
       data-gc-analytics-customclick={`${refPageAA}:${text}`}
       type={type}
@@ -72,11 +72,11 @@ const Button = ({
       data-testid={id}
     >
       {icon && !iconEnd ? (
-        <span className="grid place-items-center h-8 w-8">
+        <span className="grid h-8 w-8 place-items-center">
           <Image
             width={8}
             height={8}
-            className="pr-2 rounded"
+            className="rounded pr-2"
             src={icon}
             alt={iconAltText}
           />
@@ -85,11 +85,11 @@ const Button = ({
       {text}
       {children}
       {icon && iconEnd ? (
-        <span className="grid place-items-center h-8 w-8">
+        <span className="grid h-8 w-8 place-items-center">
           <Image
             width={8}
             height={8}
-            className="pl-2 rounded"
+            className="rounded pl-2"
             src={icon}
             alt={iconAltText}
           />
@@ -102,18 +102,18 @@ const Button = ({
       href={href}
       className={`flex flex-row ${disabled ? 'cursor-not-allowed' : ''} ${
         style === 'link'
-          ? `font-body text-xl leading-[23px] text-deep-blue-dark hover:text-blue-hover rounded-sm active:text-blue-hover focus:outline-1 focus:outline-blue-hover visited:text-purple-50a`
+          ? `rounded-sm font-body text-xl leading-[23px] text-deep-blue-dark visited:text-purple-50a hover:text-blue-hover focus:outline-1 focus:outline-blue-hover active:text-blue-hover`
           : style === 'none'
-          ? ''
-          : buttonStyle
-      } py-1.5 px-3.5 ${className} `}
+            ? ''
+            : buttonStyle
+      } px-3.5 py-1.5 ${className} `}
       onClick={onClick}
       id={id}
       data-gc-analytics-customclick={`${refPageAA}:${id}`}
     >
       {icon && !iconEnd ? (
         <Image
-          className="pr-2 rounded"
+          className="rounded pr-2"
           width={8}
           height={8}
           src={icon}
@@ -125,7 +125,7 @@ const Button = ({
       {icon && iconEnd ? (
         <div className="grid place-items-center">
           <Image
-            className="rounded pl-5 pb-3"
+            className="rounded pb-3 pl-5"
             width={8}
             height={8}
             src={icon}
@@ -136,13 +136,4 @@ const Button = ({
     </a>
   )
 }
-
-Button.defaultProps = {
-  id: 'btn1',
-  style: 'supertask',
-  text: 'default',
-  href: 'no ref',
-  iconAltText: 'default',
-}
-
 export default Button
diff --git a/components/Card.tsx b/components/Card.tsx
index bd049e68c..2a4130251 100644
--- a/components/Card.tsx
+++ b/components/Card.tsx
@@ -9,6 +9,8 @@ interface AlertProps {
   type: string
   alertHeading: string
   alertBody: string
+  alert_icon_alt_text: string
+  alert_icon_id: string
 }
 interface CardProps {
   cardTitle: string
@@ -23,7 +25,16 @@ interface CardProps {
 }
 
 const Card = ({
-  cardAlert,
+  cardAlert = [
+    {
+      id: '',
+      type: '',
+      alertHeading: '',
+      alertBody: '',
+      alert_icon_alt_text: '',
+      alert_icon_id: '',
+    },
+  ],
   hasAlert,
   locale,
   cardTitle,
@@ -101,7 +112,7 @@ const Card = ({
       {!isOpen ? null : (
         <div>
           {hasAlert &&
-            cardAlert?.map((alert, index) => {
+            cardAlert.map((alert, index) => {
               const alertType = alert.type[0].split('/').pop()
               return (
                 <ul
@@ -130,18 +141,4 @@ const Card = ({
   )
 }
 
-Card.defaultProps = {
-  cardAlert: [
-    {
-      id: '',
-      type: '',
-      alertHeading: '',
-      alertBody: '',
-      alert_icon_alt_text: '',
-      alert_icon_id: '',
-    },
-  ],
-  hasAlert: true,
-}
-
 export default Card
diff --git a/components/Collapse.tsx b/components/Collapse.tsx
index 817004545..c6110dde5 100644
--- a/components/Collapse.tsx
+++ b/components/Collapse.tsx
@@ -8,7 +8,12 @@ interface CollapseProps {
   dataTestId?: string
 }
 
-const Collapse = ({ id, title, children, dataTestId }: CollapseProps) => {
+const Collapse = ({
+  id = 'mscaPlaceholder',
+  title,
+  children,
+  dataTestId,
+}: CollapseProps) => {
   return (
     <details
       key={id}
@@ -19,9 +24,9 @@ const Collapse = ({ id, title, children, dataTestId }: CollapseProps) => {
       <summary
         data-cy="summary"
         key={`summary-${id}`}
-        className=" cursor-pointer select-none rounded border border-gray-40 px-15px py-5px text-deep-blue-60d outline-none hover:text-blue-hover hover:underline"
+        className="cursor-pointer select-none rounded border border-gray-40 px-15px py-5px text-deep-blue-60d outline-none hover:text-blue-hover hover:underline"
         data-gc-analytics-customclick={`ESDC-EDSC_MSCA-MSDC-SCH:${programs(
-          id?.split('-')[0],
+          id.split('-')[0],
         )}:${title}`}
       >
         {title}
@@ -35,8 +40,5 @@ const Collapse = ({ id, title, children, dataTestId }: CollapseProps) => {
     </details>
   )
 }
-Collapse.defaultProps = {
-  id: 'defaultAccordion',
-}
 
 export default Collapse
diff --git a/components/Date.tsx b/components/Date.tsx
index a658410f8..8f925fa39 100644
--- a/components/Date.tsx
+++ b/components/Date.tsx
@@ -4,7 +4,7 @@ interface DateProps {
   date?: string
 }
 
-const Date = ({ id, label, date }: DateProps) => {
+const Date = ({ id = 'mscaPlaceholder', label, date }: DateProps) => {
   const dateFormatted = date ? date.split('T')[0] : 'NA'
   return (
     <dl
diff --git a/components/ErrorPage.tsx b/components/ErrorPage.tsx
index c80ad37f9..30e28ee5c 100644
--- a/components/ErrorPage.tsx
+++ b/components/ErrorPage.tsx
@@ -14,9 +14,9 @@ interface ErrorPageProps {
 const ErrorPage = ({
   isAuth,
   errType,
-  lang,
-  homePageLink,
-  accountPageLink,
+  lang = 'en',
+  homePageLink = '/',
+  accountPageLink = '/',
 }: ErrorPageProps) => {
   let biClassName = ''
   const language = lang === 'en' ? [EN] : lang === 'fr' ? [FR] : [EN, FR]
@@ -116,10 +116,4 @@ const ErrorPage = ({
   )
 }
 
-ErrorPage.defaultProps = {
-  accountPageLink: '/',
-  homePageLink: '/',
-  lang: 'en',
-}
-
 export default ErrorPage
diff --git a/components/Footer.tsx b/components/Footer.tsx
index 10b75c7a3..b9b21a669 100644
--- a/components/Footer.tsx
+++ b/components/Footer.tsx
@@ -24,12 +24,19 @@ interface FooterProps {
 }
 
 const Footer = ({
-  id,
-  lang,
+  id = 'mscaPlaceholder',
+  lang = 'en',
   btnLink,
   error,
-  contactLink,
-  brandLinks,
+  contactLink = 'https://www.canada.ca/en/contact.html',
+  brandLinks = [
+    {
+      href: 'mscaPlaceholderHref',
+      text: 'mscaPlaceholder',
+      onClick: () => {},
+      id: 'mscaPlaceholder',
+    },
+  ],
   target,
 }: FooterProps) => {
   const t = lang === 'en' ? en : fr
@@ -38,13 +45,13 @@ const Footer = ({
     <footer id={id} className="w-full" data-testid="footer">
       <div className="bg-blue-primary">
         <section
-          className={`sch-container h-[5.75rem] pb-5 flex flex-col items-start`}
+          className={`sch-container flex h-[5.75rem] flex-col items-start pb-5`}
         >
-          <h2 className="pt-[22px] pb-2 text-white font-body font-bold">
+          <h2 className="pb-2 pt-[22px] font-body font-bold text-white">
             {t.mscaFooterHeading}
           </h2>
           <Link
-            className="text-white font-body text-sm hover:text-white hover:underline focus:ring-1 focus:ring-white"
+            className="font-body text-sm text-white hover:text-white hover:underline focus:ring-1 focus:ring-white"
             data-cy="footerContactUsLink"
             id="footerContactUsLink"
             href={contactLink}
@@ -61,39 +68,39 @@ const Footer = ({
         <div
           className={`'min-h-[86px] ' ${
             error ? 'items-center' : ''
-          } flex justify-between sch-container`}
+          } sch-container flex justify-between`}
         >
           {error ? (
             <div>
               <a
                 id="top_btn"
                 href={btnLink}
-                className="sm:hidden float-left cursor-pointer text-sm"
+                className="float-left cursor-pointer text-sm sm:hidden"
               >
                 {t.topOfPage}
                 <FontAwesomeIcon
                   icon={icon['chevron-up']}
-                  className="text-sm sm:hidden pl-2"
+                  className="pl-2 text-sm sm:hidden"
                 />
               </a>
             </div>
           ) : (
-            <section className="md:flex-row flex items-center">
+            <section className="flex items-center md:flex-row">
               <nav role="navigation" aria-labelledby="accessibleSectionHeader2">
                 <h2 className="sr-only" id="accessibleSectionHeader2">
                   {t.aboutThisSite}
                 </h2>
-                <ul className="flex flex-col md:flex-row whitespace-nowrap pt-4">
+                <ul className="flex flex-col whitespace-nowrap pt-4 md:flex-row">
                   {brandLinks.map(({ href, text, onClick }, index) => {
                     return (
                       <li
                         key={index}
                         className={`${
                           index === 0 ? '' : 'md:list-disc'
-                        } pr-4 mb-[17px] list-inside list-none`}
+                        } mb-[17px] list-inside list-none pr-4`}
                       >
                         <Link
-                          className="text-deep-blue-dark font-body text-sm hover:underline"
+                          className="font-body text-sm text-deep-blue-dark hover:underline"
                           onClick={onClick}
                           id={'footerLink' + index}
                           href={href}
@@ -105,12 +112,12 @@ const Footer = ({
                       </li>
                     )
                   })}
-                  <li className="sm:hidden float-left cursor-pointer text-sm">
+                  <li className="float-left cursor-pointer text-sm sm:hidden">
                     <a id="top_btn" href={btnLink}>
                       {t.topOfPage}
                       <FontAwesomeIcon
                         icon={icon['chevron-up']}
-                        className="text-sm sm:hidden pl-2"
+                        className="pl-2 text-sm sm:hidden"
                       />
                     </a>
                   </li>
@@ -121,13 +128,13 @@ const Footer = ({
           <div
             className={`${
               error ? 'items-center' : 'items-end md:items-center'
-            } min-h-[96px] flex shrink-0 mr-[5px]`}
+            } mr-[5px] flex min-h-[96px] shrink-0`}
           >
             <Image
               className={`${
                 error
                   ? 'h-[40px] w-auto'
-                  : 'h-[25px] md:h-[40px] w-[105px] md:w-[164px]'
+                  : 'h-[25px] w-[105px] md:h-[40px] md:w-[164px]'
               } my-[15px]`}
               src={logo}
               alt={t.footerCanadaCaAltText}
@@ -141,16 +148,4 @@ const Footer = ({
   )
 }
 
-Footer.defaultProps = {
-  lang: 'en',
-  contactLink: 'https://www.canada.ca/en/contact.html',
-  brandLinks: [
-    {
-      href: 'https://example.com/link1',
-      text: 'Link 1',
-      onClick: () => {},
-    },
-  ],
-}
-
 export default Footer
diff --git a/components/Header.tsx b/components/Header.tsx
index 4ad1524a9..b388554b1 100644
--- a/components/Header.tsx
+++ b/components/Header.tsx
@@ -51,13 +51,54 @@ interface HeaderProps {
 }
 
 const Header = ({
-  id,
-  lang,
+  id = 'mscaPlaceholder',
+  lang = 'en',
   linkPath,
-  menuProps,
+  menuProps = {
+    onSignOut: () => {},
+    menuList: [
+      {
+        id: 'dashId',
+        showIcon: false,
+        onSignOut: () => {},
+        key: 'dashKey',
+        value: 'My dashboard',
+        path: '/',
+      },
+      {
+        id: 'securityId',
+        showIcon: false,
+        onSignOut: () => {},
+        key: 'securityKey',
+        value: 'Security Settings',
+        path: '/',
+      },
+      {
+        id: 'profileId',
+        showIcon: false,
+        onSignOut: () => {},
+        key: 'profileKey',
+        value: 'Profile',
+        path: '/',
+      },
+      {
+        id: 'signOutId',
+        showIcon: true,
+        onSignOut: () => {},
+        key: 'outKey',
+        value: 'Sign out',
+        path: '/',
+      },
+    ],
+  },
   breadCrumbItems,
-  refPageAA,
-  topnavProps,
+  refPageAA = 'mscaPlaceholder',
+  topnavProps = {
+    skipToMainPath: '#wb-cont',
+    skipToAboutPath: '#wb-info',
+    switchToBasicPath: 'basic-en.html',
+    displayAlternateLink: false,
+  },
   dataGcAnalyticsCustomClickInstitutionVariable,
   dataGcAnalyticsCustomClickMenuVariable,
 }: HeaderProps) => {
@@ -119,37 +160,11 @@ const Header = ({
           dataGcAnalyticsCustomClick={dataGcAnalyticsCustomClickMenuVariable}
         />
         <div className="sch-container">
-          <Breadcrumb items={breadCrumbItems}
-            refPageAA={refPageAA}
-        />
+          <Breadcrumb items={breadCrumbItems} refPageAA={refPageAA} />
         </div>
       </header>
     </div>
   )
 }
 
-Header.defaultProps = {
-  lang: 'en',
-  id: Math.random(),
-  searchProps: {
-    onChange: () => {},
-    onSubmit: () => {},
-  },
-  menuProps: {
-    onSignOut: () => {},
-    menuList: [
-      { key: 'dashKey', value: 'My dashboard', path: '/' },
-      { key: 'securityKey', value: 'Security Settings', path: '/' },
-      { key: 'profileKey', value: 'Profile', path: '/' },
-      { key: 'outKey', value: 'Sign out', path: '/' },
-    ],
-  },
-  topnavProps: {
-    skipToMainPath: '#wb-cont',
-    skipToAboutPath: '#wb-info',
-    switchToBasicPath: 'basic-en.html',
-    displayAlternateLink: false,
-  },
-}
-
 export default Header
diff --git a/components/Heading.tsx b/components/Heading.tsx
index fc03e9b74..d2c43a23a 100644
--- a/components/Heading.tsx
+++ b/components/Heading.tsx
@@ -12,7 +12,7 @@ const Heading = ({
   fromLink,
   fromText,
   className,
-  id,
+  id = 'mscaPlaceholder',
   dataTestId,
 }: HeadingProps) => {
   return (
diff --git a/components/IdleTimeout.tsx b/components/IdleTimeout.tsx
index 200808dcb..bdb0c4ae5 100644
--- a/components/IdleTimeout.tsx
+++ b/components/IdleTimeout.tsx
@@ -20,7 +20,7 @@ const IdleTimeout = ({
   promptBeforeIdle,
   timeout,
   locale,
-  refPageAA,
+  refPageAA = 'mscaPlaceholder',
 }: IdleTimeoutProps) => {
   const router = useRouter()
   const [modalOpen, setModalOpen] = useState(false)
diff --git a/components/InfoMessage.tsx b/components/InfoMessage.tsx
index 505d4d709..15082948c 100644
--- a/components/InfoMessage.tsx
+++ b/components/InfoMessage.tsx
@@ -13,12 +13,12 @@ interface InfoMessageProps {
 
 const InfoMessage = ({
   locale,
-  label,
+  label = 'mscaPlaceholder',
   messageText,
   messageLinkText,
-  messageLinkHref,
+  messageLinkHref = 'mscaPlaceholder',
   icon,
-  refPageAA,
+  refPageAA = 'mscaPlaceholder',
 }: InfoMessageProps) => {
   return (
     <div
diff --git a/components/Language.tsx b/components/Language.tsx
index 2561d056f..fa80f00cb 100644
--- a/components/Language.tsx
+++ b/components/Language.tsx
@@ -13,14 +13,14 @@ interface LanguageProps {
 }
 
 const Language = ({
-  id,
+  id = 'mscaPlaceholder',
   lang,
-  path,
+  path = '/',
   abbr,
   dataTestId,
   dataCy,
   ariaLabel,
-  dataGcAnalyticsCustomClick,
+  dataGcAnalyticsCustomClick = 'mscaPlaceholder',
   text,
 }: LanguageProps) => {
   return (
@@ -28,7 +28,7 @@ const Language = ({
       {abbr ? (
         <Link
           href={path}
-          className="underline uppercase text-deep-blue-dark font-medium font-body leading-[33px] hover:text-blue-hover focus:text-blue-hover focus-visible:text-blue-hover"
+          className="font-body font-medium uppercase leading-[33px] text-deep-blue-dark underline hover:text-blue-hover focus:text-blue-hover focus-visible:text-blue-hover"
           id={id}
           data-testid={dataTestId}
           data-cy={dataCy || id}
@@ -45,7 +45,7 @@ const Language = ({
       ) : (
         <Link
           href={path}
-          className="underline text-deep-blue-dark font-base font-body text-[16px] leading-[33px] hover:text-blue-hover focus:text-blue-hover focus-visible:text-blue-hover"
+          className="font-base font-body text-[16px] leading-[33px] text-deep-blue-dark underline hover:text-blue-hover focus:text-blue-hover focus-visible:text-blue-hover"
           id={id}
           data-testid={dataTestId}
           data-cy={dataCy || id}
@@ -63,9 +63,4 @@ const Language = ({
     </>
   )
 }
-
-Language.defaultProps = {
-  path: '/',
-}
-
 export default Language
diff --git a/components/Layout.js b/components/Layout.js
index 884528104..0a8196253 100644
--- a/components/Layout.js
+++ b/components/Layout.js
@@ -1,18 +1,44 @@
+import throttle from 'lodash.throttle'
+import { signOut } from 'next-auth/react'
+import getConfig from 'next/config'
+import { useRouter } from 'next/router'
 import PropTypes from 'prop-types'
-import { useState, useCallback, useMemo, useEffect } from 'react'
-import Header from './Header'
-import Footer from './Footer'
-import MetaData from './MetaData'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import en from '../locales/en'
 import fr from '../locales/fr'
 import { lato, notoSans } from '../utils/fonts'
-import { useRouter } from 'next/router'
-import throttle from 'lodash.throttle'
+import Footer from './Footer'
+import Header from './Header'
 import IdleTimeout from './IdleTimeout'
-import { signOut } from 'next-auth/react'
-import getConfig from 'next/config'
+import MetaData from './MetaData'
 
-export default function Layout(props) {
+export default function Layout(
+  props = {
+    locale: 'en',
+    meta: '',
+    langToggleLink: '',
+    breadCrumbItems: [],
+    bannerContent: {
+      bannerBoldText: '',
+      bannerText: '',
+      bannerLink: '',
+      bannerLinkHref: '',
+      bannerSummaryTitle: '',
+      bannerSummaryContent: '',
+      bannerButtonText: '',
+      bannerButtonLink: '',
+      icon: '',
+    },
+    popupContentNA,
+    content,
+    popupContent,
+    display: { hideBanner: true },
+    popupStaySignedIn,
+    refPageAA,
+    dataGcAnalyticsCustomClickMenuVariable,
+    title: 'Service.Canada.ca',
+  },
+) {
   const t = props.locale === 'en' ? en : fr
   const [response, setResponse] = useState()
   const router = useRouter()
@@ -174,32 +200,6 @@ export default function Layout(props) {
   )
 }
 
-/**
- * Setup default props
- */
-
-Layout.defaultProps = {
-  title: 'Service.Canada.ca',
-  bannerContent: {
-    bannerBoldText: '',
-    bannerText: '',
-
-    bannerLink: '',
-    bannerLinkHref: '',
-
-    bannerSummaryTitle: '',
-    bannerSummaryContent: '',
-    bannerButtonText: '',
-    bannerButtonLink: '',
-    icon: '',
-  },
-  breadCrumbItems: [],
-  display: { hideBanner: true },
-  langToggleLink: '',
-  locale: 'en',
-  meta: '',
-}
-
 Layout.propTypes = {
   /*
    * Locale current language
diff --git a/components/Menu.tsx b/components/Menu.tsx
index 83b690805..9118fe0a4 100644
--- a/components/Menu.tsx
+++ b/components/Menu.tsx
@@ -16,7 +16,11 @@ interface MenuProps {
   menuList: MenuItem[]
 }
 
-const Menu = ({ lang, dataGcAnalyticsCustomClick, menuList }: MenuProps) => {
+const Menu = ({
+  lang,
+  dataGcAnalyticsCustomClick = 'mscaPlaceholder',
+  menuList,
+}: MenuProps) => {
   const [showDropdown, setShowDropdown] = useState<boolean>(false)
   const dropdown = useRef<HTMLDivElement>(null)
 
@@ -49,7 +53,7 @@ const Menu = ({ lang, dataGcAnalyticsCustomClick, menuList }: MenuProps) => {
   return (
     <div className="w-full bg-blue-primary">
       <nav className="sch-container sch-container-menu items-center justify-between sm:flex sm:h-[60px]">
-        <div className="mx-15px flex h-[60px] items-center font-display text-[19px] font-bold leading-[21px] text-white md:m-0 md:text-2xl ">
+        <div className="mx-15px flex h-[60px] items-center font-display text-[19px] font-bold leading-[21px] text-white md:m-0 md:text-2xl">
           <span id="mainSiteNav">
             {lang === 'fr'
               ? 'Mon dossier Service Canada'
diff --git a/components/MostReqTasks.tsx b/components/MostReqTasks.tsx
index b69a788b8..336217305 100644
--- a/components/MostReqTasks.tsx
+++ b/components/MostReqTasks.tsx
@@ -4,9 +4,7 @@ import { icon } from '../lib/loadIcons'
 
 interface Task {
   title: string
-  areaLabel: string
   link: string
-  icon?: string
   betaPopUp?: boolean
   id: string
 }
@@ -25,10 +23,19 @@ interface MostReqTasksProps {
 }
 
 const MostReqTasks = ({
-  locale,
+  locale = 'en',
   dataCy,
-  taskListMR,
-  refPageAA,
+  taskListMR = {
+    tasks: [
+      {
+        title: 'mscaPlaceholder',
+        link: 'mscaPlaceholderHref',
+        id: Math.random().toString(),
+      },
+    ],
+    title: 'mscaPlaceholder',
+  },
+  refPageAA = 'mscaPlaceholder',
   acronym,
 }: MostReqTasksProps) => {
   const newTabTaskExceptions: string[] = [
@@ -39,7 +46,7 @@ const MostReqTasks = ({
   return (
     <div className="h-full">
       <h3
-        className="pl-3 pt-6 text-xl font-bold text-white sm:pl-8 md:pl-15 "
+        className="pl-3 pt-6 text-xl font-bold text-white sm:pl-8 md:pl-15"
         data-cy={dataCy}
       >
         {taskListMR.title}
@@ -47,8 +54,7 @@ const MostReqTasks = ({
 
       {taskListMR.tasks.length > 3 ? (
         <ul
-          className="grid list-outside list-disc grid-cols-1 px-9 pb-5 pt-2
-                     text-white xs:gap-x-5 sm:auto-cols-fr sm:grid-flow-col sm:grid-cols-2 sm:grid-rows-3 sm:px-14 md:px-[100px] md:pt-4"
+          className="grid list-outside list-disc grid-cols-1 px-9 pb-5 pt-2 text-white xs:gap-x-5 sm:auto-cols-fr sm:grid-flow-col sm:grid-cols-2 sm:grid-rows-3 sm:px-14 md:px-[100px] md:pt-4"
           data-cy="most-req-links"
         >
           {taskListMR.tasks.map((task, index) => {
@@ -80,7 +86,7 @@ const MostReqTasks = ({
                       : undefined
                   }
                   data-gc-analytics-customclick={`${refPageAA} ${acronym} ${taskListMR.title}:${task.id}`}
-                  className=" rounded-sm text-white underline hover:text-gray-50a focus:outline-1 focus:outline-white"
+                  className="rounded-sm text-white underline hover:text-gray-50a focus:outline-1 focus:outline-white"
                 >
                   <span className="static text-xl font-normal">
                     {task.title}
@@ -101,7 +107,7 @@ const MostReqTasks = ({
         </ul>
       ) : (
         <ul
-          className="grid list-outside list-disc grid-cols-1  px-9 pb-5 pt-2 text-white sm:px-14 md:px-[100px] md:pt-4"
+          className="grid list-outside list-disc grid-cols-1 px-9 pb-5 pt-2 text-white sm:px-14 md:px-[100px] md:pt-4"
           data-cy="most-req-links"
         >
           {taskListMR.tasks.map((task, index) => {
@@ -133,7 +139,7 @@ const MostReqTasks = ({
                       : undefined
                   }
                   data-gc-analytics-customclick={`${refPageAA} ${acronym} ${taskListMR.title}:${task.id}`}
-                  className=" rounded-sm text-white underline hover:text-gray-50a focus:outline-1 focus:outline-white"
+                  className="rounded-sm text-white underline hover:text-gray-50a focus:outline-1 focus:outline-white"
                 >
                   <span className="static text-xl font-normal">
                     {task.title}
@@ -157,17 +163,4 @@ const MostReqTasks = ({
   )
 }
 
-MostReqTasks.defaultProps = {
-  locale: 'en',
-  taskListMR: [
-    {
-      tasks: [
-        {
-          icon: 'question-circle', // To ensure a value is used for FontAwesome icons
-        },
-      ],
-    },
-  ],
-}
-
 export default MostReqTasks
diff --git a/components/PageLink.tsx b/components/PageLink.tsx
index 8adfe5bfc..c68987d2b 100644
--- a/components/PageLink.tsx
+++ b/components/PageLink.tsx
@@ -17,36 +17,36 @@ const PageLink = ({
   lookingForText,
   linkText,
   accessText,
-  href,
+  href = 'mscaPlaceholderHref',
   dataCy,
-  buttonHref,
+  buttonHref = 'mscaPlaceholderHref',
   buttonId,
   buttonLinkText,
-  refPageAA,
+  refPageAA = 'mscaPlaceholder',
   dashId,
 }: PageLinkProps) => {
   const linkID = linkText.replace(/\s+/g, '')
 
   return (
-    <div className="pt-2 md:pt-4 my-8 border-t border-gray-light ">
+    <div className="my-8 border-t border-gray-light pt-2 md:pt-4">
       <h2
         data-cy="looking-for"
-        className="font-display font-bold text-gray-darker text-32px md:text-36px pb-2"
+        className="pb-2 font-display text-32px font-bold text-gray-darker md:text-36px"
       >
         {lookingForText}
       </h2>
-      <div className="pb-8  text-xl">
-        <span className=" text-gray-darker">{accessText}</span>
+      <div className="pb-8 text-xl">
+        <span className="text-gray-darker">{accessText}</span>
         <Link
           href={href}
           id={`link-for-${linkID}`}
           data-cy={dataCy}
           data-gc-analytics-customclick={`${refPageAA}:${linkID}`}
-          className="text-deep-blue-dark hover:text-blue-hover underline rounded-sm focus:outline-1 focus:outline-blue-hover visited:text-purple-50a"
+          className="rounded-sm text-deep-blue-dark underline visited:text-purple-50a hover:text-blue-hover focus:outline-1 focus:outline-blue-hover"
         >
           {linkText}
         </Link>
-        <span className=" text-gray-darker">.</span>
+        <span className="text-gray-darker">.</span>
       </div>
 
       <BackToButton
diff --git a/components/ProfileTasks.tsx b/components/ProfileTasks.tsx
index a7c86224e..b10c79983 100644
--- a/components/ProfileTasks.tsx
+++ b/components/ProfileTasks.tsx
@@ -4,7 +4,6 @@ interface Task {
   title: string
   areaLabel: string
   link: string
-  icon?: string
   betaPopUp?: boolean
   id: string
 }
@@ -20,8 +19,16 @@ interface ProfileTasksProps {
 const ProfileTasks = ({
   dataCy,
   programTitle,
-  tasks,
-  refPageAA,
+  tasks = [
+    {
+      id: 'mscaPlaceholder',
+      title: 'mscaPlaceholder',
+      areaLabel: 'mscaPlaceholder',
+      link: 'mscaPlaceholder',
+      betaPopUp: true,
+    },
+  ],
+  refPageAA = 'mscaPlaceholder',
   acronym,
 }: ProfileTasksProps) => {
   return (
@@ -63,17 +70,4 @@ const ProfileTasks = ({
   )
 }
 
-ProfileTasks.defaultProps = {
-  tasks: [
-    {
-      id: '',
-      icon: 'question-circle', // To ensure a value is used for FontAwesome icons,
-      title: '',
-      areaLabel: '',
-      link: '',
-      betaPopUp: true,
-    },
-  ],
-}
-
 export default ProfileTasks
diff --git a/components/TopNav.tsx b/components/TopNav.tsx
index a70798d42..50caa17a9 100644
--- a/components/TopNav.tsx
+++ b/components/TopNav.tsx
@@ -7,20 +7,20 @@ interface TopNavProps {
 }
 
 export const TopNav = ({
-  lang,
-  skipToMainPath,
-  skipToAboutPath,
-  switchToBasicPath,
-  displayAlternateLink,
+  lang = 'en',
+  skipToMainPath = '/',
+  skipToAboutPath = '/',
+  switchToBasicPath = 'mscaPlaceholderHref',
+  displayAlternateLink = false,
 }: TopNavProps) => {
   return (
     <>
       {/* Top navigation accessible only when using a keyboard to navigate the page */}
       <nav role="navigation" aria-label="topNavigation">
         <ul id="TopNavLinks" className="z-10">
-          <li className="left-0 top-2 absolute text-center box-border w-full -z-50 focus-within:z-50 ">
+          <li className="absolute left-0 top-2 -z-50 box-border w-full text-center focus-within:z-50">
             <a
-              className="focus:bg-blue-primary font-bold p-1 text-white"
+              className="p-1 font-bold text-white focus:bg-blue-primary"
               href={skipToMainPath}
             >
               {lang === 'fr'
@@ -28,9 +28,9 @@ export const TopNav = ({
                 : 'Skip to main content'}
             </a>
           </li>
-          <li className="left-0 top-2 absolute text-center box-border w-full -z-50 focus-within:z-50 ">
+          <li className="absolute left-0 top-2 -z-50 box-border w-full text-center focus-within:z-50">
             <a
-              className="focus:bg-blue-primary font-bold p-1 text-white"
+              className="p-1 font-bold text-white focus:bg-blue-primary"
               href={skipToAboutPath}
             >
               {lang === 'fr'
@@ -40,9 +40,9 @@ export const TopNav = ({
           </li>
 
           {displayAlternateLink ? (
-            <li className="left-0 top-2 absolute text-center box-border w-full -z-50 focus-within:z-50 ">
+            <li className="absolute left-0 top-2 -z-50 box-border w-full text-center focus-within:z-50">
               <a
-                className="focus:bg-blue-primary font-bold p-1 text-white"
+                className="p-1 font-bold text-white focus:bg-blue-primary"
                 href={switchToBasicPath}
                 rel="alternate"
               >
@@ -59,11 +59,3 @@ export const TopNav = ({
     </>
   )
 }
-
-TopNav.defaultProps = {
-  lang: 'en',
-  displayAlternateLink: false,
-  skipToMainPath: '/',
-  skipToAboutPath: '/',
-  switchToBasicPath: '/',
-}
diff --git a/components/ViewMoreLessButton.tsx b/components/ViewMoreLessButton.tsx
index aae67f7ab..1496ea988 100644
--- a/components/ViewMoreLessButton.tsx
+++ b/components/ViewMoreLessButton.tsx
@@ -22,14 +22,14 @@ const ViewMoreLessButton = ({
   caption,
   icon,
   onClick,
-  id,
+  id = 'mscaPlaceholder',
   dataTestid,
   ariaExpanded,
   className,
   dataCy,
-  ariaLabel,
-  refPageAA,
-  acronym,
+  ariaLabel = 'mscaPlaceholder',
+  refPageAA = 'mscaPlaceholder',
+  acronym = 'mscaPlaceholder',
 }: ViewMoreLessButtonProps) => {
   return (
     <button
diff --git a/components/contact/ContactProvince.tsx b/components/contact/ContactProvince.tsx
index a39d66dac..6f904019c 100644
--- a/components/contact/ContactProvince.tsx
+++ b/components/contact/ContactProvince.tsx
@@ -14,15 +14,15 @@ export interface ContactProvinceProps {
 export const ContactProvince = ({
   title,
   intro,
-  id,
+  id = 'mscaPlaceholder',
   details,
 }: ContactProvinceProps) => {
   return (
     <div className="max-w-4xl pb-2 md:pb-4" id={id}>
-      <h2 className="py-4 md:py-6 text-4xl text-gray-darker font-display font-bold">
+      <h2 className="py-4 font-display text-4xl font-bold text-gray-darker md:py-6">
         {title}
       </h2>
-      <div className="[&_ul]:list-inside [&_ul]:ml-4 [&_ul]:list-disc pb-4 text-xl text-gray-darker">
+      <div className="pb-4 text-xl text-gray-darker [&_ul]:ml-4 [&_ul]:list-inside [&_ul]:list-disc">
         <Markdown>{intro}</Markdown>
       </div>
       {/* Ensure provinces are sorted alphabetically regardless of language */}
diff --git a/components/contact/ContactProvinceRow.tsx b/components/contact/ContactProvinceRow.tsx
index b6180de98..3bda1c964 100644
--- a/components/contact/ContactProvinceRow.tsx
+++ b/components/contact/ContactProvinceRow.tsx
@@ -26,7 +26,7 @@ const ap = (addressContent: string | undefined, append: string): string => {
 export const ContactProvinceRow = ({
   title,
   items,
-  id,
+  id = 'mscaPlaceholder',
 }: ContactProvinceRowProps) => {
   return (
     items.length > 0 && (
diff --git a/components/contact/ContactSection.tsx b/components/contact/ContactSection.tsx
index 07368ee6d..dae423639 100644
--- a/components/contact/ContactSection.tsx
+++ b/components/contact/ContactSection.tsx
@@ -30,7 +30,7 @@ export const ContactSection = ({
   lang,
   title,
   intro,
-  id,
+  id = 'mscaPlaceholder',
   details,
 }: ContactSectionProps) => {
   return (
@@ -49,7 +49,7 @@ export const ContactSection = ({
       >
         <Markdown>{intro}</Markdown>
       </div>
-      <dl className=" divide-y-2 border-y-2 " data-cy="section2">
+      <dl className="divide-y-2 border-y-2" data-cy="section2">
         {details.map((sectionDetail) => {
           const button =
             sectionDetail.items[0]?.button &&
diff --git a/components/contact/ContactSectionRow.tsx b/components/contact/ContactSectionRow.tsx
index 4b674e02b..350e0c7ac 100644
--- a/components/contact/ContactSectionRow.tsx
+++ b/components/contact/ContactSectionRow.tsx
@@ -30,8 +30,8 @@ export const ContactSectionRow = ({
   button,
   buttonId,
   items,
-  refPageAA,
-  id,
+  refPageAA = 'mscaPlaceholder',
+  id = 'mscaPlaceholder',
 }: ContactSectionRowProps) => {
   const locale = lang === 'fr' ? 'fr' : 'en'
   const newTabTaskExceptions = [
@@ -54,7 +54,7 @@ export const ContactSectionRow = ({
         {title}
       </dt>
       <dd
-        className={`prose max-w-none prose-p:my-0 prose-p:font-body prose-p:text-xl md:col-span-8  ${
+        className={`prose max-w-none prose-p:my-0 prose-p:font-body prose-p:text-xl md:col-span-8 ${
           highlight && 'bg-blue-100 py-2'
         }`}
       >

From 6bd269bad14d28324b34d7dcd75256648cfa4bdf Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Thu, 7 Nov 2024 17:54:54 -0700
Subject: [PATCH 24/26] Fix alerts not appearing

---
 __tests__/components/Card.test.js |  2 ++
 components/Card.tsx               | 39 ++++++++++++++-----------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/__tests__/components/Card.test.js b/__tests__/components/Card.test.js
index 58a922488..a1e654808 100644
--- a/__tests__/components/Card.test.js
+++ b/__tests__/components/Card.test.js
@@ -33,4 +33,6 @@ describe('Card', () => {
     const results = await axe(container)
     expect(results).toHaveNoViolations()
   })
+
+  // TODO: Add a test that if an alert is added it actually appears
 })
diff --git a/components/Card.tsx b/components/Card.tsx
index 2a4130251..883262e2b 100644
--- a/components/Card.tsx
+++ b/components/Card.tsx
@@ -35,7 +35,6 @@ const Card = ({
       alert_icon_id: '',
     },
   ],
-  hasAlert,
   locale,
   cardTitle,
   viewMoreLessCaption,
@@ -111,27 +110,23 @@ const Card = ({
       />
       {!isOpen ? null : (
         <div>
-          {hasAlert &&
-            cardAlert.map((alert, index) => {
-              const alertType = alert.type[0].split('/').pop()
-              return (
-                <ul
-                  className="w-full pb-3 sm:px-8 sm:pb-6 md:px-15"
-                  key={index}
-                >
-                  <ContextualAlert
-                    id={alert.id}
-                    type={alertType}
-                    alertHeading={alert.alertHeading}
-                    alertBody={alert.alertBody}
-                    alert_icon_alt_text={`${alertType} ${
-                      locale === 'fr' ? 'Icônes' : 'icon'
-                    }`}
-                    alert_icon_id={` alert-icon ${alert.id}`}
-                  />
-                </ul>
-              )
-            })}
+          {cardAlert.map((alert, index) => {
+            const alertType = alert.type[0].split('/').pop()
+            return (
+              <ul className="w-full pb-3 sm:px-8 sm:pb-6 md:px-15" key={index}>
+                <ContextualAlert
+                  id={alert.id}
+                  type={alertType}
+                  alertHeading={alert.alertHeading}
+                  alertBody={alert.alertBody}
+                  alert_icon_alt_text={`${alertType} ${
+                    locale === 'fr' ? 'Icônes' : 'icon'
+                  }`}
+                  alert_icon_id={` alert-icon ${alert.id}`}
+                />
+              </ul>
+            )
+          })}
           <div className="pb-6" data-cy="sectionList">
             {children}
           </div>

From e75f40f351b0e3b92a5e8e9a8062974d03321444 Mon Sep 17 00:00:00 2001
From: Charles-Pham <charles.pham@hrsdc-rhdcc.gc.ca>
Date: Tue, 19 Nov 2024 11:42:31 -0700
Subject: [PATCH 25/26] Add cdcp to contact us (#752)

* Add cdcp to contact us

* Make CDCP first and open in a new tab
---
 cypress/e2e/ContactUs.cy.js   |  2 +-
 graphql/mappers/contact-us.ts | 21 +++++++++++++++++++++
 pages/contact-us/index.tsx    |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/ContactUs.cy.js b/cypress/e2e/ContactUs.cy.js
index 99a24f627..53099e4a7 100644
--- a/cypress/e2e/ContactUs.cy.js
+++ b/cypress/e2e/ContactUs.cy.js
@@ -27,7 +27,7 @@ describe('Validate Contact Us Landing page', () => {
     cy.get('[data-cy = "contact-task-list"]')
     .find('a')
     .should('be.visible')
-    .and('have.length', '4')
+    .and('have.length', '5')
     .and('not.have.length', 0)
     .and('not.have.attr', 'href', '#undefined')
   })
diff --git a/graphql/mappers/contact-us.ts b/graphql/mappers/contact-us.ts
index ea85c51a4..e1aa068a2 100644
--- a/graphql/mappers/contact-us.ts
+++ b/graphql/mappers/contact-us.ts
@@ -99,6 +99,7 @@ export async function getContactUsContent() {
   const oasContactFragment = findFragmentByScId(response, 'oas-contact-us')
   const cppContactFragment = findFragmentByScId(response, 'cpp-contact-us')
   const sinContactFragment = findFragmentByScId(response, 'sin-contact-us')
+  const cdcpContactFragment = findFragmentByScId(response, 'cdcp-contact-us')
 
   const mappedSecurity = {
     en: {
@@ -115,6 +116,16 @@ export async function getContactUsContent() {
       heading: response?.data.schPageV1ByPath.item.scTitleEn,
       subHeading: introFragment?.scContentEn?.json[0].content[0].value,
       links: [
+        {
+          linkId: cdcpContactFragment?.scId,
+          linkTitle: cdcpContactFragment?.scLinkTextEn,
+          linkAssistiveTitle: cdcpContactFragment?.scLinkTextAssistiveEn,
+          linkDestination: cdcpContactFragment?.scDestinationURLEn,
+          linkDescription: cdcpContactFragment?.scDescriptionEn?.json
+            ? cdcpContactFragment.scDescriptionEn.json[0].content[0].value
+            : '',
+          schBetaPopup: cdcpContactFragment?.schBetaPopUp,
+        },
         {
           linkId: eiContactFragment?.scId,
           linkTitle: eiContactFragment?.scLinkTextEn,
@@ -171,6 +182,16 @@ export async function getContactUsContent() {
       heading: response?.data.schPageV1ByPath.item.scTitleFr,
       subHeading: introFragment?.scContentFr?.json[0].content[0].value,
       links: [
+        {
+          linkId: cdcpContactFragment?.scId,
+          linkTitle: cdcpContactFragment?.scLinkTextFr,
+          linkAssistiveTitle: cdcpContactFragment?.scLinkTextAssistiveFr,
+          linkDestination: cdcpContactFragment?.scDestinationURLFr,
+          linkDescription: cdcpContactFragment?.scDescriptionFr?.json
+            ? cdcpContactFragment.scDescriptionFr.json[0].content[0].value
+            : '',
+          schBetaPopup: cdcpContactFragment?.schBetaPopUp,
+        },
         {
           linkId: eiContactFragment?.scId,
           linkTitle: eiContactFragment?.scLinkTextFr,
diff --git a/pages/contact-us/index.tsx b/pages/contact-us/index.tsx
index 1851ee39b..44810efed 100644
--- a/pages/contact-us/index.tsx
+++ b/pages/contact-us/index.tsx
@@ -47,6 +47,8 @@ const ContactLanding = (props: ContactLandingProps) => {
   const newTabExceptions: string[] = [
     'https://www.canada.ca/en/employment-social-development/corporate/contact/sin.html',
     'https://www.canada.ca/fr/emploi-developpement-social/ministere/coordonnees/nas.html',
+    'https://www.canada.ca/en/services/benefits/dental/dental-care-plan/contact.html',
+    'https://www.canada.ca/fr/services/prestations/dentaire/regime-soins-dentaires/contactez.html',
   ]
 
   return (

From ba6cd1b6190f6e4a5731f8ec1d72de10c87bd524 Mon Sep 17 00:00:00 2001
From: abalogh-esdc <adam.balogh@hrsdc-rhdcc.gc.ca>
Date: Wed, 20 Nov 2024 11:39:11 -0500
Subject: [PATCH 26/26] Change the CAL link to open in the same tab (#753)

* Change CAL link to open in same tab.

* Set other CAL link to open in same tab
---
 components/MostReqTasks.tsx              | 2 --
 components/contact/ContactSectionRow.tsx | 2 --
 2 files changed, 4 deletions(-)

diff --git a/components/MostReqTasks.tsx b/components/MostReqTasks.tsx
index 336217305..11096f6fe 100644
--- a/components/MostReqTasks.tsx
+++ b/components/MostReqTasks.tsx
@@ -39,8 +39,6 @@ const MostReqTasks = ({
   acronym,
 }: MostReqTasksProps) => {
   const newTabTaskExceptions: string[] = [
-    'https://protege-secure.pca-cal.ca/en/Account/Authorize',
-    'https://protege-secure.pca-cal.ca/fr/Compte/Autoriser',
   ]
 
   return (
diff --git a/components/contact/ContactSectionRow.tsx b/components/contact/ContactSectionRow.tsx
index 350e0c7ac..92db2ca03 100644
--- a/components/contact/ContactSectionRow.tsx
+++ b/components/contact/ContactSectionRow.tsx
@@ -41,8 +41,6 @@ export const ContactSectionRow = ({
     'https://eservices.canada.ca/fr/service/',
     'https://ep-be.alpha.service.canada.ca/en',
     'https://ep-be.alpha.service.canada.ca/fr',
-    'https://protege-secure.pca-cal.ca/en/Account/Authorize',
-    'https://protege-secure.pca-cal.ca/fr/Compte/Autoriser',
   ]
   return (
     <div className={`grid grid-cols-1 py-2 md:grid-cols-12 ${''}`}>