Skip to content

Commit

Permalink
fix: Fix package conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@wsy19961129
wsy19961129 committed Sep 23, 2024
2 parents 19dc093 + f12b26b commit a2db0c4
Show file tree
Hide file tree
Showing 3 changed files with 645 additions and 555 deletions.
51 changes: 26 additions & 25 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@
"devDependencies": {
"@babel/core": "^7.25.2",
"@babel/preset-react": "^7.24.7",
"@nx/esbuild": "19.7.2",
"@nx/eslint": "19.7.2",
"@nx/eslint-plugin": "19.7.2",
"@nx/express": "19.7.2",
"@nx/jest": "19.7.2",
"@nx/js": "19.7.2",
"@nx/node": "19.7.2",
"@nx/react": "19.7.2",
"@nx/web": "19.7.2",
"@nx/webpack": "19.7.2",
"@nx/workspace": "19.7.2",
"@nx/esbuild": "19.7.4",
"@nx/eslint": "19.7.4",
"@nx/eslint-plugin": "19.7.4",
"@nx/express": "19.7.4",
"@nx/jest": "19.7.4",
"@nx/js": "19.7.4",
"@nx/node": "19.7.4",
"@nx/react": "19.7.4",
"@nx/web": "19.7.4",
"@nx/webpack": "19.7.4",
"@nx/workspace": "19.7.4",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"@svgr/webpack": "8.1.0",
"@swc/cli": "0.4.0",
Expand All @@ -53,36 +53,36 @@
"@types/express": "4.17.21",
"@types/express-session": "1.18.0",
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.12",
"@types/jest": "29.5.13",
"@types/json2csv": "5.0.7",
"@types/jsonwebtoken": "9.0.6",
"@types/node": "^22.5.4",
"@types/nodemailer": "6.4.15",
"@types/jsonwebtoken": "9.0.7",
"@types/node": "^22.5.5",
"@types/nodemailer": "6.4.16",
"@types/passport": "1.0.16",
"@types/qrcode": "1.5.5",
"@types/react": "18.3.5",
"@types/react": "18.3.8",
"@types/react-dom": "18.3.0",
"@types/react-highlight-words": "0.20.0",
"@types/supertest": "6.0.2",
"@types/tmp": "0.2.6",
"@types/uuid": "10.0.0",
"@types/webpack-env": "1.18.5",
"@typescript-eslint/eslint-plugin": "8.5.0",
"@typescript-eslint/parser": "8.5.0",
"eslint": "8.57.0",
"@typescript-eslint/eslint-plugin": "8.6.0",
"@typescript-eslint/parser": "8.6.0",
"eslint": "8.57.1",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.30.0",
"eslint-plugin-jsonc": "2.16.0",
"eslint-plugin-jsx-a11y": "6.10.0",
"eslint-plugin-react": "7.35.2",
"eslint-plugin-react": "7.36.1",
"eslint-plugin-react-hooks": "4.6.2",
"get-port": "7.1.0",
"git-rev-sync": "3.0.2",
"husky": "^9.1.5",
"husky": "^9.1.6",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"mongodb-memory-server": "10.0.0",
"nx": "19.7.2",
"nx": "19.7.4",
"prettier": "^3.3.3",
"react-refresh": "^0.14.2",
"supertest": "7.0.0",
Expand All @@ -96,7 +96,7 @@
"webpack-merge": "^6.0.1"
},
"dependencies": {
"@ant-design/icons": "5.4.0",
"@ant-design/icons": "5.5.1",
"@apollo/client": "3.11.8",
"@apollo/server": "4.11.0",
"@commitlint/config-conventional": "^18.6.3",
Expand Down Expand Up @@ -132,7 +132,7 @@
"deepmerge": "4.3.1",
"esbuild": "^0.23.1",
"export-from-json": "1.7.4",
"express": "^4.20.0",
"express": "^4.21.0",
"express-rate-limit": "7.4.0",
"express-session": "1.18.0",
"fs-extra": "11.2.0",
Expand All @@ -146,13 +146,14 @@
"hi-base32": "0.5.1",
"http-proxy-middleware": "3.0.2",
"https-browserify": "1.0.0",
"json-bigint-patch": "0.0.8",
"jsonwebtoken": "9.0.2",
"jstat": "1.9.6",
"lint-staged": "15.2.10",
"localforage": "^1.10.0",
"lodash-es": "4.17.21",
"minio": "8.0.1",
"mongodb": "6.8.1",
"mongodb": "6.9.0",
"multer": "1.4.4",
"nodemailer": "6.9.15",
"passport": "0.7.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/itmat-docker/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"dependencies": {
"bcrypt": "5.1.1",
"compression": "1.7.4",
"express": "4.20.0",
"express": "4.21.0",
"express-rate-limit": "7.4.0",
"isobject": "4.0.0",
"minio": "8.0.1",
"mongodb": "6.8.1",
"mongodb": "6.9.0",
"sanitize-filename": "1.6.3"
}
}
Loading

0 comments on commit a2db0c4

Please sign in to comment.