From bb5d43be348b5f656ec8c5223540f2efc9f59f40 Mon Sep 17 00:00:00 2001
From: qwqcode <qwqcode@gmail.com>
Date: Tue, 19 Dec 2023 21:32:01 +0800
Subject: [PATCH] fix script

---
 docs/docs/.gitignore                  |  8 --------
 docs/docs/.vitepress/theme/Artalk.vue | 13 +++++++------
 docs/landing/package.json             |  2 +-
 docs/swagger/.gitignore               |  1 +
 docs/swagger/package.json             |  2 +-
 package.json                          |  3 ++-
 6 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 docs/swagger/.gitignore

diff --git a/docs/docs/.gitignore b/docs/docs/.gitignore
index c655fb557..128ddf37a 100644
--- a/docs/docs/.gitignore
+++ b/docs/docs/.gitignore
@@ -1,10 +1,2 @@
-# VitePress
 .vitepress/dist/**
 .vitepress/cache/**
-
-# Landing page
-public/landing/
-public/index.html
-
-# Swagger output
-public/http-api.html
diff --git a/docs/docs/.vitepress/theme/Artalk.vue b/docs/docs/.vitepress/theme/Artalk.vue
index 53017ab29..65f8f78a3 100644
--- a/docs/docs/.vitepress/theme/Artalk.vue
+++ b/docs/docs/.vitepress/theme/Artalk.vue
@@ -1,7 +1,5 @@
 <template>
-  <ClientOnly>
-    <div ref="el" style="margin-top: 20px;"></div>
-  </ClientOnly>
+  <div ref="el" style="margin-top: 20px;"></div>
 </template>
 
 <script setup lang="ts">
@@ -17,10 +15,12 @@ const page = useData().page
 let artalk: Artalk
 
 onMounted(() => {
-  initArtalk(getConfByPage())
+  nextTick(() => {
+    initArtalk(getConfByPage())
+  })
 })
 
-watch(() => router.route.data.relativePath, () => {
+watch(() => router.route.path, () => {
   nextTick(() => {
     artalk.update(getConfByPage())
     artalk.reload()
@@ -32,6 +32,7 @@ onUnmounted(() => {
 })
 
 function initArtalk(conf: any) {
+  // TODO: remove dynamic import after the new version released
   import('artalk').then(({ default: Artalk }) => {
     artalk = Artalk.init({
       el:        el.value,
@@ -48,7 +49,7 @@ function initArtalk(conf: any) {
 
 function getConfByPage() {
   return {
-    pageKey:   'https://artalk.js.org'+location.pathname,
+    pageKey:   'https://artalk.js.org'+router.route.path,
     pageTitle:  page.value.title,
     server:    'https://artalk.qwqaq.com',
     site:      'ArtalkDocs',
diff --git a/docs/landing/package.json b/docs/landing/package.json
index f27ed0f28..886bada47 100644
--- a/docs/landing/package.json
+++ b/docs/landing/package.json
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build && cp -rf ./dist/* ../docs/public/",
+    "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview"
   },
diff --git a/docs/swagger/.gitignore b/docs/swagger/.gitignore
new file mode 100644
index 000000000..1521c8b76
--- /dev/null
+++ b/docs/swagger/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/docs/swagger/package.json b/docs/swagger/package.json
index 88a058bbe..60839ff70 100644
--- a/docs/swagger/package.json
+++ b/docs/swagger/package.json
@@ -10,7 +10,7 @@
   },
   "private": true,
   "scripts": {
-    "swagger:build": "npx @redocly/cli build-docs --output ../docs/public/http-api.html",
+    "swagger:build": "npx @redocly/cli build-docs --output ./dist/http-api.html",
     "swagger:serve": "npx @redocly/cli preview-docs"
   },
   "devDependencies": {
diff --git a/package.json b/package.json
index accbb1e73..8f85a3cc8 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
   "private": true,
   "homepage": "https://artalk.js.org",
   "scripts": {
-    "docs:build": "pnpm -filter=docs-landing build && pnpm -r swagger:build && pnpm -r docs:build"
+    "docs:build": "pnpm -F=docs-landing build && pnpm -F=docs-swagger swagger:build && pnpm -F=docs docs:build && pnpm docs:patch",
+    "docs:patch": "cp -rf docs/{landing/dist/*,swagger/dist/*} docs/docs/.vitepress/dist"
   },
   "packageManager": "pnpm@8.12.1"
 }