From b13c8259b338c41ac70d08fd0423f963974dea77 Mon Sep 17 00:00:00 2001
From: Jake Jarvis <jake@jarv.is>
Date: Thu, 6 Jul 2023 10:37:51 -0400
Subject: [PATCH] attempt to make edge functions a tad bit lighter

---
 components/Link/Link.tsx               |  4 +-
 components/ThemeScript/ThemeScript.tsx | 69 ++++++++++++++------------
 components/ThemeScript/client.js       | 31 ++++--------
 contexts/ThemeContext.tsx              | 28 +++++------
 lib/config/constants.ts                | 13 -----
 lib/config/index.js                    |  1 -
 lib/config/seo.ts                      |  8 +--
 lib/helpers/build-feed.ts              | 19 ++++---
 lib/helpers/compile-note.ts            | 18 +++----
 lib/helpers/parse-notes.ts             | 45 ++++++++++-------
 next.config.js                         |  5 +-
 pages/_app.tsx                         |  2 +-
 pages/_document.tsx                    |  4 +-
 pages/api/contact.ts                   |  3 +-
 pages/notes/[slug].tsx                 |  4 +-
 pages/robots.txt.ts                    |  3 +-
 pages/sitemap.xml.ts                   | 10 ++--
 17 files changed, 121 insertions(+), 146 deletions(-)
 delete mode 100644 lib/config/constants.ts

diff --git a/components/Link/Link.tsx b/components/Link/Link.tsx
index 06d4907d..69df65be 100644
--- a/components/Link/Link.tsx
+++ b/components/Link/Link.tsx
@@ -1,7 +1,6 @@
 import NextLink from "next/link";
 import objStr from "obj-str";
 import { styled, theme, stitchesConfig } from "../../lib/styles/stitches.config";
-import { baseUrl } from "../../lib/config";
 import type { ComponentProps } from "react";
 
 const StyledLink = styled(NextLink, {
@@ -43,7 +42,8 @@ const Link = ({ href, rel, target, prefetch = false, underline = true, openInNew
   // This component auto-detects whether or not this link should open in the same window (the default for internal
   // links) or a new tab (the default for external links). Defaults can be overridden with `openInNewTab={true}`.
   const isExternal =
-    typeof href === "string" && !(href.startsWith("/") || href.startsWith("#") || href.startsWith(baseUrl));
+    typeof href === "string" &&
+    !(href.startsWith("/") || href.startsWith("#") || (process.env.BASE_URL && href.startsWith(process.env.BASE_URL)));
 
   if (openInNewTab || isExternal) {
     return (
diff --git a/components/ThemeScript/ThemeScript.tsx b/components/ThemeScript/ThemeScript.tsx
index 7fe793db..12b42ce0 100644
--- a/components/ThemeScript/ThemeScript.tsx
+++ b/components/ThemeScript/ThemeScript.tsx
@@ -1,51 +1,57 @@
-import { useMemo } from "react";
+import { memo } from "react";
 import { minify } from "uglify-js";
-import { clientScript } from "./client";
-import { IS_DEV_SERVER } from "../../lib/config/constants";
+import type { MinifyOutput } from "uglify-js";
 
-export type ThemeScriptProps = JSX.IntrinsicElements["script"] & {
+import { clientScript } from "./client.js";
+
+export type ThemeScriptProps = {
   themeClassNames: {
     [themeName: string]: string;
   };
   themeStorageKey: string;
 };
 
-const ThemeScript = ({ key, themeClassNames, themeStorageKey, ...rest }: ThemeScriptProps) => {
-  const minified = useMemo(() => {
-    // since the client function will end up being injected as a plain dumb string, we need to set dynamic values here:
-    const functionString = String(clientScript)
-      .replace('"__MEDIA_QUERY__"', `"(prefers-color-scheme: dark)"`)
-      .replace('"__STORAGE_KEY__"', `"${themeStorageKey}"`)
-      .replace('"__CLASS_NAMES__"', JSON.stringify(themeClassNames));
+// eslint-disable-next-line react/display-name
+const ThemeScript = memo<ThemeScriptProps>(({ themeClassNames, themeStorageKey }) => {
+  const minified = (() => {
+    // since the client function will end up being injected as a static hard-coded string, we need to determine all of
+    // the dynamic values within it *before* generating the final script.
+    const source = String(clientScript)
+      .replace("__MEDIA_QUERY__", "(prefers-color-scheme: dark)")
+      .replace("__STORAGE_KEY__", themeStorageKey)
+      .replace("__CLASS_NAMES__", Object.values(themeClassNames).join('","'));
 
     // turn the raw function into an iife
-    const unminified = `(${functionString})()`;
+    const unminified = `(${source})()`;
 
-    // skip minification if running locally to save a few ms
-    if (IS_DEV_SERVER) {
+    // minify the final code. this approach is a bit janky but is ONLY used at build time, so there's essentially no
+    // risk of breaking the entire site and/or accidentally bundling uglify-js clientside (bad).
+    let minified: MinifyOutput | undefined;
+    try {
+      minified = minify(unminified, {
+        toplevel: true,
+        compress: {
+          negate_iife: false,
+        },
+        parse: {
+          bare_returns: true,
+        },
+      });
+    } catch (error) {
+      // fail somewhat silenty by returning the unminified version
+      console.warn("Failed to minify inline theme script:", error);
       return unminified;
     }
 
-    // minify the final code, a bit hacky but this is ONLY done at build-time, so uglify-js is never bundled or sent to
-    // the browser to execute.
-    const minified = minify(unminified, {
-      toplevel: true,
-      compress: {
-        negate_iife: false,
-      },
-      parse: {
-        bare_returns: true,
-      },
-    });
-
-    // fail somewhat silenty by returning the unminified version
+    // same as the catch block above, but in some cases (not really sure when), minify() doesn't throw an actual error
+    // and instead just returns undefined and an "error" string, so we need to check for both.
     if (!minified || minified.error) {
-      console.warn("Failed to minify inline theme script:", minified.error);
+      console.warn("Failed to minify inline theme script. uglify-js output:", minified.error);
       return unminified;
     }
 
     return minified.code;
-  }, [themeClassNames, themeStorageKey]);
+  })();
 
   // the script tag injected manually into `<head>` in _document.tsx to prevent FARTing:
   // https://css-tricks.com/flash-of-inaccurate-color-theme-fart/
@@ -54,14 +60,13 @@ const ThemeScript = ({ key, themeClassNames, themeStorageKey, ...rest }: ThemeSc
   // TODO: using next/script *might* be possible after https://github.com/vercel/next.js/pull/36364 is merged.
   return (
     <script
-      key={key} // separate on purpose!
-      {...rest}
+      id="restore-theme"
       dangerouslySetInnerHTML={{
         // make it an IIFE:
         __html: `(function(){${minified}})()`,
       }}
     />
   );
-};
+});
 
 export default ThemeScript;
diff --git a/components/ThemeScript/client.js b/components/ThemeScript/client.js
index 1ee1c32b..6925f886 100644
--- a/components/ThemeScript/client.js
+++ b/components/ThemeScript/client.js
@@ -1,38 +1,25 @@
 // @ts-check
-/* eslint-disable no-var, no-empty */
 
 // this function is converted to a string verbatim, substitutions are made to insert dynamic values, minified, and then
 // finally exported as an inline `<script>` tag in ThemeScript.tsx for _document.tsx to use.
 export const clientScript = () => {
   // `try/catch` in case I messed something up here bigly... (will default to light theme)
   try {
-    // help minifier minify
-    var light = "light";
-    var dark = "dark";
-    var newTheme;
     // the list of <html>'s current class(es)...
-    // eslint-disable-next-line prefer-destructuring
-    var classList = document.documentElement.classList;
-    // map of theme -> classname
-    var classNames = "__CLASS_NAMES__";
+    const { classList } = document.documentElement;
+    // map of themes -> classnames ([0]=light, [1]=dark)
+    const classNames = ["__CLASS_NAMES__"];
     // user's saved preference
-    var pref = window.localStorage.getItem("__STORAGE_KEY__");
+    const pref = window.localStorage.getItem("__STORAGE_KEY__");
 
-    if (pref && (pref === light || pref === dark)) {
-      // simply restore the local storage preference
-      newTheme = pref;
-    } else {
-      // test CSS media query for system dark mode preference
-      // https://stackoverflow.com/a/57795495/1438024
-      newTheme = window.matchMedia("__MEDIA_QUERY__").matches ? dark : light;
-    }
+    // restore the local storage preference if it's set, otherwise test CSS media query for browser dark mode preference
+    // https://stackoverflow.com/a/57795495/1438024
+    const newTheme = (pref && pref === "dark") || window.matchMedia("__MEDIA_QUERY__").matches ? 1 : 0;
 
     // remove both `classNames` to start fresh...
-    // @ts-ignore
-    classList.remove(classNames[light], classNames[dark]);
+    classList.remove(classNames[0], classNames[1]);
 
     // ...and then FINALLY set the root class
-    // @ts-ignore
     classList.add(classNames[newTheme]);
-  } catch (error) {}
+  } catch (error) {} // eslint-disable-line no-empty
 };
diff --git a/contexts/ThemeContext.tsx b/contexts/ThemeContext.tsx
index b18d77e8..7d85379e 100644
--- a/contexts/ThemeContext.tsx
+++ b/contexts/ThemeContext.tsx
@@ -1,4 +1,4 @@
-import { createContext, useCallback, useEffect, useState } from "react";
+import { createContext, useCallback, useEffect, useMemo, useState } from "react";
 import useLocalStorage from "../hooks/useLocalStorage";
 import useMedia from "../hooks/useMedia";
 import { themeStorageKey } from "../lib/styles/stitches.config";
@@ -77,22 +77,18 @@ export const ThemeProvider = ({
     document.documentElement.style?.setProperty("color-scheme", colorScheme);
   }, [preferredTheme, systemTheme]);
 
-  return (
-    <ThemeContext.Provider
-      value={{
-        activeTheme: preferredTheme && themeNames.includes(preferredTheme) ? preferredTheme : systemTheme,
-        setTheme: useCallback(
-          (theme: string) => {
-            // force save to local storage
-            changeTheme(theme, true);
-          },
-          [changeTheme]
-        ),
-      }}
-    >
-      {children}
-    </ThemeContext.Provider>
+  const providerValues = useMemo(
+    () => ({
+      activeTheme: preferredTheme && themeNames.includes(preferredTheme) ? preferredTheme : systemTheme,
+      setTheme: (theme: string) => {
+        // force save to local storage
+        changeTheme(theme, true);
+      },
+    }),
+    [changeTheme, preferredTheme, systemTheme, themeNames]
   );
+
+  return <ThemeContext.Provider value={providerValues}>{children}</ThemeContext.Provider>;
 };
 
 // debugging help pls
diff --git a/lib/config/constants.ts b/lib/config/constants.ts
deleted file mode 100644
index 83af511c..00000000
--- a/lib/config/constants.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// Next.js constants (not needed in frontend)
-
-// directory containing .mdx files relative to project root
-export const NOTES_DIR = "notes";
-
-// normalize the timestamp saved when building/deploying (see next.config.js) and fall back to right now
-export const RELEASE_DATE = new Date(process.env.RELEASE_DATE || Date.now()).toISOString();
-
-// detect if running locally via `next dev` (phase is checked in next.config.js)
-export const IS_DEV_SERVER = process.env.IS_DEV_SERVER === "true";
-
-// attempt to normalize the various environment flags
-export const BUILD_ENV = process.env.VERCEL_ENV || process.env.NEXT_PUBLIC_VERCEL_ENV || process.env.NODE_ENV;
diff --git a/lib/config/index.js b/lib/config/index.js
index c60cb646..5e1cd787 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -6,7 +6,6 @@ module.exports = {
   siteDomain: "jarv.is",
   siteLocale: "en-US",
   timeZone: "America/New_York", // https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
-  baseUrl: process.env.BASE_URL || "", // see next.config.js
   onionDomain: "http://jarvis2i2vp4j4tbxjogsnqdemnte5xhzyi7hziiyzxwge3hzmh57zad.onion",
   shortDescription: "Front-End Web Developer in Boston, MA",
   longDescription:
diff --git a/lib/config/seo.ts b/lib/config/seo.ts
index 896aab4a..1de3b530 100644
--- a/lib/config/seo.ts
+++ b/lib/config/seo.ts
@@ -17,7 +17,7 @@ export const defaultSeo: DefaultSeoProps = {
     type: "website",
     images: [
       {
-        url: `${config.baseUrl}${meJpg.src}`,
+        url: `${process.env.BASE_URL}${meJpg.src}`,
         alt: `${config.siteName} – ${config.shortDescription}`,
       },
     ],
@@ -103,9 +103,9 @@ export const defaultSeo: DefaultSeoProps = {
 export const socialProfileJsonLd: SocialProfileJsonLdProps = {
   type: "Person",
   name: config.authorName,
-  url: `${config.baseUrl}/`,
+  url: `${process.env.BASE_URL}/`,
   sameAs: [
-    `${config.baseUrl}/`,
+    `${process.env.BASE_URL}/`,
     `https://github.com/${config.authorSocial?.github}`,
     `https://keybase.io/${config.authorSocial?.keybase}`,
     `https://twitter.com/${config.authorSocial?.twitter}`,
@@ -122,5 +122,5 @@ export const socialProfileJsonLd: SocialProfileJsonLdProps = {
 export const articleJsonLd: Pick<ArticleJsonLdProps, "authorName" | "publisherName" | "publisherLogo"> = {
   authorName: [config.authorName],
   publisherName: config.siteName,
-  publisherLogo: `${config.baseUrl}${meJpg.src}`,
+  publisherLogo: `${process.env.BASE_URL}${meJpg.src}`,
 };
diff --git a/lib/helpers/build-feed.ts b/lib/helpers/build-feed.ts
index 0371d0dc..561229c1 100644
--- a/lib/helpers/build-feed.ts
+++ b/lib/helpers/build-feed.ts
@@ -2,7 +2,6 @@ import { Feed } from "feed";
 import { getAllNotes } from "./parse-notes";
 import * as config from "../config";
 import { meJpg } from "../config/favicons";
-import { RELEASE_DATE } from "../config/constants";
 import type { GetServerSideProps } from "next";
 
 export type GetServerSideFeedProps = GetServerSideProps<Record<string, never>>;
@@ -22,20 +21,20 @@ export const buildFeed = async (
 
   // https://github.com/jpmonette/feed#example
   const feed = new Feed({
-    id: `${config.baseUrl}/`,
-    link: `${config.baseUrl}/`,
+    id: `${process.env.BASE_URL}/`,
+    link: `${process.env.BASE_URL}/`,
     title: config.siteName,
     description: config.longDescription,
     copyright: config.licenseUrl,
-    updated: new Date(RELEASE_DATE),
-    image: `${config.baseUrl}${meJpg.src}`,
+    updated: new Date(process.env.RELEASE_DATE || Date.now()),
+    image: `${process.env.BASE_URL}${meJpg.src}`,
     feedLinks: {
-      rss: `${config.baseUrl}/feed.xml`,
-      atom: `${config.baseUrl}/feed.atom`,
+      rss: `${process.env.BASE_URL}/feed.xml`,
+      atom: `${process.env.BASE_URL}/feed.atom`,
     },
     author: {
       name: config.authorName,
-      link: `${config.baseUrl}/`,
+      link: `${process.env.BASE_URL}/`,
       email: config.authorEmail,
     },
   });
@@ -48,11 +47,11 @@ export const buildFeed = async (
       link: note.permalink,
       title: note.title,
       description: note.description,
-      image: note.image && `${config.baseUrl}${note.image}`,
+      image: note.image && `${process.env.BASE_URL}${note.image}`,
       author: [
         {
           name: config.authorName,
-          link: `${config.baseUrl}/`,
+          link: `${process.env.BASE_URL}/`,
         },
       ],
       date: new Date(note.date),
diff --git a/lib/helpers/compile-note.ts b/lib/helpers/compile-note.ts
index 247dcdbb..9ee3facc 100644
--- a/lib/helpers/compile-note.ts
+++ b/lib/helpers/compile-note.ts
@@ -1,7 +1,6 @@
 import { serialize } from "next-mdx-remote/serialize";
 import { minify } from "uglify-js";
 import { getNoteData } from "./parse-notes";
-import { IS_DEV_SERVER } from "../config/constants";
 
 // remark/rehype markdown plugins
 import remarkGfm from "remark-gfm";
@@ -38,14 +37,15 @@ export const compileNote = async (slug: string): Promise<NoteWithSource> => {
   // TODO: next-mdx-remote v4 doesn't (yet?) minify compiled JSX output, see:
   // https://github.com/hashicorp/next-mdx-remote/pull/211#issuecomment-1013658514
   // ...so for now, let's do it manually (and conservatively) with uglify-js when building for production.
-  const compiledSource = IS_DEV_SERVER
-    ? source.compiledSource
-    : minify(source.compiledSource, {
-        toplevel: true,
-        parse: {
-          bare_returns: true,
-        },
-      }).code;
+  const compiledSource =
+    process.env.NODE_ENV === "production"
+      ? minify(source.compiledSource, {
+          toplevel: true,
+          parse: {
+            bare_returns: true,
+          },
+        }).code
+      : source.compiledSource;
 
   return {
     frontMatter,
diff --git a/lib/helpers/parse-notes.ts b/lib/helpers/parse-notes.ts
index e88a1fc0..27f8b7ae 100644
--- a/lib/helpers/parse-notes.ts
+++ b/lib/helpers/parse-notes.ts
@@ -5,19 +5,20 @@ import pMap from "p-map";
 import pMemoize from "p-memoize";
 import matter from "gray-matter";
 import removeMarkdown from "remove-markdown";
-import { marked } from "marked";
-// @ts-ignore
-import { markedSmartypants } from "marked-smartypants";
+import { unified } from "unified";
+import remarkParse from "remark-parse";
+import remarkRehype from "remark-rehype";
+import rehypeStringify from "rehype-stringify";
+import remarkSmartypants from "remark-smartypants";
 import { formatDate } from "./format-date";
-import { baseUrl } from "../config";
-import { NOTES_DIR } from "../config/constants";
 
 import type { NoteFrontMatter } from "../../types";
+import rehypeSanitize from "rehype-sanitize";
 
 export const getNoteSlugs = async (): Promise<string[]> => {
-  // list all .mdx files in NOTES_DIR
+  // list all .mdx files in "/notes"
   const mdxFiles = await glob("*.mdx", {
-    cwd: path.join(process.cwd(), NOTES_DIR),
+    cwd: path.join(process.cwd(), "notes"),
     dot: false,
   });
 
@@ -34,13 +35,25 @@ export const getNoteData = async (
   frontMatter: NoteFrontMatter;
   content: string;
 }> => {
-  const fullPath = path.join(process.cwd(), NOTES_DIR, `${slug}.mdx`);
+  const fullPath = path.join(process.cwd(), "notes", `${slug}.mdx`);
   const rawContent = await fs.readFile(fullPath, "utf8");
   const { data, content } = matter(rawContent);
 
-  // attach marked extensions:
-  // https://marked.js.org/using_advanced#extensions
-  marked.use(markedSmartypants());
+  // allow *very* limited markdown to be used in post titles
+  const htmlTitle = String(
+    await unified()
+      .use(remarkParse)
+      .use(remarkRehype)
+      .use(rehypeSanitize, { tagNames: ["code", "em", "strong"] })
+      .use(remarkSmartypants, {
+        quotes: true,
+        dashes: "oldschool",
+        backticks: false,
+        ellipses: false,
+      })
+      .use(rehypeStringify, { allowDangerousHtml: true })
+      .process(data.title)
+  );
 
   // return both the parsed YAML front matter (with a few amendments) and the raw, unparsed markdown content
   return {
@@ -48,15 +61,9 @@ export const getNoteData = async (
       ...(data as Partial<NoteFrontMatter>),
       // zero markdown title:
       title: removeMarkdown(data.title),
-      // allow markdown formatting to appear in post titles in some places (rarely used):
-      htmlTitle: marked.parseInline(data.title, {
-        silent: true,
-        // these are deprecated and throw very noisy warnings but are still defaults, make it make sense...
-        mangle: false,
-        headerIds: false,
-      }),
+      htmlTitle,
       slug,
-      permalink: `${baseUrl}/${NOTES_DIR}/${slug}/`,
+      permalink: `${process.env.BASE_URL}/notes/${slug}/`,
       date: formatDate(data.date), // validate/normalize the date string provided from front matter
     },
     content,
diff --git a/next.config.js b/next.config.js
index f2b11168..0c391a2a 100644
--- a/next.config.js
+++ b/next.config.js
@@ -21,10 +21,9 @@ module.exports = (/** @type {string} */ phase) => {
           : phase === PHASE_DEVELOPMENT_SERVER
           ? `http://localhost:${process.env.PORT || 3000}` // https://nextjs.org/docs/api-reference/cli#development
           : `https://${config.siteDomain}`, // fallback to production url
-      // freeze build timestamp for when server-side pages need a "last updated" date:
+      // freeze timestamp at build time for when server-side pages need a "last updated" date. calling Date.now() from
+      // pages using getServerSideProps will return the current(ish) time instead, which is usually not what we want.
       RELEASE_DATE: new Date().toISOString(),
-      // check if we're running locally via `next dev`:
-      IS_DEV_SERVER: phase === PHASE_DEVELOPMENT_SERVER ? "true" : "",
     },
     images: {
       deviceSizes: [640, 750, 828, 1080, 1200, 1920],
diff --git a/pages/_app.tsx b/pages/_app.tsx
index 061176f7..902e6958 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -24,7 +24,7 @@ const App = ({ Component, pageProps }: AppProps) => {
 
   // get this page's URL with full domain, and hack around query parameters and anchors
   // NOTE: this assumes trailing slashes are enabled in next.config.js
-  const canonical = `${config.baseUrl}${router.pathname === "/" ? "" : router.pathname}/`;
+  const canonical = `${process.env.BASE_URL}${router.pathname === "/" ? "" : router.pathname}/`;
 
   useEffect(() => {
     // don't track pageviews on branch/deploy previews and localhost
diff --git a/pages/_document.tsx b/pages/_document.tsx
index 608b6a8e..d49331ad 100644
--- a/pages/_document.tsx
+++ b/pages/_document.tsx
@@ -8,8 +8,8 @@ const Document = () => {
   return (
     <Html lang={config.siteLocale} className={themeClassNames["light"]}>
       <Head>
-        {/* inject a small script to set/restore the user's theme ASAP */}
-        <ThemeScript id="restore-theme" {...{ themeClassNames, themeStorageKey }} />
+        {/* inject this script (generated at build-time) to prioritize setting/restoring the user's theme. */}
+        <ThemeScript key="restore-theme-js" {...{ themeClassNames, themeStorageKey }} />
 
         <style id="stitches" dangerouslySetInnerHTML={{ __html: getCssText() }} />
       </Head>
diff --git a/pages/api/contact.ts b/pages/api/contact.ts
index 9295b49d..08e4e33f 100644
--- a/pages/api/contact.ts
+++ b/pages/api/contact.ts
@@ -1,6 +1,5 @@
 import { NextResponse } from "next/server";
 import queryString from "query-string";
-import { baseUrl } from "../../lib/config";
 import type { NextRequest } from "next/server";
 
 // fallback to dummy secret for testing: https://docs.hcaptcha.com/#integration-testing-test-keys
@@ -20,7 +19,7 @@ export const config = {
 export default async (req: NextRequest) => {
   // redirect GET requests to this endpoint to the contact form itself
   if (req.method === "GET") {
-    return NextResponse.redirect(`${baseUrl}/contact/`);
+    return NextResponse.redirect(`${process.env.BASE_URL}/contact/`);
   }
 
   // possible weirdness? https://github.com/orgs/vercel/discussions/78#discussioncomment-5089059
diff --git a/pages/notes/[slug].tsx b/pages/notes/[slug].tsx
index 40182706..26bbf0bb 100644
--- a/pages/notes/[slug].tsx
+++ b/pages/notes/[slug].tsx
@@ -32,7 +32,7 @@ const Note = ({ frontMatter, source }: InferGetStaticPropsType<typeof getStaticP
           },
           images: [
             {
-              url: `${config.baseUrl}${frontMatter.image || meJpg.src}`,
+              url: `${process.env.BASE_URL}${frontMatter.image || meJpg.src}`,
               alt: frontMatter.title,
             },
           ],
@@ -47,7 +47,7 @@ const Note = ({ frontMatter, source }: InferGetStaticPropsType<typeof getStaticP
         description={frontMatter.description || config.longDescription}
         datePublished={frontMatter.date}
         dateModified={frontMatter.date}
-        images={[`${config.baseUrl}${frontMatter.image || meJpg.src}`]}
+        images={[`${process.env.BASE_URL}${frontMatter.image || meJpg.src}`]}
         {...articleJsonLd}
       />
 
diff --git a/pages/robots.txt.ts b/pages/robots.txt.ts
index e55e8fc6..f221faa8 100644
--- a/pages/robots.txt.ts
+++ b/pages/robots.txt.ts
@@ -1,4 +1,3 @@
-import { baseUrl } from "../lib/config";
 import type { GetServerSideProps } from "next";
 
 export const getServerSideProps: GetServerSideProps<Record<string, never>> = async (context) => {
@@ -12,7 +11,7 @@ ${
     ? `Disallow: /`
     : `Allow: /
 
-Sitemap: ${baseUrl}/sitemap.xml`
+Sitemap: ${process.env.BASE_URL}/sitemap.xml`
 }
 `;
 
diff --git a/pages/sitemap.xml.ts b/pages/sitemap.xml.ts
index 71f0dd19..cc8f35ca 100644
--- a/pages/sitemap.xml.ts
+++ b/pages/sitemap.xml.ts
@@ -1,12 +1,10 @@
 import { SitemapStream, SitemapItemLoose, EnumChangefreq } from "sitemap";
 import { getAllNotes } from "../lib/helpers/parse-notes";
-import { baseUrl } from "../lib/config";
-import { RELEASE_DATE, NOTES_DIR } from "../lib/config/constants";
 import type { GetServerSideProps } from "next";
 
 export const getServerSideProps: GetServerSideProps<Record<string, never>> = async (context) => {
   const { res } = context;
-  const stream = new SitemapStream({ hostname: baseUrl });
+  const stream = new SitemapStream({ hostname: process.env.BASE_URL });
 
   // cache on edge for 12 hours
   res.setHeader("cache-control", "public, max-age=0, s-maxage=43200, stale-while-revalidate");
@@ -22,7 +20,7 @@ export const getServerSideProps: GetServerSideProps<Record<string, never>> = asy
       url: "/",
       priority: 1.0,
       changefreq: EnumChangefreq.WEEKLY,
-      lastmod: RELEASE_DATE, // timestamp frozen when a new build is deployed
+      lastmod: process.env.RELEASE_DATE, // timestamp frozen when a new build is deployed
     },
     { url: "/birthday/" },
     { url: "/cli/" },
@@ -42,7 +40,7 @@ export const getServerSideProps: GetServerSideProps<Record<string, never>> = asy
   const notes = await getAllNotes();
   notes.forEach((note) => {
     pages.push({
-      url: `/${NOTES_DIR}/${note.slug}/`,
+      url: `/notes/${note.slug}/`,
       // pull lastMod from front matter date
       lastmod: note.date,
     });
@@ -50,7 +48,7 @@ export const getServerSideProps: GetServerSideProps<Record<string, never>> = asy
 
   // set lastmod of /notes/ page to most recent post's date
   pages.push({
-    url: `/${NOTES_DIR}/`,
+    url: `/notes/`,
     lastmod: notes[0].date,
   });