fix(graphql): client bumped to newer version and build fixed

Stradivario · Stradivario · commit 5117a661218e · 2023-01-06T23:00:03.000+02:00
diff --git a/examples/package-lock.json b/examples/package-lock.json
diff --git a/examples/package.json b/examples/package.json
@@ -7,14 +7,14 @@
     "start-performance": "npx parcel ./performance/index.html --out-dir build/performance"
   },
   "dependencies": {
-    "@rhtml/components": "0.0.82",
-    "@rhtml/experiments": "0.0.82",
-    "@rhtml/graphql": "0.0.82",
-    "@rhtml/hooks": "0.0.82",
-    "@rhtml/operators": "0.0.82",
-    "@rhtml/renderer": "0.0.82",
-    "@rxdi/core": "^0.7.158",
-    "@rxdi/lit-html": "^0.7.158",
+    "@rhtml/components": "^0.0.117",
+    "@rhtml/experiments": "0.0.117",
+    "@rhtml/graphql": "0.0.117",
+    "@rhtml/hooks": "0.0.117",
+    "@rhtml/operators": "^0.0.117",
+    "@rhtml/renderer": "0.0.117",
+    "@rxdi/core": "^0.7.159",
+    "@rxdi/lit-html": "^0.7.159",
     "rxjs": "^6.6.3"
   },
   "browserslist": [
diff --git a/package.json b/package.json
@@ -59,12 +59,12 @@
   "module": "./dist/index.js",
   "typings": "./dist/index.d.ts",
   "dependencies": {
-    "@rxdi/core": "^0.7.158",
-    "@rxdi/graphql-client": "^0.7.158",
-    "@rxdi/lit-html": "^0.7.158",
+    "@rxdi/core": "^0.7.159",
+    "@rxdi/graphql-client": "^0.7.159",
+    "@rxdi/lit-html": "^0.7.159",
     "shades": "^2.1.0",
     "rxjs": "^6.6.3",
     "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0",
-    "graphql-tag": "^2.10.1"
+    "graphql-tag": "^2.12.6"
   }
 }
diff --git a/packages/component/package.json b/packages/component/package.json
@@ -16,7 +16,7 @@
     "url": "git@github.com:rhtml/rhtml.git"
   },
   "dependencies": {
-    "@rxdi/lit-html": "^0.7.158",
+    "@rxdi/lit-html": "^0.7.159",
     "@rhtml/renderer": "0.0.117"
   },
   "peerDependencies": {
diff --git a/packages/components/libs/README.md b/packages/components/libs/README.md
@@ -0,0 +1,3 @@
+This file is with purpose to replace original file inside `node_modules/@apollo/client/link/core/types.d.ts`
+Fixes bug with not transpiling package due to newer version of graphql >15 which has 2 generic arguments but instead older one has one generic argument
+TODO delete this after migration to newer graphql version
diff --git a/packages/components/libs/types b/packages/components/libs/types
@@ -0,0 +1,51 @@
+import { DocumentNode, ExecutionResult, GraphQLError } from "graphql";
+export { DocumentNode };
+import { Observable } from "../../utilities";
+export declare type Path = ReadonlyArray<string | number>;
+declare type Data<T> = T | null | undefined;
+interface ExecutionPatchResultBase {
+    hasNext?: boolean;
+}
+export interface ExecutionPatchInitialResult<TData = Record<string, any>, TExtensions = Record<string, any>> extends ExecutionPatchResultBase {
+    data: Data<TData>;
+    incremental?: never;
+    errors?: ReadonlyArray<GraphQLError>;
+    extensions?: TExtensions;
+}
+export interface IncrementalPayload<TData, TExtensions> {
+    data: Data<TData>;
+    label?: string;
+    path: Path;
+    errors?: ReadonlyArray<GraphQLError>;
+    extensions?: TExtensions;
+}
+export interface ExecutionPatchIncrementalResult<TData = Record<string, any>, TExtensions = Record<string, any>> extends ExecutionPatchResultBase {
+    incremental?: IncrementalPayload<TData, TExtensions>[];
+    data?: never;
+    errors?: never;
+    extensions?: never;
+}
+export declare type ExecutionPatchResult<TData = Record<string, any>, TExtensions = Record<string, any>> = ExecutionPatchInitialResult<TData, TExtensions> | ExecutionPatchIncrementalResult<TData, TExtensions>;
+export interface GraphQLRequest {
+    query: DocumentNode;
+    variables?: Record<string, any>;
+    operationName?: string;
+    context?: Record<string, any>;
+    extensions?: Record<string, any>;
+}
+export interface Operation {
+    query: DocumentNode;
+    variables: Record<string, any>;
+    operationName: string;
+    extensions: Record<string, any>;
+    setContext: (context: Record<string, any>) => Record<string, any>;
+    getContext: () => Record<string, any>;
+}
+export interface SingleExecutionResult<TData = Record<string, any>, TContext = Record<string, any>, TExtensions = Record<string, any>> extends ExecutionResult<TData> {
+    data?: Data<TData>;
+    context?: TContext;
+}
+export declare type FetchResult<TData = Record<string, any>, TContext = Record<string, any>, TExtensions = Record<string, any>> = SingleExecutionResult<TData, TContext, TExtensions> | ExecutionPatchResult<TData, TExtensions>;
+export declare type NextLink = (operation: Operation) => Observable<FetchResult>;
+export declare type RequestHandler = (operation: Operation, forward: NextLink) => Observable<FetchResult> | null;
+//# sourceMappingURL=types.d.ts.map
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -9,10 +9,10 @@
     "clean": "git clean -dxf",
     "lint": "npx eslint . --ext .ts",
     "lint-fix": "npx eslint . --fix --ext .ts",
-    "build": "rm -rf dist && tsc"
+    "build": "cp ./libs/types ../../node_modules/@apollo/client/link/core/types.d.ts && rm -rf dist && tsc"
   },
   "dependencies": {
-    "@rxdi/lit-html": "^0.7.158",
+    "@rxdi/lit-html": "^0.7.159",
     "@rhtml/renderer": "0.0.117",
     "rxjs": "^6.6.3",
     "shades": "^2.1.0"
diff --git a/packages/components/src/types.ts b/packages/components/src/types.ts
@@ -1,6 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import {
+  ErrorPolicy,
+  FetchPolicy,
+} from '@apollo/client/core/watchQueryOptions';
 import { TemplateResult } from '@rxdi/lit-html';
-import { ErrorPolicy, FetchPolicy } from 'apollo-client';
 import { DocumentNode } from 'graphql';
 
 export interface Settings {
diff --git a/packages/experiments/package.json b/packages/experiments/package.json
@@ -19,7 +19,7 @@
   "author": "Kristiyan Tachev",
   "license": "MIT",
   "dependencies": {
-    "@rxdi/lit-html": "^0.7.158",
+    "@rxdi/lit-html": "^0.7.159",
     "@rhtml/operators": "0.0.117"
   },
   "browserslist": [
diff --git a/packages/graphql/libs/README.md b/packages/graphql/libs/README.md
@@ -0,0 +1,3 @@
+This file is with purpose to replace original file inside `node_modules/@apollo/client/link/core/types.d.ts`
+Fixes bug with not transpiling package due to newer version of graphql >15 which has 2 generic arguments but instead older one has one generic argument
+TODO delete this after migration to newer graphql version
diff --git a/packages/graphql/libs/types b/packages/graphql/libs/types
@@ -0,0 +1,51 @@
+import { DocumentNode, ExecutionResult, GraphQLError } from "graphql";
+export { DocumentNode };
+import { Observable } from "../../utilities";
+export declare type Path = ReadonlyArray<string | number>;
+declare type Data<T> = T | null | undefined;
+interface ExecutionPatchResultBase {
+    hasNext?: boolean;
+}
+export interface ExecutionPatchInitialResult<TData = Record<string, any>, TExtensions = Record<string, any>> extends ExecutionPatchResultBase {
+    data: Data<TData>;
+    incremental?: never;
+    errors?: ReadonlyArray<GraphQLError>;
+    extensions?: TExtensions;
+}
+export interface IncrementalPayload<TData, TExtensions> {
+    data: Data<TData>;
+    label?: string;
+    path: Path;
+    errors?: ReadonlyArray<GraphQLError>;
+    extensions?: TExtensions;
+}
+export interface ExecutionPatchIncrementalResult<TData = Record<string, any>, TExtensions = Record<string, any>> extends ExecutionPatchResultBase {
+    incremental?: IncrementalPayload<TData, TExtensions>[];
+    data?: never;
+    errors?: never;
+    extensions?: never;
+}
+export declare type ExecutionPatchResult<TData = Record<string, any>, TExtensions = Record<string, any>> = ExecutionPatchInitialResult<TData, TExtensions> | ExecutionPatchIncrementalResult<TData, TExtensions>;
+export interface GraphQLRequest {
+    query: DocumentNode;
+    variables?: Record<string, any>;
+    operationName?: string;
+    context?: Record<string, any>;
+    extensions?: Record<string, any>;
+}
+export interface Operation {
+    query: DocumentNode;
+    variables: Record<string, any>;
+    operationName: string;
+    extensions: Record<string, any>;
+    setContext: (context: Record<string, any>) => Record<string, any>;
+    getContext: () => Record<string, any>;
+}
+export interface SingleExecutionResult<TData = Record<string, any>, TContext = Record<string, any>, TExtensions = Record<string, any>> extends ExecutionResult<TData> {
+    data?: Data<TData>;
+    context?: TContext;
+}
+export declare type FetchResult<TData = Record<string, any>, TContext = Record<string, any>, TExtensions = Record<string, any>> = SingleExecutionResult<TData, TContext, TExtensions> | ExecutionPatchResult<TData, TExtensions>;
+export declare type NextLink = (operation: Operation) => Observable<FetchResult>;
+export declare type RequestHandler = (operation: Operation, forward: NextLink) => Observable<FetchResult> | null;
+//# sourceMappingURL=types.d.ts.map
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -9,7 +9,7 @@
     "clean": "git clean -dxf",
     "lint": "npx eslint . --ext .ts",
     "lint-fix": "npx eslint . --fix --ext .ts",
-    "build": "rm -rf dist && tsc"
+    "build": "cp ./libs/types ../../node_modules/@apollo/client/link/core/types.d.ts && rm -rf dist && tsc"
   },
   "devDependencies": {},
   "repository": {
@@ -22,13 +22,13 @@
     "last 1 chrome versions"
   ],
   "dependencies": {
-    "@rxdi/core": "^0.7.158",
-    "@rxdi/graphql-client": "^0.7.158",
-    "@rxdi/lit-html": "^0.7.158",
+    "@rxdi/core": "^0.7.159",
+    "@rxdi/graphql-client": "^0.7.159",
+    "@rxdi/lit-html": "^0.7.159",
     "shades": "^2.1.0",
     "rxjs": "^6.6.3",
     "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0",
-    "graphql-tag": "^2.10.1"
+    "graphql-tag": "^2.12.6"
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
diff --git a/packages/graphql/src/base.service.ts b/packages/graphql/src/base.service.ts
@@ -1,11 +1,11 @@
+import { WatchQueryOptions } from '@apollo/client/core/watchQueryOptions';
 import { Injectable, Injector } from '@rxdi/core';
 import {
   ApolloClient,
   MutationOptions,
   QueryOptions,
   SubscriptionOptions,
 } from '@rxdi/graphql-client';
-import { WatchQueryOptions } from 'apollo-client';
 import { from, Observable } from 'rxjs';
 
 @Injectable()
diff --git a/packages/graphql/src/graph.component.ts b/packages/graphql/src/graph.component.ts
@@ -1,3 +1,8 @@
+import {
+  MutationOptions,
+  QueryOptions,
+  SubscriptionOptions,
+} from '@apollo/client/core/watchQueryOptions';
 import { Container, Inject } from '@rxdi/core';
 import {
   async,
@@ -7,12 +12,6 @@ import {
   LitElement,
   property,
 } from '@rxdi/lit-html';
-import {
-  MutationOptions,
-  QueryBaseOptions,
-  QueryOptions,
-  SubscriptionOptions,
-} from 'apollo-client';
 import gql from 'graphql-tag';
 import {
   BehaviorSubject,
@@ -84,7 +83,7 @@ export class GraphComponent extends LitElement {
     render: (res) => html` ${res} `,
     loading: () => html``,
     error: () => html``,
-    settings: {} as QueryBaseOptions,
+    settings: {} /* as QueryBaseOptions */,
   };
 
   @Inject(BaseService)
diff --git a/packages/graphql/src/types.ts b/packages/graphql/src/types.ts
@@ -1,6 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import {
+  ErrorPolicy,
+  FetchPolicy,
+} from '@apollo/client/core/watchQueryOptions';
 import { CSSResult, TemplateResult } from '@rxdi/lit-html';
-import { ErrorPolicy, FetchPolicy } from 'apollo-client';
 import { DocumentNode } from 'graphql';
 
 export interface Settings {
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
@@ -16,7 +16,7 @@
     "url": "git@github.com:rhtml/rhtml.git"
   },
   "dependencies": {
-    "@rxdi/lit-html": "^0.7.158"
+    "@rxdi/lit-html": "^0.7.159"
   },
   "devDependencies": {},
   "author": "Kristiyan Tachev",
diff --git a/packages/operators/package.json b/packages/operators/package.json
@@ -18,7 +18,7 @@
   "author": "Kristiyan Tachev",
   "license": "MIT",
   "dependencies": {
-    "@rxdi/lit-html": "^0.7.158",
+    "@rxdi/lit-html": "^0.7.159",
     "@rhtml/renderer": "0.0.117"
   },
   "devDependencies": {},
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
@@ -15,7 +15,7 @@
     "url": "git@github.com:rhtml/rhtml.git"
   },
   "dependencies": {
-    "@rxdi/lit-html": "^0.7.158"
+    "@rxdi/lit-html": "^0.7.159"
   },
   "devDependencies": {},
   "author": "Kristiyan Tachev",
diff --git a/yarn.lock b/yarn.lock
@@ -44,7 +44,7 @@
     "@angular-devkit/core" "7.3.10"
     rxjs "6.3.3"
 
-"@apollo/client@^3.4.16":
+"@apollo/client@^3.7.3":
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.7.3.tgz#ab3fe31046e74bc1a3762363a185ba5bcfffc58b"
   integrity sha512-nzZ6d6a4flLpm3pZOGpuAUxLlp9heob7QcCkyIqZlCLvciUibgufRfYTwfkWCc4NaGHGSZyodzvfr79H6oUwGQ==
@@ -525,26 +525,26 @@
     typeable-promisify "^2.0.1"
     yarn "^1.9.4"
 
-"@rxdi/core@^0.7.158":
-  version "0.7.158"
-  resolved "https://registry.yarnpkg.com/@rxdi/core/-/core-0.7.158.tgz#3320dbbc25cdef611ab49531b301ca46d03329c1"
-  integrity sha512-ttQu/wJySV8MF71cLPn0QM8GjbppA8zxMYYdQBVCwwbEM+3EvQ8uP4ydzWP6sst5mKkzeVpcM7jEyv4uw92y5g==
+"@rxdi/core@^0.7.159":
+  version "0.7.159"
+  resolved "https://registry.yarnpkg.com/@rxdi/core/-/core-0.7.159.tgz#a005448e20ef4bba57b593cb170dc773fe7383a1"
+  integrity sha512-39FCixgvRPV2GLM7G49PkpS6B+NmhzHnAYrg5otQy+wSFNfap03FQ3T5CoahQF9Y/q/lWVRQerqHWt0T94N3vw==
   dependencies:
     "@abraham/reflection" "^0.8.0"
     rxjs "^6.5.3"
 
-"@rxdi/graphql-client@^0.7.158":
-  version "0.7.158"
-  resolved "https://registry.yarnpkg.com/@rxdi/graphql-client/-/graphql-client-0.7.158.tgz#ff7f2f8a8b4e0784c8c10291f9eb62ea4b322e77"
-  integrity sha512-KOoh8OFnhFi3IY06OQVGrmwgxgNcUaC8GOTP8afG8tkDndS2DrG6pA2xduYLB/F/OmejA7akYjLPx4i2PajEXA==
+"@rxdi/graphql-client@^0.7.159":
+  version "0.7.159"
+  resolved "https://registry.yarnpkg.com/@rxdi/graphql-client/-/graphql-client-0.7.159.tgz#50ec323feaa3d78687595dccdf4c4d1ff3fc1230"
+  integrity sha512-atqfICcqqn0noVtBNLTKNobgX3wh43y5JJIRsXjODYtiQH85VQ39AJos4+vBSEE6ZtwjtFLpChXu5Ej4gZaLxg==
   dependencies:
-    "@apollo/client" "^3.4.16"
+    "@apollo/client" "^3.7.3"
     subscriptions-transport-ws "^0.9.19"
 
-"@rxdi/lit-html@^0.7.158":
-  version "0.7.158"
-  resolved "https://registry.yarnpkg.com/@rxdi/lit-html/-/lit-html-0.7.158.tgz#fdf96c5b1ec007e84af25a250b08c52ac3f687cd"
-  integrity sha512-2H8gmHL9VAEeDMfaSpqvdy8BNaH+9pYsj+stjPAh63k6hDRqih8JcDYsIPpFz/gEU6OCszQ61FwPxe+HSirtrQ==
+"@rxdi/lit-html@^0.7.159":
+  version "0.7.159"
+  resolved "https://registry.yarnpkg.com/@rxdi/lit-html/-/lit-html-0.7.159.tgz#353ab4e91dcfd32c532bb099e99f20e12067ed7d"
+  integrity sha512-vwH+t+lI1NUqmuszdNGkqTnvsVbSyFXwC4Mz7EM2mR+C7Sqk8VDCJCKvHMvkobdlwcL2wnTbhRg+NhTDneOquw==
   dependencies:
     lit "^2.5.0"
 
@@ -2307,11 +2307,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
-graphql-tag@^2.10.1:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.11.0.tgz#1deb53a01c46a7eb401d6cb59dec86fa1cccbffd"
-  integrity sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA==
-
 graphql-tag@^2.12.6:
   version "2.12.6"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+This file is with purpose to replace original file inside `node_modules/@apollo/client/link/core/types.d.ts`
	`2`	`+Fixes bug with not transpiling package due to newer version of graphql >15 which has 2 generic arguments but instead older one has one generic argument`
	`3`	`+TODO delete this after migration to newer graphql version`