Merge pull request #298 from sveltejs/gh-296

fix req.baseUrl synthesis
sveltejs · Jun 27, 2018 · b9a1201 · b9a1201
2 parents 31110a5 + 087356f
commit b9a1201
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -61,8 +61,13 @@ export default function middleware({ App, routes, store }: {
 	const middleware = compose_handlers([
 		(req: Req, res: ServerResponse, next: () => void) => {
 			if (req.baseUrl === undefined) {
-				req.baseUrl = req.originalUrl
-					? req.originalUrl.slice(0, -req.url.length)
+				let { originalUrl } = req;
+				if (req.url === '/' && originalUrl[originalUrl.length - 1] !== '/') {
+					originalUrl += '/';
+				}
+
+				req.baseUrl = originalUrl
+					? originalUrl.slice(0, -req.url.length)
 					: '';
 			}