From d7cfca761bf879e4fb2b1795a0c88a5577496777 Mon Sep 17 00:00:00 2001 From: abdou6666 Date: Fri, 11 Apr 2025 18:46:30 +0100 Subject: [PATCH 1/2] fix: dependencies --- frontend/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index f814932b..73c43655 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -28,7 +28,6 @@ "@mui/x-data-grid": "^7.3.2", "@projectstorm/react-canvas-core": "^7.0.3", "@projectstorm/react-diagrams": "^7.0.4", - "@types/qs": "^6.9.15", "axios": "^1.7.7", "eazychart-css": "^0.2.1-alpha.0", "eazychart-react": "^0.8.0-alpha.0", @@ -44,7 +43,8 @@ "react-hook-form": "^7.51.5", "react-i18next": "^14.1.1", "react-query": "^3.39.3", - "socket.io-client": "^4.7.5" + "socket.io-client": "^4.7.5", + "random-seed": "^0.3.0" }, "devDependencies": { "@types/node": "20.12.12", @@ -57,8 +57,8 @@ "eslint-import-resolver-typescript": "~3.6.1", "eslint-plugin-header": "^3.1.1", "lint-staged": "^15.3.0", - "random-seed": "^0.3.0", - "typescript": "^5.5.3" + "typescript": "^5.5.3", + "@types/qs": "^6.9.15" }, "engines": { "node": "^18.17.0" From 01e570c440fa3f5f83a5bc86ecaa8672365a5300 Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Fri, 11 Apr 2025 23:44:39 +0100 Subject: [PATCH 2/2] fix: resolve file conflicts --- frontend/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 788f512b..04c5613e 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -58,8 +58,7 @@ "eslint-import-resolver-typescript": "~3.6.1", "eslint-plugin-header": "^3.1.1", "lint-staged": "^15.3.0", - "typescript": "^5.5.3", - "@types/qs": "^6.9.15" + "typescript": "^5.5.3" }, "engines": { "node": "^18.17.0"