Skip to content

Commit

Permalink
Merge branch 'eclipse-xpanse:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
WangLiNaruto authored Apr 29, 2024
2 parents 6b8411b + ab3769c commit ca7e30c
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 63 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Huawei Inc.
#
FROM nginx:1.25.5-alpine
FROM nginx:1.26.0-alpine
WORKDIR /usr/share/nginx/html
RUN apk add --no-cache bash envsubst
COPY docker/nginx-entrypoint.sh /
Expand Down
106 changes: 50 additions & 56 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"dependencies": {
"@ant-design/icons": "^5.3.6",
"@axa-fr/react-oidc": "^7.22.4",
"@tanstack/react-query": "^5.31.0",
"@tanstack/react-query": "^5.32.0",
"antd": "^5.16.4",
"echarts": "5.5.0",
"echarts-for-react": "^3.0.2",
"rc-field-form": "^2.0.0",
"rc-menu": "^9.12.2",
"rc-tabs": "^15.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-dom": "^18.3.1",
"react-router-dom": "^6.23.0",
"react-timer-hook": "^3.0.7",
"yaml": "^2.4.1",
Expand Down Expand Up @@ -87,11 +87,11 @@
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@tanstack/eslint-plugin-query": "^5.28.11",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^15.0.4",
"@testing-library/react": "^15.0.5",
"@types/jest": "^29.5.12",
"@types/node": "^20.12.7",
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@types/react-dom": "^18.3.0",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "^7.7.1",
"@typescript-eslint/parser": "^7.7.1",
Expand All @@ -106,11 +106,11 @@
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"knip": "^5.10.0",
"knip": "^5.11.0",
"openapi-typescript-codegen": "^0.29.0",
"prettier": "3.2.5",
"react-scripts": "5.0.1",
"release-it": "^17.2.0",
"release-it": "^17.2.1",
"ts-jest": "^29.1.2",
"typescript": "5.4.5",
"uuid": "^9.0.1"
Expand Down

0 comments on commit ca7e30c

Please sign in to comment.