Merge pull request #66 from thefrontside/fix-base-redirects

Fix bug in base redirects

www/import_map.json

@@ -1,9 +1,9 @@
 {
   "imports": {
     "$fresh/": "https://deno.land/x/[email protected]/",
-    "preact": "https://esm.sh/preact@10.11.0",
-    "preact/": "https://esm.sh/preact@10.11.0/",
-    "preact-render-to-string": "https://esm.sh/*[email protected]",
+    "preact": "npm:preact@10.18.2",
+    "preact/": "npm:/preact@10.18.2/",
+    "preact-render-to-string": "npm:[email protected]",
     "@preact/signals": "https://esm.sh/*@preact/[email protected]",
     "@preact/signals-core": "https://esm.sh/*@preact/[email protected]",
     "twind": "https://esm.sh/[email protected]",

www/routes/docs/[...slug].tsx

@@ -46,7 +46,11 @@ export const handler: Handlers<Data> = {
     const fileContent = await Deno.readTextFile(url);
     const { body, attrs } = frontMatter<Record<string, unknown>>(fileContent);
     const page = { ...entry, markdown: body, data: attrs ?? {} };
-    const resp = ctx.render({ page, base: req.headers.get("x-base") });
+    let base = req.headers.get("x-base-url") ?? "/";
+    if (!base.endsWith("/")) {
+      base = base + "/"
+    }
+    const resp = ctx.render({ page, base });
     return resp;
   },
 };

www/routes/index.tsx

@@ -1,8 +1,12 @@
+import { join } from "https://deno.land/[email protected]/path/join.ts";
 import { Handlers } from "$fresh/server.ts";
 
 export const handler: Handlers = {
   GET(req) {
-    let base = req.headers.get("x-base") ?? req.url;
-    return Response.redirect(new URL("./docs/introduction", base));
+    let base = req.headers.get("x-base-url") ?? req.url;
+    let url = new URL(base);
+    url.pathname = join(url.pathname, "docs/introduction");
+    let response =  Response.redirect(url);
+    return response;
   },
 };

www/test/www.test.ts

@@ -50,7 +50,7 @@ describe("www", () => {
   it("sets a base element if the X-Base header is present", async () => {
     let response = await fetch("http://localhost:9999/docs/introduction", {
       headers: {
-        "X-Base": "http://example.com/path/to/subdir/",
+        "X-Base-Url": "http://example.com/path/to/subdir/",
       },
     });
     let html = await response.text();