Skip to content

Commit

Permalink
Merge branch 'feat/1.4.3/ui' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
shuashuai committed Dec 23, 2024
2 parents dcb7266 + f4de984 commit 1baa52c
Show file tree
Hide file tree
Showing 39 changed files with 11,098 additions and 8,193 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-binary-for-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20.18.1

- name: Node Build
run: make install-ui-packages ui
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ARG CGO_EXTRA_CFLAGS

COPY . ${BUILD_DIR}
WORKDIR ${BUILD_DIR}
RUN apk --no-cache add build-base git bash nodejs npm && npm install -g pnpm@8.9.2 \
RUN apk --no-cache add build-base git bash nodejs npm && npm install -g pnpm@9.7.0 \
&& make clean build

RUN chmod 755 answer
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ clean:

install-ui-packages:
@corepack enable
@corepack prepare pnpm@8.9.2 --activate
@corepack prepare pnpm@9.7.0 --activate

ui:
@cd ui && pnpm pre-install && pnpm build && cd -
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ You can also check out the [plugins here](https://answer.apache.org/plugins).
### Prerequisites

- Golang >= 1.22
- Node.js >= 16.17
- pnpm >= 8
- Node.js >= 20
- pnpm >= 9
- [mockgen](https://github.com/uber-go/mock?tab=readme-ov-file#installation) >= 1.6.0
- [wire](https://github.com/google/wire/) >= 0.5.0

Expand Down
3 changes: 3 additions & 0 deletions i18n/en_US.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1500,6 +1500,9 @@ ui:
deleted: Deleted
pending: Pending
more: More
view: View
card: Card
compact: Compact
search:
title: Search Results
keywords: Keywords
Expand Down
3 changes: 3 additions & 0 deletions i18n/zh_CN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1467,6 +1467,9 @@ ui:
deleted: 已删除
pending: 等待处理
more: 更多
view: 视图
card: 卡片模式
compact: 简洁模式
search:
title: 搜索结果
keywords: 关键词
Expand Down
14 changes: 7 additions & 7 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
"react-dom": "^18.2.0",
"react-helmet-async": "^1.3.0",
"react-i18next": "^11.18.3",
"react-router-dom": "^6.22.3",
"react-router-dom": "^7.0.2",
"semver": "^7.3.8",
"swr": "^1.3.0",
"zustand": "^4.1.1"
"zustand": "^5.0.2"
},
"devDependencies": {
"@commitlint/cli": "^17.0.3",
Expand Down Expand Up @@ -87,15 +87,15 @@
"purgecss-webpack-plugin": "^4.1.3",
"react-app-rewired": "^2.2.1",
"react-scripts": "5.0.1",
"sass": "^1.54.4",
"sass": "1.54.4",
"source-map-explorer": "^2.5.3",
"typescript": "^4.9.5",
"yaml-loader": "^0.8.0"
},
"packageManager": "pnpm@8.9.2",
"packageManager": "pnpm@9.7.0",
"engines": {
"node": ">=16.17",
"pnpm": ">=8"
"node": ">=20",
"pnpm": ">=9"
},
"license": "MIT"
}
}
Loading

0 comments on commit 1baa52c

Please sign in to comment.