totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-22 07:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #342 from aubergene/gh-338

Browse Source 
Remove basepath from deferred urls and add trailing slash to root
This commit is contained in:
Rich Harris
2018-08-06 22:06:09 -04:00
committed by GitHub
parent 1627a5767a a176a3b79b
commit 75f5b5c721
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/export.ts
View File

@@ -71,8 +71,9 @@ async function execute(emitter: EventEmitter, {
const deferreds = new Map(); const deferreds = new Map();
function get_deferred(pathname: string) { function get_deferred(pathname: string) {
pathname = pathname.replace(`/${basepath}`, '')
if (!deferreds.has(pathname)) { if (!deferreds.has(pathname)) {
deferreds.set(pathname, new Deferred()) ; deferreds.set(pathname, new Deferred());
} }
return deferreds.get(pathname); return deferreds.get(pathname);
@@ -138,6 +139,13 @@ async function execute(emitter: EventEmitter, {
} }
return ports.wait(port) 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()); .then(() => proc.kill());
} }