Skip to content

Commit

Permalink
Merge branch 'main' of github.com:walinejs/waline
Browse files Browse the repository at this point in the history
  • Loading branch information
lizheming committed Jun 1, 2024
2 parents 1a965a7 + 4cef1a7 commit ba81b6b
Show file tree
Hide file tree
Showing 8 changed files with 1,433 additions and 1,391 deletions.
14 changes: 7 additions & 7 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
},
"devDependencies": {
"@fancyapps/ui": "5.0.36",
"@vuepress/bundler-vite": "2.0.0-rc.9",
"@vuepress/helper": "2.0.0-rc.28",
"@vuepress/plugin-docsearch": "2.0.0-rc.28",
"@vuepress/plugin-redirect": "2.0.0-rc.29",
"@vuepress/bundler-vite": "2.0.0-rc.12",
"@vuepress/helper": "2.0.0-rc.31",
"@vuepress/plugin-docsearch": "2.0.0-rc.31",
"@vuepress/plugin-redirect": "2.0.0-rc.31",
"@waline/client": "workspace:*",
"marked": "12.0.2",
"mathjax-full": "3.2.2",
"vidstack": "1.11.21",
"vue": "3.4.27",
"vuepress": "2.0.0-rc.9",
"vuepress-shared": "2.0.0-rc.43",
"vuepress-theme-hope": "2.0.0-rc.43"
"vuepress": "2.0.0-rc.12",
"vuepress-shared": "2.0.0-rc.45",
"vuepress-theme-hope": "2.0.0-rc.46"
}
}
6 changes: 0 additions & 6 deletions docs/src/.vuepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ export default defineUserConfig({
},
},

markdown: {
code: {
lineNumbers: 20,
},
},

bundler: viteBundler({
viteOptions: {
ssr: {
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
"singleQuote": true
},
"devDependencies": {
"@babel/core": "7.24.5",
"@babel/plugin-transform-runtime": "7.24.3",
"@babel/preset-env": "7.24.5",
"@babel/preset-react": "7.24.1",
"@babel/runtime": "7.24.5",
"@babel/core": "7.24.6",
"@babel/plugin-transform-runtime": "7.24.6",
"@babel/preset-env": "7.24.6",
"@babel/preset-react": "7.24.6",
"@babel/runtime": "7.24.6",
"@commitlint/cli": "19.3.0",
"@commitlint/config-conventional": "19.2.2",
"@rollup/plugin-commonjs": "25.0.8",
Expand All @@ -58,7 +58,7 @@
"cz-conventional-changelog": "3.3.0",
"eslint": "8.57.0",
"eslint-config-mister-hope": "0.1.0",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-react": "7.34.2",
"eslint-plugin-vue": "9.26.0",
"husky": "9.0.11",
"markdownlint-cli2": "0.13.0",
Expand All @@ -72,17 +72,17 @@
"rollup-plugin-ts": "3.4.5",
"sass": "1.77.2",
"sort-package-json": "2.10.0",
"stylelint": "16.5.0",
"stylelint": "16.6.0",
"stylelint-config-hope": "6.0.1",
"tslib": "2.6.2",
"typescript": "5.4.5",
"vercel": "34.2.2",
"vercel": "34.2.3",
"vite": "5.2.11",
"vite-plugin-css-injected-by-js": "3.5.1",
"vite-plugin-svgr": "4.2.0",
"vitest": "1.6.0"
},
"packageManager": "[email protected].2",
"packageManager": "[email protected].3",
"apidoc": {
"title": "Waline API Documentation"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@waline/api",
"version": "1.0.0-alpha.7",
"version": "1.0.0-alpha.8",
"description": "Client API for Waline comment system",
"keywords": [
"api",
Expand Down
9 changes: 9 additions & 0 deletions packages/api/src/typings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,15 @@ export interface WalineChildComment extends BaseWalineResponseComment {
*/
// TODO: Support this field
at?: string;

/**
* Reply user information
*/
reply_user?: {
nick: string;
link: string;
avatar: string;
};
}

export interface WalineRootComment extends BaseWalineResponseComment {
Expand Down
8 changes: 4 additions & 4 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@waline/client",
"version": "3.2.0",
"version": "3.2.1",
"description": "client for waline comment system",
"keywords": [
"valine",
Expand Down Expand Up @@ -82,7 +82,7 @@
]
},
"dependencies": {
"@vueuse/core": "^10.9.0",
"@vueuse/core": "^10.10.0",
"@waline/api": "workspace:1.0.0-alpha.7",
"autosize": "^6.0.1",
"marked": "^12.0.2",
Expand All @@ -91,8 +91,8 @@
"vue": "^3.4.27"
},
"devDependencies": {
"@babel/core": "7.24.5",
"@babel/preset-env": "7.24.5",
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@giphy/js-types": "5.1.0",
"@types/autosize": "4.0.3",
"@vitejs/plugin-vue": "5.0.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@waline/vercel",
"version": "1.31.14",
"version": "1.32.0",
"description": "vercel server for waline comment system",
"keywords": [
"waline",
Expand All @@ -27,7 +27,7 @@
"dy-node-ip2region": "^1.0.1",
"fast-csv": "^5.0.1",
"form-data": "^4.0.0",
"jsdom": "^24.0.0",
"jsdom": "^24.1.0",
"jsonwebtoken": "^9.0.2",
"katex": "^0.16.10",
"koa-compose": "^4.1.0",
Expand Down
Loading

0 comments on commit ba81b6b

Please sign in to comment.