Merge pull request #875 from GSA/mmeyer/replace-xlink-href

bump dependencies and update depreciaated svg use xlink:href to use href
GSA · Jan 2, 2025 · b2a9a9a · b2a9a9a
2 parents ecd89c3 + dda3236
commit b2a9a9a
Show file tree

Hide file tree

Showing 7 changed files with 216 additions and 201 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "@astrojs/check": "^0.9.3",
     "@astrojs/mdx": "^3.1.9",
     "@astrojs/sitemap": "^3.2.1",
-    "@uswds/uswds": "3.10.0",
+    "@uswds/uswds": "3.11.0",
     "astro": "^4.16.18",
     "dayjs": "^1.11.13",
     "typescript": "^5.7.2",
@@ -32,11 +32,11 @@
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.17.0",
     "@typescript-eslint/eslint-plugin": "^8.17.0",
-    "@typescript-eslint/parser": "^8.18.0",
-    "@uswds/compile": "^1.2.0",
+    "@typescript-eslint/parser": "^8.18.2",
+    "@uswds/compile": "^1.2.1",
     "eslint": "^9.17.0",
     "eslint-plugin-astro": "^1.3.1",
-    "globals": "^15.13.0",
+    "globals": "^15.14.0",
     "gulp": "^5.0.0",
     "linkinator": "^6.1.2",
     "pa11y-ci": "^3.0.1",

diff --git a/src/components/ArrowListItem.astro b/src/components/ArrowListItem.astro
@@ -9,7 +9,7 @@
 <li class="usa-icon-list__item">
     <div class="usa-icon-list__icon">
       <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-        <use xlink:href=`${import.meta.env.BASE_URL}images/sprite.svg#${icon}`></use>
+        <use href=`${import.meta.env.BASE_URL}images/sprite.svg#${icon}`></use>
       </svg>
     </div>
     <div class="usa-icon-list__content">

diff --git a/src/components/CheckListItem.astro b/src/components/CheckListItem.astro
@@ -9,7 +9,7 @@
 <li class="usa-icon-list__item">
     <div class={`usa-icon-list__icon  ${color}`}>
       <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-        <use xlink:href=`${import.meta.env.BASE_URL}images/sprite.svg#${icon}`></use>
+        <use href=`${import.meta.env.BASE_URL}images/sprite.svg#${icon}`></use>
       </svg>
     </div>
     <div class="usa-icon-list__content">

diff --git a/src/components/GSAHeader.astro b/src/components/GSAHeader.astro
@@ -53,13 +53,13 @@ show_site_link = show_site_link==='true';
             <a href="https://www.linkedin.com/company/gsa-professional-services" class="text-middle" style="font-size:1.125em">
               <svg class="usa-icon" aria-hidden="false" focusable="true" role="img">
                 <title id="linkedin-title">OASIS Plus LinkedIn account</title>
-                <use xlink:href=`${import.meta.env.BASE_URL}images/sprite.svg#linkedin`></use>
+                <use href=`${import.meta.env.BASE_URL}images/sprite.svg#linkedin`></use>
               </svg>
             </a>
             <a href="https://twitter.com/GSAProfServices" class="text-middle" style="display:inline; vertical-align:bottom; font-size:1.125em">
               <svg class="usa-icon" aria-hidden="false" focusable="true" role="img">
                 <title id="twitter-title">OASIS Plus Twitter account</title>
-                <use xlink:href=`${import.meta.env.BASE_URL}images/sprite.svg#twitter`></use>
+                <use href=`${import.meta.env.BASE_URL}images/sprite.svg#twitter`></use>
               </svg>
             </a>
           </li>

diff --git a/src/components/OasisHelpFooter.astro b/src/components/OasisHelpFooter.astro
@@ -5,7 +5,7 @@
         >  
             <h3>
             <svg class="usa-icon text-primary" aria-hidden="true" role="img">
-                <use xlink:href=`${import.meta.env.BASE_URL}images/sprite.svg#help_outline`></use>
+                <use href=`${import.meta.env.BASE_URL}images/sprite.svg#help_outline`></use>
             </svg>
             Need help with OASIS+?</h3>
             We're here to answer your questions.

diff --git a/src/pages/buyers-guide/printable.astro b/src/pages/buyers-guide/printable.astro
@@ -69,7 +69,7 @@ const toc_buyers_other_pages = buyers_entries.filter(h =>!h.slug.startsWith('res
         <button id="print_button" class="usa-button usa-button--outline" onclick="window.print()">
             <span class="display-block" aria-hidden="true">
               <svg class="usa-icon text-primary text-middle" aria-hidden="true" role="img">
-                <use xlink:href=`${import.meta.env.BASE_URL}images/sprite.svg#print`></use>
+                <use href=`${import.meta.env.BASE_URL}images/sprite.svg#print`></use>
               </svg> Print
             </span>
           </button>