From a176a3b79b94b4b8fac637c57df4fb6183815c15 Mon Sep 17 00:00:00 2001
From: Julian Burgess <jburgess29@bloomberg.net>
Date: Mon, 6 Aug 2018 16:43:02 +0100
Subject: [PATCH] Remove basepath from deferred urls and add trailing slash to
 root request

---
 src/api/export.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/api/export.ts b/src/api/export.ts
index 2b546d5..d114f6d 100644
--- a/src/api/export.ts
+++ b/src/api/export.ts
@@ -71,8 +71,9 @@ async function execute(emitter: EventEmitter, {
 	const deferreds = new Map();
 
 	function get_deferred(pathname: string) {
+		pathname = pathname.replace(`/${basepath}`, '')
 		if (!deferreds.has(pathname)) {
-			deferreds.set(pathname, new Deferred())	;
+			deferreds.set(pathname, new Deferred());
 		}
 
 		return deferreds.get(pathname);
@@ -138,6 +139,13 @@ async function execute(emitter: EventEmitter, {
 	}
 
 	return ports.wait(port)
-		.then(() => handle(new URL(`/${basepath}`, origin))) // TODO all static routes
+		.then(() => {
+			// TODO all static routes
+			if (basepath) {
+				return handle(new URL(`/${basepath}/`, origin));
+			} else {
+				return handle(new URL('/', origin));
+			}
+		})
 		.then(() => proc.kill());
 }