Skip to content

Commit 357b2ee

Browse files
renovate[bot]ardatangithub-actions[bot]
authored
fix(deps): update all non-major dependencies (#6921)
* enhance(utils/isUrl): use `URL.canParse` when available * .. * fix(deps): update all non-major dependencies * Test * .. * Lets goi * chore(dependencies): updated changesets for modified dependencies * Removed unnecessary dep * Fix * chore(dependencies): updated changesets for modified dependencies * Prettier --------- Co-authored-by: Arda TANRIKULU <ardatanrikulu@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent f893951 commit 357b2ee

23 files changed

+463
-412
lines changed

‎.changeset/@graphql-tools_schema-6921-dependencies.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@graphql-tools/schema": patch
3+
---
4+
dependencies updates:
5+
- Removed dependency [`value-or-promise@^1.0.12` ↗︎](https://www.npmjs.com/package/value-or-promise/v/1.0.12) (from `dependencies`)

‎.changeset/@graphql-tools_url-loader-6921-dependencies.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@graphql-tools/url-loader": patch
3+
---
4+
dependencies updates:
5+
- Updated dependency [`@graphql-tools/executor-graphql-ws@^2.0.1` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor-graphql-ws/v/2.0.1) (from `^1.3.2`, in `dependencies`)
6+
- Removed dependency [`value-or-promise@^1.0.11` ↗︎](https://www.npmjs.com/package/value-or-promise/v/1.0.11) (from `dependencies`)

‎.changeset/honest-eggs-wonder.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@graphql-tools/utils': minor
3+
---
4+
5+
New `isUrl` helper, and it uses `URL.canParse` if available

‎babel.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@ module.exports = {
33
['@babel/preset-env', { targets: { node: process.versions.node.split('.')[0] } }],
44
'@babel/preset-typescript',
55
],
6-
plugins: ['@babel/plugin-proposal-class-properties'],
6+
plugins: [
7+
'@babel/plugin-proposal-class-properties',
8+
'@babel/plugin-proposal-explicit-resource-management',
9+
],
710
};

‎package.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@
4545
"ts:check": "tsc --noEmit"
4646
},
4747
"devDependencies": {
48-
"@babel/core": "7.26.7",
48+
"@babel/core": "7.26.8",
4949
"@babel/plugin-proposal-class-properties": "7.18.6",
50-
"@babel/preset-env": "7.26.7",
50+
"@babel/plugin-proposal-explicit-resource-management": "7.25.9",
51+
"@babel/preset-env": "7.26.8",
5152
"@babel/preset-typescript": "7.26.0",
5253
"@changesets/changelog-github": "0.5.0",
5354
"@changesets/cli": "2.27.12",
@@ -62,7 +63,7 @@
6263
"chalk": "5.4.1",
6364
"concurrently": "9.1.2",
6465
"cross-env": "7.0.3",
65-
"eslint": "9.19.0",
66+
"eslint": "9.20.0",
6667
"eslint-config-prettier": "10.0.1",
6768
"eslint-config-standard": "17.1.0",
6869
"eslint-plugin-import": "2.31.0",
@@ -85,7 +86,7 @@
8586
"typescript": "5.7.3"
8687
},
8788
"resolutions": {
88-
"esbuild": "0.24.2",
89+
"esbuild": "0.25.0",
8990
"graphql": "16.10.0"
9091
},
9192
"lint-staged": {

‎packages/executors/apollo-link/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"tslib": "^2.3.1"
5757
},
5858
"devDependencies": {
59-
"@apollo/client": "3.12.9"
59+
"@apollo/client": "3.12.11"
6060
},
6161
"publishConfig": {
6262
"directory": "dist",

‎packages/executors/apollo-link/tests/apollo-link.spec.ts

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { setTimeout } from 'timers/promises';
22
import { parse } from 'graphql';
3-
import { createSchema, createYoga, Repeater } from 'graphql-yoga';
3+
import { createSchema, createYoga, DisposableSymbols, Repeater } from 'graphql-yoga';
44
import { ApolloClient, FetchResult, InMemoryCache } from '@apollo/client/core';
55
import { buildHTTPExecutor } from '@graphql-tools/executor-http';
66
import { createDeferred } from '@graphql-tools/utils';
@@ -55,23 +55,21 @@ describe('Apollo Link', () => {
5555
}),
5656
});
5757

