@waline/client 2.14.7 → 2.14.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/client",
-  "version": "2.14.7",
+  "version": "2.14.9",
   "description": "client for waline comment system",
   "keywords": [
     "valine",
@@ -109,30 +109,31 @@
     ]
   },
   "dependencies": {
-    "@vueuse/core": "^9.10.0",
-    "autosize": "^5.0.2",
-    "marked": "^4.2.5",
-    "vue": "^3.2.45"
+    "@vueuse/core": "^9.13.0",
+    "autosize": "^6.0.1",
+    "marked": "^4.2.12",
+    "vue": "^3.2.47"
   },
   "devDependencies": {
-    "@babel/core": "7.20.12",
+    "@babel/core": "7.21.3",
     "@babel/preset-env": "7.20.2",
     "@giphy/js-types": "4.4.0",
     "@rollup/plugin-babel": "6.0.3",
-    "@rollup/plugin-commonjs": "24.0.0",
+    "@rollup/plugin-commonjs": "24.0.1",
     "@rollup/plugin-node-resolve": "15.0.1",
     "@rollup/plugin-replace": "5.0.2",
-    "@rollup/plugin-terser": "0.3.0",
+    "@rollup/plugin-terser": "0.4.0",
     "@types/autosize": "4.0.1",
     "@types/marked": "4.0.8",
-    "@types/node": "18.11.18",
+    "@types/node": "18.15.3",
     "@vitejs/plugin-vue": "4.0.0",
     "recaptcha-v3": "1.10.0",
-    "rollup": "3.10.0",
-    "rollup-plugin-dts": "5.1.1",
-    "rollup-plugin-ts": "3.1.1",
-    "typescript": "4.9.4",
-    "vite": "4.0.4"
+    "rollup": "3.19.1",
+    "rollup-plugin-dts": "5.2.0",
+    "rollup-plugin-ts": "3.2.0",
+    "typescript": "4.9.5",
+    "user-agent-data-types": "^0.3.1",
+    "vite": "4.1.4"
   },
   "engines": {
     "node": ">=14"

package/src/components/CommentBox.vue

@@ -329,6 +329,7 @@ import type {
   WalineSearchResult,
 } from '../typings/index.js';
 import type { WalineConfig, WalineEmojiConfig } from '../utils/index.js';
+import { userAgent } from '../utils/userAgent';
 
 const props = withDefaults(
   defineProps<{
@@ -488,14 +489,15 @@ const submitComment = async (): Promise<void> => {
   if (config.value.recaptchaV3Key)
     token = await useReCaptcha(config.value.recaptchaV3Key).execute('social');
 
+  const ua = await userAgent();
   const comment: WalineCommentData = {
     comment: content.value,
     nick: userMeta.value.nick,
     mail: userMeta.value.mail,
     link: userMeta.value.link,
-    ua: navigator.userAgent,
     url: config.value.path,
     recaptchaV3: token,
+    ua,
   };
 
   if (userInfo.value?.token) {
@@ -525,14 +527,14 @@ const submitComment = async (): Promise<void> => {
       return alert(locale.value.mailError);
     }
 
-    // check comment
-    if (!comment.comment) {
-      editorRef.value?.focus();
+    if (!comment.nick) comment.nick = locale.value.anonymous;
+  }
 
-      return;
-    }
+  // check comment
+  if (!comment.comment) {
+    editorRef.value?.focus();
 
-    if (!comment.nick) comment.nick = locale.value.anonymous;
+    return;
   }
 
   if (!isWordNumberLegal.value)

package/src/config/default.ts

@@ -6,16 +6,25 @@ import type {
   WalineSearchResult,
 } from '../typings';
 
-const availableMeta: WalineMeta[] = ['nick', 'mail', 'link'];
+const AVAILABLE_META: WalineMeta[] = ['nick', 'mail', 'link'];
 
 export const getMeta = (meta: WalineMeta[]): WalineMeta[] =>
-  meta.filter((item) => availableMeta.includes(item));
+  meta.filter((item) => AVAILABLE_META.includes(item));
 
-export const defaultEmoji: WalineEmojiPresets[] = [
+export const DEFAULT_EMOJI: WalineEmojiPresets[] = [
   '//unpkg.com/@waline/emojis@1.1.0/weibo',
 ];
 
-export const defaultLang = 'en-US';
+export const DEFAULT_LANG = 'en-US';
+
+export const DEFAULT_REACTION = [
+  '//unpkg.com/@waline/emojis/tieba/tieba_agree.png',
+  '//unpkg.com/@waline/emojis/tieba/tieba_look_down.png',
+  '//unpkg.com/@waline/emojis/tieba/tieba_sunglasses.png',
+  '//unpkg.com/@waline/emojis/tieba/tieba_pick_nose.png',
+  '//unpkg.com/@waline/emojis/tieba/tieba_awkward.png',
+  '//unpkg.com/@waline/emojis/tieba/tieba_sleep.png',
+];
 
 export const defaultUploadImage = (file: File): Promise<string> =>
   new Promise((resolve, reject) => {
@@ -35,7 +44,7 @@ export const defaultTexRenderer = (blockMode: boolean): string =>
     : '<span class="wl-tex">Tex is not available in preview</span>';
 
 export const getDefaultSearchOptions = (lang: string): WalineSearchOptions => {
-  interface GifsResult {
+  interface GifResult {
     data: IGif[];
     meta: {
       msg: string;
@@ -65,7 +74,7 @@ export const getDefaultSearchOptions = (lang: string): WalineSearchOptions => {
         ...params,
       }).toString()}`
     )
-      .then((resp) => <Promise<GifsResult>>resp.json())
+      .then((resp) => <Promise<GifResult>>resp.json())
       .then(({ data }) =>
         data.map((gif) => ({
           title: gif.title,
@@ -81,12 +90,3 @@ export const getDefaultSearchOptions = (lang: string): WalineSearchOptions => {
       fetchGiphy('search', { q: word, offset: offset.toString() }),
   };
 };
-
-export const defaultReaction = [
-  '//unpkg.com/@waline/emojis/tieba/tieba_agree.png',
-  '//unpkg.com/@waline/emojis/tieba/tieba_look_down.png',
-  '//unpkg.com/@waline/emojis/tieba/tieba_sunglasses.png',
-  '//unpkg.com/@waline/emojis/tieba/tieba_pick_nose.png',
-  '//unpkg.com/@waline/emojis/tieba/tieba_awkward.png',
-  '//unpkg.com/@waline/emojis/tieba/tieba_sleep.png',
-];

package/src/config/i18n/index.ts

@@ -10,7 +10,7 @@ import type { WalineLocale } from '../../typings';
 
 export type Locales = Record<string, WalineLocale>;
 
-export const defaultLocales: Locales = {
+export const DEFAULT_LOCALES: Locales = {
   zh: zhCN,
   'zh-cn': zhCN,
   'zh-CN': zhCN,

package/src/entries/full.ts

@@ -1,4 +1,4 @@
-export { defaultLocales } from '../config';
+export { DEFAULT_LOCALES as defaultLocales } from '../config';
 export * from '../comment';
 export * from '../init';
 export * from '../pageview';

package/src/entries/init.ts

@@ -1,4 +1,4 @@
 export * from '../init';
-export { defaultLocales } from '../config';
+export { DEFAULT_LOCALES as defaultLocales } from '../config';
 export * from '../typings';
 export * from '../version';

package/src/styles/card.scss

@@ -49,32 +49,34 @@
     margin-inline-start: 1em;
   }
 
-  .wl-card-item:last-child & {
+  .wl-card-item:last-child > & {
     border-bottom: none;
   }
 
+  .wl-nick {
+    svg {
+      position: relative;
+      bottom: -0.125em;
+      line-height: 1;
+    }
+  }
+
   .wl-head {
     // bfc to fix https://github.com/walinejs/waline/issues/1415
     overflow: hidden;
     line-height: 1.5;
-  }
 
-  .wl-nick {
-    position: relative;
-
-    display: inline-block;
-
-    margin-inline-end: 0.5em;
-
-    font-weight: bold;
-    font-size: 0.875em;
-    line-height: 1;
-    text-decoration: none;
-
-    svg {
+    .wl-nick {
       position: relative;
-      bottom: -0.125em;
+  
+      display: inline-block;
+  
+      margin-inline-end: 0.5em;
+  
+      font-weight: bold;
+      font-size: 0.875em;
       line-height: 1;
+      text-decoration: none;
     }
   }
 

package/src/utils/config.ts

@@ -1,8 +1,8 @@
 import {
-  defaultEmoji,
-  defaultLang,
-  defaultLocales,
-  defaultReaction,
+  DEFAULT_EMOJI,
+  DEFAULT_LANG,
+  DEFAULT_LOCALES,
+  DEFAULT_REACTION,
   defaultUploadImage,
   defaultHighlighter,
   defaultTexRenderer,
@@ -70,7 +70,7 @@ export const getConfig = ({
   path = location.pathname,
   lang = typeof navigator === 'undefined' ? 'en-US' : navigator.language,
   locale,
-  emoji = defaultEmoji,
+  emoji = DEFAULT_EMOJI,
   meta = ['nick', 'mail', 'link'],
   requiredMeta = [],
   dark = false,
@@ -90,7 +90,7 @@ export const getConfig = ({
   serverURL: getServerURL(serverURL),
   path: decodePath(path),
   locale: {
-    ...(defaultLocales[lang] || defaultLocales[defaultLang]),
+    ...(DEFAULT_LOCALES[lang] || DEFAULT_LOCALES[DEFAULT_LANG]),
     ...(typeof locale === 'object' ? locale : {}),
   } as WalineLocale,
   wordLimit: getWordLimit(wordLimit),
@@ -99,9 +99,9 @@ export const getConfig = ({
   imageUploader: fallback(imageUploader, defaultUploadImage),
   highlighter: fallback(highlighter, defaultHighlighter),
   texRenderer: fallback(texRenderer, defaultTexRenderer),
-  lang: Object.keys(defaultLocales).includes(lang) ? lang : 'en-US',
+  lang: Object.keys(DEFAULT_LOCALES).includes(lang) ? lang : 'en-US',
   dark,
-  emoji: typeof emoji === 'boolean' ? (emoji ? defaultEmoji : []) : emoji,
+  emoji: typeof emoji === 'boolean' ? (emoji ? DEFAULT_EMOJI : []) : emoji,
   pageSize,
   login,
   copyright,
@@ -115,7 +115,7 @@ export const getConfig = ({
   reaction: Array.isArray(reaction)
     ? reaction
     : reaction === true
-    ? defaultReaction
+    ? DEFAULT_REACTION
     : [],
   commentSorting,
   ...more,

package/src/utils/userAgent.ts

@@ -0,0 +1,31 @@
+/// <reference types="user-agent-data-types" />
+
+export const userAgent = async () => {
+  if (!navigator) {
+    return '';
+  }
+
+  const { userAgentData } = navigator;
+  let ua = navigator.userAgent;
+
+  // https://learn.microsoft.com/en-us/microsoft-edge/web-platform/how-to-detect-win11
+  if (!userAgentData || userAgentData.platform !== 'Windows') {
+    return ua;
+  }
+
+  const { platformVersion } = await userAgentData.getHighEntropyValues([
+    'platformVersion',
+  ]);
+
+  if (!platformVersion) {
+    return ua;
+  }
+
+  const isWindows11Later = parseInt(platformVersion.split('.')[0]) >= 13;
+
+  if (isWindows11Later) {
+    ua = ua.replace('Windows NT 10.0', 'Windows NT 11.0');
+  }
+
+  return ua;
+};

package/src/utils/wordCount.ts

@@ -3,18 +3,29 @@
  *
  * So We just make a simple implement here
  *
- * Forked from https://github.com/vuepress-theme-hope/vuepress-theme-hope/blob/main/packages/reading-time2/src/node/reading-time.ts
+ * Forked from https://github.com/vuepress-theme-hope/vuepress-theme-hope/blob/main/packages/reading-time2/src/node/readingTime.ts
  */
 
-export const getWords = (content: string): string[] =>
-  content.match(/[\w\d\s\u00C0-\u024F]+/giu) || [];
+/**
+ * Extract Latin words from content
+ */
+export const getWords = (content: string): RegExpMatchArray | null =>
+  // \u00C0-\u024F are Latin Supplement letters, maybe used in language like french
+  // \u0400-\u04FF are Cyrillic letters, used in russian
+  content.match(/[\w\d\s,.\u00C0-\u024F\u0400-\u04FF]+/giu);
 
-export const getChinese = (content: string): string[] =>
-  content.match(/[\u4E00-\u9FA5]/gu) || [];
+/**
+ * Extract Chinese Characters from content
+ */
+export const getChinese = (content: string): RegExpMatchArray | null =>
+  content.match(/[\u4E00-\u9FD5]/gu);
 
+/**
+ * Get word number of given string
+ */
 export const getWordNumber = (content: string): number =>
-  getWords(content).reduce(
+  (getWords(content)?.reduce<number>(
     (accumulator, word) =>
-      accumulator + (word.trim() === '' ? 0 : word.trim().split(/\s+/u).length),
+      accumulator + (word.trim() === "" ? 0 : word.trim().split(/\s+/u).length),
     0
-  ) + getChinese(content).length;
+  ) || 0) + (getChinese(content)?.length || 0);

package/src/widgets/userList.ts

@@ -1,5 +1,5 @@
 import { getUserList, WalineUser } from '../api';
-import { defaultLang, defaultLocales } from '../config';
+import { DEFAULT_LANG, DEFAULT_LOCALES } from '../config';
 import { WalineLocale } from '../typings';
 import { getRoot } from '../utils';
 
@@ -93,7 +93,7 @@ export const UserList = ({
       };
 
     locale = {
-      ...(defaultLocales[lang] || defaultLocales[defaultLang]),
+      ...(DEFAULT_LOCALES[lang] || DEFAULT_LOCALES[DEFAULT_LANG]),
       ...(typeof locale === 'object' ? locale : {}),
     } as WalineLocale;