Preparatory Refactoring: Load all pages before starting the rendering

Author: moonglum

lib/page_renderer.js

@@ -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 =>

lib/site.js

@@ -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;
@@ -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);