update(astro): to v4.9

erkobridee · May 24, 2024 · 965109a · 965109a
1 parent 39dfe06
commit 965109a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -23,7 +23,8 @@
         "dbaeumer.vscode-eslint",
         "astro-build.astro-vscode",
         "bradlc.vscode-tailwindcss",
-        "unifiedjs.vscode-mdx"
+        "unifiedjs.vscode-mdx",
+        "meganrogge.template-string-converter"
       ],
       "settings": {
         "files.autoSave": "onFocusChange",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,12 +22,12 @@
   },
   "devDependencies": {
     "@astrojs/check": "0.7.0",
-    "@astrojs/mdx": "3.0.0",
+    "@astrojs/mdx": "3.0.1",
     "@astrojs/tailwind": "5.1.0",
     "@types/canvas-confetti": "1.6.4",
     "@typescript-eslint/eslint-plugin": "7.9.0",
     "@typescript-eslint/parser": "7.9.0",
-    "astro": "4.8.6",
+    "astro": "4.9.1",
     "autoprefixer": "10.4.19",
     "cross-env": "^7.0.3",
     "eslint": "8.57.0",

diff --git a/src/components/Link.astro b/src/components/Link.astro
@@ -27,11 +27,20 @@ let extraLinkProps: HTMLAttributes<'a'> = {
 if (!external) {
   const baseUrl = `${import.meta.env.BASE_URL}`;
 
+  let newHref = baseUrl;
+
+  const hrefStartWithSlash = href.startsWith('/');
+
+  if (baseUrl === '/') {
+    newHref = hrefStartWithSlash ? href : `/${href}`;
+  } else {
+    const baseUrlEndWithSlash = baseUrl.endsWith('/');
+
+    newHref = `${baseUrl}${!baseUrlEndWithSlash && !hrefStartWithSlash ? `/` : ''}${href}`;
+  }
+
   extraLinkProps = {
-    href:
-      href === '/'
-        ? `${baseUrl}`
-        : `${baseUrl}${!href.startsWith('/') ? '/' : ''}${href}`,
+    href: newHref,
     rel: 'prefetch'
   };
 }