From 1f6be804b77206e64cadd589278c0a5d288b7ab8 Mon Sep 17 00:00:00 2001
From: Joe Wroten <joe@wroten.me>
Date: Sun, 30 Dec 2018 23:09:51 -0600
Subject: [PATCH] Page generation now gets data passed to it from index

---
 index.js                 | 14 ++++++++++++--
 src/generateHTMLPages.js |  8 ++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/index.js b/index.js
index 349a47d..6d7c8d4 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,16 @@
+const { getPinnedRepoJSONs, getStaticPageJSONs } = require('./src/discoverJSONData');
 const { generateStaticPages } = require('./src/generateHTMLPages');
 const copyStaticAssets = require('./src/copyStaticAssets');
 
-generateStaticPages().then(() => console.log('✓ Generated html pages'));
-copyStaticAssets().then(() => console.log('✓ Copied static assets'));
+(async () => {
+  let repoJSONs = await getPinnedRepoJSONs();
+  let staticJSONs = await getStaticPageJSONs();
+  await generateStaticPages(repoJSONs.concat(staticJSONs));
+  console.log('✓ Generated html pages');
+})();
+
+(async () => {
+  await copyStaticAssets();
+  console.log('✓ Copied static assets');
+})();
 
diff --git a/src/generateHTMLPages.js b/src/generateHTMLPages.js
index ca52591..4447e56 100644
--- a/src/generateHTMLPages.js
+++ b/src/generateHTMLPages.js
@@ -2,15 +2,11 @@ const { join } = require('path');
 const { outputFile } = require('fs-extra');
 const marked = require('marked');
 const getTemplate = require('./template');
-const { getPinnedRepoJSONs, getStaticPageJSONs } = require('./discoverJSONData');
 
 const distPath = './dist';
 
-const generateStaticPages = async () => {
+const generateStaticPages = async jsonData => {
   const interiorTemplate = await getTemplate('interior');
-  let repoJSONs = await getPinnedRepoJSONs();
-  let staticJSONs = await getStaticPageJSONs();
-  let combinedJSONs = repoJSONs.concat(staticJSONs);
   const saveAsInteriorHTML = async json => {
     let fileName = json.name.replace(/[^a-zA-Z\d:]/g, '').toLowerCase();
     if (json.readme && json.readme.text) {
@@ -20,7 +16,7 @@ const generateStaticPages = async () => {
   }
 
   try {
-    return await Promise.all(combinedJSONs.map(saveAsInteriorHTML));
+    return await Promise.all(jsonData.map(saveAsInteriorHTML));
   } catch (error) {
     console.error('Error while writing html files', error);
     return;