Skip to content

Commit

Permalink
Merge pull request #2560 from Mister-Hope/main
Browse files Browse the repository at this point in the history
feat: bump deps
  • Loading branch information
Snailclimb authored Dec 16, 2024
2 parents b286e7f + 1549b4c commit 0abed38
Show file tree
Hide file tree
Showing 6 changed files with 3,985 additions and 2,978 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ jobs:

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
run_install: true

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20.17.0
node-version: 22
cache: pnpm

- name: Install deps
run: pnpm install --frozen-lockfile

- name: Build test
env:
NODE_OPTIONS: --max_old_space_size=4096
Expand Down
41 changes: 19 additions & 22 deletions docs/.vuepress/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,25 @@ export default hopeTheme({
},
},

markdown: {
align: true,
codeTabs: true,
gfm: true,
include: {
resolvePath: (file, cwd) => {
if (file.startsWith("@"))
return path.resolve(
__dirname,
"../snippets",
file.replace("@", "./"),
);

return path.resolve(cwd, file);
},
},
tasklist: true,
},

plugins: {
blog: true,

Expand All @@ -59,28 +78,6 @@ export default hopeTheme({
rss: true,
},

markdownTab: {
codeTabs: true,
},

mdEnhance: {
align: true,
gfm: true,
include: {
resolvePath: (file, cwd) => {
if (file.startsWith("@"))
return path.resolve(
__dirname,
"../snippets",
file.replace("@", "./"),
);

return path.resolve(cwd, file);
},
},
tasklist: true,
},

search: {
isSearchable: (page) => page.path !== "/",
maxSuggestions: 10,
Expand Down
14 changes: 7 additions & 7 deletions docs/database/mysql/a-thousand-lines-of-mysql-study-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ CREATE [OR REPLACE] [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}] VIEW view_name

### 锁表

```mysql
```sql
/* 锁表 */
表锁定只用于防止其它客户端进行不正当地读取和写入
MyISAM 支持表锁,InnoDB 支持行锁
Expand All @@ -633,7 +633,7 @@ MyISAM 支持表锁,InnoDB 支持行锁

### 触发器

```mysql
```sql
/* 触发器 */ ------------------
触发程序是与表有关的命名数据库对象,当该表出现特定事件时,将激活该对象
监听:记录的增加、修改、删除。
Expand Down Expand Up @@ -686,7 +686,7 @@ end

### SQL 编程

```mysql
```sql
/* SQL编程 */ ------------------
--// 局部变量 ----------
-- 变量声明
Expand Down Expand Up @@ -821,7 +821,7 @@ INOUT,表示混合型

### 存储过程

```mysql
```sql
/* 存储过程 */ ------------------
存储过程是一段可执行性代码的集合。相比函数,更偏向于业务逻辑。
调用:CALL 过程名
Expand All @@ -842,7 +842,7 @@ END

### 用户和权限管理

```mysql
```sql
/* 用户和权限管理 */ ------------------
-- root密码重置
1. 停止MySQL服务
Expand Down Expand Up @@ -924,7 +924,7 @@ GRANT OPTION -- 允许授予权限

### 表维护

```mysql
```sql
/* 表维护 */
-- 分析和存储表的关键字分布
ANALYZE [LOCAL | NO_WRITE_TO_BINLOG] TABLE 表名 ...
Expand All @@ -937,7 +937,7 @@ OPTIMIZE [LOCAL | NO_WRITE_TO_BINLOG] TABLE tbl_name [, tbl_name] ...

### 杂项

```mysql
```sql
/* 杂项 */ ------------------
1. 可用反引号(`)为标识符(库名、表名、字段名、索引、别名)包裹,以避免与关键字重名!中文也可以作为标识符!
2. 每个库目录存在一个保存当前数据库的选项文件db.opt。
Expand Down
2 changes: 1 addition & 1 deletion docs/java/concurrent/java-concurrent-questions-03.md
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ public class ThreadPoolTest {

输出:

```ba
```bash
18:19:48.203 INFO [pool-1-thread-1] c.j.concurrent.ThreadPoolTest - 核心线程执行第一个任务
18:19:48.203 INFO [pool-1-thread-2] c.j.concurrent.ThreadPoolTest - 非核心线程处理第三个任务
18:19:48.203 INFO [main] c.j.concurrent.ThreadPoolTest - 主线程处理第四个任务
Expand Down
25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,19 @@
"**/*": "prettier --write --ignore-unknown",
".md": "markdownlint-cli2"
},
"packageManager": "[email protected]",
"dependencies": {
"@vuepress/bundler-vite": "2.0.0-rc.15",
"@vuepress/plugin-feed": "2.0.0-rc.3",
"@vuepress/plugin-search": "2.0.0-rc.47",
"husky": "9.1.6",
"markdownlint-cli2": "0.14.0",
"@vuepress/bundler-vite": "2.0.0-rc.19",
"@vuepress/plugin-feed": "2.0.0-rc.66",
"@vuepress/plugin-search": "2.0.0-rc.66",
"husky": "9.1.7",
"markdownlint-cli2": "0.16.0",
"mathjax-full": "3.2.2",
"nano-staged": "0.8.0",
"nodejs-jieba": "0.1.2",
"prettier": "3.3.3",
"sass-embedded": "1.79.3",
"vue": "^3.5.8",
"vuepress": "2.0.0-rc.15",
"vuepress-theme-hope": "2.0.0-rc.56"
}
"prettier": "3.4.2",
"sass-embedded": "1.83.0",
"vue": "^3.5.13",
"vuepress": "2.0.0-rc.19",
"vuepress-theme-hope": "2.0.0-rc.64"
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit 0abed38

Please sign in to comment.