@waline/client 2.14.7 → 2.14.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/client",
-  "version": "2.14.7",
+  "version": "2.14.8",
   "description": "client for waline comment system",
   "keywords": [
     "valine",
@@ -93,6 +93,16 @@
     "dist",
     "src"
   ],
+  "scripts": {
+    "build": "pnpm rollup && pnpm style",
+    "clean": "rimraf ./dist",
+    "dev": "vite",
+    "prepublishOnly": "pnpm clean && pnpm build",
+    "rollup": "rollup -c",
+    "style": "pnpm style:main && pnpm style:meta",
+    "style:main": "sass ./src/styles/index.scss ./dist/waline.css --style=compressed",
+    "style:meta": "sass ./src/styles/meta.scss ./dist/waline-meta.css --style=compressed"
+  },
   "browserslist": {
     "production": [
       ">0.5%",
@@ -109,41 +119,33 @@
     ]
   },
   "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",
+    "user-agent-data-types": "^0.3.1",
+    "vue": "^3.2.47"
   },
   "devDependencies": {
-    "@babel/core": "7.20.12",
+    "@babel/core": "7.21.0",
     "@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.14.2",
     "@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.17.3",
+    "rollup-plugin-dts": "5.2.0",
+    "rollup-plugin-ts": "3.2.0",
+    "typescript": "4.9.5",
+    "vite": "4.1.4"
   },
   "engines": {
     "node": ">=14"
-  },
-  "scripts": {
-    "build": "pnpm rollup && pnpm style",
-    "clean": "rimraf ./dist",
-    "dev": "vite",
-    "rollup": "rollup -c",
-    "style": "pnpm style:main && pnpm style:meta",
-    "style:main": "sass ./src/styles/index.scss ./dist/waline.css --style=compressed",
-    "style:meta": "sass ./src/styles/meta.scss ./dist/waline-meta.css --style=compressed"
   }
-}
+}

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) {

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);