Skip to content
Draft
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: 5 additions & 0 deletions .changeset/@graphql-mesh_cli-8292-dependencies.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphql-mesh/cli": patch
---
dependencies updates:
- Updated dependency [`graphql-ws@^6.0.1` ↗︎](https://www.npmjs.com/package/graphql-ws/v/6.0.1) (from `^6.0.0`, in `dependencies`)
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@graphql-mesh/plugin-live-query": patch
---
dependencies updates:
- Updated dependency [`@n1ru4l/in-memory-live-query-store@^0.10.0` ↗︎](https://www.npmjs.com/package/@n1ru4l/in-memory-live-query-store/v/0.10.0) (from `0.10.0`, in `dependencies`)
12 changes: 12 additions & 0 deletions .yarn/patches/@apollo-client-npm-3.12.6-4588fed38f.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/package.json b/package.json
index 69ca6b2c0a314e643e5c941226969b30270c053a..c49881be8897f0f723f5270bd73b3de62eb4e97a 100644
--- a/package.json
+++ b/package.json
@@ -173,6 +173,5 @@
"overrides": {
"pretty-format": "^29.7.0",
"@testing-library/dom": "$@testing-library/dom"
- },
- "type": "module"
+ }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/package.json b/package.json
index 9c06e612f5b1c9b0b822927dc403c78d19ed9828..cc3f2eff8175005570c9439e093d3b94ba8ada3c 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,6 @@
"typescript": {
"definition": "typings/index.d.ts"
},
- "type": "module",
"exports": {
".": {
"require": {
12 changes: 12 additions & 0 deletions .yarn/patches/tiny-lru-npm-11.2.11-8fcecc1d9e.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/package.json b/package.json
index c250aea90686de78a29cc3363964b054da6eeb34..12e0acdce85a0959f21d278bc418e49b55615cbc 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
"import": "./dist/tiny-lru.js",
"require": "./dist/tiny-lru.cjs"
},
- "type": "module",
"types": "lru.d.ts",
"engines": {
"node": ">=12"
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@typescript-eslint/eslint-plugin": "8.20.0",
"@typescript-eslint/parser": "8.20.0",
"babel-jest": "29.7.0",
"bob-the-bundler": "7.0.1",
"bob-the-bundler": "8.0.0-alpha-20250116201822-1c6814b11c3fec160bbf4b301ed13402ff664183",
"cp-cli": "^2.0.0",
"cross-env": "^7.0.3",
"eslint": "9.18.0",
Expand All @@ -106,7 +106,9 @@
"typescript": "^5.4.2"
},
"resolutions": {
"@apollo/client": "patch:@apollo/client@npm%3A3.12.6#~/.yarn/patches/@apollo-client-npm-3.12.6-4588fed38f.patch",
"@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",
"@n1ru4l/in-memory-live-query-store": "patch:@n1ru4l/in-memory-live-query-store@npm%3A0.10.0#~/.yarn/patches/@n1ru4l-in-memory-live-query-store-npm-0.10.0-47d8485a71.patch",
"@whatwg-node/fetch": "0.10.3",
"@whatwg-node/node-fetch": "0.7.7",
"@whatwg-node/server": "0.9.65",
Expand All @@ -119,6 +121,7 @@
"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",
"tiny-lru": "patch:tiny-lru@npm%3A11.2.11#~/.yarn/patches/tiny-lru-npm-11.2.11-8fcecc1d9e.patch",
"tslib": "2.8.1",
"uuid": "11.0.5"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cache/redis/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Redis from 'ioredis';
import RedisMock from 'ioredis-mock';
import { Redis } from 'ioredis';
import { redisMock as RedisMock } from 'ioredis-mock';
import { process } from '@graphql-mesh/cross-helpers';
import { stringInterpolator } from '@graphql-mesh/string-interpolation';
import type {
Expand Down
2 changes: 1 addition & 1 deletion packages/fusion/composition/src/transforms/prune.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { GraphQLSchema } from 'graphql';
import type { PruneSchemaOptions } from '@graphql-tools/utils';
import { pruneSchema } from '@graphql-tools/utils';
import type { SubgraphTransform } from '../compose';
import type { SubgraphTransform } from '../compose.js';

export type PruneTransformOptions = {
skipPruning: PruneSchemaOptions['skipPruning'] | string[];
Expand Down
2 changes: 1 addition & 1 deletion packages/legacy/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"cosmiconfig": "^9.0.0",
"dotenv": "^16.0.3",
"graphql-import-node": "^0.0.5",
"graphql-ws": "^6.0.0",
"graphql-ws": "^6.0.1",
"json-bigint-patch": "^0.0.8",
"json5": "^2.2.3",
"mkdirp": "^3.0.0",
Expand Down
2 changes: 0 additions & 2 deletions packages/legacy/cli/src/commands/serve/node-http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ export async function startNodeHttpServer({
path: graphqlPath,
server,
});
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - GraphQL WS has some issues with Bob
const { useServer } = await import('graphql-ws/use/ws');
useServer(getGraphQLWSOptions(getBuiltMesh), wsServer);
return new Promise((resolve, reject) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/legacy/cli/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ajv from 'ajv';
import { Ajv } from 'ajv';
import { cosmiconfig, defaultLoaders } from 'cosmiconfig';
import type { ConfigProcessOptions } from '@graphql-mesh/config';
import { processConfig } from '@graphql-mesh/config';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ajv from 'ajv';
import { Ajv } from 'ajv';
import addFormats from 'ajv-formats';
import { GraphQLScalarType, Kind } from 'graphql';
import { pascalCase } from 'pascal-case';
Expand Down
2 changes: 1 addition & 1 deletion packages/loaders/odata/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// eslint-disable-next-line import/no-nodejs-modules
import type EventEmitter from 'node:events';
import type { DirectiveArgsMap } from './directives';
import type { DirectiveArgsMap } from './directives.js';

export interface EntityTypeExtensions {
directives: DirectiveArgsMap;
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/live-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@graphql-mesh/string-interpolation": "0.5.7",
"@graphql-mesh/types": "^0.103.11",
"@graphql-mesh/utils": "^0.103.11",
"@n1ru4l/in-memory-live-query-store": "0.10.0",
"@n1ru4l/in-memory-live-query-store": "^0.10.0",
"tslib": "^2.4.0"
},
"publishConfig": {
Expand Down
9 changes: 5 additions & 4 deletions tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
"compilerOptions": {
"importHelpers": true,
"declaration": true,
"verbatimModuleSyntax": false,
"moduleResolution": "node"
"module": "node16",
"moduleResolution": "node16"
},
"exclude": [
"**/node_modules",
"**/dist",
"**/bundle",
"**/scripts",
"**/test/*.ts",
"**/tests/*.ts",
"**/test/**/*",
"**/tests/**/*",
"**/__integration_tests__/**/*",
"*.spec.ts",
"*.test.ts",
"examples/**/*",
Expand Down
8 changes: 3 additions & 5 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,15 @@
"baseUrl": ".",
"allowJs": true,

"target": "es2021", // TODO: remove once bob supports building cjs from node16 modules
"module": "esnext", // TODO: remove once bob supports building cjs from node16 modules
"moduleResolution": "bundler", // TODO: remove once bob supports building cjs from node16 modules
"target": "es2021",
"module": "es2022",
"moduleResolution": "bundler",

"noImplicitAny": false, // TODO: fix
"useUnknownInCatchVariables": false, // TODO: fix
"strictNullChecks": false, // TODO: fix
"strictPropertyInitialization": false, // TODO: fix (goes together with strictNullChecks)

"verbatimModuleSyntax": true,

"paths": {
"@graphql-mesh/migrate-config-cli": ["packages/legacy/migrate-config-cli/src/index.ts"],
"@graphql-mesh/include": ["packages/include/src/index.ts"],
Expand Down
Loading
Loading