handle redirect from slashed URL

utelecon · Nov 11, 2024 · 0e61800 · 0e61800
1 parent 2e5a536
commit 0e61800
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 45 deletions.
diff --git a/src/lib/RedirectIntegration.ts b/src/lib/RedirectIntegration.ts
@@ -1,8 +1,8 @@
 import type { AstroIntegration } from "astro";
-import fs from "fs/promises";
+import fs from "node:fs/promises";
 import matter from "gray-matter";
-import { extname, join, relative } from "path";
-import { fileURLToPath } from "url";
+import { extname, join, relative } from "node:path";
+import { fileURLToPath } from "node:url";
 import { glob } from "glob";
 import { VFile } from "vfile";
 
@@ -14,22 +14,25 @@ export default function redirect(): AstroIntegration {
     hooks: {
       "astro:config:setup": async ({ updateConfig, config }) => {
         const pages = join(fileURLToPath(config.srcDir), "pages");
-        const paths = await glob("**/*", { cwd: pages, nodir: true, absolute: true });
+        const paths = await glob("**/*", {
+          cwd: pages,
+          nodir: true,
+          absolute: true,
+        });
         const files = (
           await Promise.all(
             paths.map(async (path) => {
               if (!source.includes(extname(path))) return null;
               return readFile(path);
-            })
-          )).filter((file) => file !== null);
+            }),
+          )
+        ).filter((file) => file !== null);
         const redirects = files.flatMap((file) => {
           const { redirect_to, redirect_from } = file.data;
-          const here =
-            "/" +
-            relative(pages, file.path).replace(
-              /(?:index)?\.(?:md|mdx|markdown|astro)$/,
-              ""
-            );
+          const here = `/${relative(pages, file.path).replace(
+            /(?:index)?\.(?:md|mdx|markdown|astro)$/,
+            "",
+          )}`;
           if (typeof redirect_to === "string") {
             return { from: here, to: redirect_to };
           }
@@ -46,7 +49,10 @@ export default function redirect(): AstroIntegration {
         });
         updateConfig({
           redirects: Object.fromEntries(
-            redirects.map(({ from, to }) => [from, to])
+            redirects.map(({ from, to }) => [
+              from.replace(/\/$/, "/index"),
+              to,
+            ]),
           ),
         });
       },
@@ -59,23 +65,3 @@ async function readFile(path: string) {
   const { data } = matter(value);
   return new VFile({ path, value, data });
 }
-
-function html(to: string) {
-  return `\
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="refresh" content="0; url=${to}" />
-    <link rel="canonical" href="${to}" />
-  </head>
-  <body>
-    <h1>Redirecting...</h1>
-    <p>
-      If you are not redirected automatically, follow this
-      <a href="${to}">link</a>.
-    </p>
-  </body>
-</html>
-`;
-}
diff --git a/src/lib/util.ts b/src/lib/util.ts
@@ -1,17 +1,18 @@
 import { fileURLToPath } from "node:url";
-import { join } from "node:path";
-import { parse as parsePath } from "path";
+import { join, parse as parsePath } from "node:path";
 
 export function getDistFilePath(dir: URL, pathname: string, component: string) {
   const base = fileURLToPath(dir);
-  
+
   if (pathname === "/404") {
     return join(base, "404.html");
   }
 
-  if (parsePath(component).name === "index") {
+  const { name, ext } = parsePath(component);
+
+  if (name === "index" && ext && pathname !== component) {
     return join(base, pathname, "index.html");
   }
 
-  return join(base, pathname + ".html");
-}
+  return join(base, `${pathname}.html`);
+}
diff --git a/src/pages/articles/cosense/index.md b/src/pages/articles/cosense/index.md
@@ -1,5 +1,7 @@
 ---
 title: Cosenseの基本的な使い方
+redirect_from:
+  - /articles/scrapbox/
 ---
 
 ## この記事のハイライト

diff --git a/src/pages/articles/scrapbox.md b/src/pages/articles/scrapbox.md
diff --git a/src/pages/en/articles/cosense/index.md b/src/pages/en/articles/cosense/index.md
@@ -1,5 +1,7 @@
 ---
 title: Basic Use of Cosense
+redirect_from:
+  - /en/articles/scrapbox/
 ---
 
 ## Highlights of This Article

diff --git a/src/pages/en/articles/scrapbox.md b/src/pages/en/articles/scrapbox.md