diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 77b2869..f7bf0ff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ - `blog` - https://blog.developomp.com - `portfolio` - https://portfolio.developomp.com - `packages` - shared stuff used across different packages - - `blog-content` - Contents for the blog + - `content` - Contents for the blog - `eslint-config` - ESLint configuration files - `tailwind-config` -tailwindCSS configuration files - `theme` - universal developomp theme diff --git a/apps/blog/package.json b/apps/blog/package.json index 91788f6..f3d2289 100644 --- a/apps/blog/package.json +++ b/apps/blog/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "scripts": { - "cp": "cp -a ../../packages/blog-content/dist/public/. ./public", + "cp": "cp -a ../../packages/content/dist/public/. ./public", "dev": "pnpm cp && react-scripts start", "build": "pnpm cp && react-scripts build", "lint": "eslint .", @@ -11,7 +11,7 @@ "clean": "rm -rf .turbo build node_modules" }, "dependencies": { - "@developomp-site/blog-content": "workspace:*", + "@developomp-site/content": "workspace:*", "@developomp-site/theme": "workspace:*", "@fontsource/noto-sans-kr": "^5.0.3", "@fontsource/source-code-pro": "^5.0.3", diff --git a/apps/blog/src/components/PostCard.tsx b/apps/blog/src/components/PostCard.tsx index aaf1a82..718fa85 100644 --- a/apps/blog/src/components/PostCard.tsx +++ b/apps/blog/src/components/PostCard.tsx @@ -1,4 +1,4 @@ -import { PostData } from "@developomp-site/blog-content/src/types/types" +import { PostData } from "@developomp-site/content/src/types/types" import { faBook, faCalendar, diff --git a/apps/blog/src/contentMap.ts b/apps/blog/src/contentMap.ts index c24813d..fd69df2 100644 --- a/apps/blog/src/contentMap.ts +++ b/apps/blog/src/contentMap.ts @@ -1,5 +1,5 @@ -import contentMapJson from "@developomp-site/blog-content/dist/map.json" -import { ContentMap } from "@developomp-site/blog-content/src/types/types" +import contentMapJson from "@developomp-site/content/dist/map.json" +import { ContentMap } from "@developomp-site/content/src/types/types" const contentMap: ContentMap = contentMapJson diff --git a/apps/blog/src/pages/Page/Meta.tsx b/apps/blog/src/pages/Page/Meta.tsx index 579a0ec..71bc812 100644 --- a/apps/blog/src/pages/Page/Meta.tsx +++ b/apps/blog/src/pages/Page/Meta.tsx @@ -1,4 +1,4 @@ -import { PageData } from "@developomp-site/blog-content/src/types/types" +import { PageData } from "@developomp-site/content/src/types/types" import { faBook, faCalendar, diff --git a/apps/blog/src/pages/Page/Page.tsx b/apps/blog/src/pages/Page/Page.tsx index 6ccf99d..bd8e213 100644 --- a/apps/blog/src/pages/Page/Page.tsx +++ b/apps/blog/src/pages/Page/Page.tsx @@ -1,4 +1,4 @@ -import type { PageData } from "@developomp-site/blog-content/src/types/types" +import type { PageData } from "@developomp-site/content/src/types/types" import { useMeta, useTitle } from "hoofd" import { useEffect, useState } from "react" import { useLocation } from "react-router-dom" diff --git a/apps/blog/src/pages/Page/helper.ts b/apps/blog/src/pages/Page/helper.ts index 777b1bf..b4ed065 100644 --- a/apps/blog/src/pages/Page/helper.ts +++ b/apps/blog/src/pages/Page/helper.ts @@ -1,5 +1,5 @@ -import portfolio from "@developomp-site/blog-content/dist/portfolio.json" -import type { PageData } from "@developomp-site/blog-content/src/types/types" +import portfolio from "@developomp-site/content/dist/portfolio.json" +import type { PageData } from "@developomp-site/content/src/types/types" import contentMap from "../../contentMap" @@ -15,11 +15,11 @@ export async function fetchContent(pageType: PageType, url: string) { try { if (pageType == PageType.UNSEARCHABLE) { return await import( - `@developomp-site/blog-content/dist/content/unsearchable${url}.json` + `@developomp-site/content/dist/content/unsearchable${url}.json` ) } else { return await import( - `@developomp-site/blog-content/dist/content${url}.json` + `@developomp-site/content/dist/content${url}.json` ) } } catch (err) { diff --git a/apps/blog/src/pages/Search/Search.tsx b/apps/blog/src/pages/Search/Search.tsx index 283a089..1aaebbe 100644 --- a/apps/blog/src/pages/Search/Search.tsx +++ b/apps/blog/src/pages/Search/Search.tsx @@ -1,7 +1,7 @@ import "react-date-range/dist/styles.css" import "react-date-range/dist/theme/default.css" -import searchData from "@developomp-site/blog-content/dist/search.json" +import searchData from "@developomp-site/content/dist/search.json" import elasticlunr from "elasticlunr" // search engine import { useMeta, useTitle } from "hoofd" import { useCallback, useEffect, useState } from "react" diff --git a/apps/portfolio/package.json b/apps/portfolio/package.json index 0621faa..4c1f29c 100644 --- a/apps/portfolio/package.json +++ b/apps/portfolio/package.json @@ -22,7 +22,7 @@ "wouter": "^2.11.0" }, "devDependencies": { - "@developomp-site/blog-content": "workspace:*", + "@developomp-site/content": "workspace:*", "@developomp-site/tailwind-config": "workspace:*", "@linaria/babel-preset": "^4.4.5", "@linaria/vite": "^4.2.11", diff --git a/apps/portfolio/src/components/Badge/Badge.tsx b/apps/portfolio/src/components/Badge/Badge.tsx index 6358286..b624e53 100644 --- a/apps/portfolio/src/components/Badge/Badge.tsx +++ b/apps/portfolio/src/components/Badge/Badge.tsx @@ -1,6 +1,6 @@ import "./style.scss" -import { type Badge as BadgeType } from "@developomp-site/blog-content/src/types/types" +import { type Badge as BadgeType } from "@developomp-site/content/src/types/types" import { type FC, useEffect, useState } from "react" interface BadgeProps { @@ -13,9 +13,7 @@ const Badge: FC = ({ slug }) => { useEffect(() => { ;(async () => { setBadgeData( - await import( - `@developomp-site/blog-content/dist/icons/${slug}.json` - ) + await import(`@developomp-site/content/dist/icons/${slug}.json`) ) })() }, [slug]) diff --git a/apps/portfolio/src/components/ProjectCard/ProjectCard.tsx b/apps/portfolio/src/components/ProjectCard/ProjectCard.tsx index e00b422..9fcaa15 100644 --- a/apps/portfolio/src/components/ProjectCard/ProjectCard.tsx +++ b/apps/portfolio/src/components/ProjectCard/ProjectCard.tsx @@ -1,6 +1,6 @@ import "./style.scss" -import { PortfolioProject } from "@developomp-site/blog-content/src/types/types" +import { PortfolioProject } from "@developomp-site/content/src/types/types" import { type FC, useEffect, useState } from "react" import Badge from "@/components/Badge" diff --git a/apps/portfolio/src/routes/Home/Home.tsx b/apps/portfolio/src/routes/Home/Home.tsx index 49698ee..526d2be 100644 --- a/apps/portfolio/src/routes/Home/Home.tsx +++ b/apps/portfolio/src/routes/Home/Home.tsx @@ -1,7 +1,7 @@ import "./style.scss" -import portfolio from "@developomp-site/blog-content/dist/portfolio.json" -import type { PortfolioProject } from "@developomp-site/blog-content/src/types/types" +import portfolio from "@developomp-site/content/dist/portfolio.json" +import type { PortfolioProject } from "@developomp-site/content/src/types/types" import { useMeta, useTitle } from "hoofd" import { type FC } from "react" diff --git a/apps/portfolio/src/routes/Project/Project.tsx b/apps/portfolio/src/routes/Project/Project.tsx index c506637..fcbf194 100644 --- a/apps/portfolio/src/routes/Project/Project.tsx +++ b/apps/portfolio/src/routes/Project/Project.tsx @@ -1,6 +1,6 @@ import "./style.scss" -import portfolio from "@developomp-site/blog-content/dist/portfolio.json" +import portfolio from "@developomp-site/content/dist/portfolio.json" import { useMeta, useTitle } from "hoofd" import { type FC, useEffect, useState } from "react" import { useRoute } from "wouter" @@ -42,7 +42,7 @@ const Project: FC = () => { ] const fetched_content = await import( - `@developomp-site/blog-content/dist/content/projects/${params.id}.json` + `@developomp-site/content/dist/content/projects/${params.id}.json` ) setPageData({ diff --git a/packages/blog-content/.eslintrc.js b/packages/content/.eslintrc.js similarity index 100% rename from packages/blog-content/.eslintrc.js rename to packages/content/.eslintrc.js diff --git a/packages/blog-content/.prettierrc b/packages/content/.prettierrc similarity index 100% rename from packages/blog-content/.prettierrc rename to packages/content/.prettierrc diff --git a/packages/blog-content/markdown/posts/finding the ultimate browser.md b/packages/content/markdown/posts/finding the ultimate browser.md similarity index 100% rename from packages/blog-content/markdown/posts/finding the ultimate browser.md rename to packages/content/markdown/posts/finding the ultimate browser.md diff --git a/packages/blog-content/markdown/posts/test post.md b/packages/content/markdown/posts/test post.md similarity index 100% rename from packages/blog-content/markdown/posts/test post.md rename to packages/content/markdown/posts/test post.md diff --git a/packages/blog-content/markdown/projects/developomp-site.md b/packages/content/markdown/projects/developomp-site.md similarity index 100% rename from packages/blog-content/markdown/projects/developomp-site.md rename to packages/content/markdown/projects/developomp-site.md diff --git a/packages/blog-content/markdown/projects/llama bot.md b/packages/content/markdown/projects/llama bot.md similarity index 100% rename from packages/blog-content/markdown/projects/llama bot.md rename to packages/content/markdown/projects/llama bot.md diff --git a/packages/blog-content/markdown/projects/mocha downloader.md b/packages/content/markdown/projects/mocha downloader.md similarity index 100% rename from packages/blog-content/markdown/projects/mocha downloader.md rename to packages/content/markdown/projects/mocha downloader.md diff --git a/packages/blog-content/markdown/projects/pomky.md b/packages/content/markdown/projects/pomky.md similarity index 100% rename from packages/blog-content/markdown/projects/pomky.md rename to packages/content/markdown/projects/pomky.md diff --git a/packages/blog-content/markdown/projects/pompup.md b/packages/content/markdown/projects/pompup.md similarity index 100% rename from packages/blog-content/markdown/projects/pompup.md rename to packages/content/markdown/projects/pompup.md diff --git a/packages/blog-content/markdown/projects/wbm.md b/packages/content/markdown/projects/wbm.md similarity index 100% rename from packages/blog-content/markdown/projects/wbm.md rename to packages/content/markdown/projects/wbm.md diff --git a/packages/blog-content/markdown/projects/wbtimeline.md b/packages/content/markdown/projects/wbtimeline.md similarity index 100% rename from packages/blog-content/markdown/projects/wbtimeline.md rename to packages/content/markdown/projects/wbtimeline.md diff --git a/packages/blog-content/markdown/series/my quotes/0.md b/packages/content/markdown/series/my quotes/0.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/0.md rename to packages/content/markdown/series/my quotes/0.md diff --git a/packages/blog-content/markdown/series/my quotes/10_10.md b/packages/content/markdown/series/my quotes/10_10.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/10_10.md rename to packages/content/markdown/series/my quotes/10_10.md diff --git a/packages/blog-content/markdown/series/my quotes/1_1.md b/packages/content/markdown/series/my quotes/1_1.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/1_1.md rename to packages/content/markdown/series/my quotes/1_1.md diff --git a/packages/blog-content/markdown/series/my quotes/2_2.md b/packages/content/markdown/series/my quotes/2_2.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/2_2.md rename to packages/content/markdown/series/my quotes/2_2.md diff --git a/packages/blog-content/markdown/series/my quotes/3_3.md b/packages/content/markdown/series/my quotes/3_3.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/3_3.md rename to packages/content/markdown/series/my quotes/3_3.md diff --git a/packages/blog-content/markdown/series/my quotes/4_4.md b/packages/content/markdown/series/my quotes/4_4.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/4_4.md rename to packages/content/markdown/series/my quotes/4_4.md diff --git a/packages/blog-content/markdown/series/my quotes/5_5.md b/packages/content/markdown/series/my quotes/5_5.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/5_5.md rename to packages/content/markdown/series/my quotes/5_5.md diff --git a/packages/blog-content/markdown/series/my quotes/6_6.md b/packages/content/markdown/series/my quotes/6_6.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/6_6.md rename to packages/content/markdown/series/my quotes/6_6.md diff --git a/packages/blog-content/markdown/series/my quotes/7_7.md b/packages/content/markdown/series/my quotes/7_7.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/7_7.md rename to packages/content/markdown/series/my quotes/7_7.md diff --git a/packages/blog-content/markdown/series/my quotes/8_8.md b/packages/content/markdown/series/my quotes/8_8.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/8_8.md rename to packages/content/markdown/series/my quotes/8_8.md diff --git a/packages/blog-content/markdown/series/my quotes/9_9.md b/packages/content/markdown/series/my quotes/9_9.md similarity index 100% rename from packages/blog-content/markdown/series/my quotes/9_9.md rename to packages/content/markdown/series/my quotes/9_9.md diff --git a/packages/blog-content/markdown/unsearchable/resume.md b/packages/content/markdown/unsearchable/resume.md similarity index 100% rename from packages/blog-content/markdown/unsearchable/resume.md rename to packages/content/markdown/unsearchable/resume.md diff --git a/packages/blog-content/package.json b/packages/content/package.json similarity index 96% rename from packages/blog-content/package.json rename to packages/content/package.json index 680852b..c25c3ed 100644 --- a/packages/blog-content/package.json +++ b/packages/content/package.json @@ -1,5 +1,5 @@ { - "name": "@developomp-site/blog-content", + "name": "@developomp-site/content", "version": "0.0.0", "license": "MIT", "files": [ diff --git a/packages/blog-content/src/config.ts b/packages/content/src/config.ts similarity index 100% rename from packages/blog-content/src/config.ts rename to packages/content/src/config.ts diff --git a/packages/blog-content/src/index.ts b/packages/content/src/index.ts similarity index 100% rename from packages/blog-content/src/index.ts rename to packages/content/src/index.ts diff --git a/packages/blog-content/src/parseMarkdown.ts b/packages/content/src/parseMarkdown.ts similarity index 100% rename from packages/blog-content/src/parseMarkdown.ts rename to packages/content/src/parseMarkdown.ts diff --git a/packages/blog-content/src/portfolio/badge.ejs b/packages/content/src/portfolio/badge.ejs similarity index 100% rename from packages/blog-content/src/portfolio/badge.ejs rename to packages/content/src/portfolio/badge.ejs diff --git a/packages/blog-content/src/portfolio/badges.ejs b/packages/content/src/portfolio/badges.ejs similarity index 100% rename from packages/blog-content/src/portfolio/badges.ejs rename to packages/content/src/portfolio/badges.ejs diff --git a/packages/blog-content/src/portfolio/skills.ejs b/packages/content/src/portfolio/skills.ejs similarity index 100% rename from packages/blog-content/src/portfolio/skills.ejs rename to packages/content/src/portfolio/skills.ejs diff --git a/packages/blog-content/src/portfolio/skills.json b/packages/content/src/portfolio/skills.json similarity index 100% rename from packages/blog-content/src/portfolio/skills.json rename to packages/content/src/portfolio/skills.json diff --git a/packages/blog-content/src/portfolio/style.css b/packages/content/src/portfolio/style.css similarity index 100% rename from packages/blog-content/src/portfolio/style.css rename to packages/content/src/portfolio/style.css diff --git a/packages/blog-content/src/postProcess.ts b/packages/content/src/postProcess.ts similarity index 100% rename from packages/blog-content/src/postProcess.ts rename to packages/content/src/postProcess.ts diff --git a/packages/blog-content/src/recursiveParse/index.ts b/packages/content/src/recursiveParse/index.ts similarity index 100% rename from packages/blog-content/src/recursiveParse/index.ts rename to packages/content/src/recursiveParse/index.ts diff --git a/packages/blog-content/src/recursiveParse/parsePost.ts b/packages/content/src/recursiveParse/parsePost.ts similarity index 100% rename from packages/blog-content/src/recursiveParse/parsePost.ts rename to packages/content/src/recursiveParse/parsePost.ts diff --git a/packages/blog-content/src/recursiveParse/parseProjects.ts b/packages/content/src/recursiveParse/parseProjects.ts similarity index 100% rename from packages/blog-content/src/recursiveParse/parseProjects.ts rename to packages/content/src/recursiveParse/parseProjects.ts diff --git a/packages/blog-content/src/recursiveParse/parseSeries.ts b/packages/content/src/recursiveParse/parseSeries.ts similarity index 100% rename from packages/blog-content/src/recursiveParse/parseSeries.ts rename to packages/content/src/recursiveParse/parseSeries.ts diff --git a/packages/blog-content/src/recursiveParse/parseUnsearchable.ts b/packages/content/src/recursiveParse/parseUnsearchable.ts similarity index 100% rename from packages/blog-content/src/recursiveParse/parseUnsearchable.ts rename to packages/content/src/recursiveParse/parseUnsearchable.ts diff --git a/packages/blog-content/src/searchIndex.ts b/packages/content/src/searchIndex.ts similarity index 100% rename from packages/blog-content/src/searchIndex.ts rename to packages/content/src/searchIndex.ts diff --git a/packages/blog-content/src/types/markdown-it-footnote.d.ts b/packages/content/src/types/markdown-it-footnote.d.ts similarity index 100% rename from packages/blog-content/src/types/markdown-it-footnote.d.ts rename to packages/content/src/types/markdown-it-footnote.d.ts diff --git a/packages/blog-content/src/types/markdown-it-highlight-lines.d.ts b/packages/content/src/types/markdown-it-highlight-lines.d.ts similarity index 100% rename from packages/blog-content/src/types/markdown-it-highlight-lines.d.ts rename to packages/content/src/types/markdown-it-highlight-lines.d.ts diff --git a/packages/blog-content/src/types/markdown-it-mark.d.ts b/packages/content/src/types/markdown-it-mark.d.ts similarity index 100% rename from packages/blog-content/src/types/markdown-it-mark.d.ts rename to packages/content/src/types/markdown-it-mark.d.ts diff --git a/packages/blog-content/src/types/markdown-it-sub.d.ts b/packages/content/src/types/markdown-it-sub.d.ts similarity index 100% rename from packages/blog-content/src/types/markdown-it-sub.d.ts rename to packages/content/src/types/markdown-it-sub.d.ts diff --git a/packages/blog-content/src/types/markdown-it-sup.d.ts b/packages/content/src/types/markdown-it-sup.d.ts similarity index 100% rename from packages/blog-content/src/types/markdown-it-sup.d.ts rename to packages/content/src/types/markdown-it-sup.d.ts diff --git a/packages/blog-content/src/types/markdown-it-task-checkbox.d.ts b/packages/content/src/types/markdown-it-task-checkbox.d.ts similarity index 100% rename from packages/blog-content/src/types/markdown-it-task-checkbox.d.ts rename to packages/content/src/types/markdown-it-task-checkbox.d.ts diff --git a/packages/blog-content/src/types/markdown-it-texmath.d.ts b/packages/content/src/types/markdown-it-texmath.d.ts similarity index 100% rename from packages/blog-content/src/types/markdown-it-texmath.d.ts rename to packages/content/src/types/markdown-it-texmath.d.ts diff --git a/packages/blog-content/src/types/markdown-toc.d.ts b/packages/content/src/types/markdown-toc.d.ts similarity index 100% rename from packages/blog-content/src/types/markdown-toc.d.ts rename to packages/content/src/types/markdown-toc.d.ts diff --git a/packages/blog-content/src/types/types.ts b/packages/content/src/types/types.ts similarity index 100% rename from packages/blog-content/src/types/types.ts rename to packages/content/src/types/types.ts diff --git a/packages/blog-content/src/util.ts b/packages/content/src/util.ts similarity index 100% rename from packages/blog-content/src/util.ts rename to packages/content/src/util.ts diff --git a/packages/blog-content/tsconfig.json b/packages/content/tsconfig.json similarity index 100% rename from packages/blog-content/tsconfig.json rename to packages/content/tsconfig.json diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b73b8e2..8ead3e7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,9 +26,9 @@ importers: apps/blog: dependencies: - '@developomp-site/blog-content': + '@developomp-site/content': specifier: workspace:* - version: link:../../packages/blog-content + version: link:../../packages/content '@developomp-site/theme': specifier: workspace:* version: link:../../packages/theme @@ -283,9 +283,9 @@ importers: specifier: ^2.11.0 version: 2.11.0(react@18.2.0) devDependencies: - '@developomp-site/blog-content': + '@developomp-site/content': specifier: workspace:* - version: link:../../packages/blog-content + version: link:../../packages/content '@developomp-site/tailwind-config': specifier: workspace:* version: link:../../packages/tailwind-config @@ -356,7 +356,7 @@ importers: specifier: ^4.2.0 version: 4.2.0(typescript@5.1.6)(vite@4.3.9) - packages/blog-content: + packages/content: dependencies: '@developomp-site/tsconfig': specifier: workspace:*