Skip to content

Commit

Permalink
fix(admin-ui): Fix TS error with latest apollo-client typings
Browse files Browse the repository at this point in the history
Fixes #243
  • Loading branch information
michaelbromley committed Jan 24, 2020
1 parent 005a553 commit 465f81e
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 12 deletions.
2 changes: 1 addition & 1 deletion packages/admin-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@webcomponents/custom-elements": "^1.2.4",
"apollo-angular": "^1.6.0",
"apollo-cache-inmemory": "^1.6.2",
"apollo-client": "^2.6.3",
"apollo-client": "2.6.8",
"apollo-link": "^1.2.12",
"apollo-link-context": "^1.0.18",
"apollo-upload-client": "^11.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { InMemoryCache } from 'apollo-cache-inmemory';
import { GraphQLFieldResolver } from 'graphql';

import {
GetNetworkStatus,
Expand All @@ -22,7 +21,7 @@ export type ResolverContext = {

export type ResolverDefinition = {
Mutation: {
[name: string]: GraphQLFieldResolver<any, ResolverContext, any>;
[name: string]: (rootValue: any, args: any, context: ResolverContext, info?: any) => any;
};
};

Expand Down
36 changes: 27 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2946,26 +2946,34 @@ apollo-cache-inmemory@^1.6.2:
ts-invariant "^0.4.0"
tslib "^1.9.3"

[email protected], apollo-cache@^1.3.2:
[email protected]:
version "1.3.4"
resolved "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.3.4.tgz#0c9f63c793e1cd6e34c450f7668e77aff58c9a42"
integrity sha512-7X5aGbqaOWYG+SSkCzJNHTz2ZKDcyRwtmvW4mGVLRqdQs+HxfXS4dUS2CcwrAj449se6tZ6NLUMnjko4KMt3KA==
dependencies:
apollo-utilities "^1.3.3"
tslib "^1.10.0"

apollo-cache@^1.3.2:
version "1.3.2"
resolved "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.3.2.tgz#df4dce56240d6c95c613510d7e409f7214e6d26a"
integrity sha512-+KA685AV5ETEJfjZuviRTEImGA11uNBp/MJGnaCvkgr+BYRrGLruVKBv6WvyFod27WEB2sp7SsG8cNBKANhGLg==
dependencies:
apollo-utilities "^1.3.2"
tslib "^1.9.3"

apollo-client@^2.6.3:
version "2.6.4"
resolved "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.4.tgz#872c32927263a0d34655c5ef8a8949fbb20b6140"
integrity sha512-oWOwEOxQ9neHHVZrQhHDbI6bIibp9SHgxaLRVPoGvOFy7OH5XUykZE7hBQAVxq99tQjBzgytaZffQkeWo1B4VQ==
[email protected].8:
version "2.6.8"
resolved "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.8.tgz#01cebc18692abf90c6b3806414e081696b0fa537"
integrity sha512-0zvJtAcONiozpa5z5zgou83iEKkBaXhhSSXJebFHRXs100SecDojyUWKjwTtBPn9HbM6o5xrvC5mo9VQ5fgAjw==
dependencies:
"@types/zen-observable" "^0.8.0"
apollo-cache "1.3.2"
apollo-cache "1.3.4"
apollo-link "^1.0.0"
apollo-utilities "1.3.2"
apollo-utilities "1.3.3"
symbol-observable "^1.0.2"
ts-invariant "^0.4.0"
tslib "^1.9.3"
tslib "^1.10.0"
zen-observable "^0.8.0"

apollo-datasource@^0.6.3:
Expand Down Expand Up @@ -3143,7 +3151,17 @@ apollo-upload-client@^11.0.0:
apollo-link-http-common "^0.2.14"
extract-files "^5.0.1"

[email protected], apollo-utilities@^1.0.1, apollo-utilities@^1.3.0, apollo-utilities@^1.3.2:
[email protected], apollo-utilities@^1.3.3:
version "1.3.3"
resolved "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.3.tgz#f1854715a7be80cd810bc3ac95df085815c0787c"
integrity sha512-F14aX2R/fKNYMvhuP2t9GD9fggID7zp5I96MF5QeKYWDWTrkRdHRp4+SVfXUVN+cXOaB/IebfvRtzPf25CM0zw==
dependencies:
"@wry/equality" "^0.1.2"
fast-json-stable-stringify "^2.0.0"
ts-invariant "^0.4.0"
tslib "^1.10.0"

apollo-utilities@^1.0.1, apollo-utilities@^1.3.0, apollo-utilities@^1.3.2:
version "1.3.2"
resolved "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
Expand Down

0 comments on commit 465f81e

Please sign in to comment.