Unverified Commit ef22bcc8 authored by Andrey Azov's avatar Andrey Azov Committed by GitHub

Update dependencies (#327)

Changes that required manual intervention:

- webpack-merge no longer has default export
- replaced apollo-boost and @apollo/react-hooks with apollo-client v.3
- ran npx browserslist@latest --update-db to update caniuse-lite
parent 972ba4d6
Pipeline #88038 passed with stages
in 7 minutes and 41 seconds
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -48,24 +48,22 @@
}
},
"dependencies": {
"@apollo/react-hooks": "3.1.5",
"@sentry/browser": "5.18.0",
"apollo-boost": "0.4.9",
"@apollo/client": "3.0.2",
"@sentry/browser": "5.19.2",
"classnames": "2.2.6",
"connected-react-router": "6.8.0",
"core-js": "3.6.5",
"d3": "5.16.0",
"dotenv": "8.2.0",
"ensembl-genome-browser": "https://raw.githubusercontent.com/Ensembl/ensembl-genome-browser-assets/master/assets-80f51620ed443c640cdfd6b5aebd505b.tar.gz",
"graphql": "15.1.0",
"graphql-tag": "2.10.3",
"graphql": "15.3.0",
"koa-proxy": "1.0.0-alpha.3",
"lodash": "4.17.15",
"lodash": "4.17.19",
"query-string": "6.13.1",
"react": "16.13.1",
"react-cookie": "4.0.3",
"react-dom": "16.13.1",
"react-ga": "3.0.0",
"react-ga": "3.1.2",
"react-redux": "7.2.0",
"react-router": "5.2.0",
"react-router-dom": "5.2.0",
......@@ -74,21 +72,21 @@
"redux-devtools-extension": "2.13.8",
"redux-observable": "1.2.0",
"redux-thunk": "2.3.0",
"rxjs": "6.5.5",
"rxjs": "6.6.0",
"typesafe-actions": "5.1.0",
"what-input": "5.2.10"
},
"devDependencies": {
"@babel/core": "7.10.3",
"@babel/plugin-proposal-class-properties": "7.10.1",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
"@babel/plugin-proposal-object-rest-spread": "7.10.3",
"@babel/plugin-proposal-optional-chaining": "7.10.3",
"@babel/core": "7.10.5",
"@babel/plugin-proposal-class-properties": "7.10.4",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.10.4",
"@babel/plugin-proposal-object-rest-spread": "7.10.4",
"@babel/plugin-proposal-optional-chaining": "7.10.4",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-transform-modules-commonjs": "7.10.1",
"@babel/preset-env": "7.10.3",
"@babel/preset-react": "7.10.1",
"@babel/preset-typescript": "7.10.1",
"@babel/plugin-transform-modules-commonjs": "7.10.4",
"@babel/preset-env": "7.10.4",
"@babel/preset-react": "7.10.4",
"@babel/preset-typescript": "7.10.4",
"@storybook/addon-actions": "5.3.19",
"@storybook/addon-notes": "5.3.19",
"@storybook/react": "5.3.19",
......@@ -98,38 +96,38 @@
"@types/enzyme": "3.10.5",
"@types/enzyme-adapter-react-16": "1.0.6",
"@types/faker": "4.1.12",
"@types/jest": "26.0.3",
"@types/jest": "26.0.5",
"@types/lodash": "4.14.157",
"@types/node": "14.0.14",
"@types/prettier": "2.0.1",
"@types/react": "16.9.41",
"@types/node": "14.0.23",
"@types/prettier": "2.0.2",
"@types/react": "16.9.43",
"@types/react-dom": "16.9.8",
"@types/react-redux": "7.1.9",
"@types/react-router-dom": "5.1.5",
"@types/react-router-hash-link": "1.2.1",
"@types/redux-mock-store": "1.0.2",
"@types/webpack-env": "1.15.2",
"@typescript-eslint/eslint-plugin": "3.4.0",
"@typescript-eslint/parser": "3.4.0",
"@typescript-eslint/eslint-plugin": "3.6.1",
"@typescript-eslint/parser": "3.6.1",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "26.1.0",
"babel-loader": "8.1.0",
"brotli-webpack-plugin": "1.1.0",
"compression-webpack-plugin": "4.0.0",
"connect-history-api-fallback": "1.6.0",
"copy-webpack-plugin": "6.0.2",
"copy-webpack-plugin": "6.0.3",
"css-loader": "3.6.0",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.2",
"enzyme-to-json": "3.5.0",
"eslint": "7.3.1",
"eslint": "7.5.0",
"eslint-config-prettier": "6.11.0",
"eslint-plugin-prettier": "3.1.4",
"eslint-plugin-react": "7.20.0",
"eslint-plugin-react-hooks": "4.0.4",
"eslint-plugin-react": "7.20.3",
"eslint-plugin-react-hooks": "4.0.8",
"faker": "4.1.0",
"file-loader": "6.0.0",
"fork-ts-checker-webpack-plugin": "5.0.5",
"fork-ts-checker-webpack-plugin": "5.0.7",
"gh-pages": "3.1.0",
"html-webpack-plugin": "4.3.0",
"husky": "4.2.5",
......@@ -139,7 +137,7 @@
"jest-fetch-mock": "3.0.3",
"jest-transform-stub": "2.0.0",
"koa": "2.13.0",
"koa-connect": "2.0.1",
"koa-connect": "2.1.0",
"koa-static": "5.0.0",
"licence-manager": "git+https://github.com/Ensembl/ensembl-licence-manager.git#36b534d28ff26d345b4ba4da0cbc18e1e0f7a6b7",
"lint-staged": "10.2.11",
......@@ -152,20 +150,20 @@
"redux-mock-store": "1.5.4",
"rimraf": "3.0.2",
"robotstxt-webpack-plugin": "7.0.0",
"sass-loader": "8.0.2",
"source-map-loader": "1.0.0",
"sass-loader": "9.0.2",
"source-map-loader": "1.0.1",
"style-loader": "1.2.1",
"stylelint": "13.6.1",
"stylelint-config-recommended-scss": "4.2.0",
"stylelint-scss": "3.18.0",
"stylelint-webpack-plugin": "2.1.0",
"terser-webpack-plugin": "3.0.6",
"typescript": "3.9.5",
"terser-webpack-plugin": "3.0.7",
"typescript": "3.9.7",
"webpack": "4.43.0",
"webpack-bundle-analyzer": "3.8.0",
"webpack-cli": "3.3.12",
"webpack-dev-server": "3.11.0",
"webpack-merge": "4.2.2",
"webpack-merge": "5.0.9",
"workbox-webpack-plugin": "5.1.3"
},
"browserslist": [
......
......@@ -15,10 +15,9 @@
*/
import React, { useEffect } from 'react';
import ApolloClient from 'apollo-boost';
import { ApolloClient, InMemoryCache, ApolloProvider } from '@apollo/client';
import { connect } from 'react-redux';
import { useParams } from 'react-router-dom';
import { ApolloProvider } from '@apollo/react-hooks';
import { BreakpointWidth } from 'src/global/globalConfig';
......@@ -58,7 +57,8 @@ export type EntityViewerParams = {
};
const client = new ApolloClient({
uri: '/toygraphql'
uri: '/toygraphql',
cache: new InMemoryCache()
});
const EntityViewer = (props: Props) => {
......
......@@ -17,8 +17,7 @@
import React from 'react';
import { connect } from 'react-redux';
import { Link } from 'react-router-dom';
import { useQuery } from '@apollo/react-hooks';
import { gql } from 'apollo-boost';
import { useQuery, gql } from '@apollo/client';
import * as urlHelper from 'src/shared/helpers/urlHelper';
import { buildFocusIdForUrl } from 'src/shared/state/ens-object/ensObjectHelpers';
......
......@@ -17,8 +17,7 @@
import React, { useState, useEffect } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import { replace } from 'connected-react-router';
import { useQuery } from '@apollo/react-hooks';
import { gql } from 'apollo-boost';
import { useQuery, gql } from '@apollo/client';
import { useParams, useLocation } from 'react-router-dom';
import usePrevious from 'src/shared/hooks/usePrevious';
......
......@@ -15,9 +15,8 @@
*/
import React from 'react';
import ApolloClient from 'apollo-boost';
import { connect } from 'react-redux';
import { ApolloProvider } from '@apollo/react-hooks';
import { ApolloClient, InMemoryCache, ApolloProvider } from '@apollo/client';
import GeneOverview from 'src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/overview/GeneOverview';
import GeneExternalReferences from 'src/content/app/entity-viewer/gene-view/components/gene-view-sidebar/external-references/GeneExternalReferences';
......@@ -32,7 +31,8 @@ type Props = {
};
const client = new ApolloClient({
uri: '/thoas'
uri: '/thoas',
cache: new InMemoryCache()
});
const GeneViewSidebar = (props: Props) => {
......
......@@ -16,8 +16,7 @@
import React, { useState } from 'react';
import { connect } from 'react-redux';
import { useQuery } from '@apollo/react-hooks';
import { gql } from 'apollo-boost';
import { useQuery, gql } from '@apollo/client';
import { useParams } from 'react-router';
import {
......
......@@ -15,8 +15,7 @@
*/
import React from 'react';
import { useQuery } from '@apollo/react-hooks';
import { gql } from 'apollo-boost';
import { useQuery, gql } from '@apollo/client';
import ScaleSwitcher from './scale-switcher/ScaleSwitcher';
import { GeneSummaryStrip } from 'src/shared/components/feature-summary-strip';
......
const webpackMerge = require('webpack-merge');
const { merge: webpackMerge } = require('webpack-merge');
/* NOTE:
- env may or may not be passed
......
const webpackMerge = require("webpack-merge");
const { merge: webpackMerge } = require('webpack-merge');
const loadPresets = require('./presets/loadPresets');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment