Fixes some issues (#43)

- normalise base for when it is not set
mxdvl · Jul 11, 2023 · 4c168ee · 4c168ee
2 parents e120fb9 + 49e8275
commit 4c168ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/deno.lock b/deno.lock
diff --git a/src/esbuild_plugins/svelte_components.ts b/src/esbuild_plugins/svelte_components.ts
@@ -5,8 +5,8 @@ import {
 } from "https://deno.land/[email protected]/path/mod.ts";
 import type { Plugin } from "https://deno.land/x/[email protected]/mod.js";
 import { normalize } from "https://deno.land/[email protected]/path/mod.ts";
-import { compile } from "npm:svelte/compiler";
-import type { ComponentType } from "npm:svelte";
+import { compile } from "npm:svelte@3.58/compiler";
+import type { ComponentType } from "npm:svelte@3.58";
 
 const filter = /\.svelte$/;
 const name = "mononykus/svelte";

diff --git a/src/server.ts b/src/server.ts
@@ -12,8 +12,13 @@ export const create_handler = (
 ): Handler => ((req) => {
 	const url = new URL(req.url);
 
-	if (url.pathname.startsWith(normalise("/" + base))) {
-		return serveDir(req, { fsRoot: out_dir, urlRoot: base });
+	const normalised_base = normalise("/" + base);
+
+	if (url.pathname.startsWith(normalised_base)) {
+		return serveDir(req, {
+			fsRoot: out_dir,
+			urlRoot: normalised_base.slice(1),
+		});
 	} else {
 		return Response.redirect(
 			new URL(normalise(base + url.pathname), url.origin),