Skip to content

Commit 0a8a7aa

Browse files
chore(deps-dev): bump @rsbuild/core from 1.7.4 to 1.7.5 in /ui in the development-dependencies group (#76)
* chore(deps-dev): bump @rsbuild/core Bumps the development-dependencies group in /ui with 1 update: [@rsbuild/core](https://github.com/web-infra-dev/rsbuild/tree/HEAD/packages/core). Updates `@rsbuild/core` from 1.7.4 to 1.7.5 - [Release notes](https://github.com/web-infra-dev/rsbuild/releases) - [Commits](https://github.com/web-infra-dev/rsbuild/commits/v1.7.5/packages/core) --- updated-dependencies: - dependency-name: "@rsbuild/core" dependency-version: 1.7.5 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: development-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Resolve pnpm cache paths in CI workflows * Update CI Node/pnpm and add package engines * Add pnpm workspace and enable engineStrict --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: HowieHz <howie_hzgo@outlook.com>
1 parent 3ab83a5 commit 0a8a7aa

7 files changed

Lines changed: 250 additions & 218 deletions

File tree

.github/workflows/build-and-release.yaml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/checkout@v6
5454
with:
5555
submodules: true
56-
- name: Set up JDK 21
56+
- name: Set up JDK
5757
uses: actions/setup-java@v5
5858
with:
5959
distribution: 'temurin'
@@ -66,18 +66,28 @@ jobs:
6666
name: Install pnpm
6767
id: pnpm-install
6868
with:
69-
version: 10
69+
version: 10.22.0
7070
run_install: false
71+
- name: Resolve pnpm cache dependency paths
72+
id: pnpm-cache-paths
73+
shell: bash
74+
run: |
75+
{
76+
echo 'paths<<EOF'
77+
echo 'ui/pnpm-lock.yaml'
78+
if [ -f js-modules/shiki/pnpm-lock.yaml ]; then
79+
echo 'js-modules/shiki/pnpm-lock.yaml'
80+
fi
81+
echo 'EOF'
82+
} >> "$GITHUB_OUTPUT"
7183
- name: Set up Node.js
7284
uses: actions/setup-node@v6
7385
with:
74-
node-version: 24
86+
node-version: 25
7587
cache: 'pnpm'
76-
# 新增独立的前端子模块时,记得把对应的 pnpm-lock.yaml 一并加入这里,
77-
# 否则像 :shiki:pnpmInstall 这类子包安装步骤不会命中预期的 pnpm 缓存键。
78-
cache-dependency-path: |
79-
ui/pnpm-lock.yaml
80-
js-modules/shiki/pnpm-lock.yaml
88+
# 新增独立的前端子模块时,记得把对应的 pnpm-lock.yaml 一并加入这里。
89+
# 先过滤掉不存在的路径,避免 lite 变体或精简仓库缺少子模块时缓存步骤报错。
90+
cache-dependency-path: ${{ steps.pnpm-cache-paths.outputs.paths }}
8191
- name: Make gradlew executable
8292
run: chmod +x ./gradlew
8393
- name: Build with Gradle

.github/workflows/ci-test.yaml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v6
1515
with:
1616
submodules: true
17-
- name: Set up JDK 21
17+
- name: Set up JDK
1818
uses: actions/setup-java@v5
1919
with:
2020
distribution: 'temurin'
@@ -27,18 +27,28 @@ jobs:
2727
name: Install pnpm
2828
id: pnpm-install
2929
with:
30-
version: 10
30+
version: 10.22.0
3131
run_install: false
32+
- name: Resolve pnpm cache dependency paths
33+
id: pnpm-cache-paths
34+
shell: bash
35+
run: |
36+
{
37+
echo 'paths<<EOF'
38+
echo 'ui/pnpm-lock.yaml'
39+
if [ -f js-modules/shiki/pnpm-lock.yaml ]; then
40+
echo 'js-modules/shiki/pnpm-lock.yaml'
41+
fi
42+
echo 'EOF'
43+
} >> "$GITHUB_OUTPUT"
3244
- name: Set up Node.js
3345
uses: actions/setup-node@v6
3446
with:
35-
node-version: 24
47+
node-version: 25
3648
cache: 'pnpm'
37-
# 新增独立的前端子模块时,记得把对应的 pnpm-lock.yaml 一并加入这里,
38-
# 否则像 :shiki:pnpmInstall 这类子包安装步骤不会命中预期的 pnpm 缓存键。
39-
cache-dependency-path: |
40-
ui/pnpm-lock.yaml
41-
js-modules/shiki/pnpm-lock.yaml
49+
# 新增独立的前端子模块时,记得把对应的 pnpm-lock.yaml 一并加入这里。
50+
# 先过滤掉不存在的路径,避免 lite 变体或精简仓库缺少子模块时缓存步骤报错。
51+
cache-dependency-path: ${{ steps.pnpm-cache-paths.outputs.paths }}
4252
- name: Make gradlew executable
4353
run: chmod +x ./gradlew
4454
- name: gradlew test

js-modules/shiki/package.json

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
{
2-
"name": "shiki",
3-
"private": true,
4-
"version": "0.0.0",
5-
"type": "module",
6-
"scripts": {
7-
"dev": "vite",
8-
"build": "vite build",
9-
"prebuild": "pnpm run generate-config",
10-
"generate-config": "node ./scripts/generate-config.js",
11-
"preview": "vite preview"
12-
},
13-
"devDependencies": {
14-
"js-yaml": "^4.1.1",
15-
"vite": "8.0.3"
16-
},
17-
"dependencies": {
18-
"shiki": "^4.0.2"
19-
}
2+
"name": "shiki",
3+
"private": true,
4+
"version": "0.0.0",
5+
"type": "module",
6+
"scripts": {
7+
"dev": "vite",
8+
"build": "vite build",
9+
"prebuild": "pnpm run generate-config",
10+
"generate-config": "node ./scripts/generate-config.js",
11+
"preview": "vite preview"
12+
},
13+
"devDependencies": {
14+
"js-yaml": "^4.1.1",
15+
"vite": "8.0.3"
16+
},
17+
"dependencies": {
18+
"shiki": "^4.0.2"
19+
},
20+
"engines": {
21+
"node": ">=25",
22+
"pnpm": "^10.33.0"
23+
},
24+
"packageManager": "pnpm@10.33.0"
2025
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
packages:
2+
- '.'
3+
engineStrict: true # engines.node will be strictly enforced when installing dependencies

ui/package.json

Lines changed: 65 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,67 @@
11
{
2-
"private": true,
3-
"type": "module",
4-
"scripts": {
5-
"dev": "pnpm run \"/^watch:.*/\"",
6-
"watch:rsbuild": "rsbuild build --watch --env-mode=development",
7-
"build": "run-p build:type-check \"build:build-only {@}\" --",
8-
"build:type-check": "vue-tsc --build",
9-
"build:build-only": "rsbuild build",
10-
"lint": "run-s lint:*",
11-
"lint:oxlint": "oxlint . --fix -D correctness --ignore-path .gitignore",
12-
"lint:eslint": "eslint . --fix",
13-
"format": "pnpm run \"/^format:.*/\"",
14-
"format:prettier": "prettier --write src/",
15-
"test": "pnpm run \"/^test:.*/\"",
16-
"test:unit": "vitest --passWithNoTests",
17-
"prepare": "cd .. && husky ui/.husky"
18-
},
19-
"prettier": {
20-
"printWidth": 100,
21-
"semi": false,
22-
"singleQuote": true,
23-
"tabWidth": 2
24-
},
25-
"dependencies": {
26-
"@halo-dev/api-client": "^2.23.0",
27-
"@halo-dev/components": "^2.23.0",
28-
"@halo-dev/ui-shared": "^2.23.0",
29-
"axios": "^1.14.0",
30-
"canvas-confetti": "^1.9.4",
31-
"husky": "^9.1.7",
32-
"vue": "^3.5.31"
33-
},
34-
"devDependencies": {
35-
"@halo-dev/ui-plugin-bundler-kit": "^2.23.0",
36-
"@iconify/json": "^2.2.456",
37-
"@rsbuild/core": "^1.7.4",
38-
"@rsbuild/plugin-sass": "^1.5.1",
39-
"@tsconfig/node20": "^20.1.9",
40-
"@types/canvas-confetti": "^1.9.0",
41-
"@types/jsdom": "^28.0.1",
42-
"@types/node": "^25.5.0",
43-
"@vitest/eslint-plugin": "^1.6.13",
44-
"@vue/eslint-config-prettier": "^10.2.0",
45-
"@vue/eslint-config-typescript": "^14.7.0",
46-
"@vue/test-utils": "^2.4.6",
47-
"@vue/tsconfig": "^0.9.1",
48-
"eslint": "^10.1.0",
49-
"eslint-plugin-oxlint": "^1.57.0",
50-
"eslint-plugin-vue": "~10.8.0",
51-
"husky": "^8.0.0",
52-
"jsdom": "^29.0.1",
53-
"npm-run-all2": "^8.0.4",
54-
"oxlint": "^1.57.0",
55-
"prettier": "^3.8.1",
56-
"sass": "^1.98.0",
57-
"typescript": "~5.9.3",
58-
"unplugin-icons": "^23.0.1",
59-
"vitest": "^4.1.2",
60-
"vue-tsc": "^3.2.6"
61-
},
62-
"packageManager": "pnpm@10.2.0"
2+
"private": true,
3+
"type": "module",
4+
"scripts": {
5+
"dev": "pnpm run \"/^watch:.*/\"",
6+
"watch:rsbuild": "rsbuild build --watch --env-mode=development",
7+
"build": "run-p build:type-check \"build:build-only {@}\" --",
8+
"build:type-check": "vue-tsc --build",
9+
"build:build-only": "rsbuild build",
10+
"lint": "run-s lint:*",
11+
"lint:oxlint": "oxlint . --fix -D correctness --ignore-path .gitignore",
12+
"lint:eslint": "eslint . --fix",
13+
"format": "pnpm run \"/^format:.*/\"",
14+
"format:prettier": "prettier --write src/",
15+
"test": "pnpm run \"/^test:.*/\"",
16+
"test:unit": "vitest --passWithNoTests",
17+
"prepare": "cd .. && husky ui/.husky"
18+
},
19+
"prettier": {
20+
"printWidth": 100,
21+
"semi": false,
22+
"singleQuote": true,
23+
"tabWidth": 2
24+
},
25+
"dependencies": {
26+
"@halo-dev/api-client": "^2.23.0",
27+
"@halo-dev/components": "^2.23.0",
28+
"@halo-dev/ui-shared": "^2.23.0",
29+
"axios": "^1.14.0",
30+
"canvas-confetti": "^1.9.4",
31+
"husky": "^9.1.7",
32+
"vue": "^3.5.31"
33+
},
34+
"devDependencies": {
35+
"@halo-dev/ui-plugin-bundler-kit": "^2.23.0",
36+
"@iconify/json": "^2.2.456",
37+
"@rsbuild/core": "^1.7.5",
38+
"@rsbuild/plugin-sass": "^1.5.1",
39+
"@tsconfig/node20": "^20.1.9",
40+
"@types/canvas-confetti": "^1.9.0",
41+
"@types/jsdom": "^28.0.1",
42+
"@types/node": "^25.5.0",
43+
"@vitest/eslint-plugin": "^1.6.13",
44+
"@vue/eslint-config-prettier": "^10.2.0",
45+
"@vue/eslint-config-typescript": "^14.7.0",
46+
"@vue/test-utils": "^2.4.6",
47+
"@vue/tsconfig": "^0.9.1",
48+
"eslint": "^10.1.0",
49+
"eslint-plugin-oxlint": "^1.57.0",
50+
"eslint-plugin-vue": "~10.8.0",
51+
"husky": "^8.0.0",
52+
"jsdom": "^29.0.1",
53+
"npm-run-all2": "^8.0.4",
54+
"oxlint": "^1.57.0",
55+
"prettier": "^3.8.1",
56+
"sass": "^1.98.0",
57+
"typescript": "~5.9.3",
58+
"unplugin-icons": "^23.0.1",
59+
"vitest": "^4.1.2",
60+
"vue-tsc": "^3.2.6"
61+
},
62+
"engines": {
63+
"node": ">=25",
64+
"pnpm": "^10.33.0"
65+
},
66+
"packageManager": "pnpm@10.33.0"
6367
}

0 commit comments

Comments
 (0)