@waline/client 2.1.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/client",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "client for waline comment system",
   "keywords": [
     "valine",
@@ -24,9 +24,23 @@
       "require": "./dist/shim.js",
       "default": "./dist/shim.js"
     },
-    "./dist": "./dist/shim.js",
+    "./dist": {
+      "import": "./dist/shim.esm.js",
+      "require": "./dist/shim.js",
+      "default": "./dist/shim.js"
+    },
+    "./dist/pageview": {
+      "import": "./dist/pageview.esm.js",
+      "require": "./dist/pageview.cjs.js",
+      "default": "./dist/pageview.js"
+    },
+    "./dist/waline": {
+      "import": "./dist/waline.esm.js",
+      "require": "./dist/waline.cjs.js",
+      "default": "./dist/waline.js"
+    },
     "./dist/waline.css": "./dist/waline.css",
-    "./dist/*": "./dist/*.js",
+    "./dist/*": "./dist/*",
     "./src/*": "./src/*",
     "./package.json": "./package.json"
   },

package/src/comment.ts

@@ -27,12 +27,22 @@ export interface WalineCommentCountOptions {
    * @default window.location.pathname
    */
   path?: string;
+
+  /**
+   * 错误提示消息所使用的语言
+   *
+   * Language of error message
+   *
+   * @default 'zh-CN'
+   */
+  lang?: string;
 }
 
 export const commentCount = ({
   serverURL,
   path = window.location.pathname,
   selector = '.waline-comment-count',
+  lang = 'zh-CN',
 }: // eslint-disable-next-line @typescript-eslint/no-explicit-any
 WalineCommentCountOptions): WalineAbort => {
   const controller = new AbortController();
@@ -48,6 +58,7 @@ WalineCommentCountOptions): WalineAbort => {
       paths: Array.from(elements).map((element) =>
         decodePath(element.dataset.path || element.getAttribute('id') || path)
       ),
+      lang,
       signal: controller.signal,
       token: userInfo.value?.token,
     })

package/src/components/Waline.vue

