Skip to content

Commit 2c0b7fb

Browse files
committed
Merge remote-tracking branch 'upstream/main' into chore/use-biome
2 parents 839fedc + 5a5d657 commit 2c0b7fb

7 files changed

Lines changed: 53 additions & 145 deletions

File tree

.github/workflows/cd.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: CD
2+
3+
on:
4+
release:
5+
types:
6+
- published
7+
8+
jobs:
9+
cd:
10+
uses: halo-sigs/reusable-workflows/.github/workflows/plugin-cd.yaml@v3
11+
secrets:
12+
halo-pat: ${{ secrets.HALO_PAT }}
13+
permissions:
14+
contents: write
15+
with:
16+
node-version: "20"
17+
pnpm-version: "10"
18+
app-id: app-YXyaD
19+
ui-path: "."

.github/workflows/ci.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
jobs:
12+
ci:
13+
uses: halo-sigs/reusable-workflows/.github/workflows/plugin-ci.yaml@v3
14+
with:
15+
node-version: "20"
16+
pnpm-version: "10"
17+
ui-path: "."

.github/workflows/workflow.yaml

Lines changed: 0 additions & 138 deletions
This file was deleted.

build.gradle

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'java'
33
id "io.freefair.lombok" version "8.0.1"
4-
id "com.github.node-gradle.node" version "5.0.0"
4+
id "com.github.node-gradle.node" version "7.0.2"
55
id "run.halo.plugin.devtools" version "0.0.7"
66
}
77

@@ -31,13 +31,20 @@ node {
3131
nodeProjectDir = file("${project.projectDir}")
3232
}
3333

34-
task buildFrontend(type: PnpmTask) {
34+
tasks.register('buildFrontend', PnpmTask) {
3535
args = ['build']
36+
dependsOn('installDepsForUI')
37+
}
38+
39+
tasks.register('installDepsForUI', PnpmTask) {
40+
args = ['install']
3641
}
3742

3843
build {
3944
// build frontend before build
40-
tasks.getByName('compileJava').dependsOn('buildFrontend')
45+
tasks.named('compileJava').configure {
46+
dependsOn('buildFrontend')
47+
}
4148
}
4249

4350
halo {

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@
3131
"lint-staged": "^16.1.2",
3232
"typescript": "~5.3.3",
3333
"vite": "^5.1.4"
34-
}
34+
},
35+
"packageManager": "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39"
3536
}

packages/comment-widget/src/generated/locales/zh-TW.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
's0fbf6dc6a1966408': `下一頁`,
1717
's1c6fefb092506753': `載入評論列表失敗,請稍後重試`,
1818
's1e3e30a26025484c': `載入回覆列表失敗,請稍後重試`,
19-
's299b10f3a58a09fd': `点击确定将跳转至退出登录页面,请确保正在编辑的内容已保存。`,
19+
's299b10f3a58a09fd': `按下確定將跳轉至退出登入頁面,請確保正在編輯的內容已儲存。`,
2020
's3fb33d17bad61aa9': `評論成功,請等待審核`,
2121
's4c0e15f9073382e6': `獲取驗證碼失敗`,
2222
's67749057edb2586b': `登出`,
@@ -37,4 +37,4 @@
3737
'sf3ff78cc329d3528': `上一頁`,
3838
'sf77128b082955d42': `(或登入帳號)`,
3939
};
40-
40+

pnpm-workspace.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
packages:
2-
- 'packages/**'
2+
- packages/**
3+
onlyBuiltDependencies:
4+
- esbuild

0 commit comments

Comments
 (0)