Dependencies upgrade (#103)

Author: pepakriz

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ jobs:
         uses: docker://mstruebing/editorconfig-checker:2.0.3
 
       - name: Install
-        run: yarn install && yarn run generate
+        run: yarn install --frozen-lockfile && yarn run generate
 
       - name: Lint
         run: yarn run check:cs

dashboard/codegen.yml

@@ -17,6 +17,7 @@ generates:
     plugins:
       - typescript
       - typescript-operations
+      - typescript-react-apollo
     hooks:
       afterOneFileWrite:
         - prettier --write

dashboard/package.json

@@ -16,30 +16,26 @@
 		"check:tests": "true"
 	},
 	"dependencies": {
-		"@apollo/react-hooks": "^3.1.3",
-		"@apollo/react-ssr": "^3.1.3",
+		"@apollo/client": "^3.1.3",
 		"@gitlab-merger-bot/common": "*",
 		"@gitlab-merger-bot/server": "*",
 		"@material-ui/core": "^4.11.0",
 		"@material-ui/icons": "^4.5.1",
-		"apollo-cache-inmemory": "^1.6.6",
-		"apollo-client": "^2.6.10",
-		"apollo-link-http": "^1.5.16",
-		"apollo-link-ws": "^1.0.19",
 		"graphql-tag": "^2.11.0",
 		"isomorphic-unfetch": "^3.0.0",
 		"next": "^9.5.2",
 		"react": "^16.12.0",
-		"react-dom": "^16.12.0"
+		"react-dom": "^16.12.0",
+		"subscriptions-transport-ws": "^0.9.18"
 	},
 	"devDependencies": {
 		"@graphql-codegen/cli": "^1.17.8",
 		"@graphql-codegen/typescript": "^1.17.9",
 		"@graphql-codegen/typescript-operations": "^1.17.8",
+		"@graphql-codegen/typescript-react-apollo": "^2.0.6",
 		"@types/node": "^14.6.0",
 		"@types/react": "^16.9.19",
-		"apollo-utilities": "^1.3.4",
-		"graphql": "^15.3.0",
+		"graphql": "^14.7.0",
 		"typescript": "^4.0.2"
 	}
 }

dashboard/src/components/layout.tsx

@@ -10,7 +10,7 @@ import Paper from '@material-ui/core/Paper';
 import Avatar from '@material-ui/core/Avatar';
 import Tabs from '@material-ui/core/Tabs';
 import Tab from '@material-ui/core/Tab';
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery } from '@apollo/client';
 import { MeQuery } from '../types';
 import gql from 'graphql-tag';
 

dashboard/src/components/ui/UserAvatar.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery } from '@apollo/client';
 import { AvatarQuery, AvatarQueryVariables } from '../../types';
 import gql from 'graphql-tag';
 import Avatar from '@material-ui/core/Avatar';

dashboard/src/lib/apollo.tsx

@@ -2,14 +2,17 @@ import { NextPage, NextPageContext } from 'next';
 import React from 'react';
 
 import Head from 'next/head';
-import { ApolloProvider } from '@apollo/react-hooks';
-import { ApolloClient } from 'apollo-client';
-import { InMemoryCache, NormalizedCacheObject } from 'apollo-cache-inmemory';
-import { HttpLink } from 'apollo-link-http';
+import {
+	ApolloProvider,
+	ApolloClient,
+	InMemoryCache,
+	NormalizedCacheObject,
+	split,
+} from '@apollo/client';
+import { getMainDefinition } from '@apollo/client/utilities';
+import { HttpLink } from '@apollo/client/link/http';
+import { WebSocketLink } from '@apollo/client/link/ws';
 import fetch from 'isomorphic-unfetch';
-import { WebSocketLink } from 'apollo-link-ws';
-import { getMainDefinition } from 'apollo-utilities';
-import { split } from 'apollo-link';
 
 type TApolloClient = ApolloClient<NormalizedCacheObject>;
 
@@ -51,7 +54,7 @@ export function withApollo(PageComponent: NextPage, { ssr = true } = {}) {
 
 				if (ssr) {
 					try {
-						const { getDataFromTree } = await import('@apollo/react-ssr');
+						const { getDataFromTree } = await import('@apollo/client/react/ssr');
 						await getDataFromTree(
 							<AppTree
 								pageProps={{

dashboard/src/pages/index.tsx

@@ -3,7 +3,7 @@ import { withApollo } from '../lib/apollo';
 import Typography from '@material-ui/core/Typography';
 import Box from '@material-ui/core/Box';
 import Layout from '../components/layout';
-import { useMutation, useSubscription } from '@apollo/react-hooks';
+import { useMutation, useSubscription } from '@apollo/client';
 import gql from 'graphql-tag';
 import OverlayLoading from '../components/ui/overlay-loading';
 import {

server/package.json

@@ -22,6 +22,7 @@
 		"env-var": "^6.3.0",
 		"express": "^4.17.1",
 		"fast-deep-equal": "^3.1.3",
+		"graphql": "^14.7.0",
 		"node-fetch": "^2.3.0",
 		"serve-static": "^1.14.1",
 		"uuid": "^8.3.0"