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

add test for exporting with custom basepath

Browse Source
This commit is contained in:
Rich Harris
2018-08-06 22:35:02 -04:00
parent 75f5b5c721
commit 84a58f34a0
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/export.ts
View File

@@ -51,9 +51,10 @@ async function execute(emitter: EventEmitter, {
const port = await ports.find(3000);
const origin = `http://localhost:${port}`;
const root = new URL(basepath || '', origin);
emitter.emit('info', {
message: `Crawling ${origin}`
message: `Crawling ${root.href}`
});
const proc = child_process.fork(path.resolve(`${build}/server.js`), [], {
@@ -71,7 +72,8 @@ async function execute(emitter: EventEmitter, {
const deferreds = new Map();
function get_deferred(pathname: string) {
pathname = pathname.replace(`/${basepath}`, '')
pathname = pathname.replace(root.pathname, '');
if (!deferreds.has(pathname)) {
deferreds.set(pathname, new Deferred());
}
@@ -108,7 +110,7 @@ async function execute(emitter: EventEmitter, {
});
async function handle(url: URL) {
const pathname = url.pathname || '/';
const pathname = (url.pathname.replace(root.pathname, '') || '/');
if (seen.has(pathname)) return;
seen.add(pathname);
@@ -141,11 +143,7 @@ async function execute(emitter: EventEmitter, {
return ports.wait(port)
.then(() => {
// TODO all static routes
if (basepath) {
return handle(new URL(`/${basepath}/`, origin));
} else {
return handle(new URL('/', origin));
}
return handle(root);
})
.then(() => proc.kill());
}