This is an automated email from the ASF dual-hosted git repository. shuai pushed a commit to branch feat/1.4.3/ui in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 0d4b178072013aa45e9156a4ec621add2c44824f Author: shuai <[email protected]> AuthorDate: Fri Dec 20 10:48:09 2024 +0800 fix: upgeade dependences --- .github/workflows/build-binary-for-release.yml | 2 +- README.md | 4 +- ui/package.json | 4 +- ui/pnpm-lock.yaml | 67 +++++++++++++++++--------- ui/src/components/QuestionList/index.tsx | 2 +- ui/src/components/QuestionListLoader/index.tsx | 2 +- 6 files changed, 52 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-binary-for-release.yml b/.github/workflows/build-binary-for-release.yml index 0356f97f..03877ff1 100644 --- a/.github/workflows/build-binary-for-release.yml +++ b/.github/workflows/build-binary-for-release.yml @@ -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 diff --git a/README.md b/README.md index bdf036c7..90f775e4 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/ui/package.json b/ui/package.json index 31920c1b..15bcaaa0 100644 --- a/ui/package.json +++ b/ui/package.json @@ -42,7 +42,7 @@ "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": "^5.0.2" @@ -94,7 +94,7 @@ }, "packageManager": "[email protected]", "engines": { - "node": ">=18.16", + "node": ">=20", "pnpm": ">=9" }, "license": "MIT" diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml index aa4f45cf..452e8505 100644 --- a/ui/pnpm-lock.yaml +++ b/ui/pnpm-lock.yaml @@ -87,8 +87,8 @@ importers: specifier: ^11.18.3 version: 11.18.6([email protected])([email protected]([email protected]))([email protected]) react-router-dom: - specifier: ^6.22.3 - version: 6.28.0([email protected]([email protected]))([email protected]) + specifier: ^7.0.2 + version: 7.0.2([email protected]([email protected]))([email protected]) semver: specifier: ^7.3.8 version: 7.6.3 @@ -1464,10 +1464,6 @@ packages: peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 - '@remix-run/[email protected]': - resolution: {integrity: sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA==} - engines: {node: '>=14.0.0'} - '@restart/[email protected]': resolution: {integrity: sha512-f7aCv7c+nU/3mF7NWLtVVr0Ra80RqsO89hO72r+Y/nvQr5+q0UFGkocElTH6MJApvReVh6JHUFYn2cw1WdHF3w==} peerDependencies: @@ -1666,6 +1662,9 @@ packages: '@types/[email protected]': resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} + '@types/[email protected]': + resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} + '@types/[email protected]': resolution: {integrity: sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg==} @@ -2608,6 +2607,10 @@ packages: resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==} engines: {node: '>= 0.6'} + [email protected]: + resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} + engines: {node: '>=18'} + [email protected]: resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==} @@ -5625,18 +5628,22 @@ packages: resolution: {integrity: sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==} engines: {node: '>=0.10.0'} - [email protected]: - resolution: {integrity: sha512-kQ7Unsl5YdyOltsPGl31zOjLrDv+m2VcIEcIHqYYD3Lp0UppLjrzcfJqDJwXxFw3TH/yvapbnUvPlAj7Kx5nbg==} - engines: {node: '>=14.0.0'} + [email protected]: + resolution: {integrity: sha512-VJOQ+CDWFDGaWdrG12Nl+d7yHtLaurNgAQZVgaIy7/Xd+DojgmYLosFfZdGz1wpxmjJIAkAMVTKWcvkx1oggAw==} + engines: {node: '>=20.0.0'} peerDependencies: - react: '>=16.8' - react-dom: '>=16.8' + react: '>=18' + react-dom: '>=18' - [email protected]: - resolution: {integrity: sha512-HrYdIFqdrnhDw0PqG/AKjAqEqM7AvxCz0DQ4h2W8k6nqmc5uRBYDag0SBxx9iYz5G8gnuNVLzUe13wl9eAsXXg==} - engines: {node: '>=14.0.0'} + [email protected]: + resolution: {integrity: sha512-m5AcPfTRUcjwmhBzOJGEl6Y7+Crqyju0+TgTQxoS4SO+BkWbhOrcfZNq6wSWdl2BBbJbsAoBUb8ZacOFT+/JlA==} + engines: {node: '>=20.0.0'} peerDependencies: - react: '>=16.8' + react: '>=18' + react-dom: '>=18' + peerDependenciesMeta: + react-dom: + optional: true [email protected]: resolution: {integrity: sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==} @@ -5951,6 +5958,9 @@ packages: [email protected]: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} + [email protected]: + resolution: {integrity: sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==} + [email protected]: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} @@ -6415,6 +6425,9 @@ packages: peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' + [email protected]: + resolution: {integrity: sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==} + [email protected]: resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==} engines: {node: '>= 0.8.0'} @@ -8676,8 +8689,6 @@ snapshots: '@swc/helpers': 0.5.15 react: 18.3.1 - '@remix-run/[email protected]': {} - '@restart/[email protected]([email protected])': dependencies: dequal: 2.0.3 @@ -8929,6 +8940,8 @@ snapshots: dependencies: '@types/node': 16.18.121 + '@types/[email protected]': {} + '@types/[email protected]': dependencies: '@types/trusted-types': 2.0.7 @@ -10051,6 +10064,8 @@ snapshots: [email protected]: {} + [email protected]: {} + [email protected]: dependencies: toggle-selection: 1.0.6 @@ -13559,17 +13574,21 @@ snapshots: [email protected]: {} - [email protected]([email protected]([email protected]))([email protected]): + [email protected]([email protected]([email protected]))([email protected]): dependencies: - '@remix-run/router': 1.21.0 react: 18.3.1 react-dom: 18.3.1([email protected]) - react-router: 6.28.0([email protected]) + react-router: 7.0.2([email protected]([email protected]))([email protected]) - [email protected]([email protected]): + [email protected]([email protected]([email protected]))([email protected]): dependencies: - '@remix-run/router': 1.21.0 + '@types/cookie': 0.6.0 + cookie: 1.0.2 react: 18.3.1 + set-cookie-parser: 2.7.1 + turbo-stream: 2.4.0 + optionalDependencies: + react-dom: 18.3.1([email protected]) [email protected](@babel/[email protected](@babel/[email protected]))(@babel/[email protected](@babel/[email protected]))(@types/[email protected])([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected]))([email protected])([email protected]): dependencies: @@ -13993,6 +14012,8 @@ snapshots: [email protected]: {} + [email protected]: {} + [email protected]: dependencies: define-data-property: 1.1.4 @@ -14519,6 +14540,8 @@ snapshots: tslib: 1.14.1 typescript: 4.9.5 + [email protected]: {} + [email protected]: dependencies: prelude-ls: 1.1.2 diff --git a/ui/src/components/QuestionList/index.tsx b/ui/src/components/QuestionList/index.tsx index 256dbfb4..c94602ff 100644 --- a/ui/src/components/QuestionList/index.tsx +++ b/ui/src/components/QuestionList/index.tsx @@ -135,7 +135,7 @@ const QuestionList: FC<Props> = ({ {li.description} </p> - <div className="question-tags mb-2"> + <div className="question-tags mb-12"> {Array.isArray(li.tags) ? li.tags.map((tag, index) => { return ( diff --git a/ui/src/components/QuestionListLoader/index.tsx b/ui/src/components/QuestionListLoader/index.tsx index e76aa00d..4e604624 100644 --- a/ui/src/components/QuestionListLoader/index.tsx +++ b/ui/src/components/QuestionListLoader/index.tsx @@ -52,7 +52,7 @@ const Index: FC<Props> = ({ count = 10 }) => { /> <div - className="placeholder w-50 align-top mb-2" + className="placeholder w-50 align-top mb-12" style={{ height: '24px' }} />
