Skip to content
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.

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

Update all dependencies #1125

Merged
merged 2 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,7 @@ typings/
# lockfiles
package-lock.json
yarn.lock
pnpm-lock.yaml
pnpm-lock.yaml

# tap
.tap
5 changes: 0 additions & 5 deletions .taprc

This file was deleted.

3 changes: 2 additions & 1 deletion lib/subscription-connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ module.exports = class SubscriptionConnection {
this.fastify.log.error(err)
this.handleConnectionClose()
}
/* c8 ignore next 3 */
}
}

Expand Down Expand Up @@ -168,7 +169,7 @@ module.exports = class SubscriptionConnection {
if (this.keepAlive) {
this.sendKeepAlive()

/* istanbul ignore next */
/* c8 ignore next 3 */
this.keepAliveTimer = setInterval(() => {
this.sendKeepAlive()
}, this.keepAlive)
Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,44 +31,44 @@
"@graphql-tools/merge": "^9.0.0",
"@graphql-tools/schema": "^10.0.0",
"@graphql-tools/utils": "^10.0.0",
"@sinonjs/fake-timers": "^11.0.0",
"@sinonjs/fake-timers": "^14.0.0",
"@types/isomorphic-form-data": "^2.0.0",
"@types/node": "^22.0.0",
"@types/ws": "^8.2.0",
"autocannon": "^7.3.0",
"concurrently": "^8.0.1",
"autocannon": "^8.0.0",
"concurrently": "^9.0.0",
"docsify-cli": "^4.4.3",
"eslint": "^9.9.1",
"fastify": "^5.0.0-alpha.4",
"graphql": "^16.0.0",
"graphql-tag": "^2.12.6",
"graphql-ws": "^5.11.2",
"neostandard": "^0.11.4",
"neostandard": "^0.12.0",
"pre-commit": "^1.2.2",
"proxyquire": "^2.1.3",
"semver": "^7.5.0",
"sinon": "^17.0.0",
"sinon": "^19.0.0",
"split2": "^4.0.0",
"tap": "^16.3.0",
"tsd": "^0.30.0",
"tap": "^21.0.0",
"tsd": "^0.31.0",
"typescript": "^5.0.2",
"wait-on": "^7.0.1"
"undici": "^7.0.0",
"wait-on": "^8.0.0"
},
"dependencies": {
"@fastify/error": "^4.0.0",
"@fastify/static": "^8.0.0",
"@fastify/websocket": "^11.0.0",
"fastify-plugin": "^5.0.0",
"graphql-jit": "0.8.6",
"graphql-jit": "0.8.7",
"mqemitter": "^6.0.0",
"p-map": "^4.0.0",
"quick-lru": "^7.0.0",
"readable-stream": "^4.0.0",
"safe-stable-stringify": "^2.3.0",
"secure-json-parse": "^2.7.0",
"secure-json-parse": "^3.0.0",
jonnydgreen marked this conversation as resolved.
Show resolved Hide resolved
"single-user-cache": "^1.0.0",
"tiny-lru": "^11.0.0",
"undici": "^6.19.8",
"ws": "^8.2.2"
},
"tsd": {
Expand Down
56 changes: 46 additions & 10 deletions tap-snapshots/test/errors.js.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,51 @@
* Make sure to inspect the output below. Do not ignore changes!
*/
'use strict'
exports['test/errors.js TAP POST query which throws, with JIT enabled, twice > must match snapshot 1'] = `
exports['test/errors.js > TAP > app.graphql which throws, with JIT enabled, twice > must match snapshot 1'] = `
{
"errors": [
{
"message": "Bad Resolver",
"locations": [
{
"line": 3,
"column": 9
}
],
"path": [
"bad"
]
}
],
"data": {
"bad": null
}
}
`

exports['test/errors.js > TAP > app.graphql which throws, with JIT enabled, twice > must match snapshot 2'] = `
{
"data": {
"bad": null
},
"errors": [
{
"message": "Int cannot represent non-integer value: [function bad]",
"locations": [
{
"line": 3,
"column": 9
}
],
"path": [
"bad"
]
}
]
}
`

exports['test/errors.js > TAP > POST query which throws, with JIT enabled, twice > must match snapshot 1'] = `
{
"data": {
"bad": null
Expand All @@ -27,7 +71,7 @@ exports['test/errors.js TAP POST query which throws, with JIT enabled, twice > m
}
`

exports['test/errors.js TAP POST query which throws, with JIT enabled, twice > must match snapshot 2'] = `
exports['test/errors.js > TAP > POST query which throws, with JIT enabled, twice > must match snapshot 2'] = `
{
"data": {
"bad": null
Expand All @@ -48,11 +92,3 @@ exports['test/errors.js TAP POST query which throws, with JIT enabled, twice > m
]
}
`

exports['test/errors.js TAP app.graphql which throws, with JIT enabled, twice > must match snapshot 1'] = `
{"errors":[{"message":"Bad Resolver","locations":[{"line":3,"column":9}],"path":["bad"]}],"data":{"bad":null}}
`

exports['test/errors.js TAP app.graphql which throws, with JIT enabled, twice > must match snapshot 2'] = `
{"data":{"bad":null},"errors":[{"message":"Int cannot represent non-integer value: [function bad]","locations":[{"line":3,"column":9}],"path":["bad"]}]}
`
46 changes: 0 additions & 46 deletions tap-snapshots/test/federation.js.test.cjs

This file was deleted.

14 changes: 0 additions & 14 deletions tap-snapshots/test/gateway/remote-services.js.test.cjs

This file was deleted.

22 changes: 11 additions & 11 deletions tap-snapshots/test/routes.js.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Make sure to inspect the output below. Do not ignore changes!
*/
'use strict'
exports['test/routes.js TAP GET return 200 on resolver error > must match snapshot 1'] = `
exports['test/routes.js > TAP > GET return 200 on resolver error > must match snapshot 1'] = `
{
"data": {
"add": null
Expand All @@ -27,7 +27,7 @@ exports['test/routes.js TAP GET return 200 on resolver error > must match snapsh
}
`

exports['test/routes.js TAP HTTP mutation with GET errors > must match snapshot 1'] = `
exports['test/routes.js > TAP > HTTP mutation with GET errors > must match snapshot 1'] = `
{
"data": null,
"errors": [
Expand All @@ -38,7 +38,12 @@ exports['test/routes.js TAP HTTP mutation with GET errors > must match snapshot
}
`

exports['test/routes.js TAP POST return 200 on resolver error > must match snapshot 1'] = `
exports['test/routes.js > TAP > if ide is graphiql, serve config.js with the correct endpoint > must match snapshot 1'] = `
window.GRAPHQL_ENDPOINT = '/app/graphql';
window.GRAPHIQL_PLUGIN_LIST = []
`

exports['test/routes.js > TAP > POST return 200 on resolver error > must match snapshot 1'] = `
{
"data": {
"add": null
Expand All @@ -60,7 +65,7 @@ exports['test/routes.js TAP POST return 200 on resolver error > must match snaps
}
`

exports['test/routes.js TAP POST return 400 on error > must match snapshot 1'] = `
exports['test/routes.js > TAP > POST return 400 on error > must match snapshot 1'] = `
{
"data": null,
"errors": [
Expand All @@ -77,12 +82,7 @@ exports['test/routes.js TAP POST return 400 on error > must match snapshot 1'] =
}
`

exports['test/routes.js TAP if ide is graphiql, serve config.js with the correct endpoint > must match snapshot 1'] = `
window.GRAPHQL_ENDPOINT = '/app/graphql';
window.GRAPHIQL_PLUGIN_LIST = []
`

exports['test/routes.js TAP server should return 200 on graphql errors (if field can be null) > must match snapshot 1'] = `
exports['test/routes.js > TAP > server should return 200 on graphql errors (if field can be null) > must match snapshot 1'] = `
{
"data": {
"hello": null
Expand All @@ -104,7 +104,7 @@ exports['test/routes.js TAP server should return 200 on graphql errors (if field
}
`

exports['test/routes.js TAP server should return 200 on graphql errors (if field can not be null) > must match snapshot 1'] = `
exports['test/routes.js > TAP > server should return 200 on graphql errors (if field can not be null) > must match snapshot 1'] = `
{
"data": null,
"errors": [
Expand Down
2 changes: 1 addition & 1 deletion test/app-decorator.js
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ test('scalar should be supported', async (t) => {
return value
},
serialize (value) {
t.pass(value, 4)
t.equal(value, 4)
return value
},
parseLiteral (ast) {
Expand Down
4 changes: 2 additions & 2 deletions test/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -775,11 +775,11 @@ test('app.graphql which throws, with JIT enabled, twice', async (t) => {

let res = await app.graphql(query, null, { x: 1 })

t.matchSnapshot(JSON.stringify(res), null, 2)
t.matchSnapshot(JSON.stringify(res, null, 2))

res = await app.graphql(query, null, { x: 1 })

t.matchSnapshot(JSON.stringify(res), null, 2)
t.matchSnapshot(JSON.stringify(res, null, 2))

lines.end()

Expand Down
3 changes: 2 additions & 1 deletion test/subscription.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ t.beforeEach(({ context }) => {
context.clock = FakeTimers.install({
shouldClearNativeTimers: true,
shouldAdvanceTime: true,
advanceTimeDelta: 40
advanceTimeDelta: 40,
toFake: ['setTimeout', 'clearTimeout', 'setImmediate', 'clearImmediate', 'setInterval', 'clearInterval', 'Date', 'hrtime', 'performance']
})
})

Expand Down
Loading