@@ -233,6 +233,7 @@ export default defineComponent({
 
       fetchCommentList({
         serverURL,
+        lang: config.value.lang,
         path,
         pageSize,
         page: pageNumber,

package/src/pageview.ts

@@ -41,6 +41,15 @@ export interface WalinePageviewCountOptions {
    * @default true
    */
   update?: boolean;
+
+  /**
+   * 错误提示消息所使用的语言
+   *
+   * Language of error message
+   *
+   * @default 'zh-CN'
+   */
+  lang?: string;
 }
 
 const renderVisitorCount = (
@@ -57,6 +66,7 @@ export const pageviewCount = ({
   path = window.location.pathname,
   selector = '.waline-pageview-count',
   update = true,
+  lang = 'zh-CN',
 }: WalinePageviewCountOptions): WalineAbort => {
   const controller = new AbortController();
 
@@ -75,6 +85,7 @@ export const pageviewCount = ({
     fetchPageviews({
       serverURL,
       paths: elements.map((element) => getQuery(element) || path),
+      lang,
       signal: controller.signal,
     })
       .then((counts) => renderVisitorCount(counts, elements))
@@ -85,7 +96,7 @@ export const pageviewCount = ({
     const normalElements = elements.filter((element) => !filter(element));
     const elementsNeedstoBeFetched = elements.filter(filter);
 
-    void updatePageviews({ serverURL, path }).then((count) =>
+    void updatePageviews({ serverURL, path, lang }).then((count) =>
       renderVisitorCount(
         new Array<number>(normalElements.length).fill(count),
         normalElements

package/src/styles/card.scss

@@ -85,12 +85,12 @@
   .wl-badge {
     display: inline-block;
 
-    margin-right: 0.5em;
+    margin-right: 1em;
     padding: 0 0.3em;
-    border-radius: 3px;
+    border: 1px solid var(--waline-badge-color);
+    border-radius: 4px;
 
-    background: var(--waline-badge-color);
-    color: var(--waline-white);
+    color: var(--waline-badge-color);
 
     font-size: var(--waline-badge-font-size);
   }

package/src/styles/config.scss

@@ -1,6 +1,6 @@
 :root {
   // font-size
-  --waline-font-size: 16px;
+  --waline-font-size: 1rem;
 
   // regular colors
   --waline-white: #fff;
@@ -30,7 +30,7 @@
 
   // badge
   --waline-badge-color: #3498db;
-  --waline-badge-font-size: 0.775em;
+  --waline-badge-font-size: 0.75em;
 
   // info
   --waline-info-bgcolor: #f8f8f8;

package/src/styles/layout.scss

@@ -7,9 +7,9 @@
   .vemoji,
   .wl-emoji {
     display: inline-block;
-    vertical-align: middle;
-    width: 1.25em;
-    margin: 0.25em;
+    vertical-align: baseline;
+    height: 1.25em;
+    margin: -0.125em 0.25em;
   }
 
   .wl-tex {

package/src/utils/fetch.ts

@@ -18,6 +18,7 @@ const errorCheck = <T = unknown>(data: T | FetchErrorData, name = ''): T => {
 
 export interface FetchCountOptions {
   serverURL: string;
+  lang: string;
   paths: string[];
   signal: AbortSignal;
   token?: string;
@@ -25,6 +26,7 @@ export interface FetchCountOptions {
 
 export const fetchCommentCount = ({
   serverURL,
+  lang,
   paths,
   signal,
   token,
@@ -36,7 +38,7 @@ export const fetchCommentCount = ({
     fetch(
       `${serverURL}/comment?type=count&url=${encodeURIComponent(
         paths.join(',')
-      )}`,
+      )}&lang=${lang}`,
       { signal, headers }
     )
       .then((resp) => resp.json() as Promise<number | number[]>)
@@ -47,6 +49,7 @@ export const fetchCommentCount = ({
 };
 export interface FetchRecentOptions {
   serverURL: string;
+  lang: string;
   count: number;
   signal: AbortSignal;
   token?: string;
@@ -54,6 +57,7 @@ export interface FetchRecentOptions {
 
 export const fetchRecentComment = ({
   serverURL,
+  lang,
   count,
   signal,
   token,
@@ -61,7 +65,7 @@ export const fetchRecentComment = ({
   const headers: Record<string, string> = {};
   if (token) headers.Authorization = `Bearer ${token}`;
 
-  return fetch(`${serverURL}/comment?type=recent&count=${count}`, {
+  return fetch(`${serverURL}/comment?type=recent&count=${count}&lang=${lang}`, {
     signal,
     headers,
   })
@@ -76,6 +80,7 @@ export interface FetchListOptions {
   pageSize: number;
   signal: AbortSignal;
   token?: string;
+  lang: string;
 }
 
 export interface FetchListResult {
@@ -86,6 +91,7 @@ export interface FetchListResult {
 
 export const fetchCommentList = ({
   serverURL,
+  lang,
   path,
   page,
   pageSize,
@@ -98,7 +104,7 @@ export const fetchCommentList = ({
   return fetch(
     `${serverURL}/comment?path=${encodeURIComponent(
       path
-    )}&pageSize=${pageSize}&page=${page}`,
+    )}&pageSize=${pageSize}&page=${page}&lang=${lang}`,
     { signal, headers }
   )
     .then((resp) => resp.json() as Promise<FetchListResult>)
@@ -139,18 +145,23 @@ export const postComment = ({
 
 export interface FetchPageviewsOptions {
   serverURL: string;
+  lang: string;
   paths: string[];
   signal: AbortSignal;
 }
 
 export const fetchPageviews = ({
   serverURL,
+  lang,
   paths,
   signal,
 }: FetchPageviewsOptions): Promise<number[]> =>
-  fetch(`${serverURL}/article?path=${encodeURIComponent(paths.join(','))}`, {
-    signal,
-  })
+  fetch(
+    `${serverURL}/article?path=${encodeURIComponent(
+      paths.join(',')
+    )}&lang=${lang}`,
+    { signal }
+  )
     .then((resp) => resp.json() as Promise<number[] | number>)
     .then((data) => errorCheck(data, 'visit count'))
     // TODO: Improve this API
@@ -158,14 +169,16 @@ export const fetchPageviews = ({
 
 export interface UpdatePageviewsOptions {
   serverURL: string;
+  lang: string;
   path: string;
 }
 
 export const updatePageviews = ({
   serverURL,
+  lang,
   path,
 }: UpdatePageviewsOptions): Promise<number> =>
-  fetch(`${serverURL}/article`, {
+  fetch(`${serverURL}/article?lang=${lang}`, {
     method: 'POST',
     headers: {
       // eslint-disable-next-line @typescript-eslint/naming-convention

package/src/widgets/recentComments.ts

@@ -24,6 +24,15 @@ export interface WalineRecentCommentsOptions {
    * Element to be mounted
    */
   el?: string | HTMLElement;
+
+  /**
+   * 错误提示消息所使用的语言
+   *
+   * Language of error message
+   *
+   * @default 'zh-CN'
+   */
+  lang?: string;
 }
 
 export interface WalineRecentCommentsResult {
@@ -46,6 +55,7 @@ export const RecentComments = ({
   el,
   serverURL,
   count,
+  lang = 'zh-CN',
 }: WalineRecentCommentsOptions): Promise<WalineRecentCommentsResult> => {
   const userInfo = useUserInfo();
   const root = getRoot(el);
@@ -54,6 +64,7 @@ export const RecentComments = ({
   return fetchRecentComment({
     serverURL,
     count,
+    lang,
     signal: controller.signal,
     token: userInfo.value?.token,
   }).then((comments) => {