1
mirror of https://github.com/jakejarvis/jarv.is.git synced 2025-11-05 07:05:40 -05:00

refactor .js files to ES modules where possible

This commit is contained in:
2024-03-12 14:58:00 -04:00
parent e66dc37c41
commit e1a26d5257
28 changed files with 460 additions and 414 deletions

View File

@@ -1,6 +1,6 @@
// @ts-check
// do not convert to ESM and/or TS -- this needs to be imported in CJS files like next.config.js too
module.exports = {
const config = {
// Site info
siteName: "Jake Jarvis",
siteDomain: "jarv.is",
@@ -17,8 +17,6 @@ module.exports = {
githubRepo: "jakejarvis/jarv.is",
verifyGoogle: "qQhmLTwjNWYgQ7W42nSTq63xIrTch13X_11mmxBE9zk",
verifyBing: "164551986DA47F7F6FC0D21A93FFFCA6",
fathomSiteId: "PIUEIVIZ",
hcaptchaSiteKey: "60d959de-b01b-4e22-a901-ce395ed086cb",
giscusConfig: {
// https://github.com/giscus/giscus-component/tree/main/packages/react#readme
repo: "jakejarvis/jarv.is",
@@ -41,3 +39,5 @@ module.exports = {
mastodon: "fediverse.jarv.is/@jake",
},
};
export default config;

View File

@@ -1,4 +1,4 @@
import * as config from ".";
import config from ".";
import { meJpg, faviconPng, faviconIco, appleTouchIconPng } from "./favicons";
import type { DefaultSeoProps, SocialProfileJsonLdProps, ArticleJsonLdProps } from "next-seo";

View File

@@ -1,21 +1,20 @@
import { Feed } from "feed";
import { getAllPosts } from "./posts";
import * as config from "../config";
import config from "../config";
import { meJpg } from "../config/favicons";
import type { GetServerSideProps } from "next";
export type GetServerSideFeedProps = GetServerSideProps<Record<string, never>>;
export type BuildFeedOptions = {
edgeCacheAge?: number; // in seconds, defaults to 43200 (12 hours)
format: "rss" | "atom" | "json";
};
// handles literally *everything* about building the server-side rss/atom feeds and writing the response.
// all the page needs to do is `return buildFeed(context, "rss")` from getServerSideProps.
export const buildFeed = async (
context: Parameters<GetServerSideFeedProps>[0],
type: "rss" | "atom" | "json",
options?: BuildFeedOptions
options: BuildFeedOptions
): Promise<ReturnType<GetServerSideFeedProps>> => {
const { res } = context;
const baseUrl = process.env.NEXT_PUBLIC_BASE_URL || `https://${config.siteDomain}`;
@@ -59,26 +58,23 @@ export const buildFeed = async (
});
});
// cache on edge for 12 hours by default
res.setHeader(
"cache-control",
`public, max-age=0, s-maxage=${options?.edgeCacheAge ?? 86400}, stale-while-revalidate`
);
// cache on edge for 24 hours by default
res.setHeader("cache-control", `public, max-age=0, s-maxage=86400, stale-while-revalidate`);
// generates RSS by default
if (type === "rss") {
if (options.format === "rss") {
res.setHeader("content-type", "application/rss+xml; charset=utf-8");
res.write(feed.rss2());
} else if (type === "atom") {
} else if (options.format === "atom") {
res.setHeader("content-type", "application/atom+xml; charset=utf-8");
res.write(feed.atom1());
} else if (type === "json") {
} else if (options.format === "json") {
// rare but including as an option because why not...
// https://www.jsonfeed.org/
res.setHeader("content-type", "application/feed+json; charset=utf-8");
res.write(feed.json1());
} else {
throw new TypeError(`Invalid feed type "${type}", must be "rss", "atom", or "json".`);
throw new TypeError(`Invalid feed type "${options.format}", must be "rss", "atom", or "json".`);
}
res.end();

View File

@@ -5,7 +5,7 @@ import dayjsRelativeTime from "dayjs/plugin/relativeTime";
import dayjsLocalizedFormat from "dayjs/plugin/localizedFormat";
import dayjsAdvancedFormat from "dayjs/plugin/advancedFormat";
import "dayjs/locale/en";
import { timeZone } from "../config";
import config from "../config";
const IsomorphicDayJs = (date?: dayjs.ConfigType): dayjs.Dayjs => {
// plugins
@@ -15,7 +15,7 @@ const IsomorphicDayJs = (date?: dayjs.ConfigType): dayjs.Dayjs => {
dayjs.extend(dayjsLocalizedFormat);
dayjs.extend(dayjsAdvancedFormat);
return dayjs(date).locale("en").tz(timeZone).clone();
return dayjs(date).locale("en").tz(config.timeZone).clone();
};
// simple wrapper around dayjs.format() to normalize timezone across the site, both server and client side, to prevent