Merge pull request #291 from kirillkurko/vercel-kv-migration

Migrate to vercel/kv
kirillkurko · Mar 17, 2024 · 3b6bff0 · 3b6bff0
2 parents a9ef604 + fda3c8b
commit 3b6bff0
Show file tree

Hide file tree

Showing 26 changed files with 182 additions and 260 deletions.
diff --git a/package.json b/package.json
@@ -7,14 +7,12 @@
     "dev": "next dev",
     "build": "contentlayer build && next build",
     "start": "next start",
-    "lint": "next lint",
-    "seed": "node prisma/seed.js",
-    "postinstall": "prisma generate"
+    "lint": "next lint"
   },
   "dependencies": {
-    "@prisma/client": "5.10.2",
     "@tailwindcss/typography": "^0.5.10",
     "@vercel/analytics": "^1.2.2",
+    "@vercel/kv": "^1.0.1",
     "@vercel/speed-insights": "^1.0.10",
     "babel-runtime": "^6.26.0",
     "clsx": "^2.1.0",
@@ -50,7 +48,6 @@
     "eslint-plugin-react": "^7.34.0",
     "postcss": "^8.4.35",
     "prettier": "^3.2.5",
-    "prisma": "^5.10.2",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.4.2"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/prisma/data.js b/prisma/data.js
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
diff --git a/prisma/seed.js b/prisma/seed.js
diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
@@ -1,8 +1,8 @@
 import { PageTitle, Paragraph } from '@components/typography';
 import AboutCard from './AboutCard';
 import type { Metadata } from 'next';
-import { BASE_URL } from '../../utils/const';
-import { OG_IMAGE } from '../../utils/ogImages';
+import { BASE_URL } from '@utils/const';
+import { OG_IMAGE } from '@utils/ogImages';
 
 interface Feedback {
   avatar: string;

diff --git a/src/app/blog/[slug]/ViewTracker.tsx b/src/app/blog/[slug]/ViewTracker.tsx
@@ -6,9 +6,17 @@ interface Props {
   slug: string;
 }
 
+let finished = false;
+
 function ViewTracker({ slug }: Props) {
   useEffect(() => {
-    trackBlogPostView(slug);
+    if (!finished) {
+      trackBlogPostView(slug);
+    }
+
+    return () => {
+      finished = true;
+    };
   }, [slug]);
 
   return <></>;

diff --git a/src/app/blog/[slug]/page.tsx b/src/app/blog/[slug]/page.tsx
@@ -3,8 +3,8 @@ import { Mdx } from '@components/mdx';
 import { allBlogs } from '@contentlayer/generated';
 import { type Metadata } from 'next';
 import ViewTracker from './ViewTracker';
-import { BASE_URL } from '../../../utils/const';
-import { getBlogPostOpengraphImage } from '../../../utils/ogImages';
+import { BASE_URL } from '@utils/const';
+import { getBlogPostOpengraphImage } from '@utils/ogImages';
 
 export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const { slug } = params;

diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx
@@ -2,8 +2,8 @@ import { PageTitle, Paragraph, SectionTitle } from '@components/typography';
 import ArticlePreview from '@components/ArticlePreview';
 import { type Metadata } from 'next';
 import { getAllBlogPosts } from '@lib/models/blog';
-import { BASE_URL } from '../../utils/const';
-import { OG_IMAGE } from '../../utils/ogImages';
+import { BASE_URL } from '@utils/const';
+import { OG_IMAGE } from '@utils/ogImages';
 
 export const metadata: Metadata = {
   title: 'Blog',

diff --git a/src/app/emoji/Emoji.tsx b/src/app/emoji/Emoji.tsx
@@ -1,7 +1,7 @@
 'use client';
 import { useState } from 'react';
 import { Paragraph } from '@components/typography';
-import { EmojiName } from '@lib/models/emoji';
+import { EmojiName } from '@app-types/EmojiName';
 import { upvoteEmoji } from './upvoteEmoji';
 import { useDebounce } from 'react-use';
 

diff --git a/src/app/emoji/page.tsx b/src/app/emoji/page.tsx
@@ -2,8 +2,8 @@ import Emoji from './Emoji';
 import { PageTitle, Paragraph } from '@components/typography';
 import { getAllEmojis } from '@lib/models/emoji';
 import { type Metadata } from 'next';
-import { BASE_URL } from '../../utils/const';
-import { OG_IMAGE } from '../../utils/ogImages';
+import { BASE_URL } from '@utils/const';
+import { OG_IMAGE } from '@utils/ogImages';
 
 export const revalidate = 0;
 

diff --git a/src/app/emoji/upvoteEmoji.ts b/src/app/emoji/upvoteEmoji.ts
@@ -1,5 +1,6 @@
 'use server';
-import { EmojiName, updateEmojiUpvoteCount } from '@lib/models/emoji';
+import { updateEmojiUpvoteCount } from '@lib/models/emoji';
+import { EmojiName } from '@app-types/EmojiName';
 
 export async function upvoteEmoji(emoji: EmojiName, upvoteCount: number) {
   return updateEmojiUpvoteCount(emoji, upvoteCount);

diff --git a/src/app/gallery/page.tsx b/src/app/gallery/page.tsx
@@ -1,7 +1,7 @@
 import WorkInProgress from '@components/WorkInProgress';
 import type { Metadata } from 'next';
-import { BASE_URL } from '../../utils/const';
-import { OG_IMAGE } from '../../utils/ogImages';
+import { BASE_URL } from '@utils/const';
+import { OG_IMAGE } from '@utils/ogImages';
 
 export const metadata: Metadata = {
   title: 'Gallery',

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -5,7 +5,7 @@ import { Analytics } from '@vercel/analytics/react';
 import type { Metadata } from 'next';
 import Container from '@components/Container';
 import './globals.css';
-import { BASE_URL } from '../utils/const';
+import { BASE_URL } from '@utils/const';
 
 const redHatText = Red_Hat_Text({
   variable: '--font-red-hat-text',

diff --git a/src/app/newsletter/page.tsx b/src/app/newsletter/page.tsx
@@ -1,7 +1,7 @@
 import WorkInProgress from '@components/WorkInProgress';
 import type { Metadata } from 'next';
-import { BASE_URL } from '../../utils/const';
-import { OG_IMAGE } from '../../utils/ogImages';
+import { BASE_URL } from '@utils/const';
+import { OG_IMAGE } from '@utils/ogImages';
 
 export const metadata: Metadata = {
   title: 'Newsletter',

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,7 +1,7 @@
 import { PageTitle, Paragraph } from '@components/typography';
 import type { Metadata } from 'next';
-import { BASE_URL } from '../utils/const';
-import { OG_IMAGE } from '../utils/ogImages';
+import { BASE_URL } from '@utils/const';
+import { OG_IMAGE } from '@utils/ogImages';
 
 export const metadata: Metadata = {
   title: 'Kirill Kurko',

diff --git a/src/app/sitemap.ts b/src/app/sitemap.ts
@@ -1,5 +1,5 @@
 import { MetadataRoute } from 'next';
-import { BASE_URL } from '../utils/const';
+import { BASE_URL } from '@utils/const';
 import { getAllBlogPosts } from '@lib/models/blog';
 
 export default function sitemap(): MetadataRoute.Sitemap {

diff --git a/src/app/snippets/page.tsx b/src/app/snippets/page.tsx
@@ -1,7 +1,7 @@
 import WorkInProgress from '@components/WorkInProgress';
 import type { Metadata } from 'next';
-import { BASE_URL } from '../../utils/const';
-import { OG_IMAGE } from '../../utils/ogImages';
+import { BASE_URL } from '@utils/const';
+import { OG_IMAGE } from '@utils/ogImages';
 
 export const metadata: Metadata = {
   title: 'Snippets',

diff --git a/src/lib/database/client.ts b/src/lib/database/client.ts
@@ -0,0 +1,12 @@
+import { createClient } from '@vercel/kv';
+import invariant from 'tiny-invariant';
+
+const KV_URL = process.env.REDIS_REST_API_URL;
+const KV_TOKEN = process.env.REDIS_REST_API_TOKEN;
+
+invariant(KV_URL && KV_TOKEN, 'KV_URL and KV_TOKEN are required');
+
+export const client = createClient({
+  url: KV_URL,
+  token: KV_TOKEN,
+});