From f7dea0647f5192230c230b8957844b72c0f12dd7 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Thu, 9 Jul 2020 14:10:39 -0400 Subject: [PATCH] Remove unnecessary blocking generators --- lib/generate/css.ts | 6 +++--- lib/generate/index.ts | 2 +- lib/generate/rss.ts | 10 ++++++++-- lib/index.ts | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lib/generate/css.ts b/lib/generate/css.ts index fface00..5468759 100644 --- a/lib/generate/css.ts +++ b/lib/generate/css.ts @@ -30,9 +30,9 @@ async function generate(theme: string) { } export default async function css() { - await generate("light"); - await generate("dark"); - await generate("auto"); + generate("light"); + generate("dark"); + generate("auto"); if (process.env.NODE_ENV === "development") { require("fs").watch("site/css/", css); diff --git a/lib/generate/index.ts b/lib/generate/index.ts index d5a2cce..d0efb81 100644 --- a/lib/generate/index.ts +++ b/lib/generate/index.ts @@ -4,7 +4,7 @@ import css from "./css"; import errors from "./errors"; import homepage from "./homepage"; import posts from "./posts"; -import rss from "./rss"; +import * as rss from "./rss"; import tutorials from "./tutorials"; import years from "./years"; diff --git a/lib/generate/rss.ts b/lib/generate/rss.ts index 660483c..7523e2a 100644 --- a/lib/generate/rss.ts +++ b/lib/generate/rss.ts @@ -24,12 +24,18 @@ async function generateFeed(posts: Page[], permalink: string, category?: string) util.write(dest, text); } -export default async function rss(posts: Page[], categories: Map, tutorials: TutorialSeries[]) { +export async function posts(posts: Page[]) { generateFeed(posts, "/"); +} + +export async function categories(categories: Map) { categories.forEach((posts, category) => { generateFeed(posts, `/${category}/`, category); }); +} + +export async function tutorials(tutorials: TutorialSeries[]) { tutorials.forEach(series => { generateFeed(series.posts, `/tutorials/${series.series}/`, series.seriesName); }); -} \ No newline at end of file +} diff --git a/lib/index.ts b/lib/index.ts index 235cddc..92601f8 100644 --- a/lib/index.ts +++ b/lib/index.ts @@ -16,13 +16,13 @@ async function generate(): Promise { generators.css(); generators.errors(); - const tutorials = await generators.tutorials(); + generators.tutorials().then(generators.rss.tutorials); const posts = await generators.posts(); generators.homepage(posts); generators.years(posts); - const categories = await generators.categories(posts); - await generators.rss(posts, categories, tutorials); + generators.rss.posts(posts) + generators.categories(posts).then(generators.rss.categories); return posts; }