Skip to content

Commit

Permalink
Preparatory Refactoring: Load all pages before starting the rendering
Browse files Browse the repository at this point in the history
  • Loading branch information
moonglum committed Nov 19, 2018
1 parent 943282a commit 0312094
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
1 change: 0 additions & 1 deletion lib/page_renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module.exports = class PageRenderer {
}

async render(page) {
await page.load();
let parsed = this.reader.parse(page.body);
let { html, snippets } = this.writer.render(parsed);
this.snippets = this.snippets.concat(snippets.map(snippet =>
Expand Down
16 changes: 11 additions & 5 deletions lib/site.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,8 @@ module.exports = class Site {
tree = await this.load();
}

let layout = generateLayout(tree, this.assetManager.manifest);
let pageRenderer = new PageRenderer({ renderers, layout });

let dirs = new Set();
let writes = tree.map(async page => {
let preperations = tree.map(async page => {
let filepath = path.resolve(this.target, page.slug);
if(filepaths && !filepaths.has(filepath)) {
return;
Expand All @@ -73,10 +70,19 @@ module.exports = class Site {

page.filepath = filepath;

return page.load();
});

await Promise.all(preperations);

let layout = generateLayout(tree, this.assetManager.manifest);
let pageRenderer = new PageRenderer({ renderers, layout });

let writes = tree.map(async page => {
let html = await pageRenderer.render(page);

// TODO: Report errors if something goes wrong
return this.writeFile(`${filepath}/index.html`, `${html}\n`);
return this.writeFile(`${page.filepath}/index.html`, `${html}\n`);
});

await Promise.all(writes);
Expand Down

0 comments on commit 0312094

Please sign in to comment.