Skip to content

Commit

Permalink
Merge pull request #2708 from Amsterdam/combine-prs-branch
Browse files Browse the repository at this point in the history
Combined PR
  • Loading branch information
remyvdwereld authored Nov 18, 2024
2 parents f9fc066 + 8a15f47 commit 63f627f
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 74 deletions.
114 changes: 47 additions & 67 deletions package-lock.json

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

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@testing-library/user-event": "^14.4.3",
"@types/dompurify": "^3.0.5",
"@types/lodash": "^4.17.13",
"@types/node": "^22.8.7",
"@types/node": "^22.9.0",
"@types/qs": "^6.9.16",
"@types/react": "^17.0.43",
"@types/react-beautiful-dnd": "^13.1.4",
Expand All @@ -44,7 +44,7 @@
"@vitejs/plugin-react": "^4.3.3",
"axios": "^1.7.2",
"dayjs": "^1.11.13",
"dompurify": "^3.1.6",
"dompurify": "^3.2.0",
"env-cmd": "^10.1.0",
"eslint-config-react-app": "^7.0.1",
"final-form": "^4.20.10",
Expand All @@ -62,21 +62,21 @@
"react-dom": "^17.0.2",
"react-final-form": "^6.5.9",
"react-final-form-arrays": "^3.1.4",
"react-router-dom": "^6.27.0",
"react-router-dom": "^6.28.0",
"styled-components": "^5.3.11",
"typescript": "5.1.6",
"typescript": "5.6.3",
"vite": "^5.4.10",
"vite-tsconfig-paths": "^5.0.1"
"vite-tsconfig-paths": "^5.1.2"
},
"devDependencies": {
"@babel/core": "^7.24.7",
"@babel/core": "^7.26.0",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.26.0",
"@testing-library/react": "^12.1.5",
"@testing-library/react-hooks": "^8.0.1",
"@types/jest": "^29.5.13",
"@types/node": "^22.8.7",
"@types/node": "^22.9.0",
"dtsgenerator": "^3.19.2",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down

0 comments on commit 63f627f

Please sign in to comment.