Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
updated the package.json and pacakage-lock.json to resolve conflicts
Browse files Browse the repository at this point in the history
nadeemnagarji committed Dec 10, 2024
1 parent 1ece1b7 commit 696726f
Showing 2 changed files with 1,963 additions and 16,231 deletions.
18,105 changes: 1,915 additions & 16,190 deletions package-lock.json

Large diffs are not rendered by default.

89 changes: 48 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
@@ -5,26 +5,28 @@
"type": "module",
"config-overrides-path": "scripts/config-overrides",
"dependencies": {
"@apollo/client": "^3.11.4",
"@apollo/client": "^3.11.8",
"@apollo/link-error": "^2.0.0-beta.3",
"@apollo/react-testing": "^4.0.0",
"@dicebear/collection": "^8.0.2",
"@dicebear/core": "^8.0.2",
"@dicebear/collection": "^9.2.2",
"@dicebear/core": "^9.2.2",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/private-theming": "^5.15.12",
"@mui/system": "^5.14.12",
"@mui/x-charts": "^7.17.0",
"@mui/x-data-grid": "^7.16.0",
"@mui/x-date-pickers": "^7.11.1",
"@pdfme/generator": "^4.5.2",
"@reduxjs/toolkit": "^2.2.7",
"@vitejs/plugin-react": "^4.3.2",
"@mui/base": "^5.0.0-beta.61",
"@mui/icons-material": "^6.1.6",
"@mui/material": "^6.1.6",
"@mui/private-theming": "^6.1.6",
"@mui/system": "^6.1.6",
"@mui/x-charts": "^7.22.2",
"@mui/x-data-grid": "^7.22.1",
"@mui/x-date-pickers": "^7.18.0",
"@pdfme/generator": "^5.2.3",
"@pdfme/schemas": "^5.1.6",
"@reduxjs/toolkit": "^2.3.0",
"@vitejs/plugin-react": "^4.3.3",
"babel-plugin-transform-import-meta": "^2.2.1",
"bootstrap": "^5.3.3",
"customize-cra": "^1.0.0",
"chart.js": "^4.4.6",
"dayjs": "^1.11.13",
"dotenv": "^16.4.5",
"flag-icons": "^7.2.3",
@@ -37,12 +39,15 @@
"i18next-http-backend": "^2.6.1",
"inquirer": "^8.0.0",
"js-cookie": "^3.0.1",
"lcov-result-merger": "^5.0.1",
"markdown-toc": "^1.2.0",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-bootstrap": "^2.10.4",
"react-datepicker": "^7.3.0",
"react-bootstrap": "^2.10.5",
"react-chartjs-2": "^5.2.0",
"react-datepicker": "^7.5.0",
"react-dom": "^18.3.1",
"react-google-recaptcha": "^3.1.0",
"react-i18next": "^15.0.2",
@@ -52,17 +57,18 @@
"react-redux": "^9.1.2",
"react-router-dom": "^6.27.0",
"react-toastify": "^10.0.6",
"react-tooltip": "^5.27.1",
"react-tooltip": "^5.28.0",
"redux": "^5.0.1",
"redux-thunk": "^3.1.0",
"sanitize-html": "^2.13.0",
"typedoc": "^0.26.7",
"typedoc-plugin-markdown": "^4.2.1",
"typescript": "^5.6.2",
"typedoc": "^0.26.10",
"typedoc-plugin-markdown": "^4.2.10",
"typescript": "^5.6.3",
"vite": "^5.4.8",
"vite-plugin-environment": "^1.1.3",
"vite-plugin-node-polyfills": "^0.22.0",
"vite-tsconfig-paths": "^5.0.1",
"web-vitals": "^4.2.3"
"vite-tsconfig-paths": "^5.1.3",
"web-vitals": "^4.2.4"
},
"scripts": {
"serve": "cross-env ESLINT_NO_DEV_ERRORS=true vite --config config/vite.config.ts",
@@ -71,14 +77,15 @@
"test:vitest": "vitest run",
"test:vitest:watch": "vitest",
"test:vitest:coverage": "vitest run --coverage",
"test": "cross-env NODE_ENV=test jest --env=./scripts/custom-test-env.js --watchAll --coverage",
"eject": "react-scripts eject",
"lint:check": "eslint \"**/*.{ts,tsx}\" --max-warnings=0 && python .github/workflows/eslint_disable_check.py",
"lint:fix": "eslint --fix \"**/*.{ts,tsx}\"",
"format:fix": "prettier --write \"**/*.{ts,tsx,json,scss,css}\"",
"format:check": "prettier --check \"**/*.{ts,tsx,json,scss,css}\"",
"check-tsdoc": "node .github/workflows/check-tsdoc.js",
"typecheck": "tsc --project tsconfig.json --noEmit",
"prepare": "husky install",
"prepare": "[ \"$NODE_ENV\" != \"production\" ] && husky install || exit 0",
"jest-preview": "jest-preview",
"update:toc": "node scripts/githooks/update-toc.js",
"lint-staged": "lint-staged --concurrent false",
@@ -105,34 +112,33 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/preset-env": "^7.25.4",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.25.7",
"@babel/preset-typescript": "^7.24.7",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.0",
"@babel/preset-typescript": "^7.26.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^12.1.10",
"@types/inquirer": "^9.0.7",
"@types/jest": "^26.0.24",
"@types/js-cookie": "^3.0.6",
"@types/node": "^22.5.4",
"@types/node": "^22.9.0",
"@types/node-fetch": "^2.6.10",
"@types/react": "^18.3.3",
"@types/react": "^18.3.12",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-bootstrap": "^0.32.32",
"@types/react-bootstrap": "^0.32.37",
"@types/react-chartjs-2": "^2.5.7",
"@types/react-datepicker": "^7.0.0",
"@types/react-dom": "^18.3.0",
"@types/react-dom": "^18.3.1",
"@types/react-google-recaptcha": "^2.1.9",
"@types/react-router-dom": "^5.1.8",
"@types/sanitize-html": "^2.13.0",
"@typescript-eslint/eslint-plugin": "^8.17.0",
"@typescript-eslint/parser": "^8.17.0",
"@vitest/coverage-istanbul": "^2.1.8",
"@vitest/ui": "^2.1.8",
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.5.0",
"@vitest/coverage-istanbul": "^2.1.5",
"babel-jest": "^29.7.0",
"cross-env": "^7.0.3",
"eslint": "^8.49.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jest": "^28.8.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.1",
@@ -145,11 +151,12 @@
"jest-preview": "^0.3.1",
"lint-staged": "^15.2.8",
"postcss-modules": "^6.0.0",
"sass": "^1.77.8",
"sass": "^1.80.7",
"tsx": "^4.19.1",
"vitest": "^2.1.5",
"whatwg-fetch": "^3.6.20",
"vite-plugin-svgr": "^4.2.0",
"vitest": "^2.1.8",
"whatwg-fetch": "^3.6.20"
"cross-env": "^7.0.3"
},
"resolutions": {
"@apollo/client": "^3.4.0-beta.19",

0 comments on commit 696726f

Please sign in to comment.