58+
const executor = buildHTTPExecutor({
59+
endpoint: `http://localhost${yoga.graphqlEndpoint}`,
60+
fetch: yoga.fetch,
61+
File: yoga.fetchAPI.File,
62+
FormData: yoga.fetchAPI.FormData,
63+
});
5864
const client = new ApolloClient({
59-
link: new ExecutorLink(
60-
buildHTTPExecutor({
61-
endpoint: `http://localhost${yoga.graphqlEndpoint}`,
62-
fetch: yoga.fetch,
63-
File: yoga.fetchAPI.File,
64-
FormData: yoga.fetchAPI.FormData,
65-
}),
66-
),
65+
link: new ExecutorLink(executor),
6766
cache: new InMemoryCache(),
6867
});
6968

70-
beforeEach(() => {});
71-
72-
afterAll(() => {
69+
afterAll(async () => {
70+
await executor[DisposableSymbols.asyncDispose]();
7371
client.stop();
74-
return client.clearStore();
72+
await client.clearStore();
7573
});
7674

7775
it('should handle queries correctly', async () => {

‎packages/executors/urql-exchange/tests/urql-exchange.spec.ts

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { setTimeout } from 'timers/promises';
2-
import { createSchema, createYoga } from 'graphql-yoga';
2+
import { createSchema, createYoga, DisposableSymbols } from 'graphql-yoga';
33
import { pipe, toObservable } from 'wonka';
44
import { buildHTTPExecutor } from '@graphql-tools/executor-http';
55
import { ExecutionResult } from '@graphql-tools/utils';
@@ -49,20 +49,19 @@ describe('URQL Yoga Exchange', () => {
4949
}),
5050
});
5151

52+
const executor = buildHTTPExecutor({
53+
endpoint: 'http://localhost:4000/graphql',
54+
fetch: yoga.fetch,
55+
File: yoga.fetchAPI.File,
56+
FormData: yoga.fetchAPI.FormData,
57+
});
5258
const client = createClient({
5359
url: 'http://localhost:4000/graphql',
54-
exchanges: [
55-
executorExchange(
56-
buildHTTPExecutor({
57-
endpoint: 'http://localhost:4000/graphql',
58-
fetch: yoga.fetch,
59-
File: yoga.fetchAPI.File,
60-
FormData: yoga.fetchAPI.FormData,
61-
}),
62-
),
63-
],
60+
exchanges: [executorExchange(executor)],
6461
});
6562

63+
afterAll(() => executor[DisposableSymbols.asyncDispose]());
64+
6665
it('should handle queries correctly', async () => {
6766
const result = await client
6867
.query(

‎packages/executors/yoga/src/index.ts

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { YogaInitialContext, type Plugin } from 'graphql-yoga';
1+
import { DisposableSymbols, YogaInitialContext, type Plugin } from 'graphql-yoga';
22
import {
33
ExecutorPluginExtras,
44
ExecutorPluginOpts,
@@ -11,6 +11,12 @@ export function useExecutor(
1111
opts?: ExecutorPluginOpts,
1212
): Plugin & ExecutorPluginExtras {
1313
const envelopPlugin = useEnvelopExecutor<YogaInitialContext>(executor, opts);
14+
let disposableSymbol: typeof DisposableSymbols.asyncDispose | typeof DisposableSymbols.dispose;
15+
if (executor[DisposableSymbols.asyncDispose]) {
16+
disposableSymbol = DisposableSymbols.asyncDispose;
17+
} else if (executor[DisposableSymbols.dispose]) {
18+
disposableSymbol = DisposableSymbols.dispose;
19+
}
1420
return {
1521
...envelopPlugin,
1622
onRequestParse({ serverContext }) {
@@ -23,5 +29,8 @@ export function useExecutor(
2329
},
2430
};
2531
},
32+
[disposableSymbol]() {
33+
return executor[disposableSymbol]();
34+
},
2635
};
2736
}

‎packages/executors/yoga/tests/yoga.spec.ts

+25-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
11
import { createSchema, createYoga } from 'graphql-yoga';
22
import { buildHTTPExecutor } from '@graphql-tools/executor-http';
33
import { useExecutor } from '@graphql-tools/executor-yoga';
4+
import { patchSymbols } from '@whatwg-node/disposablestack';
5+
6+
patchSymbols();
47

58
describe('Yoga Plugin', () => {
6-
const actual = createYoga({
7-
logging: false,
8-
schema: createSchema({
9-
typeDefs: /* GraphQL */ `
10-
type Query {
11-
hello: String
12-
}
13-
`,
14-
resolvers: {
15-
Query: {
16-
hello: () => 'Hello World!',
17-
},
18-
},
19-
}),
20-
});
21-
const executor = buildHTTPExecutor({
22-
endpoint: 'http://yoga/graphql',
23-
fetch: actual.fetch,
24-
});
25-
const proxy = createYoga({
26-
plugins: [useExecutor(executor)],
27-
});
289
it('should pass the operation correctly', async () => {
10+
await using actual = createYoga({
11+
logging: false,
12+
schema: createSchema({
13+
typeDefs: /* GraphQL */ `
14+
type Query {
15+
hello: String
16+
}
17+
`,
18+
resolvers: {
19+
Query: {
20+
hello: () => 'Hello World!',
21+
},
22+
},
23+
}),
24+
});
25+
await using executor = buildHTTPExecutor({
26+
endpoint: 'http://yoga/graphql',
27+
fetch: actual.fetch,
28+
});
29+
await using proxy = createYoga({
30+
plugins: [useExecutor(executor)],
31+
});
2932
const result = await proxy.fetch('http://yoga/graphql', {
3033
method: 'POST',
3134
headers: {

‎packages/graphql-tag-pluck/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@
6060
},
6161
"devDependencies": {
6262
"@astrojs/compiler": "^2.3.4",
63-
"@babel/parser": "7.26.7",
64-
"@babel/traverse": "7.26.7",
65-
"@babel/types": "7.26.7",
63+
"@babel/parser": "7.26.8",
64+
"@babel/traverse": "7.26.8",
65+
"@babel/types": "7.26.8",
6666
"@types/babel__traverse": "7.20.6",
6767
"@vue/compiler-sfc": "3.5.13",
6868
"astrojs-compiler-sync": "^1.0.0",
6969
"content-tag": "^3.0.0",
70-
"svelte": "5.19.8",
70+
"svelte": "5.19.9",
7171
"svelte2tsx": "0.7.34"
7272
},
7373
"publishConfig": {

‎packages/links/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"tslib": "^2.4.0"
6060
},
6161
"devDependencies": {
62-
"@apollo/client": "3.12.9",
62+
"@apollo/client": "3.12.11",
6363
"@graphql-tools/stitch": "^9.3.4",
6464
"@types/apollo-upload-client": "17.0.5",
6565
"@types/node-fetch": "^2",

‎packages/loaders/url/package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
5252
},
5353
"dependencies": {
54-
"@graphql-tools/executor-graphql-ws": "^1.3.2",
54+
"@graphql-tools/executor-graphql-ws": "^2.0.1",
5555
"@graphql-tools/executor-http": "^1.1.9",
5656
"@graphql-tools/executor-legacy-ws": "^1.1.10",
5757
"@graphql-tools/utils": "^10.7.2",
@@ -61,20 +61,19 @@
6161
"isomorphic-ws": "^5.0.0",
6262
"sync-fetch": "0.6.0-2",
6363
"tslib": "^2.4.0",
64-
"value-or-promise": "^1.0.11",
6564
"ws": "^8.17.1"
6665
},
6766
"devDependencies": {
6867
"@envelop/core": "5.0.3",
6968
"@envelop/live-query": "7.0.0",
70-
"@graphql-yoga/plugin-defer-stream": "3.10.11",
69+
"@graphql-yoga/plugin-defer-stream": "3.11.0",
7170
"@types/express": "5.0.0",
7271
"@types/valid-url": "1.0.7",
7372
"babel-loader": "9.2.1",
7473
"express": "4.21.2",
7574
"graphql-sse": "2.5.4",
7675
"graphql-upload": "17.0.0",
77-
"graphql-yoga": "5.10.11",
76+
"graphql-yoga": "5.11.0",
7877
"puppeteer": "24.2.0",
7978
"subscriptions-transport-ws": "0.11.0",
8079
"webpack": "5.97.1"

‎packages/loaders/url/src/defaultAsyncFetch.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import { AsyncFetchFn } from '@graphql-tools/executor-http';
22
import { fetch } from '@whatwg-node/fetch';
33

4-
export const defaultAsyncFetch: AsyncFetchFn = async (input, init) => {
5-
return fetch(input, init);
6-
};
4+
export const defaultAsyncFetch: AsyncFetchFn = fetch;

0 commit comments

Comments
 (0)