Skip to content

Commit

Permalink
Merge branch 'main' into feature/technical-logging
Browse files Browse the repository at this point in the history
# Conflicts:
#	frontend/pnpm-lock.yaml
  • Loading branch information
mawilms committed Jan 8, 2024
2 parents 5f4d9fc + 3bbfcd2 commit 33de756
Show file tree
Hide file tree
Showing 3 changed files with 960 additions and 812 deletions.
11 changes: 6 additions & 5 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
},
"devDependencies": {
"@playwright/test": "^1.28.1",
"@sveltejs/adapter-static": "^2.0.3",
"@sveltejs/kit": "^1.27.4",
"@sveltejs/adapter-static": "^3.0.0",
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"autoprefixer": "^10.4.16",
Expand All @@ -32,8 +33,8 @@
"tailwindcss": "^3.3.6",
"tslib": "^2.4.1",
"typescript": "^5.0.0",
"vite": "^4.4.2",
"vitest": "^0.32.2"
"vite": "^5.0.0",
"vitest": "^1.0.0"
},
"type": "module"
}
}
Loading

0 comments on commit 33de756

Please sign in to comment.