Skip to content

Commit 6eaf13c

Browse files
authored
Merge pull request #2254 from Mister-Hope/main
feat: bump deps
2 parents af60681 + e194254 commit 6eaf13c

File tree

7 files changed

+1149
-1238
lines changed

7 files changed

+1149
-1238
lines changed

.husky/pre-commit

-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
3-
41
pnpm nano-staged

docs/.vuepress/config.ts

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { viteBundler } from "@vuepress/bundler-vite";
12
import { defineUserConfig } from "vuepress";
23
import theme from "./theme.js";
34

@@ -53,6 +54,8 @@ export default defineUserConfig({
5354
],
5455
],
5556

57+
bundler: viteBundler(),
58+
5659
theme,
5760

5861
pagePatterns: ["**/*.md", "!**/*.snippet.md", "!.vuepress", "!node_modules"],

docs/.vuepress/theme.ts

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { getDirname, path } from "@vuepress/utils";
1+
import { getDirname, path } from "vuepress/utils";
22
import { hopeTheme } from "vuepress-theme-hope";
3-
import { componentsPlugin } from "vuepress-plugin-components";
43

54
import navbar from "./navbar.js";
65
import sidebar from "./sidebar/index.js";
@@ -30,15 +29,7 @@ export default hopeTheme({
3029
'<a href="https://beian.miit.gov.cn/" target="_blank">鄂ICP备2020015769号-1</a>',
3130
displayFooter: true,
3231

33-
pageInfo: [
34-
"Author",
35-
"Category",
36-
"Tag",
37-
// "Date",
38-
"Original",
39-
"Word",
40-
"ReadingTime",
41-
],
32+
pageInfo: ["Author", "Category", "Tag", "Original", "Word", "ReadingTime"],
4233

4334
blog: {
4435
intro: "/about-the-author/",
@@ -72,7 +63,9 @@ export default hopeTheme({
7263
],
7364
},
7465
},
66+
7567
blog: true,
68+
7669
copyright: {
7770
author: "JavaGuide(javaguide.cn)",
7871
license: "MIT",

docs/java/jvm/jvm-parameters-intro.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tag:
3939

4040
### 2.2.显式新生代内存(Young Generation)
4141

42-
根据[Oracle 官方文档](https://docs.oracle.com/javase/8/docs/technotes/guides/vm/gctuning/sizing.html),在堆总可用内存配置完成之后,第二大影响因素是为 `Young Generation` 在堆内存所占的比例。默认情况下,YG 的最小大小为 1310 _MB_,最大大小为*无限制*
42+
根据[Oracle 官方文档](https://docs.oracle.com/javase/8/docs/technotes/guides/vm/gctuning/sizing.html),在堆总可用内存配置完成之后,第二大影响因素是为 `Young Generation` 在堆内存所占的比例。默认情况下,YG 的最小大小为 1310 _MB_,最大大小为 _无限制_
4343

4444
一共有两种指定 新生代内存(Young Generation)大小的方法:
4545

docs/system-design/framework/mybatis/mybatis-interview.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@ head:
2626
答:
2727

2828
- `${}`是 Properties 文件中的变量占位符,它可以用于标签属性值和 sql 内部,属于原样文本替换,可以替换任意内容,比如\${driver}会被原样替换为`com.mysql.jdbc. Driver`
29-
一个实例:根据参数按任意字段排序:
29+
30+
一个示例:根据参数按任意字段排序:
31+
3032
```sql
3133
select * from users order by ${orderCols}
3234
```
35+
3336
`orderCols`可以是 `name``name desc``name,sex asc`等,实现灵活的排序。
3437

3538
- `#{}`是 sql 的参数占位符,MyBatis 会将 sql 中的`#{}`替换为? 号,在 sql 执行前会使用 PreparedStatement 的参数设置方法,按序给 sql 的? 号占位符设置参数值,比如 ps.setInt(0, parameterValue),`#{item.name}` 的取值方式为使用反射从参数对象中获取 item 对象的 name 属性值,相当于 `param.getItem().getName()`

package.json

+12-16
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,27 @@
1212
"lint": "pnpm lint:prettier && pnpm lint:md",
1313
"lint:md": "markdownlint-cli2 '**/*.md'",
1414
"lint:prettier": "prettier --check --write .",
15-
"prepare": "husky install",
15+
"prepare": "husky",
1616
"update": "pnpm dlx vp-update"
1717
},
1818
"nano-staged": {
1919
"**/*": "prettier --write --ignore-unknown",
2020
".md": "markdownlint-cli2"
2121
},
22-
"packageManager": "pnpm@8.13.1",
22+
"packageManager": "pnpm@8.15.1",
2323
"dependencies": {
24-
"@vuepress/client": "2.0.0-rc.0",
25-
"@vuepress/plugin-search": "2.0.0-rc.0",
26-
"@vuepress/utils": "2.0.0-rc.0",
27-
"husky": "8.0.3",
28-
"markdownlint-cli2": "0.11.0",
24+
"@vuepress/bundler-vite": "2.0.0-rc.6",
25+
"@vuepress/plugin-copyright": "2.0.0-rc.11",
26+
"@vuepress/plugin-feed": "2.0.0-rc.11",
27+
"@vuepress/plugin-search": "2.0.0-rc.11",
28+
"husky": "9.0.10",
29+
"markdownlint-cli2": "0.12.1",
2930
"mathjax-full": "3.2.2",
3031
"nano-staged": "0.8.0",
3132
"nodejs-jieba": "0.1.2",
32-
"prettier": "3.1.1",
33-
"vue": "^3.4.13",
34-
"vuepress": "2.0.0-rc.0",
35-
"vuepress-plugin-copyright2": "2.0.0-rc.11",
36-
"vuepress-plugin-feed2": "2.0.0-rc.11",
37-
"vuepress-theme-hope": "2.0.0-rc.11"
38-
},
39-
"devDependencies": {
40-
"vuepress-plugin-components": "2.0.0-rc.11"
33+
"prettier": "3.2.5",
34+
"vue": "3.4.15",
35+
"vuepress": "2.0.0-rc.6",
36+
"vuepress-theme-hope": "2.0.0-rc.22"
4137
}
4238
}

0 commit comments

Comments
 (0)