Skip to content

Commit

Permalink
Merge branch 'develop' into ci-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
TheLastCicada authored Dec 18, 2024
2 parents c39d90f + 080a623 commit eaf65e5
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 48 deletions.
155 changes: 111 additions & 44 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
"electron:package:linux": "npm run clean && npm run build && electron-builder -l -c.extraMetadata.main=build/main.js"
},
"dependencies": {
"@eslint/compat": "^1.2.3",
"@eslint/compat": "^1.2.4",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.16.0",
"@reduxjs/toolkit": "^2.4.0",
"@reduxjs/toolkit": "^2.5.0",
"@types/styled-components": "^5.1.34",
"@xterm/xterm": "^5.5.0",
"chart.js": "^4.4.7",
Expand Down Expand Up @@ -60,7 +60,7 @@
"@types/react-dom": "^18.3.1",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^8.17.0",
"@typescript-eslint/parser": "^8.17.0",
"@typescript-eslint/parser": "^8.18.1",
"@vitejs/plugin-react-swc": "^3.7.2",
"autoprefixer": "^10.4.20",
"concurrently": "^9.1.0",
Expand All @@ -75,7 +75,7 @@
"postcss": "^8.4.49",
"prettier": "^3.4.1",
"standard-version": "^9.5.0",
"tailwindcss": "^3.4.15",
"tailwindcss": "^3.4.17",
"typescript": "^5.7.2",
"vite": "^5.4.11",
"wait-on": "^8.0.1"
Expand Down

0 comments on commit eaf65e5

Please sign in to comment.