From 92eeb520579ab646d773e74cdafb38c845062fa7 Mon Sep 17 00:00:00 2001 From: Daniel Almaguer Date: Wed, 4 Sep 2024 18:30:09 -0500 Subject: [PATCH] chore(client): use graphl.web --- packages/client/package.json | 5 +- packages/client/src/utils/getOperationName.ts | 12 ++- packages/client/src/utils/normalizeQuery.ts | 2 +- pnpm-lock.yaml | 79 +++++-------------- 4 files changed, 32 insertions(+), 66 deletions(-) diff --git a/packages/client/package.json b/packages/client/package.json index 70caf8ce0..9007ab63c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -16,18 +16,15 @@ "dist" ], "dependencies": { + "@0no-co/graphql.web": "^1.0.8", "std-env": "^3.7.0" }, - "peerDependencies": { - "graphql": "^16.0.0" - }, "devDependencies": { "@bigcommerce/eslint-config": "^2.9.1", "@bigcommerce/eslint-config-catalyst": "workspace:^", "@types/node": "^20.16.1", "dotenv-cli": "^7.4.2", "eslint": "^8.57.0", - "graphql": "^16.9.0", "prettier": "^3.3.3", "tsup": "^8.2.4", "typescript": "^5.5.4" diff --git a/packages/client/src/utils/getOperationName.ts b/packages/client/src/utils/getOperationName.ts index 9ae2b5cb0..27642d585 100644 --- a/packages/client/src/utils/getOperationName.ts +++ b/packages/client/src/utils/getOperationName.ts @@ -1,10 +1,16 @@ -import { DefinitionNode, Kind, OperationDefinitionNode, parse } from 'graphql'; +import { DefinitionNode, OperationDefinitionNode, parse } from '@0no-co/graphql.web'; function isOperationDefinitionNode(node: DefinitionNode): node is OperationDefinitionNode { - return node.kind === Kind.OPERATION_DEFINITION; + // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison + return node.kind === 'OperationDefinition'; } -export const getOperationInfo = (document: string) => { +interface OperationInfo { + name?: string; + type: 'query' | 'mutation' | 'subscription'; +} + +export const getOperationInfo = (document: string): OperationInfo => { const documentNode = parse(document); const operationInfo = documentNode.definitions.filter(isOperationDefinitionNode).map((def) => { diff --git a/packages/client/src/utils/normalizeQuery.ts b/packages/client/src/utils/normalizeQuery.ts index 2e0f6c9e3..a32a44d01 100644 --- a/packages/client/src/utils/normalizeQuery.ts +++ b/packages/client/src/utils/normalizeQuery.ts @@ -1,4 +1,4 @@ -import { DocumentNode, print } from 'graphql'; +import { DocumentNode, print } from '@0no-co/graphql.web'; import { DocumentDecoration } from '../types'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b5fd6463c..4594e9122 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -246,6 +246,9 @@ importers: packages/client: dependencies: + '@0no-co/graphql.web': + specifier: ^1.0.8 + version: 1.0.8(graphql@16.9.0) std-env: specifier: ^3.7.0 version: 3.7.0 @@ -265,9 +268,6 @@ importers: eslint: specifier: ^8.57.0 version: 8.57.0 - graphql: - specifier: ^16.9.0 - version: 16.9.0 prettier: specifier: ^3.3.3 version: 3.3.3 @@ -402,8 +402,8 @@ importers: packages: - '@0no-co/graphql.web@1.0.7': - resolution: {integrity: sha512-E3Qku4mTzdrlwVWGPxklDnME5ANrEGetvYw4i2GCRlppWXXE4QD66j7pwb8HelZwS6LnqEChhrSOGCXpbiu6MQ==} + '@0no-co/graphql.web@1.0.8': + resolution: {integrity: sha512-8BG6woLtDMvXB9Ajb/uE+Zr/U7y4qJ3upXi0JQHZmsKUJa7HjF/gFvmL2f3/mSmfZoQGRr9VoY97LCX2uaFMzA==} peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 peerDependenciesMeta: @@ -925,12 +925,6 @@ packages: '@gql.tada/vue-support': optional: true - '@gql.tada/internal@1.0.6': - resolution: {integrity: sha512-K5dKMqqU0pcNWS+/i6EnoUGvA7lW2Agwl+nepZOEWbGpG80aJxXfL+yAvaHihP5VqGZFOygyc3NDBo1mm+Z4KQ==} - peerDependencies: - graphql: ^15.5.0 || ^16.0.0 || ^17.0.0 - typescript: ^5.0.0 - '@gql.tada/internal@1.0.7': resolution: {integrity: sha512-mI/7l7If7YR4rBlgnkXihh1qxD7eO41o8nf5ZYjwYl4s6FGFQFZY1E1reV3AgRy8tDXbiuMz1bIVLpnxPXxKIQ==} peerDependencies: @@ -2805,15 +2799,6 @@ packages: supports-color: optional: true - debug@4.3.5: - resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - debug@4.3.6: resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==} engines: {node: '>=6.0'} @@ -5004,11 +4989,6 @@ packages: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true - semver@7.6.2: - resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==} - engines: {node: '>=10'} - hasBin: true - semver@7.6.3: resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==} engines: {node: '>=10'} @@ -5370,9 +5350,6 @@ packages: tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - tslib@2.6.3: - resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} - tslib@2.7.0: resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} @@ -5715,13 +5692,13 @@ packages: snapshots: - '@0no-co/graphql.web@1.0.7(graphql@16.9.0)': + '@0no-co/graphql.web@1.0.8(graphql@16.9.0)': optionalDependencies: graphql: 16.9.0 '@0no-co/graphqlsp@1.12.13(graphql@16.9.0)(typescript@5.5.4)': dependencies: - '@gql.tada/internal': 1.0.6(graphql@16.9.0)(typescript@5.5.4) + '@gql.tada/internal': 1.0.7(graphql@16.9.0)(typescript@5.5.4) graphql: 16.9.0 typescript: 5.5.4 @@ -5964,9 +5941,9 @@ snapshots: '@typescript-eslint/parser': 8.4.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 eslint-config-prettier: 9.1.0(eslint@8.57.0) - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0) eslint-plugin-gettext: 1.2.0 - eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0) + eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0) eslint-plugin-jest: 28.8.3(@typescript-eslint/eslint-plugin@8.4.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.4) eslint-plugin-jest-formatting: 3.1.0(eslint@8.57.0) eslint-plugin-jsdoc: 50.2.2(eslint@8.57.0) @@ -5995,9 +5972,9 @@ snapshots: '@typescript-eslint/parser': 8.4.0(eslint@8.57.0)(typescript@5.5.4) eslint: 8.57.0 eslint-config-prettier: 9.1.0(eslint@8.57.0) - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0)(eslint@8.57.0) eslint-plugin-gettext: 1.2.0 - eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0) + eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.0) eslint-plugin-jest: 28.8.3(@typescript-eslint/eslint-plugin@8.4.0(@typescript-eslint/parser@8.4.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(jest@29.7.0)(typescript@5.5.4) eslint-plugin-jest-formatting: 3.1.0(eslint@8.57.0) eslint-plugin-jsdoc: 50.2.2(eslint@8.57.0) @@ -6052,7 +6029,7 @@ snapshots: outdent: 0.5.0 prettier: 2.8.8 resolve-from: 5.0.0 - semver: 7.6.2 + semver: 7.6.3 '@changesets/assemble-release-plan@6.0.3': dependencies: @@ -6062,7 +6039,7 @@ snapshots: '@changesets/should-skip-package': 0.1.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 - semver: 7.6.2 + semver: 7.6.3 '@changesets/changelog-git@0.2.0': dependencies: @@ -6107,7 +6084,7 @@ snapshots: p-limit: 2.3.0 preferred-pm: 3.1.3 resolve-from: 5.0.0 - semver: 7.6.2 + semver: 7.6.3 spawndamnit: 2.0.0 term-size: 2.2.1 @@ -6131,7 +6108,7 @@ snapshots: '@manypkg/get-packages': 1.1.3 chalk: 2.4.2 fs-extra: 7.0.1 - semver: 7.6.2 + semver: 7.6.3 '@changesets/get-github-info@0.6.0(encoding@0.1.13)': dependencies: @@ -6372,15 +6349,9 @@ snapshots: graphql: 16.9.0 typescript: 5.5.4 - '@gql.tada/internal@1.0.6(graphql@16.9.0)(typescript@5.5.4)': - dependencies: - '@0no-co/graphql.web': 1.0.7(graphql@16.9.0) - graphql: 16.9.0 - typescript: 5.5.4 - '@gql.tada/internal@1.0.7(graphql@16.9.0)(typescript@5.5.4)': dependencies: - '@0no-co/graphql.web': 1.0.7(graphql@16.9.0) + '@0no-co/graphql.web': 1.0.8(graphql@16.9.0) graphql: 16.9.0 typescript: 5.5.4 @@ -7969,7 +7940,7 @@ snapshots: aria-hidden@1.2.4: dependencies: - tslib: 2.6.3 + tslib: 2.7.0 aria-query@5.1.3: dependencies: @@ -8397,10 +8368,6 @@ snapshots: dependencies: ms: 2.1.3 - debug@4.3.5: - dependencies: - ms: 2.1.2 - debug@4.3.6: dependencies: ms: 2.1.2 @@ -9064,7 +9031,7 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.5 + debug: 4.3.6 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -9416,7 +9383,7 @@ snapshots: gql.tada@1.8.6(graphql@16.9.0)(typescript@5.5.4): dependencies: - '@0no-co/graphql.web': 1.0.7(graphql@16.9.0) + '@0no-co/graphql.web': 1.0.8(graphql@16.9.0) '@0no-co/graphqlsp': 1.12.13(graphql@16.9.0)(typescript@5.5.4) '@gql.tada/cli-utils': 1.6.1(@0no-co/graphqlsp@1.12.13(graphql@16.9.0)(typescript@5.5.4))(graphql@16.9.0)(typescript@5.5.4) '@gql.tada/internal': 1.0.7(graphql@16.9.0)(typescript@5.5.4) @@ -10851,7 +10818,7 @@ snapshots: react: 18.3.1 react-remove-scroll-bar: 2.3.6(@types/react@18.3.4)(react@18.3.1) react-style-singleton: 2.2.1(@types/react@18.3.4)(react@18.3.1) - tslib: 2.6.3 + tslib: 2.7.0 use-callback-ref: 1.3.2(@types/react@18.3.4)(react@18.3.1) use-sidecar: 1.1.2(@types/react@18.3.4)(react@18.3.1) optionalDependencies: @@ -11008,8 +10975,6 @@ snapshots: semver@6.3.1: {} - semver@7.6.2: {} - semver@7.6.3: {} serialize-javascript@6.0.2: @@ -11294,7 +11259,7 @@ snapshots: synckit@0.9.1: dependencies: '@pkgr/core': 0.1.1 - tslib: 2.6.3 + tslib: 2.7.0 tabbable@6.2.0: {} @@ -11424,8 +11389,6 @@ snapshots: tslib@1.14.1: {} - tslib@2.6.3: {} - tslib@2.7.0: {} tsscmp@1.0.6: {}