fix(plugin_katex): fix event issue causing katex integration failure (#…

…897)
ArtalkJS · May 30, 2024 · ca6f8ed · ca6f8ed
1 parent a0b0a33
commit ca6f8ed
Show file tree

Hide file tree

Showing 15 changed files with 159 additions and 148 deletions.
diff --git a/docs/docs/.vitepress/theme/Artalk.vue b/docs/docs/.vitepress/theme/Artalk.vue
@@ -6,6 +6,7 @@
 import { watch, nextTick, ref, onMounted, onUnmounted } from 'vue'
 import { useData, useRouter } from 'vitepress'
 import Artalk from 'artalk'
+import { ArtalkKatexPlugin } from '@artalk/plugin-katex'
 import 'artalk/dist/Artalk.css'
 
 const el = ref<HTMLElement | null>(null)
@@ -36,6 +37,8 @@ onUnmounted(() => {
 })
 
 function initArtalk(conf: any) {
+  Artalk.use(ArtalkKatexPlugin)
+
   artalk = Artalk.init({
     el: el.value,
     emoticons: '/assets/emoticons/default.json',

diff --git a/docs/docs/package.json b/docs/docs/package.json
@@ -21,6 +21,7 @@
     "vitepress": "1.1.4"
   },
   "dependencies": {
+    "@artalk/plugin-katex": "^0.1.7",
     "vue": "^3.4.26"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/ui/artalk-sidebar/src/pages/settings.vue b/ui/artalk-sidebar/src/pages/settings.vue
@@ -162,6 +162,8 @@ function save() {
     border-bottom: 1px solid var(--at-color-border);
     outline: none;
     background: transparent;
+    -webkit-appearance: none;
+    border-radius: 0;
 
     &:focus {
       border-bottom-color: var(--at-color-main);

diff --git a/ui/artalk/src/plugins/markdown.ts b/ui/artalk/src/plugins/markdown.ts
@@ -2,12 +2,14 @@ import type { ArtalkPlugin } from '@/types'
 import * as marked from '@/lib/marked'
 
 export const Markdown: ArtalkPlugin = (ctx) => {
-  ctx.watchConf(['markedReplacers', 'imgLazyLoad', 'markedOptions'], (conf) => {
+  ctx.watchConf(['imgLazyLoad', 'markedOptions'], (conf) => {
     marked.initMarked({
       markedOptions: ctx.getConf().markedOptions,
       imgLazyLoad: ctx.getConf().imgLazyLoad,
     })
+  })
 
-    if (conf.markedReplacers) marked.setReplacers(conf.markedReplacers)
+  ctx.watchConf(['markedReplacers'], (conf) => {
+    conf.markedReplacers && marked.setReplacers(conf.markedReplacers)
   })
 }
diff --git a/ui/plugin-auth/artalk-plugin-shim.d.ts b/ui/plugin-auth/artalk-plugin-shim.d.ts
@@ -1,9 +1 @@
-import type { ArtalkPlugin } from 'artalk'
-
-export {}
-
-declare global {
-  interface Window {
-    ArtalkPlugins?: { [name: string]: ArtalkPlugin }
-  }
-}
+/// <reference types="@artalk/plugin-kit/client" />
diff --git a/ui/plugin-auth/main.tsx b/ui/plugin-auth/main.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import './style.scss'
-import Artalk, { ArtalkPlugin } from 'artalk'
+import { ArtalkPlugin } from 'artalk'
 import { DialogMain } from './DialogMain'
 import { createLayer } from './lib/layer'
 import { RenderEditorUser } from './EditorUser'
@@ -56,13 +56,9 @@ export const ArtalkAuthPlugin: ArtalkPlugin = (ctx) => {
   })
 }
 
-if ((window as any)?.Artalk) {
-  ;(window as any).Artalk.use(ArtalkAuthPlugin)
-} else if (Artalk) {
-  Artalk.use(ArtalkAuthPlugin)
-}
-
+// Mount plugin to browser window global
 if (window) {
   !window.ArtalkPlugins && (window.ArtalkPlugins = {})
   window.ArtalkPlugins.Auth = ArtalkAuthPlugin
+  window.Artalk?.use(ArtalkAuthPlugin)
 }
diff --git a/ui/plugin-auth/package.json b/ui/plugin-auth/package.json
@@ -34,6 +34,7 @@
     "solid-js": "^1.8.17"
   },
   "devDependencies": {
+    "@artalk/plugin-kit": "workspace:^",
     "vite-plugin-css-injected-by-js": "^3.5.1",
     "vite-plugin-solid": "^2.10.2"
   }

diff --git a/ui/plugin-katex/README.md b/ui/plugin-katex/README.md
@@ -1,3 +1,3 @@
 # @artalk/plugin-katex
 
-食用方法参考：[官方文档](https://artalk.js.org/guide/frontend/latex.html)
+使用方法参考：[官方文档](https://artalk.js.org/guide/frontend/latex.html)
diff --git a/ui/plugin-katex/index.html b/ui/plugin-katex/index.html
diff --git a/ui/plugin-katex/main.ts b/ui/plugin-katex/main.ts
diff --git a/ui/plugin-katex/package.json b/ui/plugin-katex/package.json
@@ -1,10 +1,16 @@
 {
   "name": "@artalk/plugin-katex",
-  "version": "0.1.6",
+  "version": "0.1.7",
+  "minAppVersion": "2.8.6",
   "license": "MIT",
   "description": "The katex plugin for artalk",
+  "type": "module",
   "main": "./dist/artalk-plugin-katex.js",
-  "module": "./dist/artalk-plugin-katex.es.js",
+  "module": "./dist/artalk-plugin-katex.mjs",
+  "types": "./dist/artalk-plugin-katex.d.ts",
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -17,6 +23,19 @@
     "katex": "^0.16.10"
   },
   "devDependencies": {
+    "@artalk/plugin-kit": "workspace:^",
     "@types/katex": "0.16.7"
+  },
+  "exports": {
+    ".": {
+      "require": {
+        "types": "./dist/artalk-plugin-katex.d.cts",
+        "default": "./dist/artalk-plugin-katex.cjs"
+      },
+      "default": {
+        "types": "./dist/artalk-plugin-katex.d.ts",
+        "default": "./dist/artalk-plugin-katex.mjs"
+      }
+    }
   }
 }