Merge branch 'main' into feat/reddit-comments

.vitepress/constants.ts

@@ -22,7 +22,6 @@ export const search: DefaultTheme.Config['search'] = {
       searchOptions: {
         combineWith: 'AND',
         fuzzy: false,
-        // @ts-ignore
         boostDocument: (
           _,
           term,

.vitepress/routes/comments.get.ts

@@ -0,0 +1 @@
+export default defineEventHandler(async (event) => {})

.vitepress/theme/components/Authors.vue

@@ -41,7 +41,7 @@ const authors = computed(() =>
 <template>
   <div class="flex flex-wrap gap-4 pt-2">
     <div v-for="(c, index) of authors" class="flex gap-2 items-center">
-      <img :src="`${c.github}.png`" class="w-8 h-8 rounded-full" >
+      <img :src="`${c.github}.png`" class="w-8 h-8 rounded-full" />
       <a :href="c.github">{{ c.name }}</a>
       <span v-if="index < authors.length - 1">•</span>
     </div>

.vitepress/theme/components/Feedback.vue

@@ -5,7 +5,7 @@ import {
   type FeedbackType,
   getFeedbackOption,
   feedbackOptions
-} from '../../../../api/types/Feedback'
+} from '../../types/Feedback'
 
 const loading = ref<boolean>(false)
 const error = ref<unknown>(null)

api/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "@fmhy/api",
-  "version": "1.0.0",
-  "type": "module",
-  "description": "FMHY API.",
-  "scripts": {
-    "prepare": "nitropack prepare",
-    "dev": "nitropack dev",
-    "build": "nitropack build",
-    "preview": "node .output/server/index.mjs",
-    "types": "nitropack prepare",
-    "lint": "eslint --cache -f pretty routes types middleware nitro.config.ts"
-  },
-  "dependencies": {
-    "itty-fetcher": "^0.9.4",
-    "nitro-cors": "^0.7.0",
-    "nitropack": "latest"
-  },
-  "devDependencies": {
-    "@taskylizard/eslint-config": "^1.1.1",
-    "eslint": "^8.56.0"
-  },
-  "author": "taskylizard <taskylizard@fmhy.net>"
-}

docs/eslint.config.js

@@ -1,10 +0,0 @@
-// @ts-check
-import tasky from '@taskylizard/eslint-config'
-
-export default tasky({
-  vue: true,
-  typescript: true,
-  browser: true,
-  unocss: true,
-  files: ['**/.vitepress/**']
-})

docs/package.json

@@ -1,36 +0,0 @@
-{
-  "name": "@fmhy/docs",
-  "version": "1.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vitepress dev",
-    "build": "vitepress build",
-    "preview": "vitepress preview",
-    "lint": "eslint --cache -f pretty .",
-    "og": "x-satori -t ./.vitepress/hooks/Template.vue -c ./.vitepress/hooks/satoriConfig.ts --dev"
-  },
-  "dependencies": {
-    "@headlessui/vue": "^1.7.17",
-    "@resvg/resvg-js": "^2.6.0",
-    "vitepress": "npm:@taskylizard/vitepress@1.0.10",
-    "consola": "^3.2.3",
-    "feed": "^4.2.2",
-    "fs-extra": "^11.2.0",
-    "nprogress": "^0.2.0",
-    "pathe": "^1.1.2",
-    "unocss": "^0.58.4",
-    "vue": "^3.4.15",
-    "x-satori": "^0.1.5",
-    "zod": "^3.22.4"
-  },
-  "devDependencies": {
-    "@taskylizard/eslint-config": "^1.1.1",
-    "eslint": "^8.56.0",
-    "@iconify-json/carbon": "^1.1.28",
-    "@iconify-json/twemoji": "^1.1.15",
-    "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.11.15",
-    "@types/nprogress": "^0.2.3"
-  },
-  "author": "nbats, taskylizard & Contributors"
-}

docs/tsconfig.json

@@ -1,29 +0,0 @@
-{
-  "compilerOptions": {
-    "verbatimModuleSyntax": true,
-    "baseUrl": ".",
-    "module": "esnext",
-    "target": "esnext",
-    "lib": [
-      "DOM",
-      "ESNext"
-    ],
-    "strict": true,
-    "jsx": "preserve",
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "noUnusedLocals": true,
-    "strictNullChecks": true,
-    "forceConsistentCasingInFileNames": true,
-    "types": [
-      "vite/client",
-      "vitepress"
-    ]
-  },
-  "include": [
-    ".vitepress",
-    "eslint.config.js"
-  ]
-}

eslint.config.js

@@ -2,6 +2,7 @@
 import tasky from '@taskylizard/eslint-config'
 
 export default tasky({
+  vue: true,
   browser: true,
-  ignores: ['**/.nitro']
+  typescript: true
 })

nitro.config.ts

@@ -3,6 +3,7 @@ export default defineNitroConfig({
   runtimeConfig: {
     WEBHOOK_URL: process.env.WEBHOOK_URL
   },
+  srcDir: '.vitepress',
   routeRules: {
     '/': {
       cors: false

package.json

@@ -1,23 +1,45 @@
 {
-  "name": "@fmhy/monorepo",
+  "name": "fmhy",
+  "type": "module",
   "packageManager": "pnpm@8.15.1",
-  "engines": {
-    "node": "21.6.2"
-  },
   "scripts": {
-    "docs:dev": "pnpm -F docs dev",
+    "docs:dev": "vitepress dev",
-    "docs:build": "pnpm -F docs build",
+    "docs:build": "vitepress build",
-    "docs:preview": "pnpm -F docs serve",
+    "docs:preview": "vitepress preview",
-    "api:dev": "pnpm -F api dev",
+    "api:prepare": "nitropack prepare",
-    "api:build": "pnpm -F api build",
+    "api:dev": "nitropack dev",
-    "api:prepare": "pnpm -F api prepare",
+    "api:build": "nitropack build",
-    "api:preview": "pnpm -F api preview",
+    "api:preview": "node .output/server/index.mjs",
+    "og:dev": "x-satori -t ./.vitepress/hooks/Template.vue -c ./.vitepress/hooks/satoriConfig.ts --dev",
     "format": "prettier -w --cache --check .",
-    "og:dev": "pnpm -F docs og",
+    "lint": "eslint .vitepress -f pretty --cache",
-    "lint": "pnpm --parallel -R lint",
+    "postinstall": "nitropack prepare"
-    "postinstall": "pnpm -F api types"
+  },
+  "dependencies": {
+    "@headlessui/vue": "^1.7.17",
+    "@resvg/resvg-js": "^2.6.0",
+    "vitepress": "npm:@taskylizard/vitepress@1.0.10",
+    "consola": "^3.2.3",
+    "feed": "^4.2.2",
+    "fs-extra": "^11.2.0",
+    "itty-fetcher": "^0.9.4",
+    "nitro-cors": "^0.7.0",
+    "nitropack": "latest",
+    "nprogress": "^0.2.0",
+    "pathe": "^1.1.2",
+    "unocss": "^0.58.4",
+    "vue": "^3.4.15",
+    "x-satori": "^0.1.5",
+    "zod": "^3.22.4"
   },
   "devDependencies": {
+    "@iconify-json/carbon": "^1.1.28",
+    "@iconify-json/twemoji": "^1.1.15",
+    "@taskylizard/eslint-config": "^1.1.1",
+    "@types/fs-extra": "^11.0.4",
+    "@types/node": "^20.11.15",
+    "@types/nprogress": "^0.2.3",
+    "eslint": "^8.56.0",
     "prettier": "^3.2.4"
   }
 }

pnpm-workspace.yaml

@@ -1,4 +0,0 @@
-packages:
-  - 'docs/'
-  - 'api/'
-  - '!**/test/**'