From 36dc08b0fd06a65301d3b10b3403cd90e40f5ee1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2024 13:57:51 +0300 Subject: [PATCH] fix(deps): update dependency commander to v13 (#8206) * fix(deps): update dependency commander to v13 * chore(dependencies): updated changesets for modified dependencies * Allow excess arguments too in case of TEST * chore(dependencies): updated changesets for modified dependencies * No warnings * Go * chore(dependencies): updated changesets for modified dependencies * No floating promises * Cleanup * chore(dependencies): updated changesets for modified dependencies * Cleanup * Jest cache * Faster relink * Hmm * Go * Jest caching better * Faster CI * Fast --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] Co-authored-by: Arda TANRIKULU --- ...phql-mesh_compose-cli-8206-dependencies.md | 5 + ...ql-mesh_urql-exchange-8206-dependencies.md | 5 + .changeset/modern-dolls-deny.md | 6 + .github/workflows/pr.yml | 3 + .github/workflows/release.yml | 3 + .github/workflows/tests.yml | 32 +++- .github/workflows/website.yml | 3 + ...-extra-typings-npm-12.1.0-65a781f8c6.patch | 13 -- .../graphql-jit-npm-0.8.7-3ae882ba75.patch | 6 +- .../ioredis-mock-npm-8.9.0-3ae882ba75.patch | 6 +- ...-leak-detector-npm-29.7.0-3ae882ba75.patch | 6 +- .../tests/federation-example.test.ts | 4 +- examples/grpc-example/tests/grpc.test.ts | 6 +- .../tests/grpc-reflection.test.ts | 2 +- .../tests/json-schema-covid.test.ts | 10 +- .../tests/json-schema-example.test.ts | 2 +- .../tests/json-schema-subscriptions.test.ts | 2 +- .../tests/mysql-employees.test.ts | 2 +- .../neo4j-example/tests/neo4j-example.test.ts | 2 +- .../odata-trippin/tests/odata-trippin.test.ts | 4 +- .../tests/javascript-wiki.test.ts | 4 +- .../openapi-javascript-wiki/tsconfig.json | 2 +- .../test/openapi-stackexchange.test.ts.bak | 2 +- examples/postgres-geodb/test/test.ts | 2 +- .../tests/programmatic-batching.spec.ts | 2 +- .../tests/sqlite-chinook.test.ts | 2 +- .../tests/thrift-calculator.test.ts | 2 +- .../type-merging-batching-example.test.ts | 2 +- jest.config.js | 8 - package.json | 11 +- packages/compose-cli/package.json | 2 +- packages/compose-cli/src/run.ts | 3 +- packages/legacy/runtime/src/get-mesh.ts | 2 +- packages/legacy/runtime/src/types.ts | 8 +- packages/legacy/urql/package.json | 1 + packages/legacy/urql/src/index.ts | 14 +- yarn.lock | 158 ++++++++---------- 37 files changed, 180 insertions(+), 167 deletions(-) create mode 100644 .changeset/@graphql-mesh_compose-cli-8206-dependencies.md create mode 100644 .changeset/@graphql-mesh_urql-exchange-8206-dependencies.md create mode 100644 .changeset/modern-dolls-deny.md delete mode 100644 .yarn/patches/@commander-js-extra-typings-npm-12.1.0-65a781f8c6.patch rename patches/graphql-jit+0.8.7.patch => .yarn/patches/graphql-jit-npm-0.8.7-3ae882ba75.patch (83%) rename patches/ioredis-mock+8.9.0.patch => .yarn/patches/ioredis-mock-npm-8.9.0-3ae882ba75.patch (72%) rename patches/jest-leak-detector+29.7.0.patch => .yarn/patches/jest-leak-detector-npm-29.7.0-3ae882ba75.patch (82%) diff --git a/.changeset/@graphql-mesh_compose-cli-8206-dependencies.md b/.changeset/@graphql-mesh_compose-cli-8206-dependencies.md new file mode 100644 index 0000000000000..40cc283adaba0 --- /dev/null +++ b/.changeset/@graphql-mesh_compose-cli-8206-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/compose-cli": patch +--- +dependencies updates: + - Updated dependency [`commander@^13.0.0` ↗︎](https://www.npmjs.com/package/commander/v/13.0.0) (from `^12.0.0`, in `dependencies`) diff --git a/.changeset/@graphql-mesh_urql-exchange-8206-dependencies.md b/.changeset/@graphql-mesh_urql-exchange-8206-dependencies.md new file mode 100644 index 0000000000000..be319e5dd522d --- /dev/null +++ b/.changeset/@graphql-mesh_urql-exchange-8206-dependencies.md @@ -0,0 +1,5 @@ +--- +"@graphql-mesh/urql-exchange": patch +--- +dependencies updates: + - Added dependency [`value-or-promise@^1.0.12` ↗︎](https://www.npmjs.com/package/value-or-promise/v/1.0.12) (to `dependencies`) diff --git a/.changeset/modern-dolls-deny.md b/.changeset/modern-dolls-deny.md new file mode 100644 index 0000000000000..6ca7fc1fe45f4 --- /dev/null +++ b/.changeset/modern-dolls-deny.md @@ -0,0 +1,6 @@ +--- +'@graphql-mesh/runtime': patch +'@graphql-mesh/urql-exchange': patch +--- + +Improvements on Executor typings diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9b98705a789a1..a3c9a94c204b4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -5,6 +5,9 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} +env: + YARN_ENABLE_HARDENED_MODE: 0 + jobs: dependencies: if: ${{ github.event.pull_request.title != 'Upcoming Release Changes' }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e28d1cbcb94eb..ee1f0d5265f8a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,6 +9,9 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.ref }} +env: + YARN_ENABLE_HARDENED_MODE: 0 + jobs: stable: permissions: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 10295f8630051..cdbe8e7d6f637 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,6 +17,9 @@ env: REDIS_HOST: localhost REDIS_PORT: 6379 APOLLO_ELV2_LICENSE: accept + NODE_NO_WARNINGS: 1 + YARN_ENABLE_HARDENED_MODE: 0 + jobs: check: name: check @@ -28,6 +31,8 @@ jobs: name: set up env with: node-version-file: .node-version + env: + YARN_ENABLE_HARDENED_MODE: 1 - name: Prepare for build run: yarn prebuild - name: Format @@ -69,9 +74,12 @@ jobs: uses: actions/cache@v4 with: path: .cache/jest - key: ${{ runner.os }}-${{matrix.node-version}}-jest-unit-${{ hashFiles('yarn.lock') }} + key: jest-unit-${{ runner.os }}-${{matrix.node-version}}-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{runner.os}}-${{matrix.node-version}}-jest-unit- + jest-unit-${{runner.os}}-${{matrix.node-version}}- + jest-unit-${{runner.os}}- + jest-unit- + jest- - name: Generate config schema run: yarn generate-config-schema @@ -153,9 +161,12 @@ jobs: with: path: .cache/jest key: - ${{ runner.os }}-${{matrix.node-version}}-jest-integration-${{ hashFiles('yarn.lock') }} + jest-integration-${{ runner.os }}-${{matrix.node-version}}-${{ hashFiles('yarn.lock') }} restore-keys: | - ${{runner.os}}-${{matrix.node-version}}-jest-integration- + jest-integration-${{runner.os}}-${{matrix.node-version}}- + jest-integration-${{runner.os}}- + jest-integration- + jest- - name: Download Postgres Dump run: @@ -212,10 +223,21 @@ jobs: uses: the-guild-org/shared-config/setup@v1 with: node-version: ${{matrix.node-version}} + - name: Cache Jest + uses: actions/cache@v4 + with: + path: .cache/jest + key: jest-e2e-${{ runner.os }}-${{matrix.node-version}}-${{ hashFiles('yarn.lock') }} + restore-keys: | + jest-e2e-${{runner.os}}-${{matrix.node-version}}- + jest-e2e-${{runner.os}}- + jest-e2e- + jest- + - name: build run: yarn build - name: relink - run: yarn + run: yarn install - name: Run E2E Tests uses: nick-fields/retry@v3 with: diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 67640b53a0339..9c43363c1a11b 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -6,6 +6,9 @@ on: - master pull_request: +env: + YARN_ENABLE_HARDENED_MODE: 0 + concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.yarn/patches/@commander-js-extra-typings-npm-12.1.0-65a781f8c6.patch b/.yarn/patches/@commander-js-extra-typings-npm-12.1.0-65a781f8c6.patch deleted file mode 100644 index 47a2545647b0d..0000000000000 --- a/.yarn/patches/@commander-js-extra-typings-npm-12.1.0-65a781f8c6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/index.d.ts b/index.d.ts -index 4f975490cbddac887873fb9988de9b7b26567286..4ed7c9c0e42a7c7b59342236d7d4296ba20ef250 100644 ---- a/index.d.ts -+++ b/index.d.ts -@@ -1176,7 +1176,7 @@ export class Command { - /** - * Return an object containing merged local and global option values as key-value pairs. - */ -- optsWithGlobals(): T; -+ optsWithGlobals(): T & Opts; - - /** - * Set the description. diff --git a/patches/graphql-jit+0.8.7.patch b/.yarn/patches/graphql-jit-npm-0.8.7-3ae882ba75.patch similarity index 83% rename from patches/graphql-jit+0.8.7.patch rename to .yarn/patches/graphql-jit-npm-0.8.7-3ae882ba75.patch index 4858f3596b47c..98571df5f71af 100644 --- a/patches/graphql-jit+0.8.7.patch +++ b/.yarn/patches/graphql-jit-npm-0.8.7-3ae882ba75.patch @@ -1,7 +1,7 @@ -diff --git a/node_modules/graphql-jit/dist/index.js b/node_modules/graphql-jit/dist/index.js +diff --git a/dist/index.js b/dist/index.js index d881c5b..fce0201 100644 ---- a/node_modules/graphql-jit/dist/index.js -+++ b/node_modules/graphql-jit/dist/index.js +--- a/dist/index.js ++++ b/dist/index.js @@ -1,17 +1,16 @@ "use strict"; var __defProp = Object.defineProperty; diff --git a/patches/ioredis-mock+8.9.0.patch b/.yarn/patches/ioredis-mock-npm-8.9.0-3ae882ba75.patch similarity index 72% rename from patches/ioredis-mock+8.9.0.patch rename to .yarn/patches/ioredis-mock-npm-8.9.0-3ae882ba75.patch index 30a8409696f62..cca813d862100 100644 --- a/patches/ioredis-mock+8.9.0.patch +++ b/.yarn/patches/ioredis-mock-npm-8.9.0-3ae882ba75.patch @@ -1,7 +1,7 @@ -diff --git a/node_modules/ioredis-mock/lib/index.js b/node_modules/ioredis-mock/lib/index.js +diff --git a/lib/index.js b/lib/index.js index a82c297..88f1e58 100644 ---- a/node_modules/ioredis-mock/lib/index.js -+++ b/node_modules/ioredis-mock/lib/index.js +--- a/lib/index.js ++++ b/lib/index.js @@ -6274,7 +6274,8 @@ var defaultOptions = { RedisMock.Command = Command; RedisMock.Cluster = class extends RedisMock { diff --git a/patches/jest-leak-detector+29.7.0.patch b/.yarn/patches/jest-leak-detector-npm-29.7.0-3ae882ba75.patch similarity index 82% rename from patches/jest-leak-detector+29.7.0.patch rename to .yarn/patches/jest-leak-detector-npm-29.7.0-3ae882ba75.patch index a26217e3fbc5b..03ea6f267b6cd 100644 --- a/patches/jest-leak-detector+29.7.0.patch +++ b/.yarn/patches/jest-leak-detector-npm-29.7.0-3ae882ba75.patch @@ -1,7 +1,7 @@ -diff --git a/node_modules/jest-leak-detector/build/index.js b/node_modules/jest-leak-detector/build/index.js +diff --git a/build/index.js b/build/index.js index a8ccb1e..70699fd 100644 ---- a/node_modules/jest-leak-detector/build/index.js -+++ b/node_modules/jest-leak-detector/build/index.js +--- a/build/index.js ++++ b/build/index.js @@ -74,26 +74,14 @@ class LeakDetector { value = null; } diff --git a/examples/federation-example/tests/federation-example.test.ts b/examples/federation-example/tests/federation-example.test.ts index 874cfef4fd71d..67312cf6f8c2f 100644 --- a/examples/federation-example/tests/federation-example.test.ts +++ b/examples/federation-example/tests/federation-example.test.ts @@ -497,7 +497,7 @@ describe('Federation Example', () => { mesh = await getMesh(config); }); it('should give correct response for example queries', async () => { - const result = await mesh.execute(exampleQuery, undefined); + const result = await mesh.execute(exampleQuery); expect(result?.data).toMatchObject(expectedResult); }); afterAll(() => { @@ -513,7 +513,7 @@ describe('Federation Example', () => { mesh = await getMesh(config); }); it('should give correct response for example queries', async () => { - const result = await mesh.execute(exampleQuery, undefined); + const result = await mesh.execute(exampleQuery); expect(result?.errors).toBeFalsy(); expect(result?.data).toMatchObject(expectedResult); }); diff --git a/examples/grpc-example/tests/grpc.test.ts b/examples/grpc-example/tests/grpc.test.ts index 714ccbce8b273..79e62d426393b 100644 --- a/examples/grpc-example/tests/grpc.test.ts +++ b/examples/grpc-example/tests/grpc.test.ts @@ -24,7 +24,7 @@ describe('gRPC Example', () => { join(__dirname, '../example-queries/GetMovies.query.graphql'), 'utf8', ); - const result = await mesh.execute(GetMoviesQuery, undefined); + const result = await mesh.execute(GetMoviesQuery); expect(result).toMatchSnapshot('get-movies-grpc-example-result'); }); it('should fetch movies by cast as a stream correctly', async () => { @@ -32,7 +32,7 @@ describe('gRPC Example', () => { join(__dirname, '../example-queries/MoviesByCast.stream.graphql'), 'utf8', ); - const result = await mesh.execute(MoviesByCastStream, undefined); + const result = await mesh.execute(MoviesByCastStream); let i = 0; for await (const item of result as AsyncIterable) { expect(item).toMatchSnapshot(`movies-by-cast-grpc-example-result-stream-${i++}`); @@ -43,7 +43,7 @@ describe('gRPC Example', () => { join(__dirname, '../example-queries/MoviesByCast.subscription.graphql'), 'utf8', ); - const result = await mesh.execute(MoviesByCastSubscription, undefined); + const result = await mesh.execute(MoviesByCastSubscription); let i = 0; for await (const item of result as AsyncIterable) { expect(item).toMatchSnapshot(`movies-by-cast-grpc-example-result-subscription-${i++}`); diff --git a/examples/grpc-reflection-example/tests/grpc-reflection.test.ts b/examples/grpc-reflection-example/tests/grpc-reflection.test.ts index 7d6ec82999c5a..2a53be20d10fc 100644 --- a/examples/grpc-reflection-example/tests/grpc-reflection.test.ts +++ b/examples/grpc-reflection-example/tests/grpc-reflection.test.ts @@ -24,7 +24,7 @@ describe('gRPC Reflection Example', () => { join(__dirname, '../example-queries/GetGreeting.query.graphql'), 'utf8', ); - const result = await mesh.execute(GreetingQuery, undefined); + const result = await mesh.execute(GreetingQuery); expect(result).toMatchSnapshot('greeting-result'); }); afterAll(() => { diff --git a/examples/json-schema-covid/tests/json-schema-covid.test.ts b/examples/json-schema-covid/tests/json-schema-covid.test.ts index 14a0c9948ee71..8ef4e431d9802 100644 --- a/examples/json-schema-covid/tests/json-schema-covid.test.ts +++ b/examples/json-schema-covid/tests/json-schema-covid.test.ts @@ -24,7 +24,7 @@ describe('JSON Schema Covid', () => { join(__dirname, '../example-queries/getData_step1.graphql'), 'utf8', ); - const result = await mesh.execute(getDataStep1Query, undefined); + const result = await mesh.execute(getDataStep1Query); expect(result.errors).toBeFalsy(); // Check exposed response metadata expect(result.data?.population?._response).toBeTruthy(); @@ -45,7 +45,7 @@ describe('JSON Schema Covid', () => { join(__dirname, '../example-queries/getData_step1.graphql'), 'utf8', ); - const result = await mesh.execute(getDataStep1Query, undefined); + const result = await mesh.execute(getDataStep1Query); expect(result.errors?.length).toBeFalsy(); expect(typeof result?.data?.case?.confirmed).toBe('number'); expect(result?.data?.case?.countryRegion).toBe('France'); @@ -60,7 +60,7 @@ describe('JSON Schema Covid', () => { join(__dirname, '../example-queries/getData_step2.graphql'), 'utf8', ); - const result = await mesh.execute(getDataStep2Query, undefined); + const result = await mesh.execute(getDataStep2Query); expect(result.errors).toBeFalsy(); expect(typeof result?.data?.case?.confirmed).toBe('number'); expect(typeof result?.data?.case?.deaths).toBe('number'); @@ -73,7 +73,7 @@ describe('JSON Schema Covid', () => { join(__dirname, '../example-queries/getData_step3_1.graphql'), 'utf8', ); - const result = await mesh.execute(getDataStep3_1Query, undefined); + const result = await mesh.execute(getDataStep3_1Query); expect(result.errors).toBeFalsy(); expect(typeof result?.data?.fr?.deathRatio).toBe('number'); @@ -84,7 +84,7 @@ describe('JSON Schema Covid', () => { join(__dirname, '../example-queries/getData_step3_2.graphql'), 'utf8', ); - const result = await mesh.execute(getDataStep3_2Query, undefined); + const result = await mesh.execute(getDataStep3_2Query); expect(result.errors).toBeFalsy(); expect(typeof result?.data?.fr?.deathRatio).toBe('number'); expect(typeof result?.data?.fr?.case?.deaths).toBe('number'); diff --git a/examples/json-schema-example/tests/json-schema-example.test.ts b/examples/json-schema-example/tests/json-schema-example.test.ts index a79286b33b576..2cfed24b17898 100644 --- a/examples/json-schema-example/tests/json-schema-example.test.ts +++ b/examples/json-schema-example/tests/json-schema-example.test.ts @@ -17,7 +17,7 @@ describe('JSON Schema Example', () => { }); it('should give correct response', async () => { const query = await fsPromises.readFile(join(__dirname, '../example-query.graphql'), 'utf8'); - const result = await mesh.execute(query, {}); + const result = await mesh.execute(query); expect(result?.data?.me?.firstName).toBeDefined(); expect(result?.data?.me?.jobTitle).toBeDefined(); expect(result?.data?.me?.lastName).toBeDefined(); diff --git a/examples/json-schema-subscriptions/tests/json-schema-subscriptions.test.ts b/examples/json-schema-subscriptions/tests/json-schema-subscriptions.test.ts index 1df39b849dcfa..1ed97ac1f2fa8 100644 --- a/examples/json-schema-subscriptions/tests/json-schema-subscriptions.test.ts +++ b/examples/json-schema-subscriptions/tests/json-schema-subscriptions.test.ts @@ -82,7 +82,7 @@ describe('JSON Schema Subscriptions', () => { } `; - const queryResult = await mesh.execute(query, {}); + const queryResult = await mesh.execute(query); expect(queryResult).toMatchObject({ data: { todos: [ diff --git a/examples/mysql-employees/tests/mysql-employees.test.ts b/examples/mysql-employees/tests/mysql-employees.test.ts index 9446db75aef07..e557c4c267ca4 100644 --- a/examples/mysql-employees/tests/mysql-employees.test.ts +++ b/examples/mysql-employees/tests/mysql-employees.test.ts @@ -21,7 +21,7 @@ describe('MySQL Employees', () => { it('should give correct response for example queries', () => Promise.all( config.documents.map(async operation => { - const result = await mesh.execute(operation.document!, {}); + const result = await mesh.execute(operation.document!); expect(result).toMatchSnapshot( basename(operation.location || 'anonymous') + '-query-result', ); diff --git a/examples/neo4j-example/tests/neo4j-example.test.ts b/examples/neo4j-example/tests/neo4j-example.test.ts index b573deecb3268..f136400cbab56 100644 --- a/examples/neo4j-example/tests/neo4j-example.test.ts +++ b/examples/neo4j-example/tests/neo4j-example.test.ts @@ -30,7 +30,7 @@ describe('Neo4j', () => { }); it('should give correct response for example queries', async () => { for (const source of config.documents) { - const result = await mesh.execute(source.document!, {}); + const result = await mesh.execute(source.document!); expect(result).toMatchSnapshot(basename(source.location!) + '-query-result'); } }); diff --git a/examples/odata-trippin/tests/odata-trippin.test.ts b/examples/odata-trippin/tests/odata-trippin.test.ts index 44ad05dda8e71..daee91065d551 100644 --- a/examples/odata-trippin/tests/odata-trippin.test.ts +++ b/examples/odata-trippin/tests/odata-trippin.test.ts @@ -4,8 +4,6 @@ import { findAndParseConfig } from '@graphql-mesh/cli'; import { getMesh, MeshInstance } from '@graphql-mesh/runtime'; import { ProcessedConfig } from '../../../packages/legacy/config/dist/typings/process'; -jest.setTimeout(15000); - describe('OData TripPin', () => { let config: ProcessedConfig; let mesh: MeshInstance; @@ -27,7 +25,7 @@ describe('OData TripPin', () => { if (!source.document || !source.location) { continue; } - const result = await mesh.execute(source.document, {}); + const result = await mesh.execute(source.document); expect(result).toMatchSnapshot(basename(source.location) + '-query-result'); } }); diff --git a/examples/openapi-javascript-wiki/tests/javascript-wiki.test.ts b/examples/openapi-javascript-wiki/tests/javascript-wiki.test.ts index d3ca0a52395ec..c65dbfec0d439 100644 --- a/examples/openapi-javascript-wiki/tests/javascript-wiki.test.ts +++ b/examples/openapi-javascript-wiki/tests/javascript-wiki.test.ts @@ -24,7 +24,7 @@ describe('JavaScript Wiki', () => { join(__dirname, '../example-queries/views-in-past-month.graphql'), 'utf8', ); - const result = await mesh.execute(viewsInPastMonthQuery, {}); + const result = await mesh.execute(viewsInPastMonthQuery); expect(result.errors).toBeFalsy(); expect(result?.data?.viewsInPastMonth).toBeGreaterThan(0); }); @@ -33,7 +33,7 @@ describe('JavaScript Wiki', () => { join(__dirname, '../example-queries/wikipedia-metrics.graphql'), 'utf8', ); - const result = await mesh.execute(wikipediaMetricsQuery, {}); + const result = await mesh.execute(wikipediaMetricsQuery); expect(result).toMatchSnapshot('wikipedia-metrics-result'); }); afterAll(() => mesh?.destroy()); diff --git a/examples/openapi-javascript-wiki/tsconfig.json b/examples/openapi-javascript-wiki/tsconfig.json index 7963064c978ef..60c24de5857a8 100644 --- a/examples/openapi-javascript-wiki/tsconfig.json +++ b/examples/openapi-javascript-wiki/tsconfig.json @@ -7,6 +7,6 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true }, - "files": [".mesh/index.d.ts", "additional-resolvers.ts"], + "files": ["additional-resolvers.ts"], "exclude": ["node_modules"] } diff --git a/examples/openapi-stackexchange/test/openapi-stackexchange.test.ts.bak b/examples/openapi-stackexchange/test/openapi-stackexchange.test.ts.bak index b191c219adc30..d0a8bc384f611 100644 --- a/examples/openapi-stackexchange/test/openapi-stackexchange.test.ts.bak +++ b/examples/openapi-stackexchange/test/openapi-stackexchange.test.ts.bak @@ -23,7 +23,7 @@ describe.skip('Stack Exchange', () => { join(__dirname, '..', 'list-questions.query.graphql'), 'utf-8', ); - const result = await mesh.execute(listQuestionsQuery, {}); + const result = await mesh.execute(listQuestionsQuery); expect(result).toMatchObject({ data: { listUnansweredQuestions: { diff --git a/examples/postgres-geodb/test/test.ts b/examples/postgres-geodb/test/test.ts index b84be87dd2262..bdcb1085889fc 100644 --- a/examples/postgres-geodb/test/test.ts +++ b/examples/postgres-geodb/test/test.ts @@ -17,7 +17,7 @@ describe('PostgresGeoDB', () => { process.env.DEBUG = debugEnvFlag; }); it('should give correct response for example queries', async () => { - const result = await mesh.execute(config.documents[0].document!, {}); + const result = await mesh.execute(config.documents[0].document!); expect(result?.data?.allCities?.nodes?.[0]?.countrycode).toBeTruthy(); expect(result?.data?.allCities?.nodes?.[0]?.developers?.[0]?.login).toBeTruthy(); }); diff --git a/examples/programmatic-batching/tests/programmatic-batching.spec.ts b/examples/programmatic-batching/tests/programmatic-batching.spec.ts index 25ef87d06c3b7..e6dbcd774e452 100644 --- a/examples/programmatic-batching/tests/programmatic-batching.spec.ts +++ b/examples/programmatic-batching/tests/programmatic-batching.spec.ts @@ -28,7 +28,7 @@ describe('Batching Example', () => { }); it('should give correct response for the batched example query', async () => { const queryStr = await readFile(join(__dirname, '..', 'example-query.graphql'), 'utf-8'); - const result = await mesh.execute(queryStr, {}); + const result = await mesh.execute(queryStr); expect(result).toMatchSnapshot('example-query-result'); expect(config.fetchFn).toHaveBeenCalledTimes(2); }); diff --git a/examples/sqlite-chinook/tests/sqlite-chinook.test.ts b/examples/sqlite-chinook/tests/sqlite-chinook.test.ts index d5a917111b0eb..3c2a3dc008789 100644 --- a/examples/sqlite-chinook/tests/sqlite-chinook.test.ts +++ b/examples/sqlite-chinook/tests/sqlite-chinook.test.ts @@ -23,7 +23,7 @@ describe('SQLite Chinook', () => { if (!source.document || !source.location) { throw new Error(`Invalid source: ${source.location}`); } - const result = await mesh.execute(source.document, undefined); + const result = await mesh.execute(source.document); expect(result).toMatchSnapshot(basename(source.location) + '-sqlite-chinook-result'); } }); diff --git a/examples/thrift-calculator/tests/thrift-calculator.test.ts b/examples/thrift-calculator/tests/thrift-calculator.test.ts index 6b15098b3529a..0e2b804417084 100644 --- a/examples/thrift-calculator/tests/thrift-calculator.test.ts +++ b/examples/thrift-calculator/tests/thrift-calculator.test.ts @@ -32,7 +32,7 @@ describe('Thrift Calculator', () => { if (!source.document || !source.location) { throw new Error(`Invalid source: ${source.location}`); } - const result = await mesh.execute(source.document, {}); + const result = await mesh.execute(source.document); expect(result.errors).toBeFalsy(); expect(result).toMatchSnapshot(basename(source.location) + '-thrift-calculator-result'); } diff --git a/examples/type-merging-batching-example/tests/type-merging-batching-example.test.ts b/examples/type-merging-batching-example/tests/type-merging-batching-example.test.ts index 302264108cb8c..d7e89dcf96481 100644 --- a/examples/type-merging-batching-example/tests/type-merging-batching-example.test.ts +++ b/examples/type-merging-batching-example/tests/type-merging-batching-example.test.ts @@ -25,7 +25,7 @@ describe('Type Merging and Batching Example', () => { if (!source.document || !source.location) { throw new Error(`Invalid source: ${inspect(source)}`); } - const result = await mesh.execute(source.document, {}); + const result = await mesh.execute(source.document); expect(result).toMatchSnapshot(basename(source.location) + '-query-result'); } }); diff --git a/jest.config.js b/jest.config.js index ed202c446708c..47347cf266df1 100644 --- a/jest.config.js +++ b/jest.config.js @@ -30,8 +30,6 @@ if (process.env.LEAK_TEST) { testMatch.push('!**/examples/grpc-*/**'); testMatch.push('!**/examples/sqlite-*/**'); testMatch.push('!**/examples/mysql-*/**'); - testMatch.push('!**/examples/v1-next/grpc-*/**'); - testMatch.push('!**/examples/v1-next/sqlite-*/**'); testMatch.push('!**/examples/v1-next/mysql-*/**'); testMatch.push('!**/examples/federation-example/tests/polling.test.ts'); } @@ -73,12 +71,6 @@ if (process.env.E2E_TEST && process.env.CI && !isLinux) { } } -// Disable grpc-reflection tests for Node.js v22.7.0 -// See https://github.com/nodejs/node/issues/54518 -if (process.version === 'v22.7.0') { - testMatch.push('!**/examples/grpc-reflection*/**'); -} - /** @type {import('jest').Config} */ module.exports = { displayName, diff --git a/package.json b/package.json index 26c2f7aa3c209..f3c769585576f 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ "postbuild": "yarn inject-version && yarn copy-config-schema && yarn fix-bin && tsx scripts/replace-import-meta-url-in-cjs.ts", "postchangeset": "yarn install --no-immutable", "postgenerate-config-schema": "node scripts/create-config-schema-ts.js && npx prettier --write ./packages/legacy/types/src", - "postinstall": "husky install && patch-package", "prebuild": "yarn clean && yarn generate-config-schema", "prettier": "prettier --write --list-different .", "prettier:check": "prettier --check .", @@ -100,7 +99,6 @@ "lint-staged": "15.3.0", "minimatch": "10.0.1", "node-gyp": "^11.0.0", - "patch-package": "8.0.0", "prettier": "3.4.2", "threads": "^1.7.0", "ts-jest": "29.2.5", @@ -109,18 +107,19 @@ }, "resolutions": { "@changesets/assemble-release-plan": "patch:@changesets/assemble-release-plan@npm%3A5.2.3#~/.yarn/patches/@changesets-assemble-release-plan-npm-5.2.3-296454a28f.patch", - "@commander-js/extra-typings@npm:^12.1.0": "patch:@commander-js/extra-typings@npm%3A12.1.0#~/.yarn/patches/@commander-js-extra-typings-npm-12.1.0-65a781f8c6.patch", "@whatwg-node/fetch": "0.10.1", "@whatwg-node/node-fetch": "0.7.5", "@whatwg-node/server": "0.9.65", "es5-ext": "0.10.64", "esbuild": "^0.24.0", "graphql": "16.10.0", - "graphql-rate-limit@npm:^3.3.0": "patch:graphql-rate-limit@npm%3A3.3.0#~/.yarn/patches/graphql-rate-limit-npm-3.3.0-3ae882ba75.patch", + "graphql-jit": "patch:graphql-jit@npm%3A0.8.7#~/.yarn/patches/graphql-jit-npm-0.8.7-3ae882ba75.patch", + "graphql-rate-limit": "patch:graphql-rate-limit@npm%3A3.3.0#~/.yarn/patches/graphql-rate-limit-npm-3.3.0-3ae882ba75.patch", + "ioredis-mock": "patch:ioredis-mock@npm%3A8.9.0#~/.yarn/patches/ioredis-mock-npm-8.9.0-3ae882ba75.patch", + "jest-leak-detector": "patch:jest-leak-detector@npm%3A29.7.0#~/.yarn/patches/jest-leak-detector-npm-29.7.0-3ae882ba75.patch", "node-gyp": "^11.0.0", "sqlite3": "^5.1.7", "tslib": "2.8.1", - "undici": "7.2.0", "uuid": "11.0.3" }, "lint-staged": { @@ -131,7 +130,7 @@ "prettier --write" ], "yarn.lock": [ - "yarn dedupe" + "yarn dedupe && git add yarn.lock" ] } } diff --git a/packages/compose-cli/package.json b/packages/compose-cli/package.json index ae393a98f679f..4f36cf2ea6870 100644 --- a/packages/compose-cli/package.json +++ b/packages/compose-cli/package.json @@ -50,7 +50,7 @@ "@graphql-tools/schema": "^10.0.5", "@graphql-tools/utils": "^10.6.0", "@whatwg-node/fetch": "^0.10.0", - "commander": "^12.0.0", + "commander": "^13.0.0", "dotenv": "^16.3.1" }, "publishConfig": { diff --git a/packages/compose-cli/src/run.ts b/packages/compose-cli/src/run.ts index 3aea84aebdbdd..5277e59897001 100644 --- a/packages/compose-cli/src/run.ts +++ b/packages/compose-cli/src/run.ts @@ -66,7 +66,8 @@ export async function run({ program = program.name(binName).description(productDescription); if (version) program = program.version(version); - if (process.env.NODE_ENV === 'test') program = program.allowUnknownOption(); + if (process.env.NODE_ENV === 'test') + program = program.allowUnknownOption().allowExcessArguments(); const opts = program.parse().opts(); const log = rootLog.child(` ${productName}`); diff --git a/packages/legacy/runtime/src/get-mesh.ts b/packages/legacy/runtime/src/get-mesh.ts index e8a16e833d9df..7d80166d080bf 100644 --- a/packages/legacy/runtime/src/get-mesh.ts +++ b/packages/legacy/runtime/src/get-mesh.ts @@ -348,7 +348,7 @@ export async function getMesh(options: GetMeshOptions): Promise { operationName, }), ); - } as MeshExecutor; + }; } function sdkRequesterFactory(globalContext: any): SdkRequester { diff --git a/packages/legacy/runtime/src/types.ts b/packages/legacy/runtime/src/types.ts index 7a58c0cf5a2a7..da8ad8772a249 100644 --- a/packages/legacy/runtime/src/types.ts +++ b/packages/legacy/runtime/src/types.ts @@ -12,7 +12,7 @@ import type { YamlConfig, } from '@graphql-mesh/types'; import type { TerminateHandler } from '@graphql-mesh/utils'; -import type { IResolvers, Source } from '@graphql-tools/utils'; +import type { IResolvers, MaybeAsyncIterable, MaybePromise, Source } from '@graphql-tools/utils'; import type { MESH_CONTEXT_SYMBOL } from './constants.js'; import type { MeshInstance } from './get-mesh.js'; @@ -38,11 +38,11 @@ export type MeshResolvedSource = { export type ExecuteMeshFn = ( document: GraphQLOperation, - variables: TVariables, + variables?: TVariables, context?: TContext, rootValue?: TRootValue, operationName?: string, -) => Promise>; +) => MaybePromise>; export type SubscribeMeshFn = ( document: GraphQLOperation, @@ -50,7 +50,7 @@ export type SubscribeMeshFn Promise | AsyncIterable>>; +) => MaybePromise>>; export type MeshContext = { [MESH_CONTEXT_SYMBOL]: true; diff --git a/packages/legacy/urql/package.json b/packages/legacy/urql/package.json index ac086ddf3260e..08d8a57fe5602 100644 --- a/packages/legacy/urql/package.json +++ b/packages/legacy/urql/package.json @@ -39,6 +39,7 @@ "@graphql-mesh/runtime": "^0.105.10", "@graphql-tools/utils": "^10.6.0", "tslib": "^2.4.0", + "value-or-promise": "^1.0.12", "wonka": "^6.3.1" }, "devDependencies": { diff --git a/packages/legacy/urql/src/index.ts b/packages/legacy/urql/src/index.ts index c8334d1ddbe53..5ed4198f84933 100644 --- a/packages/legacy/urql/src/index.ts +++ b/packages/legacy/urql/src/index.ts @@ -1,3 +1,5 @@ +/* eslint-disable @typescript-eslint/no-floating-promises */ +import { ValueOrPromise } from 'value-or-promise'; import type { Source } from 'wonka'; import { filter, make, merge, mergeMap, pipe, share, takeUntil } from 'wonka'; import type { ExecuteMeshFn, SubscribeMeshFn } from '@graphql-mesh/runtime'; @@ -10,10 +12,13 @@ const makeExecuteSource = ( operation: Operation, options: MeshExchangeOptions, ): Source => { - const operationFn = operation.kind === 'subscription' ? options.subscribe : options.execute; + const operationFn = + options.subscribe && operation.kind === 'subscription' ? options.subscribe : options.execute; return make(observer => { let ended = false; - operationFn(operation.query, operation.variables, operation.context, ROOT_VALUE) + new ValueOrPromise(() => + operationFn(operation.query, operation.variables, operation.context, ROOT_VALUE), + ) .then((result: ExecutionResult | AsyncIterable): any => { if (ended || !result) { return; @@ -48,9 +53,10 @@ const makeExecuteSource = ( observer.complete(); }) .catch(error => { - observer.next(makeErrorResult(operation, error)); + observer.next(makeErrorResult(operation, error as Error)); observer.complete(); - }); + }) + .resolve(); return () => { ended = true; diff --git a/yarn.lock b/yarn.lock index eef8043f3a83a..031c7b072a37a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3300,7 +3300,7 @@ __metadata: languageName: node linkType: hard -"@commander-js/extra-typings@npm:12.1.0": +"@commander-js/extra-typings@npm:^12.1.0": version: 12.1.0 resolution: "@commander-js/extra-typings@npm:12.1.0" peerDependencies: @@ -3318,15 +3318,6 @@ __metadata: languageName: node linkType: hard -"@commander-js/extra-typings@patch:@commander-js/extra-typings@npm%3A12.1.0#~/.yarn/patches/@commander-js-extra-typings-npm-12.1.0-65a781f8c6.patch": - version: 12.1.0 - resolution: "@commander-js/extra-typings@patch:@commander-js/extra-typings@npm%3A12.1.0#~/.yarn/patches/@commander-js-extra-typings-npm-12.1.0-65a781f8c6.patch::version=12.1.0&hash=952fa3" - peerDependencies: - commander: ~12.1.0 - checksum: 10c0/d5939ca9177be6ed0c6b56adccb789168a734d51a14411b26f9e0466f4415ce00ac5127cbf79353384309ebb33e93f21b9fbe9750ee202d141375b013a8f6079 - languageName: node - linkType: hard - "@contrast/fn-inspect@npm:^3.3.0": version: 3.4.0 resolution: "@contrast/fn-inspect@npm:3.4.0" @@ -5400,6 +5391,13 @@ __metadata: languageName: node linkType: hard +"@fastify/busboy@npm:^2.0.0": + version: 2.1.1 + resolution: "@fastify/busboy@npm:2.1.1" + checksum: 10c0/6f8027a8cba7f8f7b736718b013f5a38c0476eea67034c94a0d3c375e2b114366ad4419e6a6fa7ffc2ef9c6d3e0435d76dd584a7a1cbac23962fda7650b579e3 + languageName: node + linkType: hard + "@fastify/error@npm:^4.0.0": version: 4.0.0 resolution: "@fastify/error@npm:4.0.0" @@ -6163,7 +6161,7 @@ __metadata: "@graphql-tools/schema": "npm:^10.0.5" "@graphql-tools/utils": "npm:^10.6.0" "@whatwg-node/fetch": "npm:^0.10.0" - commander: "npm:^12.0.0" + commander: "npm:^13.0.0" dotenv: "npm:^16.3.1" peerDependencies: graphql: "*" @@ -7455,6 +7453,7 @@ __metadata: "@graphql-tools/utils": "npm:^10.6.0" "@urql/core": "npm:5.1.0" tslib: "npm:^2.4.0" + value-or-promise: "npm:^1.0.12" wonka: "npm:^6.3.1" peerDependencies: "@urql/core": ^2.4.3 || ^4.0.0 || ^5.0.0 @@ -14463,13 +14462,6 @@ __metadata: languageName: node linkType: hard -"@yarnpkg/lockfile@npm:^1.1.0": - version: 1.1.0 - resolution: "@yarnpkg/lockfile@npm:1.1.0" - checksum: 10c0/0bfa50a3d756623d1f3409bc23f225a1d069424dbc77c6fd2f14fb377390cd57ec703dc70286e081c564be9051ead9ba85d81d66a3e68eeb6eb506d4e0c0fbda - languageName: node - linkType: hard - "abab@npm:^2.0.3, abab@npm:^2.0.5": version: 2.0.6 resolution: "abab@npm:2.0.6" @@ -16916,6 +16908,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^13.0.0": + version: 13.0.0 + resolution: "commander@npm:13.0.0" + checksum: 10c0/8ba1e2b83bfdbcefd967aa505f5f5dc58202aa5f8e10437f61f6980dd8a69f868dba439a261f9fb72fc543c5f6fe58140e37b001a4c70b92ae22527abe94dfe1 + languageName: node + linkType: hard + "commander@npm:^2.14.1, commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3, commander@npm:^2.7.1": version: 2.20.3 resolution: "commander@npm:2.20.3" @@ -20910,15 +20909,6 @@ __metadata: languageName: node linkType: hard -"find-yarn-workspace-root@npm:^2.0.0": - version: 2.0.0 - resolution: "find-yarn-workspace-root@npm:2.0.0" - dependencies: - micromatch: "npm:^4.0.2" - checksum: 10c0/b0d3843013fbdaf4e57140e0165889d09fa61745c9e85da2af86e54974f4cc9f1967e40f0d8fc36a79d53091f0829c651d06607d552582e53976f3cd8f4e5689 - languageName: node - linkType: hard - "flat-cache@npm:^3.0.4": version: 3.2.0 resolution: "flat-cache@npm:3.2.0" @@ -21679,7 +21669,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 @@ -21837,7 +21827,7 @@ __metadata: languageName: node linkType: hard -"graphql-jit@npm:0.8.7, graphql-jit@npm:^0.8.7": +"graphql-jit@npm:0.8.7": version: 0.8.7 resolution: "graphql-jit@npm:0.8.7" dependencies: @@ -21853,6 +21843,22 @@ __metadata: languageName: node linkType: hard +"graphql-jit@patch:graphql-jit@npm%3A0.8.7#~/.yarn/patches/graphql-jit-npm-0.8.7-3ae882ba75.patch": + version: 0.8.7 + resolution: "graphql-jit@patch:graphql-jit@npm%3A0.8.7#~/.yarn/patches/graphql-jit-npm-0.8.7-3ae882ba75.patch::version=0.8.7&hash=90c32e" + dependencies: + "@graphql-typed-document-node/core": "npm:^3.2.0" + fast-json-stringify: "npm:^5.16.1" + generate-function: "npm:^2.3.1" + lodash.memoize: "npm:^4.1.2" + lodash.merge: "npm:4.6.2" + lodash.mergewith: "npm:4.6.2" + peerDependencies: + graphql: ">=15" + checksum: 10c0/6c87905c9139e0421db59dc0a25006c0fb4598d15cf324719492a43f3d7bb01032e5290567a8f6484cc2d8d41c57cba90985306bf28a11c85f03fe124c4ee6ab + languageName: node + linkType: hard + "graphql-mesh@workspace:.": version: 0.0.0-use.local resolution: "graphql-mesh@workspace:." @@ -21892,7 +21898,6 @@ __metadata: lint-staged: "npm:15.3.0" minimatch: "npm:10.0.1" node-gyp: "npm:^11.0.0" - patch-package: "npm:8.0.0" prettier: "npm:3.4.2" threads: "npm:^1.7.0" ts-jest: "npm:29.2.5" @@ -23136,7 +23141,7 @@ __metadata: languageName: node linkType: hard -"ioredis-mock@npm:^8.8.3": +"ioredis-mock@npm:8.9.0": version: 8.9.0 resolution: "ioredis-mock@npm:8.9.0" dependencies: @@ -23152,6 +23157,22 @@ __metadata: languageName: node linkType: hard +"ioredis-mock@patch:ioredis-mock@npm%3A8.9.0#~/.yarn/patches/ioredis-mock-npm-8.9.0-3ae882ba75.patch": + version: 8.9.0 + resolution: "ioredis-mock@patch:ioredis-mock@npm%3A8.9.0#~/.yarn/patches/ioredis-mock-npm-8.9.0-3ae882ba75.patch::version=8.9.0&hash=a5b625" + dependencies: + "@ioredis/as-callback": "npm:^3.0.0" + "@ioredis/commands": "npm:^1.2.0" + fengari: "npm:^0.1.4" + fengari-interop: "npm:^0.1.3" + semver: "npm:^7.5.4" + peerDependencies: + "@types/ioredis-mock": ^8 + ioredis: ^5 + checksum: 10c0/d050eae6502b0ba2ae462eac3494c9352e97b6668e236d1435fb97b36fd7c879ddeca187974f4802594c572d500831779e5809647fd289b08356ee06793a71d8 + languageName: node + linkType: hard + "ioredis@npm:>=5, ioredis@npm:^5.3.2": version: 5.4.2 resolution: "ioredis@npm:5.4.2" @@ -24423,23 +24444,23 @@ __metadata: languageName: node linkType: hard -"jest-leak-detector@npm:^27.5.1": - version: 27.5.1 - resolution: "jest-leak-detector@npm:27.5.1" +"jest-leak-detector@npm:29.7.0": + version: 29.7.0 + resolution: "jest-leak-detector@npm:29.7.0" dependencies: - jest-get-type: "npm:^27.5.1" - pretty-format: "npm:^27.5.1" - checksum: 10c0/33ec88ab7d76931ae0a03b18186234114e42a4e9fae748f8a197f7f85b884c2e92ea692c06704b8a469ac26b9c6411a7a1bbc8d34580ed56672a7f6be2681aee + jest-get-type: "npm:^29.6.3" + pretty-format: "npm:^29.7.0" + checksum: 10c0/71bb9f77fc489acb842a5c7be030f2b9acb18574dc9fb98b3100fc57d422b1abc55f08040884bd6e6dbf455047a62f7eaff12aa4058f7cbdc11558718ca6a395 languageName: node linkType: hard -"jest-leak-detector@npm:^29.7.0": +"jest-leak-detector@patch:jest-leak-detector@npm%3A29.7.0#~/.yarn/patches/jest-leak-detector-npm-29.7.0-3ae882ba75.patch": version: 29.7.0 - resolution: "jest-leak-detector@npm:29.7.0" + resolution: "jest-leak-detector@patch:jest-leak-detector@npm%3A29.7.0#~/.yarn/patches/jest-leak-detector-npm-29.7.0-3ae882ba75.patch::version=29.7.0&hash=bbbac3" dependencies: jest-get-type: "npm:^29.6.3" pretty-format: "npm:^29.7.0" - checksum: 10c0/71bb9f77fc489acb842a5c7be030f2b9acb18574dc9fb98b3100fc57d422b1abc55f08040884bd6e6dbf455047a62f7eaff12aa4058f7cbdc11558718ca6a395 + checksum: 10c0/c950374dc4ee6b9b3ba5b4c937f5edca67cee44f68330d7ff7317054ddf3cd8ad70fcb50948f45cef0b9eeef56c3eae537b4658b77f65d6886b5f14ecc54aa22 languageName: node linkType: hard @@ -25330,7 +25351,7 @@ __metadata: languageName: node linkType: hard -"json-stable-stringify@npm:^1.0.2, json-stable-stringify@npm:^1.1.1": +"json-stable-stringify@npm:^1.1.1": version: 1.2.1 resolution: "json-stable-stringify@npm:1.2.1" dependencies: @@ -25550,15 +25571,6 @@ __metadata: languageName: node linkType: hard -"klaw-sync@npm:^6.0.0": - version: 6.0.0 - resolution: "klaw-sync@npm:6.0.0" - dependencies: - graceful-fs: "npm:^4.1.11" - checksum: 10c0/00d8e4c48d0d699b743b3b028e807295ea0b225caf6179f51029e19783a93ad8bb9bccde617d169659fbe99559d73fb35f796214de031d0023c26b906cecd70a - languageName: node - linkType: hard - "kleur@npm:^3.0.3": version: 3.0.3 resolution: "kleur@npm:3.0.3" @@ -29347,31 +29359,6 @@ __metadata: languageName: node linkType: hard -"patch-package@npm:8.0.0": - version: 8.0.0 - resolution: "patch-package@npm:8.0.0" - dependencies: - "@yarnpkg/lockfile": "npm:^1.1.0" - chalk: "npm:^4.1.2" - ci-info: "npm:^3.7.0" - cross-spawn: "npm:^7.0.3" - find-yarn-workspace-root: "npm:^2.0.0" - fs-extra: "npm:^9.0.0" - json-stable-stringify: "npm:^1.0.2" - klaw-sync: "npm:^6.0.0" - minimist: "npm:^1.2.6" - open: "npm:^7.4.2" - rimraf: "npm:^2.6.3" - semver: "npm:^7.5.3" - slash: "npm:^2.0.0" - tmp: "npm:^0.0.33" - yaml: "npm:^2.2.2" - bin: - patch-package: index.js - checksum: 10c0/690eab0537e953a3fd7d32bb23f0e82f97cd448f8244c3227ed55933611a126f9476397325c06ad2c11d881a19b427a02bd1881bee78d89f1731373fc4fe0fee - languageName: node - linkType: hard - "path-browserify@npm:1.0.1": version: 1.0.1 resolution: "path-browserify@npm:1.0.1" @@ -32493,7 +32480,7 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^2.6.1, rimraf@npm:^2.6.3": +"rimraf@npm:^2.6.1": version: 2.7.1 resolution: "rimraf@npm:2.7.1" dependencies: @@ -33407,13 +33394,6 @@ __metadata: languageName: node linkType: hard -"slash@npm:^2.0.0": - version: 2.0.0 - resolution: "slash@npm:2.0.0" - checksum: 10c0/f83dbd3cb62c41bb8fcbbc6bf5473f3234b97fa1d008f571710a9d3757a28c7169e1811cad1554ccb1cc531460b3d221c9a7b37f549398d9a30707f0a5af9193 - languageName: node - linkType: hard - "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0" @@ -35718,10 +35698,12 @@ __metadata: languageName: node linkType: hard -"undici@npm:7.2.0": - version: 7.2.0 - resolution: "undici@npm:7.2.0" - checksum: 10c0/97b8452bae99304b697f79e9b8c094a2c28e6b805f720187af3a01cae2d297788d7ab6fe883577ba94e48fc20f1fbf04ab4fb050c23527bf32f8ada79a26dcb2 +"undici@npm:^5.28.4": + version: 5.28.4 + resolution: "undici@npm:5.28.4" + dependencies: + "@fastify/busboy": "npm:^2.0.0" + checksum: 10c0/08d0f2596553aa0a54ca6e8e9c7f45aef7d042c60918564e3a142d449eda165a80196f6ef19ea2ef2e6446959e293095d8e40af1236f0d67223b06afac5ecad7 languageName: node linkType: hard @@ -37602,7 +37584,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.2.2, yaml@npm:^2.3.1, yaml@npm:^2.3.2, yaml@npm:^2.3.4, yaml@npm:~2.6.1": +"yaml@npm:^2.3.1, yaml@npm:^2.3.2, yaml@npm:^2.3.4, yaml@npm:~2.6.1": version: 2.6.1 resolution: "yaml@npm:2.6.1" bin: