Merge remote-tracking branch 'boilerplate/develop' into develop

# Conflicts:
#	package.json
This commit is contained in:
Alice Gaudon 2022-03-07 19:07:15 +01:00
commit 0a0a8a8952
2 changed files with 3 additions and 5 deletions

View File

@ -19,10 +19,9 @@
},
"devDependencies": {
"@tsconfig/svelte": "^3.0.0",
"@types/config": "^0.0.40",
"@types/config": "^0.0.41",
"@types/express": "^4.17.6",
"@types/express-session": "^1.17.0",
"@types/feather-icons": "^4.7.0",
"@types/formidable": "^2.0.0",
"@types/jest": "^27.0.3",
"@types/mysql": "^2.15.15",
@ -32,12 +31,11 @@
"@types/ws": "^8.2.0",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"concurrently": "^6.0.0",
"concurrently": "^7.0.0",
"eslint": "^8.3.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-simple-import-sort": "^7.0.0",
"eslint-plugin-svelte3": "^3.2.1",
"feather-icons": "^4.28.0",
"imagemin-gifsicle": "^7.0.0",
"imagemin-mozjpeg": "^10.0.0",
"imagemin-pngquant": "^9.0.2",
@ -56,6 +54,6 @@
"config": "^3.3.1",
"express": "^4.17.1",
"formidable": "^2.0.1",
"swaf": "^0.24.7"
"swaf": "^0.25.1"
}
}