Skip to content

Merge next into master #140

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
merged 2 commits into from
Jun 19, 2024
Merged

Merge next into master #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3c2559
Upgrade for fastify v5 (#135)
synapse Apr 14, 2024
ccbacb0
update deps
jsumners Jun 19, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
test:
uses: fastify/workflows/.github/workflows/plugins-ci-mysql.yml@v3
uses: fastify/workflows/.github/workflows/plugins-ci-mysql.yml@v4.1.0
with:
license-check: true
lint: true
6 changes: 1 addition & 5 deletions .taprc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
jobs: 1
jsx: false
ts: false
flow: false

disable-coverage: true
files:
- test/**/*.test.js
3 changes: 2 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ function isMySQLPromiseConnection (obj) {
}

module.exports = fp(fastifyMysql, {
fastify: '4.x',
// DISABLED UNTIL v5 RELEASE:
// fastify: '4.x',
name: '@fastify/mysql'
})
module.exports.default = fastifyMysql
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
},
"homepage": "https://github.com/fastify/fastify-mysql#readme",
"dependencies": {
"fastify-plugin": "^4.0.0",
"fastify-plugin": "^4.5.1",
"mysql2": "^3.9.7"
},
"devDependencies": {
"@types/node": "^20.1.0",
"fastify": "^4.0.0-rc.2",
"standard": "^17.0.0",
"tap": "^16.0.0",
"tsd": "^0.31.0"
"@types/node": "^20.11.30",
"fastify": "^5.0.0-alpha.1",
"standard": "^17.1.0",
"tap": "^19.2.5",
"tsd": "^0.31.1"
},
"publishConfig": {
"access": "public"
Expand Down