Skip to content

Commit

Permalink
refactor: update server libs
Browse files Browse the repository at this point in the history
  • Loading branch information
hta218 committed Aug 14, 2023
1 parent 1951065 commit 47cc5e9
Show file tree
Hide file tree
Showing 23 changed files with 38 additions and 33 deletions.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions libs/mdx.ts → libs/mdx.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import { TOKEN_CLASSNAMES } from '~/constant'
import type { BlogFrontMatter, MdxFileData, MdxFrontMatter } from '~/types/mdx'
import type { TOC, UnistNodeType } from '~/types/server'
import { dateSortDesc } from '~/utils/date'
import { formatSlug, getAllFilesRecursively } from './files'
import { remarkCodeBlockTitle } from './remark-code-block-title'
import { remarkImgToJsx } from './remark-img-to-jsx'
import { remarkTocHeading } from './remark-toc-heading'
import { formatSlug, getAllFilesRecursively } from './files.server'
import { remarkCodeBlockTitle } from './remark-code-block-title.server'
import { remarkImgToJsx } from './remark-img-to-jsx.server'
import { remarkTocHeading } from './remark-toc-heading.server'

export async function getFileBySlug(
locale: string = process.env.NEXT_PUBLIC_DEFAULT_LOCALE,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 8 additions & 2 deletions libs/remark-toc-heading.ts → libs/remark-toc-heading.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import { toString } from 'mdast-util-to-string'
import { visit } from 'unist-util-visit'
import type { RemarkTocHeadingOptions, UnistNodeType, UnistTreeType } from '~/types/server'

function transformNode(node, output, indexMap, sluggerInstance) {
function transformNode(
node: UnistNodeType,
output: RemarkTocHeadingOptions['exportRef'],
indexMap: Record<number, any>,
sluggerInstance: Slugger
) {
let textContent = toString(node)
let transformedNode = {
value: textContent,
Expand All @@ -26,7 +31,7 @@ function transformNode(node, output, indexMap, sluggerInstance) {
}
}

function addID(node, nodes, sluggerInstance) {
function addID(node: UnistNodeType, nodes: Record<string, number>, sluggerInstance: Slugger) {
let originalSlug = sluggerInstance.slug(toString(node))

if (!nodes[originalSlug]) {
Expand All @@ -39,6 +44,7 @@ function addID(node, nodes, sluggerInstance) {

node.data = node.data || {}
node.data.hProperties = node.data.hProperties || {}
// @ts-ignore
node.data.hProperties.id = id
}

Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion libs/tags.ts → libs/tags.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import path from 'path'
import type { MdxFrontMatter } from '~/types/mdx'
import type { TagsCount } from '~/types/server'
import { kebabCase } from '~/utils/string'
import { getFiles } from './files'
import { getFiles } from './files.server'

export function getAllTags(type: string): TagsCount {
let files = getFiles(type)
Expand Down
2 changes: 1 addition & 1 deletion pages/about.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MDXLayoutRenderer } from '~/components/MDXComponents'
import { getFileBySlug } from '~/libs/mdx'
import { getFileBySlug } from '~/libs/mdx.server'
import type { MdxFileData } from '~/types/mdx'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'

Expand Down
2 changes: 1 addition & 1 deletion pages/api/spotify.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { NextApiRequest, NextApiResponse } from 'next'
import { getNowPlaying } from '~/libs/spotify'
import { getNowPlaying } from '~/libs/spotify.server'
import type { SpotifyNowPlayingData } from '~/types/server'

export default async function fetchNowPlaying(_: NextApiRequest, res: NextApiResponse) {
Expand Down
2 changes: 1 addition & 1 deletion pages/api/views/[slug].ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { NextApiRequest, NextApiResponse } from 'next'
import { __db } from '~/libs/prisma'
import { __db } from '~/libs/prisma.server'

export default async function handler(req: NextApiRequest, res: NextApiResponse) {
try {
Expand Down
2 changes: 1 addition & 1 deletion pages/api/views/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { NextApiRequest, NextApiResponse } from 'next'
import { __db } from '~/libs/prisma'
import { __db } from '~/libs/prisma.server'

export default async function handler(_: NextApiRequest, res: NextApiResponse) {
try {
Expand Down
2 changes: 1 addition & 1 deletion pages/blog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { PageSeo } from '~/components/SEO'
import { POSTS_PER_PAGE } from '~/constant'
import { ListLayout } from '~/layouts/ListLayout'
import { getAllFilesFrontMatter } from '~/libs/mdx'
import { getAllFilesFrontMatter } from '~/libs/mdx.server'
import type { BlogListProps } from '~/types/page'

export async function getStaticProps({ locale }) {
Expand Down
8 changes: 4 additions & 4 deletions pages/blog/[...slug].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { MDXLayoutRenderer } from '~/components/MDXComponents'
import { PageTitle } from '~/components/PageTitle'
import { POSTS_PER_PAGE } from '~/constant'
import { getCommentConfigs } from '~/libs/comment'
import { formatSlug, getMetaData, getFiles } from '~/libs/files'
import { generateRss } from '~/libs/generate-rss'
import { getAllFilesFrontMatter, getFileBySlug } from '~/libs/mdx'
import { getCommentConfigs } from '~/libs/comment.server'
import { formatSlug, getMetaData, getFiles } from '~/libs/files.server'
import { generateRss } from '~/libs/rss.server'
import { getAllFilesFrontMatter, getFileBySlug } from '~/libs/mdx.server'
import type { AuthorFrontMatter, MdxPageLayout } from '~/types/mdx'
import type { BlogProps } from '~/types/page'

Expand Down
2 changes: 1 addition & 1 deletion pages/blog/page/[page].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { POSTS_PER_PAGE } from '~/constant'
import type { GetStaticPathsContext } from 'next'
import { useTranslation } from 'next-i18next'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { getAllFilesFrontMatter } from '~/libs/mdx'
import { getAllFilesFrontMatter } from '~/libs/mdx.server'
import type { BlogListProps } from '~/types/page'

export async function getStaticPaths(context: GetStaticPathsContext) {
Expand Down
11 changes: 5 additions & 6 deletions pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { useEffect, useState } from 'react'
import { PageSeo } from 'components/SEO'
import { useTranslation } from 'next-i18next'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { ProfileCard } from '~/components/ProfileCard'
import { Twemoji } from '~/components/Twemoji'
import { BlogLinks } from '~/components/homepage/BlogLinks'
import { FeaturedPosts } from '~/components/homepage/FeaturedPosts'
import { Greeting } from '~/components/homepage/Greeting'
import { Heading } from '~/components/homepage/Heading'
import { ShortDescription } from '~/components/homepage/ShortDescription'
import { TypedBios } from '~/components/homepage/TypedBios'
import { ProfileCard } from '~/components/ProfileCard'
import { Twemoji } from '~/components/Twemoji'
import { getAllFilesFrontMatter } from '~/libs/mdx'
import { useTranslation } from 'next-i18next'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { getAllFilesFrontMatter } from '~/libs/mdx.server'

export async function getStaticProps({ locale }) {
let posts = getAllFilesFrontMatter(`${locale}/blog`)
Expand Down
2 changes: 1 addition & 1 deletion pages/resume.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { MDXLayoutRenderer } from '~/components/MDXComponents'
import { getFileBySlug } from '~/libs/mdx'
import { getFileBySlug } from '~/libs/mdx.server'
import type { MdxFileData } from '~/types/mdx'

export async function getStaticProps({ locale }) {
Expand Down
6 changes: 3 additions & 3 deletions pages/snippets/[...slug].tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { MDXLayoutRenderer } from 'components/MDXComponents'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { PageTitle } from '~/components/PageTitle'
import { getCommentConfigs } from '~/libs/comment'
import { formatSlug, getFiles } from '~/libs/files'
import { getFileBySlug } from '~/libs/mdx'
import { getCommentConfigs } from '~/libs/comment.server'
import { formatSlug, getFiles } from '~/libs/files.server'
import { getFileBySlug } from '~/libs/mdx.server'
import type { MdxPageLayout } from '~/types/mdx'
import type { SnippetProps } from '~/types/page'

Expand Down
2 changes: 1 addition & 1 deletion pages/snippets/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { PageSeo } from 'components/SEO'
import { useTranslation } from 'next-i18next'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { SnippetLayout } from '~/layouts/SnippetLayout'
import { getAllFilesFrontMatter } from '~/libs/mdx'
import { getAllFilesFrontMatter } from '~/libs/mdx.server'
import type { SnippetFrontMatter } from '~/types/mdx'

export async function getStaticProps({ locale }: { locale: string }) {
Expand Down
2 changes: 1 addition & 1 deletion pages/tags.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import { Link } from '~/components/Link'
import { PageSeo } from '~/components/SEO'
import { Tag } from '~/components/Tag'
import { getAllTags } from '~/libs/tags'
import { getAllTags } from '~/libs/tags.server'
import type { TagsCount } from '~/types/server'
import { kebabCase } from '~/utils/string'

Expand Down
8 changes: 4 additions & 4 deletions pages/tags/[tag].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { useTranslation } from 'next-i18next'
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
import path from 'path'
import { ListLayout } from '~/layouts/ListLayout'
import { getMetaData } from '~/libs/files'
import { generateRss } from '~/libs/generate-rss'
import { getAllFilesFrontMatter } from '~/libs/mdx'
import { getAllTags } from '~/libs/tags'
import { getMetaData } from '~/libs/files.server'
import { generateRss } from '~/libs/rss.server'
import { getAllFilesFrontMatter } from '~/libs/mdx.server'
import { getAllTags } from '~/libs/tags.server'
import type { BlogFrontMatter } from '~/types/mdx'
import { kebabCase } from '~/utils/string'

Expand Down

0 comments on commit 47cc5e9

Please sign in to comment.