Skip to content

Commit

Permalink
fix(deps): update dependency commander to v13 (#8206)
Browse files Browse the repository at this point in the history
* 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] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Arda TANRIKULU <[email protected]>
  • Loading branch information
3 people authored Dec 31, 2024
1 parent 2a602a4 commit 36dc08b
Show file tree
Hide file tree
Showing 37 changed files with 180 additions and 167 deletions.
5 changes: 5 additions & 0 deletions .changeset/@graphql-mesh_compose-cli-8206-dependencies.md
Original file line number Diff line number Diff line change
@@ -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`)
5 changes: 5 additions & 0 deletions .changeset/@graphql-mesh_urql-exchange-8206-dependencies.md
Original file line number Diff line number Diff line change
@@ -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`)
6 changes: 6 additions & 0 deletions .changeset/modern-dolls-deny.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@graphql-mesh/runtime': patch
'@graphql-mesh/urql-exchange': patch
---

Improvements on Executor typings
3 changes: 3 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ on:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}

env:
YARN_ENABLE_HARDENED_MODE: 0

jobs:
stable:
permissions:
Expand Down
32 changes: 27 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- master
pull_request:

env:
YARN_ENABLE_HARDENED_MODE: 0

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions examples/federation-example/tests/federation-example.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand All @@ -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);
});
Expand Down
6 changes: 3 additions & 3 deletions examples/grpc-example/tests/grpc.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ 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 () => {
const MoviesByCastStream = await readFile(
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<any>) {
expect(item).toMatchSnapshot(`movies-by-cast-grpc-example-result-stream-${i++}`);
Expand All @@ -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<any>) {
expect(item).toMatchSnapshot(`movies-by-cast-grpc-example-result-subscription-${i++}`);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
10 changes: 5 additions & 5 deletions examples/json-schema-covid/tests/json-schema-covid.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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');
Expand All @@ -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');
Expand All @@ -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');

Expand All @@ -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');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
2 changes: 1 addition & 1 deletion examples/mysql-employees/tests/mysql-employees.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
);
Expand Down
2 changes: 1 addition & 1 deletion examples/neo4j-example/tests/neo4j-example.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
});
Expand Down
4 changes: 1 addition & 3 deletions examples/odata-trippin/tests/odata-trippin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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');
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand All @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion examples/openapi-javascript-wiki/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"esModuleInterop": true,
"allowSyntheticDefaultImports": true
},
"files": [".mesh/index.d.ts", "additional-resolvers.ts"],
"files": ["additional-resolvers.ts"],
"exclude": ["node_modules"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion examples/postgres-geodb/test/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
2 changes: 1 addition & 1 deletion examples/sqlite-chinook/tests/sqlite-chinook.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
});
Expand Down
2 changes: 1 addition & 1 deletion examples/thrift-calculator/tests/thrift-calculator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
Loading

0 comments on commit 36dc08b

Please sign in to comment.