mirror of
https://github.com/jakejarvis/jarv.is.git
synced 2025-04-26 01:45:25 -04:00
clean up remaining NEXT_PUBLIC_ environment variables
This commit is contained in:
parent
f08aa16862
commit
b60fbcc15c
@ -10,7 +10,11 @@ RESEND_API_KEY=
|
||||
RESEND_FROM_EMAIL=
|
||||
RESEND_TO_EMAIL=
|
||||
TURNSTILE_SECRET_KEY=
|
||||
NEXT_PUBLIC_BASE_URL=
|
||||
NEXT_PUBLIC_GISCUS_CATEGORY_ID=
|
||||
NEXT_PUBLIC_GISCUS_REPO_ID=
|
||||
NEXT_PUBLIC_GITHUB_REPO=
|
||||
NEXT_PUBLIC_ONION_DOMAIN=
|
||||
NEXT_PUBLIC_SITE_LOCALE=
|
||||
NEXT_PUBLIC_SITE_TZ=
|
||||
NEXT_PUBLIC_TURNSTILE_SITE_KEY=
|
||||
|
@ -1,8 +1,8 @@
|
||||
import { env } from "../../lib/env";
|
||||
import { JsonLd } from "react-schemaorg";
|
||||
import PageTitle from "../../components/PageTitle";
|
||||
import Video from "../../components/Video";
|
||||
import { addMetadata } from "../../lib/helpers/metadata";
|
||||
import { BASE_URL } from "../../lib/config/constants";
|
||||
import type { VideoObject } from "schema-dts";
|
||||
|
||||
import mp4 from "./birthday.mp4";
|
||||
@ -26,9 +26,9 @@ const Page = () => {
|
||||
"@type": "VideoObject",
|
||||
name: metadata.title as string,
|
||||
description: metadata.description as string,
|
||||
contentUrl: `${BASE_URL}${webm}`,
|
||||
thumbnailUrl: `${BASE_URL}${thumbnail.src}`,
|
||||
embedUrl: `${BASE_URL}/birthday`,
|
||||
contentUrl: `${env.NEXT_PUBLIC_BASE_URL}${webm}`,
|
||||
thumbnailUrl: `${env.NEXT_PUBLIC_BASE_URL}${thumbnail.src}`,
|
||||
embedUrl: `${env.NEXT_PUBLIC_BASE_URL}/birthday`,
|
||||
uploadDate: "1996-02-06T00:00:00Z",
|
||||
duration: "PT6M10S",
|
||||
}}
|
||||
|
@ -1,9 +1,9 @@
|
||||
import { env } from "../../lib/env";
|
||||
import { JsonLd } from "react-schemaorg";
|
||||
import PageTitle from "../../components/PageTitle";
|
||||
import Link from "../../components/Link";
|
||||
import Video from "../../components/Video";
|
||||
import { addMetadata } from "../../lib/helpers/metadata";
|
||||
import { BASE_URL } from "../../lib/config/constants";
|
||||
import type { VideoObject } from "schema-dts";
|
||||
|
||||
import webm from "./convention.webm";
|
||||
@ -28,9 +28,9 @@ const Page = () => {
|
||||
"@type": "VideoObject",
|
||||
name: metadata.title as string,
|
||||
description: metadata.description as string,
|
||||
contentUrl: `${BASE_URL}${webm}`,
|
||||
thumbnailUrl: `${BASE_URL}${thumbnail.src}`,
|
||||
embedUrl: `${BASE_URL}/hillary`,
|
||||
contentUrl: `${env.NEXT_PUBLIC_BASE_URL}${webm}`,
|
||||
thumbnailUrl: `${env.NEXT_PUBLIC_BASE_URL}${thumbnail.src}`,
|
||||
embedUrl: `${env.NEXT_PUBLIC_BASE_URL}/hillary`,
|
||||
uploadDate: "2016-07-25T00:00:00Z",
|
||||
duration: "PT1M51S",
|
||||
}}
|
||||
|
@ -1,3 +1,4 @@
|
||||
import { env } from "../lib/env";
|
||||
import { JsonLd } from "react-schemaorg";
|
||||
import { Analytics } from "@vercel/analytics/next";
|
||||
import clsx from "clsx";
|
||||
@ -7,7 +8,7 @@ import Footer from "../components/Footer";
|
||||
import { SkipNavLink, SkipNavTarget } from "../components/SkipNav";
|
||||
import { defaultMetadata } from "../lib/helpers/metadata";
|
||||
import * as config from "../lib/config";
|
||||
import { BASE_URL, MAX_WIDTH, SITE_LOCALE } from "../lib/config/constants";
|
||||
import { MAX_WIDTH } from "../lib/config/constants";
|
||||
import type { Metadata } from "next";
|
||||
import type { Person, WebSite } from "schema-dts";
|
||||
|
||||
@ -21,7 +22,7 @@ export const metadata: Metadata = defaultMetadata;
|
||||
|
||||
const RootLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
|
||||
return (
|
||||
<html lang={SITE_LOCALE || "en-US"} suppressHydrationWarning>
|
||||
<html lang={env.NEXT_PUBLIC_SITE_LOCALE} suppressHydrationWarning>
|
||||
<head>
|
||||
<ThemeScript />
|
||||
|
||||
@ -29,12 +30,12 @@ const RootLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
|
||||
item={{
|
||||
"@context": "https://schema.org",
|
||||
"@type": "Person",
|
||||
"@id": `${BASE_URL}/#person`,
|
||||
"@id": `${env.NEXT_PUBLIC_BASE_URL}/#person`,
|
||||
name: config.authorName,
|
||||
url: BASE_URL,
|
||||
image: [`${BASE_URL}/opengraph-image.jpg`],
|
||||
url: env.NEXT_PUBLIC_BASE_URL,
|
||||
image: [`${env.NEXT_PUBLIC_BASE_URL}/opengraph-image.jpg`],
|
||||
sameAs: [
|
||||
`${BASE_URL}`,
|
||||
env.NEXT_PUBLIC_BASE_URL!,
|
||||
`https://${config.authorSocial?.mastodon}`,
|
||||
`https://github.com/${config.authorSocial?.github}`,
|
||||
`https://bsky.app/profile/${config.authorSocial?.bluesky}`,
|
||||
@ -51,12 +52,12 @@ const RootLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
|
||||
item={{
|
||||
"@context": "https://schema.org",
|
||||
"@type": "WebSite",
|
||||
"@id": `${BASE_URL}/#website`,
|
||||
"@id": `${env.NEXT_PUBLIC_BASE_URL}/#website`,
|
||||
name: config.siteName,
|
||||
url: BASE_URL,
|
||||
url: env.NEXT_PUBLIC_BASE_URL,
|
||||
author: config.authorName,
|
||||
description: config.description,
|
||||
inLanguage: SITE_LOCALE,
|
||||
inLanguage: env.NEXT_PUBLIC_SITE_LOCALE,
|
||||
license: config.licenseUrl,
|
||||
}}
|
||||
/>
|
||||
|
@ -1,9 +1,9 @@
|
||||
import { env } from "../../lib/env";
|
||||
import { JsonLd } from "react-schemaorg";
|
||||
import PageTitle from "../../components/PageTitle";
|
||||
import Link from "../../components/Link";
|
||||
import Video from "../../components/Video";
|
||||
import { addMetadata } from "../../lib/helpers/metadata";
|
||||
import { BASE_URL } from "../../lib/config/constants";
|
||||
import type { VideoObject } from "schema-dts";
|
||||
|
||||
import mp4 from "./leo.mp4";
|
||||
@ -28,9 +28,9 @@ const Page = () => {
|
||||
"@type": "VideoObject",
|
||||
name: metadata.title as string,
|
||||
description: metadata.description as string,
|
||||
contentUrl: `${BASE_URL}${webm}`,
|
||||
thumbnailUrl: `${BASE_URL}${thumbnail.src}`,
|
||||
embedUrl: `${BASE_URL}/leo`,
|
||||
contentUrl: `${env.NEXT_PUBLIC_BASE_URL}${webm}`,
|
||||
thumbnailUrl: `${env.NEXT_PUBLIC_BASE_URL}${thumbnail.src}`,
|
||||
embedUrl: `${env.NEXT_PUBLIC_BASE_URL}/leo`,
|
||||
uploadDate: "2007-05-10T00:00:00Z",
|
||||
duration: "PT1M48S",
|
||||
}}
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { env } from "../lib/env";
|
||||
import * as config from "../lib/config";
|
||||
import { SITE_LOCALE } from "../lib/config/constants";
|
||||
import type { MetadataRoute } from "next";
|
||||
|
||||
const manifest = (): MetadataRoute.Manifest => {
|
||||
@ -8,7 +8,7 @@ const manifest = (): MetadataRoute.Manifest => {
|
||||
// eslint-disable-next-line camelcase
|
||||
short_name: config.siteName,
|
||||
description: config.description,
|
||||
lang: SITE_LOCALE,
|
||||
lang: env.NEXT_PUBLIC_SITE_LOCALE,
|
||||
icons: [
|
||||
{
|
||||
src: "/icon.png",
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { env } from "../../../lib/env";
|
||||
import { connection } from "next/server";
|
||||
import CountUp from "../../../components/CountUp";
|
||||
import redis from "../../../lib/redis";
|
||||
import { SITE_LOCALE } from "../../../lib/config/constants";
|
||||
|
||||
const HitCounter = async ({ slug }: { slug: string }) => {
|
||||
await connection();
|
||||
@ -16,7 +16,7 @@ const HitCounter = async ({ slug }: { slug: string }) => {
|
||||
|
||||
// we have data!
|
||||
return (
|
||||
<span title={`${Intl.NumberFormat(SITE_LOCALE || "en-US").format(hits)} ${hits === 1 ? "view" : "views"}`}>
|
||||
<span title={`${Intl.NumberFormat(env.NEXT_PUBLIC_SITE_LOCALE).format(hits)} ${hits === 1 ? "view" : "views"}`}>
|
||||
<CountUp start={0} end={hits} delay={0} duration={1.5} />
|
||||
</span>
|
||||
);
|
||||
|
@ -10,7 +10,7 @@ import HitCounter from "./counter";
|
||||
import { getSlugs, getFrontMatter } from "../../../lib/helpers/posts";
|
||||
import { addMetadata } from "../../../lib/helpers/metadata";
|
||||
import * as config from "../../../lib/config";
|
||||
import { BASE_URL, POSTS_DIR, SITE_LOCALE } from "../../../lib/config/constants";
|
||||
import { POSTS_DIR } from "../../../lib/config/constants";
|
||||
import { size as ogImageSize } from "./opengraph-image";
|
||||
import type { Metadata } from "next";
|
||||
import type { BlogPosting } from "schema-dts";
|
||||
@ -72,18 +72,18 @@ const Page = async ({ params }: { params: Promise<{ slug: string }> }) => {
|
||||
url: frontmatter!.permalink,
|
||||
image: {
|
||||
"@type": "ImageObject",
|
||||
contentUrl: `${BASE_URL}/${POSTS_DIR}/${frontmatter!.slug}/opengraph-image`,
|
||||
contentUrl: `${env.NEXT_PUBLIC_BASE_URL}/${POSTS_DIR}/${frontmatter!.slug}/opengraph-image`,
|
||||
width: `${ogImageSize.width}`,
|
||||
height: `${ogImageSize.height}`,
|
||||
},
|
||||
keywords: frontmatter!.tags?.join(", "),
|
||||
datePublished: frontmatter!.date,
|
||||
dateModified: frontmatter!.date,
|
||||
inLanguage: SITE_LOCALE,
|
||||
inLanguage: env.NEXT_PUBLIC_SITE_LOCALE,
|
||||
license: config.licenseUrl,
|
||||
author: {
|
||||
// defined in app/layout.tsx
|
||||
"@id": `${BASE_URL}/#person`,
|
||||
"@id": `${env.NEXT_PUBLIC_BASE_URL}/#person`,
|
||||
},
|
||||
}}
|
||||
/>
|
||||
@ -111,7 +111,7 @@ const Page = async ({ params }: { params: Promise<{ slug: string }> }) => {
|
||||
|
||||
<div className={styles.metaItem}>
|
||||
<Link
|
||||
href={`https://github.com/${config.githubRepo}/blob/main/${POSTS_DIR}/${frontmatter!.slug}/index.mdx`}
|
||||
href={`https://github.com/${env.NEXT_PUBLIC_GITHUB_REPO}/blob/main/${POSTS_DIR}/${frontmatter!.slug}/index.mdx`}
|
||||
title={`Edit "${frontmatter!.title}" on GitHub`}
|
||||
plain
|
||||
className={styles.metaLink}
|
||||
@ -121,26 +121,23 @@ const Page = async ({ params }: { params: Promise<{ slug: string }> }) => {
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
{/* only count hits on production site */}
|
||||
{env.VERCEL_ENV === "production" ? (
|
||||
<div
|
||||
className={styles.metaItem}
|
||||
style={{
|
||||
// fix potential layout shift when number of hits loads
|
||||
minWidth: "7em",
|
||||
marginRight: 0,
|
||||
}}
|
||||
<div
|
||||
className={styles.metaItem}
|
||||
style={{
|
||||
// fix potential layout shift when number of hits loads
|
||||
minWidth: "7em",
|
||||
marginRight: 0,
|
||||
}}
|
||||
>
|
||||
<EyeIcon size="1.2em" className={styles.metaIcon} />
|
||||
<Suspense
|
||||
// when this loads, the component will count up from zero to the actual number of hits, so we can simply
|
||||
// show a zero here as a "loading indicator"
|
||||
fallback={<span>0</span>}
|
||||
>
|
||||
<EyeIcon size="1.2em" className={styles.metaIcon} />
|
||||
<Suspense
|
||||
// when this loads, the component will count up from zero to the actual number of hits, so we can simply
|
||||
// show a zero here as a "loading indicator"
|
||||
fallback={<span>0</span>}
|
||||
>
|
||||
<HitCounter slug={`${POSTS_DIR}/${frontmatter!.slug}`} />
|
||||
</Suspense>
|
||||
</div>
|
||||
) : null}
|
||||
<HitCounter slug={`${POSTS_DIR}/${frontmatter!.slug}`} />
|
||||
</Suspense>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h1 className={styles.title}>
|
||||
|
@ -7,7 +7,6 @@ import Link from "../../components/Link";
|
||||
import RelativeTime from "../../components/RelativeTime";
|
||||
import { addMetadata } from "../../lib/helpers/metadata";
|
||||
import * as config from "../../lib/config";
|
||||
import { SITE_LOCALE } from "../../lib/config/constants";
|
||||
import type { User } from "@octokit/graphql-schema";
|
||||
|
||||
import styles from "./page.module.css";
|
||||
@ -121,12 +120,12 @@ const Page = async () => {
|
||||
<div className={styles.metaItem}>
|
||||
<Link
|
||||
href={`${repo!.url}/stargazers`}
|
||||
title={`${Intl.NumberFormat(SITE_LOCALE || "en-US").format(repo!.stargazerCount)} ${repo!.stargazerCount === 1 ? "star" : "stars"}`}
|
||||
title={`${Intl.NumberFormat(env.NEXT_PUBLIC_SITE_LOCALE).format(repo!.stargazerCount)} ${repo!.stargazerCount === 1 ? "star" : "stars"}`}
|
||||
plain
|
||||
className={styles.metaLink}
|
||||
>
|
||||
<StarIcon size="1.25em" className={styles.metaIcon} />
|
||||
<span>{Intl.NumberFormat(SITE_LOCALE || "en-US").format(repo!.stargazerCount)}</span>
|
||||
<span>{Intl.NumberFormat(env.NEXT_PUBLIC_SITE_LOCALE).format(repo!.stargazerCount)}</span>
|
||||
</Link>
|
||||
</div>
|
||||
)}
|
||||
@ -135,12 +134,12 @@ const Page = async () => {
|
||||
<div className={styles.metaItem}>
|
||||
<Link
|
||||
href={`${repo!.url}/network/members`}
|
||||
title={`${Intl.NumberFormat(SITE_LOCALE || "en-US").format(repo!.forkCount)} ${repo!.forkCount === 1 ? "fork" : "forks"}`}
|
||||
title={`${Intl.NumberFormat(env.NEXT_PUBLIC_SITE_LOCALE).format(repo!.forkCount)} ${repo!.forkCount === 1 ? "fork" : "forks"}`}
|
||||
plain
|
||||
className={styles.metaLink}
|
||||
>
|
||||
<GitForkIcon size="1.25em" className={styles.metaIcon} />
|
||||
<span>{Intl.NumberFormat(SITE_LOCALE || "en-US").format(repo!.forkCount)}</span>
|
||||
<span>{Intl.NumberFormat(env.NEXT_PUBLIC_SITE_LOCALE).format(repo!.forkCount)}</span>
|
||||
</Link>
|
||||
</div>
|
||||
)}
|
||||
|
@ -1,4 +1,4 @@
|
||||
import { BASE_URL } from "../lib/config/constants";
|
||||
import { env } from "../lib/env";
|
||||
import type { MetadataRoute } from "next";
|
||||
|
||||
const robots = (): MetadataRoute.Robots => ({
|
||||
@ -8,7 +8,7 @@ const robots = (): MetadataRoute.Robots => ({
|
||||
disallow: ["/api/", "/404", "/500"],
|
||||
},
|
||||
],
|
||||
sitemap: `${BASE_URL}/sitemap.xml`,
|
||||
sitemap: `${env.NEXT_PUBLIC_BASE_URL}/sitemap.xml`,
|
||||
});
|
||||
|
||||
export default robots;
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { env } from "../lib/env";
|
||||
import path from "path";
|
||||
import glob from "fast-glob";
|
||||
import { getFrontMatter } from "../lib/helpers/posts";
|
||||
import { BASE_URL, RELEASE_TIMESTAMP } from "../lib/config/constants";
|
||||
import type { MetadataRoute } from "next";
|
||||
|
||||
const sitemap = async (): Promise<MetadataRoute.Sitemap> => {
|
||||
@ -9,9 +9,9 @@ const sitemap = async (): Promise<MetadataRoute.Sitemap> => {
|
||||
const routes: MetadataRoute.Sitemap = [
|
||||
{
|
||||
// homepage
|
||||
url: `${BASE_URL}`,
|
||||
url: `${env.NEXT_PUBLIC_BASE_URL}`,
|
||||
priority: 1.0,
|
||||
lastModified: new Date(RELEASE_TIMESTAMP), // timestamp frozen when a new build is deployed
|
||||
lastModified: new Date(),
|
||||
},
|
||||
];
|
||||
|
||||
@ -30,7 +30,7 @@ const sitemap = async (): Promise<MetadataRoute.Sitemap> => {
|
||||
).forEach((route) => {
|
||||
routes.push({
|
||||
// remove matching page.(tsx|mdx) file and make all URLs absolute
|
||||
url: `${BASE_URL}/${route.replace(/\/page\.(tsx|mdx)$/, "")}`,
|
||||
url: `${env.NEXT_PUBLIC_BASE_URL}/${route.replace(/\/page\.(tsx|mdx)$/, "")}`,
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -2,7 +2,6 @@
|
||||
|
||||
import { env } from "../../lib/env";
|
||||
import Giscus from "@giscus/react";
|
||||
import * as config from "../../lib/config";
|
||||
import type { GiscusProps } from "@giscus/react";
|
||||
|
||||
export type CommentsProps = {
|
||||
@ -21,7 +20,7 @@ const Comments = ({ title }: CommentsProps) => {
|
||||
|
||||
return (
|
||||
<Giscus
|
||||
repo={config.githubRepo as GiscusProps["repo"]}
|
||||
repo={env.NEXT_PUBLIC_GITHUB_REPO as GiscusProps["repo"]}
|
||||
repoId={env.NEXT_PUBLIC_GISCUS_REPO_ID}
|
||||
term={title}
|
||||
category="Comments"
|
||||
|
@ -1,8 +1,8 @@
|
||||
import { env } from "../../lib/env";
|
||||
import clsx from "clsx";
|
||||
import { HeartIcon } from "lucide-react";
|
||||
import Link from "../Link";
|
||||
import * as config from "../../lib/config";
|
||||
import { RELEASE_TIMESTAMP } from "../../lib/config/constants";
|
||||
import type { ComponentPropsWithoutRef } from "react";
|
||||
|
||||
import styles from "./Footer.module.css";
|
||||
@ -22,7 +22,7 @@ const Footer = ({ className, ...rest }: FooterProps) => {
|
||||
<Link href="/previously" title="Previously on..." plain className={styles.link}>
|
||||
{config.copyrightYearStart}
|
||||
</Link>{" "}
|
||||
– {new Date(RELEASE_TIMESTAMP).getUTCFullYear()}.
|
||||
– {new Date().getUTCFullYear()}.
|
||||
</div>
|
||||
|
||||
<div>
|
||||
@ -53,7 +53,7 @@ const Footer = ({ className, ...rest }: FooterProps) => {
|
||||
</Link>
|
||||
.{" "}
|
||||
<Link
|
||||
href={`https://github.com/${config.githubRepo}`}
|
||||
href={`https://github.com/${env.NEXT_PUBLIC_GITHUB_REPO}`}
|
||||
title="View Source on GitHub"
|
||||
plain
|
||||
className={clsx(styles.link, styles.underline)}
|
||||
|
@ -1,8 +1,8 @@
|
||||
import { env } from "../../lib/env";
|
||||
import { format, formatISO } from "date-fns";
|
||||
import { enUS } from "date-fns/locale";
|
||||
import { tz } from "@date-fns/tz";
|
||||
import { utc } from "@date-fns/utc";
|
||||
import { SITE_TZ } from "../../lib/config/constants";
|
||||
import type { ComponentPropsWithoutRef } from "react";
|
||||
|
||||
export type TimeProps = ComponentPropsWithoutRef<"time"> & {
|
||||
@ -14,10 +14,10 @@ const Time = ({ date, format: formatStr = "PPpp", ...rest }: TimeProps) => {
|
||||
return (
|
||||
<time
|
||||
dateTime={formatISO(date, { in: utc })}
|
||||
title={format(date, "MMM d, y, h:mm a O", { in: tz(SITE_TZ), locale: enUS })}
|
||||
title={format(date, "MMM d, y, h:mm a O", { in: tz(env.NEXT_PUBLIC_SITE_TZ), locale: enUS })}
|
||||
{...rest}
|
||||
>
|
||||
{format(date, formatStr, { in: tz(SITE_TZ), locale: enUS })}
|
||||
{format(date, formatStr, { in: tz(env.NEXT_PUBLIC_SITE_TZ), locale: enUS })}
|
||||
</time>
|
||||
);
|
||||
};
|
||||
|
@ -1,16 +1,3 @@
|
||||
/**
|
||||
* Locale code to define the site's language in ISO-639 format. Defaults to `en-US`.
|
||||
* @see https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes#Table
|
||||
*/
|
||||
export const SITE_LOCALE = "en-US";
|
||||
|
||||
/**
|
||||
* Consistent timezone for the site. Doesn't really matter what it is, as long as it's the same everywhere to avoid
|
||||
* hydration complaints.
|
||||
* @see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
|
||||
*/
|
||||
export const SITE_TZ = "America/New_York";
|
||||
|
||||
/** Path to directory with .mdx files, relative to project root. */
|
||||
export const POSTS_DIR = "notes";
|
||||
|
||||
@ -22,9 +9,3 @@ export const AVATAR_PATH = "app/avatar.jpg";
|
||||
|
||||
/** Maximum width of content wrapper (e.g. for images) in pixels. */
|
||||
export const MAX_WIDTH = 865;
|
||||
|
||||
/** Chooses the most appropriate URL for the current deployment. Defined in [`next.config.ts`](../../next.config.ts). */
|
||||
export const BASE_URL = process.env.NEXT_PUBLIC_BASE_URL!;
|
||||
|
||||
/** Freezes time at build. Defined in [`next.config.ts`](../../next.config.ts). */
|
||||
export const RELEASE_TIMESTAMP = process.env.NEXT_PUBLIC_RELEASE_TIMESTAMP!;
|
||||
|
@ -7,7 +7,6 @@ export const license = "Creative Commons Attribution 4.0 International";
|
||||
export const licenseAbbr = "CC-BY-4.0";
|
||||
export const licenseUrl = "https://creativecommons.org/licenses/by/4.0/";
|
||||
export const copyrightYearStart = 2001;
|
||||
export const githubRepo = "jakejarvis/jarv.is";
|
||||
|
||||
// Me info
|
||||
export const authorName = "Jake Jarvis";
|
||||
|
54
lib/env.ts
54
lib/env.ts
@ -64,6 +64,13 @@ export const env = createEnv({
|
||||
TURNSTILE_SECRET_KEY: v.optional(v.string(), "1x0000000000000000000000000000000AA"),
|
||||
},
|
||||
client: {
|
||||
/**
|
||||
* Optional. Overrides the most appropriate default URL for the current deployment.
|
||||
*
|
||||
* @see https://nextjs.org/docs/app/api-reference/functions/generate-metadata#default-value
|
||||
*/
|
||||
NEXT_PUBLIC_BASE_URL: v.optional(v.pipe(v.string(), v.url())),
|
||||
|
||||
/**
|
||||
* Optional. Enables comments on blog posts via GitHub discussions.
|
||||
*
|
||||
@ -77,6 +84,11 @@ export const env = createEnv({
|
||||
*/
|
||||
NEXT_PUBLIC_GISCUS_REPO_ID: v.optional(v.string()),
|
||||
|
||||
/**
|
||||
* Required. GitHub repository for the site in the format of `{username}/{repo}`.
|
||||
*/
|
||||
NEXT_PUBLIC_GITHUB_REPO: v.string(),
|
||||
|
||||
/**
|
||||
* Optional. Sets an `Onion-Location` header in responses to advertise a URL for the same page but hosted on a
|
||||
* hidden service on the Tor network. Browsers like Brave and Tor Browser will automatically pick this up and offer
|
||||
@ -86,6 +98,21 @@ export const env = createEnv({
|
||||
*/
|
||||
NEXT_PUBLIC_ONION_DOMAIN: v.optional(v.pipe(v.string(), v.endsWith(".onion"))),
|
||||
|
||||
/**
|
||||
* Optional. Locale code to define the site's language in ISO-639 format. Defaults to `en-US`.
|
||||
*
|
||||
* @see https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes#Table
|
||||
*/
|
||||
NEXT_PUBLIC_SITE_LOCALE: v.optional(v.string(), "en-US"),
|
||||
|
||||
/**
|
||||
* Optional. Consistent timezone for the site. Doesn't really matter what it is, as long as it's the same everywhere
|
||||
* to avoid hydration complaints.
|
||||
*
|
||||
* @see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
|
||||
*/
|
||||
NEXT_PUBLIC_SITE_TZ: v.optional(v.string(), "America/New_York"),
|
||||
|
||||
/**
|
||||
* Required. Site key must be prefixed with NEXT_PUBLIC_ since it is used to embed the captcha widget. Falls back to
|
||||
* testing keys if not set or in dev environment.
|
||||
@ -95,9 +122,36 @@ export const env = createEnv({
|
||||
NEXT_PUBLIC_TURNSTILE_SITE_KEY: v.optional(v.string(), "XXXX.DUMMY.TOKEN.XXXX"),
|
||||
},
|
||||
experimental__runtimeEnv: {
|
||||
NEXT_PUBLIC_BASE_URL:
|
||||
process.env.NEXT_PUBLIC_BASE_URL ||
|
||||
// Vercel: https://vercel.com/docs/environment-variables/system-environment-variables
|
||||
(process.env.VERCEL
|
||||
? process.env.VERCEL_ENV === "production" && process.env.VERCEL_PROJECT_PRODUCTION_URL
|
||||
? `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`
|
||||
: process.env.VERCEL_ENV === "preview" && process.env.VERCEL_BRANCH_URL
|
||||
? `https://${process.env.VERCEL_BRANCH_URL}`
|
||||
: process.env.VERCEL_URL
|
||||
? `https://${process.env.VERCEL_URL}`
|
||||
: undefined
|
||||
: undefined) ||
|
||||
// Netlify: https://docs.netlify.com/configure-builds/environment-variables/#read-only-variables
|
||||
(process.env.NETLIFY
|
||||
? process.env.CONTEXT === "production" && process.env.URL
|
||||
? `${process.env.URL}`
|
||||
: process.env.DEPLOY_PRIME_URL
|
||||
? `${process.env.DEPLOY_PRIME_URL}`
|
||||
: process.env.DEPLOY_URL
|
||||
? `${process.env.DEPLOY_URL}`
|
||||
: undefined
|
||||
: undefined) ||
|
||||
// next dev
|
||||
`http://localhost:${process.env.PORT || 3000}`,
|
||||
NEXT_PUBLIC_GISCUS_CATEGORY_ID: process.env.NEXT_PUBLIC_GISCUS_CATEGORY_ID,
|
||||
NEXT_PUBLIC_GISCUS_REPO_ID: process.env.NEXT_PUBLIC_GISCUS_REPO_ID,
|
||||
NEXT_PUBLIC_GITHUB_REPO: process.env.NEXT_PUBLIC_GITHUB_REPO,
|
||||
NEXT_PUBLIC_ONION_DOMAIN: process.env.NEXT_PUBLIC_ONION_DOMAIN,
|
||||
NEXT_PUBLIC_SITE_LOCALE: process.env.NEXT_PUBLIC_SITE_LOCALE,
|
||||
NEXT_PUBLIC_SITE_TZ: process.env.NEXT_PUBLIC_SITE_TZ,
|
||||
NEXT_PUBLIC_TURNSTILE_SITE_KEY: process.env.NEXT_PUBLIC_TURNSTILE_SITE_KEY,
|
||||
},
|
||||
emptyStringAsUndefined: true,
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { env } from "../../lib/env";
|
||||
import { Feed } from "feed";
|
||||
import { getFrontMatter, getContent } from "./posts";
|
||||
import * as config from "../config";
|
||||
import { BASE_URL, RELEASE_TIMESTAMP } from "../config/constants";
|
||||
import type { Item as FeedItem } from "feed";
|
||||
|
||||
import ogImage from "../../app/opengraph-image.jpg";
|
||||
@ -12,20 +12,20 @@ import ogImage from "../../app/opengraph-image.jpg";
|
||||
*/
|
||||
export const buildFeed = async (): Promise<Feed> => {
|
||||
const feed = new Feed({
|
||||
id: `${BASE_URL}`,
|
||||
link: `${BASE_URL}`,
|
||||
id: `${env.NEXT_PUBLIC_BASE_URL}`,
|
||||
link: `${env.NEXT_PUBLIC_BASE_URL}`,
|
||||
title: config.siteName,
|
||||
description: config.description,
|
||||
copyright: config.licenseUrl,
|
||||
updated: new Date(RELEASE_TIMESTAMP),
|
||||
image: `${BASE_URL}${ogImage.src}`,
|
||||
updated: new Date(),
|
||||
image: `${env.NEXT_PUBLIC_BASE_URL}${ogImage.src}`,
|
||||
feedLinks: {
|
||||
rss: `${BASE_URL}/feed.xml`,
|
||||
atom: `${BASE_URL}/feed.atom`,
|
||||
rss: `${env.NEXT_PUBLIC_BASE_URL}/feed.xml`,
|
||||
atom: `${env.NEXT_PUBLIC_BASE_URL}/feed.atom`,
|
||||
},
|
||||
author: {
|
||||
name: config.authorName,
|
||||
link: BASE_URL,
|
||||
link: env.NEXT_PUBLIC_BASE_URL,
|
||||
email: config.authorEmail,
|
||||
},
|
||||
});
|
||||
@ -41,7 +41,7 @@ export const buildFeed = async (): Promise<Feed> => {
|
||||
author: [
|
||||
{
|
||||
name: config.authorName,
|
||||
link: `${BASE_URL}`,
|
||||
link: `${env.NEXT_PUBLIC_BASE_URL}`,
|
||||
},
|
||||
],
|
||||
date: new Date(post.date),
|
||||
|
@ -1,9 +1,9 @@
|
||||
import { env } from "../env";
|
||||
import * as config from "../config";
|
||||
import { BASE_URL, SITE_LOCALE } from "../config/constants";
|
||||
import type { Metadata } from "next";
|
||||
|
||||
export const defaultMetadata: Metadata = {
|
||||
metadataBase: new URL(BASE_URL),
|
||||
metadataBase: env.NEXT_PUBLIC_BASE_URL ? new URL(env.NEXT_PUBLIC_BASE_URL) : undefined,
|
||||
title: {
|
||||
template: `%s – ${config.siteName}`,
|
||||
default: `${config.siteName} – ${config.tagline}`,
|
||||
@ -16,7 +16,7 @@ export const defaultMetadata: Metadata = {
|
||||
default: `${config.siteName} – ${config.tagline}`,
|
||||
},
|
||||
url: "/",
|
||||
locale: SITE_LOCALE?.replace("-", "_"),
|
||||
locale: env.NEXT_PUBLIC_SITE_LOCALE.replace("-", "_"),
|
||||
type: "website",
|
||||
},
|
||||
twitter: {
|
||||
|
@ -1,10 +1,11 @@
|
||||
import { env } from "../../lib/env";
|
||||
import path from "path";
|
||||
import fs from "fs/promises";
|
||||
import glob from "fast-glob";
|
||||
import { unified } from "unified";
|
||||
import { remarkHtml, remarkParse, remarkSmartypants, remarkFrontmatter } from "./remark-rehype-plugins";
|
||||
import { decode } from "html-entities";
|
||||
import { BASE_URL, POSTS_DIR } from "../config/constants";
|
||||
import { POSTS_DIR } from "../config/constants";
|
||||
|
||||
export type FrontMatter = {
|
||||
slug: string;
|
||||
@ -77,7 +78,7 @@ Promise<any> => {
|
||||
slug,
|
||||
// validate/normalize the date string provided from front matter
|
||||
date: new Date(frontmatter.date).toISOString(),
|
||||
permalink: `${BASE_URL}/${POSTS_DIR}/${slug}`,
|
||||
permalink: `${env.NEXT_PUBLIC_BASE_URL}/${POSTS_DIR}/${slug}`,
|
||||
} as FrontMatter;
|
||||
} catch (error) {
|
||||
console.error(`Failed to load front matter for post with slug "${slug}":`, error);
|
||||
|
@ -12,21 +12,6 @@ import "./lib/env";
|
||||
const nextConfig: NextConfig = {
|
||||
reactStrictMode: true,
|
||||
productionBrowserSourceMaps: true,
|
||||
env: {
|
||||
// same logic as metadataBase: https://nextjs.org/docs/app/api-reference/functions/generate-metadata#default-value
|
||||
NEXT_PUBLIC_BASE_URL:
|
||||
process.env.VERCEL_ENV === "production" && process.env.VERCEL_PROJECT_PRODUCTION_URL
|
||||
? `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`
|
||||
: process.env.VERCEL_ENV === "preview" && process.env.VERCEL_BRANCH_URL
|
||||
? `https://${process.env.VERCEL_BRANCH_URL}`
|
||||
: process.env.VERCEL_URL
|
||||
? `https://${process.env.VERCEL_URL}`
|
||||
: `http://localhost:${process.env.PORT || 3000}`,
|
||||
|
||||
// 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.
|
||||
NEXT_PUBLIC_RELEASE_TIMESTAMP: new Date().toISOString(),
|
||||
},
|
||||
pageExtensions: ["js", "jsx", "ts", "tsx", "md", "mdx"],
|
||||
outputFileTracingIncludes: {
|
||||
"/notes/[slug]/opengraph-image": [
|
||||
|
Loading…
x
Reference in New Issue
Block a user