@waline/client 2.14.8 → 2.15.0

package/src/config/default.ts

@@ -1,21 +1,31 @@
-import type { IGif } from '@giphy/js-types';
-import type {
-  WalineEmojiPresets,
-  WalineMeta,
-  WalineSearchOptions,
-  WalineSearchResult,
-} from '../typings';
+import { type IGif } from '@giphy/js-types';
 
-const availableMeta: WalineMeta[] = ['nick', 'mail', 'link'];
+import {
+  type WalineEmojiPresets,
+  type WalineMeta,
+  type WalineSearchOptions,
+  type WalineSearchResult,
+} from '../typings/index.js';
+
+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 +45,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 +75,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 +91,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/generate.ts

@@ -1,4 +1,4 @@
-import type { WalineLocale } from '../../typings';
+import { type WalineLocale } from '../../typings/index.js';
 
 const localeKeys = [
   'nick',

package/src/config/i18n/index.ts

@@ -1,16 +1,15 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import en from './en';
-import jp from './jp';
-import zhCN from './zh-CN';
-import zhTW from './zh-TW';
-import ptBR from './pt-BR';
-import ru from './ru';
-
-import type { WalineLocale } from '../../typings';
+import en from './en.js';
+import jp from './jp.js';
+import ptBR from './pt-BR.js';
+import ru from './ru.js';
+import zhCN from './zh-CN.js';
+import zhTW from './zh-TW.js';
+import { type WalineLocale } from '../../typings/index.js';
 
 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/entries/legacy.ts

@@ -1,13 +1,13 @@
-import { covertOptions, warning } from '../compact';
-import { init, WalineInstance } from '../init';
-
-import type {
-  DeprecatedValineOptions,
-  DeprecatedWalineOptions,
-} from '../compact';
-import type { WalineInitOptions } from '../typings';
-
-export { WalineInstance } from '../init';
+import {
+  type DeprecatedValineOptions,
+  type DeprecatedWalineOptions,
+  covertOptions,
+  warning,
+} from '../compact/index.js';
+import { init, WalineInstance } from '../init.js';
+import { type WalineInitOptions } from '../typings/index.js';
+
+export { WalineInstance } from '../init.js';
 
 warning(
   ' This is a legacy package compatible with Valine and Waline@v1, please switch to Waline@v2 using https://<CDN.LINK>/@waline/client/dist/waline.js instead!'

package/src/init.ts

@@ -1,11 +1,10 @@
 import { createApp, h, reactive, watchEffect } from 'vue';
 
+import { commentCount } from './comment.js';
 import Waline from './components/WalineComment.vue';
-import { commentCount } from './comment';
-import { pageviewCount } from './pageview';
-import { getRoot } from './utils';
-
-import type { WalineInitOptions } from './typings';
+import { pageviewCount } from './pageview.js';
+import { type WalineInitOptions } from './typings/index.js';
+import { getRoot } from './utils/index.js';
 
 export interface WalineInstance {
   /**

package/src/pageview.ts

@@ -1,7 +1,6 @@
-import { getPageview, updatePageview } from './api';
-import { errorHandler, getQuery, getServerURL } from './utils';
-
-import type { WalineAbort } from './typings';
+import { getPageview, updatePageview } from './api/index.js';
+import { type WalineAbort } from './typings/index.js';
+import { errorHandler, getQuery, getServerURL } from './utils/index.js';
 
 export interface WalinePageviewCountOptions {
   /**

package/src/shims-vue.d.ts

@@ -1,5 +1,6 @@
 declare module '*.vue' {
-  import type { DefineComponent } from 'vue';
+  import { type DefineComponent } from 'vue';
+
   const component: DefineComponent;
   export default component;
 }

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;
+    .wl-nick {
+      position: relative;
 
-    margin-inline-end: 0.5em;
+      display: inline-block;
 
-    font-weight: bold;
-    font-size: 0.875em;
-    line-height: 1;
-    text-decoration: none;
+      margin-inline-end: 0.5em;
 
-    svg {
-      position: relative;
-      bottom: -0.125em;
+      font-weight: bold;
+      font-size: 0.875em;
       line-height: 1;
+      text-decoration: none;
     }
   }
 

package/src/styles/emoji.scss

@@ -79,11 +79,8 @@
 
   .wl-tabs {
     position: relative;
-
     overflow-x: auto;
-
     padding: 0 6px;
-
     white-space: nowrap;
 
     &::before {

package/src/styles/index.scss

@@ -1,17 +1,12 @@
 @use 'config';
 @use 'normalize';
-
 @use 'base';
-
 @use 'panel';
 @use 'emoji';
 @use 'gif';
-
 @use 'card';
 @use 'layout';
 @use 'reaction';
-
 @use 'highlight';
-
 @use 'recent';
 @use 'user-list';

package/src/typings/comment.ts

@@ -49,6 +49,11 @@ export interface WalineCommentData {
    * Recaptcha Token
    */
   recaptchaV3?: string;
+
+  /**
+   * Turnstile Token
+   */
+  turnstile?: string;
 }
 
 export type WalineCommentStatus = 'approved' | 'waiting' | 'spam';

package/src/typings/options.ts

@@ -1,4 +1,4 @@
-import type { WalineProps } from './waline';
+import { type WalineProps } from './waline.js';
 
 export interface WalineInitOptions extends Omit<WalineProps, 'path'> {
   /**

package/src/typings/waline.ts

@@ -1,15 +1,15 @@
-import type {
-  WalineCommentSorting,
-  WalineHighlighter,
-  WalineEmojiInfo,
-  WalineEmojiPresets,
-  WalineImageUploader,
-  WalineLoginStatus,
-  WalineMeta,
-  WalineTexRenderer,
-  WalineSearchOptions,
-} from './base';
-import type { WalineLocale } from './locale';
+import {
+  type WalineCommentSorting,
+  type WalineHighlighter,
+  type WalineEmojiInfo,
+  type WalineEmojiPresets,
+  type WalineImageUploader,
+  type WalineLoginStatus,
+  type WalineMeta,
+  type WalineTexRenderer,
+  type WalineSearchOptions,
+} from './base.js';
+import { type WalineLocale } from './locale.js';
 
 export interface WalineProps {
   /**
@@ -239,6 +239,11 @@ export interface WalineProps {
    */
   recaptchaV3Key?: string;
 
+  /**
+   * turnstile client key
+   */
+  turnstileKey?: string;
+
   /**
    * reaction
    */

package/src/utils/config.ts

@@ -1,23 +1,21 @@
+import { decodePath, isLinkHttp, removeEndingSplash } from './path.js';
 import {
-  defaultEmoji,
-  defaultLang,
-  defaultLocales,
-  defaultReaction,
+  DEFAULT_EMOJI,
+  DEFAULT_LANG,
+  DEFAULT_LOCALES,
+  DEFAULT_REACTION,
   defaultUploadImage,
   defaultHighlighter,
   defaultTexRenderer,
   getDefaultSearchOptions,
   getMeta,
-} from '../config';
-
-import { decodePath, isLinkHttp, removeEndingSplash } from './path';
-
-import type {
-  WalineEmojiInfo,
-  WalineEmojiMaps,
-  WalineLocale,
-  WalineProps,
-} from '../typings';
+} from '../config/index.js';
+import {
+  type WalineEmojiInfo,
+  type WalineEmojiMaps,
+  type WalineLocale,
+  type WalineProps,
+} from '../typings/index.js';
 
 export interface WalineEmojiConfig {
   tabs: Pick<WalineEmojiInfo, 'name' | 'icon' | 'items'>[];
@@ -70,7 +68,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,
@@ -84,13 +82,14 @@ export const getConfig = ({
   search,
   reaction,
   recaptchaV3Key = '',
+  turnstileKey = '',
   commentSorting = 'latest',
   ...more
 }: WalineProps): WalineConfig => ({
   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 +98,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,
@@ -112,10 +111,11 @@ export const getConfig = ({
       ? search
       : getDefaultSearchOptions(lang),
   recaptchaV3Key,
+  turnstileKey,
   reaction: Array.isArray(reaction)
     ? reaction
     : reaction === true
-    ? defaultReaction
+    ? DEFAULT_REACTION
     : [],
   commentSorting,
   ...more,

package/src/utils/emoji.ts

@@ -1,8 +1,8 @@
 import { useStorage } from '@vueuse/core';
-import { removeEndingSplash } from './path';
 
-import type { WalineEmojiConfig } from './config';
-import type { WalineEmojiInfo } from '../typings';
+import { type WalineEmojiConfig } from './config.js';
+import { removeEndingSplash } from './path.js';
+import { type WalineEmojiInfo } from '../typings/index.js';
 
 const hasVersion = (url: string): boolean =>
   Boolean(/@[0-9]+\.[0-9]+\.[0-9]+/.test(url));

package/src/utils/index.ts

@@ -1,11 +1,12 @@
-export * from './config';
-export * from './darkmode';
-export * from './date';
-export * from './emoji';
-export * from './error';
-export * from './getRoot';
-export * from './image';
-export * from './markdown';
-export * from './path';
-export * from './query';
-export * from './wordCount';
+export * from './config.js';
+export * from './darkmode.js';
+export * from './date.js';
+export * from './emoji.js';
+export * from './error.js';
+export * from './getRoot.js';
+export * from './image.js';
+export * from './markdown.js';
+export * from './path.js';
+export * from './query.js';
+export * from './wordCount.js';
+export * from './userAgent.js';

package/src/utils/markdown.ts

@@ -1,11 +1,11 @@
 import { marked } from 'marked';
-import { markedTexExtensions } from './markedMathExtension';
 
-import type {
-  WalineEmojiMaps,
-  WalineHighlighter,
-  WalineTexRenderer,
-} from '../typings';
+import { markedTexExtensions } from './markedMathExtension.js';
+import {
+  type WalineEmojiMaps,
+  type WalineHighlighter,
+  type WalineTexRenderer,
+} from '../typings/index.js';
 
 export const parseEmoji = (text = '', emojiMap: WalineEmojiMaps = {}): string =>
   text.replace(/:(.+?):/g, (placeholder, key: string) =>

package/src/utils/markedMathExtension.ts

@@ -1,5 +1,6 @@
-import type { marked } from 'marked';
-import type { WalineTexRenderer } from '../typings';
+import { type marked } from 'marked';
+
+import { type WalineTexRenderer } from '../typings/index.js';
 
 const inlineMathStart = /\$.*?\$/;
 const inlineMathReg = /^\$(.*?)\$/;

package/src/utils/userAgent.ts

@@ -1,6 +1,6 @@
 /// <reference types="user-agent-data-types" />
 
-export const userAgent = async () => {
+export const userAgent = async (): Promise<string> => {
   if (!navigator) {
     return '';
   }

package/src/utils/wordCount.ts

@@ -26,6 +26,6 @@ export const getChinese = (content: string): RegExpMatchArray | null =>
 export const getWordNumber = (content: string): number =>
   (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
   ) || 0) + (getChinese(content)?.length || 0);

package/src/widgets/recentComments.ts

@@ -1,8 +1,7 @@
-import { getRecentComment } from '../api';
-import { useUserInfo } from '../composables';
-import { getRoot } from '../utils';
-
-import type { WalineComment } from '../typings';
+import { getRecentComment } from '../api/index.js';
+import { useUserInfo } from '../composables/index.js';
+import { type WalineComment } from '../typings/index.js';
+import { getRoot } from '../utils/index.js';
 
 export interface WalineRecentCommentsOptions {
   /**

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;