Skip to content

Merge branch "dev" into "main" #1367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kdev merged 4 commits into from
Oct 24, 2025
Merged

Merge branch "dev" into "main" #1367

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd2541c
chore(deps): switch to pnpm
kdev Oct 24, 2025
35142f2
refactor(prisma): use Rust-free client
kdev Oct 24, 2025
868d3b3
fix: use new prisma client
kdev Oct 24, 2025
3ce8575
Merge branch 'main' into dev
kdev Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ dist
storage
coverage
.DS_Store
data
data
src/generated/prisma-client
9,052 changes: 0 additions & 9,052 deletions package-lock.json
View file
Open in desktop

This file was deleted.

59 changes: 30 additions & 29 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,44 +28,44 @@
},
"homepage": "https://github.com/LEDBrain/Community-Service#readme",
"dependencies": {
"@discordjs/rest": "^2.4.0",
"@hapi/hapi": "^21.3.10",
"@prisma/client": "^5.19.1",
"@discordjs/rest": "^2.6.0",
"@hapi/hapi": "^21.4.3",
"@prisma/client": "^6.18.0",
"@t3-oss/env-core": "^0.11.1",
"cross-env": "^7.0.3",
"discord-api-types": "^0.37.100",
"discord.js": "^14.16.2",
"dotenv": "^16.4.5",
"discord-api-types": "^0.37.120",
"discord.js": "^14.23.2",
"dotenv": "^16.6.1",
"joi": "^17.13.3",
"jsdom": "^25.0.1",
"node-libcurl": "^4.0.0",
"zod": "^3.23.8"
"node-libcurl": "^4.1.0",
"zod": "^3.25.76"
},
"devDependencies": {
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@commitlint/cli": "^19.8.1",
"@commitlint/config-conventional": "^19.8.1",
"@hapi/code": "^9.0.3",
"@hapi/iron": "^7.0.0",
"@hapi/lab": "^25.3.1",
"@tsconfig/node16": "^16.1.3",
"@hapi/iron": "^7.0.1",
"@hapi/lab": "^25.3.2",
"@tsconfig/node16": "^16.1.6",
"@types/hapi__catbox": "^10.2.6",
"@types/jsdom": "^21.1.7",
"@types/ms": "^0.7.34",
"@types/node": "^22.5.5",
"@types/node-fetch": "^2.6.11",
"@typescript-eslint/eslint-plugin": "^8.6.0",
"@typescript-eslint/parser": "^8.6.0",
"c8": "^10.1.2",
"@types/node": "^22.18.12",
"@types/node-fetch": "^2.6.13",
"@typescript-eslint/eslint-plugin": "^8.46.2",
"@typescript-eslint/parser": "^8.46.2",
"c8": "^10.1.3",
"cz-conventional-changelog": "^3.3.0",
"esbuild": "0.24.0",
"eslint": "^8.56.0",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"prisma": "^5.19.1",
"eslint": "^8.57.1",
"husky": "^9.1.7",
"lint-staged": "^15.5.2",
"prettier": "^3.6.2",
"prisma": "^6.18.0",
"rimraf": "^6.0.1",
"tsx": "^4.19.1",
"typescript": "^5.6.2"
"tsx": "^4.20.6",
"typescript": "^5.9.3"
},
"config": {
"commitizen": {
Expand All @@ -82,8 +82,9 @@
"@sapphire/shapeshift": "3.9.2"
},
"optionalDependencies": {
"bufferutil": "^4.0.8",
"utf-8-validate": "^6.0.4",
"zlib-sync": "^0.1.9"
}
"bufferutil": "^4.0.9",
"utf-8-validate": "^6.0.5",
"zlib-sync": "^0.1.10"
},
"packageManager": "pnpm@10.19.0+sha512.c9fc7236e92adf5c8af42fd5bf1612df99c2ceb62f27047032f4720b33f8eacdde311865e91c411f2774f618d82f320808ecb51718bfa82c060c4ba7c76a32b8"
}
Loading
Loading