From 5fc299a1fa4922bed8ccfb790b836354d046e4fc Mon Sep 17 00:00:00 2001 From: Victor Vlasenko Date: Mon, 12 Aug 2019 13:42:22 +0300 Subject: [PATCH 1/7] Export compose function from core-common --- modules/core/common/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/common/index.ts b/modules/core/common/index.ts index 9eed7dfd16..15fd627bbf 100644 --- a/modules/core/common/index.ts +++ b/modules/core/common/index.ts @@ -6,3 +6,4 @@ export { default as createApolloClient } from './createApolloClient'; export { default as createReduxStore } from './createReduxStore'; export * from './createReduxStore'; export * from './utils'; +export { flowRight as compose } from 'lodash'; From 33dc865dbf50bdba3daa730a6271c84f9dd1ee9f Mon Sep 17 00:00:00 2001 From: Victor Vlasenko Date: Mon, 12 Aug 2019 13:42:46 +0300 Subject: [PATCH 2/7] Fix unsubscribe var naming --- modules/user/client-react/containers/withSubscription.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/user/client-react/containers/withSubscription.jsx b/modules/user/client-react/containers/withSubscription.jsx index 8e940ee6b0..048192e08a 100644 --- a/modules/user/client-react/containers/withSubscription.jsx +++ b/modules/user/client-react/containers/withSubscription.jsx @@ -8,8 +8,8 @@ export const useUsersWithSubscription = (subscribeToMore, filter) => { const [usersUpdated, setUsersUpdated] = useState(null); useEffect(() => { - const subscribe = subscribeToUsers(); - return () => subscribe(); + const unsubscribe = subscribeToUsers(); + return () => unsubscribe(); }); const subscribeToUsers = () => { From 963a295217566728f0ebd3c5da6320a70c72879f Mon Sep 17 00:00:00 2001 From: Victor Vlasenko Date: Mon, 12 Aug 2019 13:45:47 +0300 Subject: [PATCH 3/7] Fix initial filter passing --- modules/user/client-react/containers/Users.web.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/user/client-react/containers/Users.web.jsx b/modules/user/client-react/containers/Users.web.jsx index 69996919a5..2b925655a1 100644 --- a/modules/user/client-react/containers/Users.web.jsx +++ b/modules/user/client-react/containers/Users.web.jsx @@ -2,8 +2,8 @@ import React, { useEffect } from 'react'; import PropTypes from 'prop-types'; import Helmet from 'react-helmet'; import { Link } from 'react-router-dom'; -import { compose } from 'react-apollo'; +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { Button, PageLayout } from '@gqlapp/look-client-react'; import settings from '@gqlapp/config'; @@ -21,7 +21,8 @@ import { } from './UserOperations'; const Users = props => { - const { t, updateQuery, subscribeToMore, filter } = props; + const { t, updateQuery, subscribeToMore } = props; + const filter = { isActive: true }; const usersUpdated = useUsersWithSubscription(subscribeToMore, filter); useEffect(() => { @@ -50,9 +51,9 @@ const Users = props => {
- +
- + ); }; From a0e057a9e32c1a87095d95abbd7faea42f73ffef Mon Sep 17 00:00:00 2001 From: Victor Vlasenko Date: Mon, 12 Aug 2019 13:46:35 +0300 Subject: [PATCH 4/7] Fix dependency in useEffect --- .../pagination/client-react/containers/DataProvider.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/pagination/client-react/containers/DataProvider.jsx b/modules/pagination/client-react/containers/DataProvider.jsx index e77a7df611..508e803f92 100644 --- a/modules/pagination/client-react/containers/DataProvider.jsx +++ b/modules/pagination/client-react/containers/DataProvider.jsx @@ -16,10 +16,6 @@ const allEdges = generateEdgesArray(47); export const useDataProvider = () => { const [items, setItems] = useState(null); - useEffect(() => { - loadData(0, 'replace'); - }, [loadData]); - const loadData = useCallback( (offset, dataDelivery) => { const newEdges = allEdges.slice(offset, offset + itemsNumber); @@ -40,6 +36,10 @@ export const useDataProvider = () => { [items] ); + useEffect(() => { + loadData(0, 'replace'); + }); + return { items, loadData }; }; From d10da3f20f32ae5155a3f97fe72f89dfdb15828a Mon Sep 17 00:00:00 2001 From: Victor Vlasenko Date: Mon, 12 Aug 2019 13:46:54 +0300 Subject: [PATCH 5/7] Upgrade to react-apollo 3 --- .../containers/ChatOperations.jsx | 4 +- .../containers/ClientCounter.tsx | 10 +- modules/post/client-react/containers/Post.jsx | 4 +- .../post/client-react/containers/Post.web.jsx | 4 +- .../client-react/containers/PostComments.jsx | 4 +- .../containers/PostComments.web.jsx | 4 +- .../post/client-react/containers/PostEdit.jsx | 4 +- .../client-react/containers/PostEdit.web.jsx | 4 +- .../client-react/containers/Upload.native.jsx | 5 +- .../client-react/containers/Upload.web.jsx | 5 +- .../containers/ForgotPassword.jsx | 4 +- .../containers/ForgotPassword.native.jsx | 4 +- .../client-react/containers/Login.native.jsx | 5 +- .../client-react/containers/Login.web.jsx | 4 +- .../client-react/containers/Logout.native.jsx | 3 +- .../user/client-react/containers/Profile.jsx | 6 +- .../containers/Register.native.jsx | 3 +- .../client-react/containers/Register.web.jsx | 3 +- .../client-react/containers/ResetPassword.jsx | 7 +- .../user/client-react/containers/UserAdd.jsx | 3 +- .../user/client-react/containers/UserEdit.jsx | 3 +- .../containers/UserScreenNavigator.native.jsx | 3 +- .../client-react/containers/Users.native.jsx | 3 +- package.json | 4 +- packages/client-angular/package.json | 2 +- packages/client-vue/package.json | 2 +- packages/client/package.json | 4 +- packages/common/package.json | 2 +- packages/mobile/package.json | 4 +- packages/server/package.json | 4 +- yarn.lock | 103 ++++++++++++++---- 31 files changed, 157 insertions(+), 67 deletions(-) diff --git a/modules/chat/client-react/containers/ChatOperations.jsx b/modules/chat/client-react/containers/ChatOperations.jsx index 90dc5941b8..e5dc7a5a90 100644 --- a/modules/chat/client-react/containers/ChatOperations.jsx +++ b/modules/chat/client-react/containers/ChatOperations.jsx @@ -1,7 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { compose, graphql } from 'react-apollo/index'; +import { graphql } from 'react-apollo'; import update from 'immutability-helper'; + +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { withUser } from '@gqlapp/user-client-react'; import settings from '@gqlapp/config'; diff --git a/modules/counter/client-react/clientCounter/containers/ClientCounter.tsx b/modules/counter/client-react/clientCounter/containers/ClientCounter.tsx index 0beed5f31c..7c69756810 100644 --- a/modules/counter/client-react/clientCounter/containers/ClientCounter.tsx +++ b/modules/counter/client-react/clientCounter/containers/ClientCounter.tsx @@ -30,13 +30,9 @@ interface CounterProps { const ClientCounter = ({ t }: CounterProps) => ( - {({ - data: { - clientCounter: { amount } - } - }: any) => { - return ( - + {({ data, loading }: any) => { + return loading ? null : ( + ); diff --git a/modules/post/client-react/containers/Post.jsx b/modules/post/client-react/containers/Post.jsx index b078b4f3e6..90860f4359 100644 --- a/modules/post/client-react/containers/Post.jsx +++ b/modules/post/client-react/containers/Post.jsx @@ -1,9 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose } from 'react-apollo'; +import { graphql } from 'react-apollo'; import update from 'immutability-helper'; -import { PLATFORM } from '@gqlapp/core-common'; +import { compose, PLATFORM } from '@gqlapp/core-common'; import settings from '@gqlapp/config'; import PostList from '../components/PostList'; diff --git a/modules/post/client-react/containers/Post.web.jsx b/modules/post/client-react/containers/Post.web.jsx index c61db7f9ee..7591332fa8 100644 --- a/modules/post/client-react/containers/Post.web.jsx +++ b/modules/post/client-react/containers/Post.web.jsx @@ -1,9 +1,9 @@ import React, { useEffect } from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose } from 'react-apollo'; +import { graphql } from 'react-apollo'; import update from 'immutability-helper'; -import { PLATFORM } from '@gqlapp/core-common'; +import { compose, PLATFORM } from '@gqlapp/core-common'; import settings from '@gqlapp/config'; import PostList from '../components/PostList'; diff --git a/modules/post/client-react/containers/PostComments.jsx b/modules/post/client-react/containers/PostComments.jsx index 9928aaba08..e970942a7f 100644 --- a/modules/post/client-react/containers/PostComments.jsx +++ b/modules/post/client-react/containers/PostComments.jsx @@ -1,8 +1,10 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose } from 'react-apollo'; +import { graphql } from 'react-apollo'; import update from 'immutability-helper'; +import { compose } from '@gqlapp/core-common'; + import PostCommentsView from '../components/PostCommentsView'; import POST_QUERY from '../graphql/PostQuery.graphql'; diff --git a/modules/post/client-react/containers/PostComments.web.jsx b/modules/post/client-react/containers/PostComments.web.jsx index 30ef4bda56..cb84c67bb2 100644 --- a/modules/post/client-react/containers/PostComments.web.jsx +++ b/modules/post/client-react/containers/PostComments.web.jsx @@ -1,8 +1,10 @@ import React, { useEffect } from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose } from 'react-apollo'; +import { graphql } from 'react-apollo'; import update from 'immutability-helper'; +import { compose } from '@gqlapp/core-common'; + import PostCommentsView from '../components/PostCommentsView'; import POST_QUERY from '../graphql/PostQuery.graphql'; diff --git a/modules/post/client-react/containers/PostEdit.jsx b/modules/post/client-react/containers/PostEdit.jsx index 9753a84348..6fc357471d 100644 --- a/modules/post/client-react/containers/PostEdit.jsx +++ b/modules/post/client-react/containers/PostEdit.jsx @@ -1,6 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { compose, graphql } from 'react-apollo'; +import { graphql } from 'react-apollo'; + +import { compose } from '@gqlapp/core-common'; import PostEditView from '../components/PostEditView'; diff --git a/modules/post/client-react/containers/PostEdit.web.jsx b/modules/post/client-react/containers/PostEdit.web.jsx index 57c1454832..6b3b0908af 100644 --- a/modules/post/client-react/containers/PostEdit.web.jsx +++ b/modules/post/client-react/containers/PostEdit.web.jsx @@ -1,6 +1,8 @@ import React, { useEffect } from 'react'; import PropTypes from 'prop-types'; -import { compose, graphql } from 'react-apollo'; +import { graphql } from 'react-apollo'; + +import { compose } from '@gqlapp/core-common'; import PostEditView from '../components/PostEditView'; diff --git a/modules/upload/client-react/containers/Upload.native.jsx b/modules/upload/client-react/containers/Upload.native.jsx index 9af3304c5c..bc3ad48afc 100644 --- a/modules/upload/client-react/containers/Upload.native.jsx +++ b/modules/upload/client-react/containers/Upload.native.jsx @@ -1,7 +1,10 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose } from 'react-apollo'; +import { graphql } from 'react-apollo'; + +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; + import UploadView from '../components/UploadView'; import FILES_QUERY from '../graphql/FilesQuery.graphql'; import UPLOAD_FILES from '../graphql/UploadFiles.graphql'; diff --git a/modules/upload/client-react/containers/Upload.web.jsx b/modules/upload/client-react/containers/Upload.web.jsx index 101d82729c..ee68845ccf 100644 --- a/modules/upload/client-react/containers/Upload.web.jsx +++ b/modules/upload/client-react/containers/Upload.web.jsx @@ -1,7 +1,10 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose } from 'react-apollo'; +import { graphql } from 'react-apollo'; + +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; + import UploadView from '../components/UploadView'; import FILES_QUERY from '../graphql/FilesQuery.graphql'; import UPLOAD_FILES from '../graphql/UploadFiles.graphql'; diff --git a/modules/user/client-react/containers/ForgotPassword.jsx b/modules/user/client-react/containers/ForgotPassword.jsx index 423a463382..5f0bd47978 100644 --- a/modules/user/client-react/containers/ForgotPassword.jsx +++ b/modules/user/client-react/containers/ForgotPassword.jsx @@ -1,9 +1,11 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; -import { compose, graphql } from 'react-apollo'; +import { graphql } from 'react-apollo'; +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { FormError } from '@gqlapp/forms-client-react'; + import ForgotPasswordView from '../components/ForgotPasswordView'; import FORGOT_PASSWORD from '../graphql/ForgotPassword.graphql'; diff --git a/modules/user/client-react/containers/ForgotPassword.native.jsx b/modules/user/client-react/containers/ForgotPassword.native.jsx index 81a15d4d84..db9eb7c10f 100644 --- a/modules/user/client-react/containers/ForgotPassword.native.jsx +++ b/modules/user/client-react/containers/ForgotPassword.native.jsx @@ -1,9 +1,11 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose } from 'react-apollo'; +import { graphql } from 'react-apollo'; +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { FormError } from '@gqlapp/forms-client-react'; + import ForgotPasswordView from '../components/ForgotPasswordView'; import FORGOT_PASSWORD from '../graphql/ForgotPassword.graphql'; diff --git a/modules/user/client-react/containers/Login.native.jsx b/modules/user/client-react/containers/Login.native.jsx index 24b0e447d7..859164949b 100644 --- a/modules/user/client-react/containers/Login.native.jsx +++ b/modules/user/client-react/containers/Login.native.jsx @@ -1,9 +1,10 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose, withApollo } from 'react-apollo'; +import { graphql, withApollo } from 'react-apollo'; + +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { FormError } from '@gqlapp/forms-client-react'; - import authentication from '@gqlapp/authentication-client-react'; import LoginView from '../components/LoginView'; diff --git a/modules/user/client-react/containers/Login.web.jsx b/modules/user/client-react/containers/Login.web.jsx index a90a694d60..7320bc1c4a 100644 --- a/modules/user/client-react/containers/Login.web.jsx +++ b/modules/user/client-react/containers/Login.web.jsx @@ -1,6 +1,8 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose, withApollo } from 'react-apollo'; +import { graphql, withApollo } from 'react-apollo'; + +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { FormError } from '@gqlapp/forms-client-react'; diff --git a/modules/user/client-react/containers/Logout.native.jsx b/modules/user/client-react/containers/Logout.native.jsx index 4cef7aadba..7ecb20a06e 100644 --- a/modules/user/client-react/containers/Logout.native.jsx +++ b/modules/user/client-react/containers/Logout.native.jsx @@ -1,7 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import { View } from 'react-native'; -import { compose } from 'react-apollo'; + +import { compose } from '@gqlapp/core-common'; import { HeaderTitle } from '@gqlapp/look-client-react-native'; import { translate } from '@gqlapp/i18n-client-react'; diff --git a/modules/user/client-react/containers/Profile.jsx b/modules/user/client-react/containers/Profile.jsx index dbbacfbe26..474db0973a 100644 --- a/modules/user/client-react/containers/Profile.jsx +++ b/modules/user/client-react/containers/Profile.jsx @@ -1,10 +1,8 @@ -// React import React from 'react'; +import { graphql } from 'react-apollo'; -// Apollo -import { graphql, compose } from 'react-apollo'; +import { compose } from '@gqlapp/core-common'; -// Components import ProfileView from '../components/ProfileView'; import CURRENT_USER_QUERY from '../graphql/CurrentUserQuery.graphql'; diff --git a/modules/user/client-react/containers/Register.native.jsx b/modules/user/client-react/containers/Register.native.jsx index 780ae61dbd..7078861c0d 100644 --- a/modules/user/client-react/containers/Register.native.jsx +++ b/modules/user/client-react/containers/Register.native.jsx @@ -1,7 +1,8 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose } from 'react-apollo'; +import { graphql } from 'react-apollo'; +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { FormError } from '@gqlapp/forms-client-react'; import settings from '@gqlapp/config'; diff --git a/modules/user/client-react/containers/Register.web.jsx b/modules/user/client-react/containers/Register.web.jsx index b26e9e2251..003fbfeb5b 100644 --- a/modules/user/client-react/containers/Register.web.jsx +++ b/modules/user/client-react/containers/Register.web.jsx @@ -1,7 +1,8 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; -import { graphql, compose } from 'react-apollo'; +import { graphql } from 'react-apollo'; +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { FormError } from '@gqlapp/forms-client-react'; import settings from '@gqlapp/config'; diff --git a/modules/user/client-react/containers/ResetPassword.jsx b/modules/user/client-react/containers/ResetPassword.jsx index a538044867..bc570291ce 100644 --- a/modules/user/client-react/containers/ResetPassword.jsx +++ b/modules/user/client-react/containers/ResetPassword.jsx @@ -1,10 +1,13 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { compose, graphql } from 'react-apollo'; -import { translate } from '@gqlapp/i18n-client-react'; +import { graphql } from 'react-apollo'; +import { compose } from '@gqlapp/core-common'; +import { translate } from '@gqlapp/i18n-client-react'; import { FormError } from '@gqlapp/forms-client-react'; + import ResetPasswordView from '../components/ResetPasswordView'; + import RESET_PASSWORD from '../graphql/ResetPassword.graphql'; const ResetPassword = props => { diff --git a/modules/user/client-react/containers/UserAdd.jsx b/modules/user/client-react/containers/UserAdd.jsx index 0314d4a482..e2f1f4866c 100644 --- a/modules/user/client-react/containers/UserAdd.jsx +++ b/modules/user/client-react/containers/UserAdd.jsx @@ -1,8 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { compose, graphql } from 'react-apollo'; +import { graphql } from 'react-apollo'; import { pick } from 'lodash'; +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { FormError } from '@gqlapp/forms-client-react'; import settings from '@gqlapp/config'; diff --git a/modules/user/client-react/containers/UserEdit.jsx b/modules/user/client-react/containers/UserEdit.jsx index b12030f400..0ecbdc89ce 100644 --- a/modules/user/client-react/containers/UserEdit.jsx +++ b/modules/user/client-react/containers/UserEdit.jsx @@ -1,8 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { compose, graphql } from 'react-apollo'; +import { graphql } from 'react-apollo'; import { pick } from 'lodash'; +import { compose } from '@gqlapp/core-common'; import { translate } from '@gqlapp/i18n-client-react'; import { FormError } from '@gqlapp/forms-client-react'; import settings from '@gqlapp/config'; diff --git a/modules/user/client-react/containers/UserScreenNavigator.native.jsx b/modules/user/client-react/containers/UserScreenNavigator.native.jsx index 4e225100b6..ec587008fb 100644 --- a/modules/user/client-react/containers/UserScreenNavigator.native.jsx +++ b/modules/user/client-react/containers/UserScreenNavigator.native.jsx @@ -2,7 +2,8 @@ import { createAppContainer, createDrawerNavigator } from 'react-navigation'; import React from 'react'; import PropTypes from 'prop-types'; import { pickBy } from 'lodash'; -import { compose } from 'react-apollo'; + +import { compose } from '@gqlapp/core-common'; import { DrawerComponent } from '@gqlapp/look-client-react-native'; import { withUser } from './Auth'; diff --git a/modules/user/client-react/containers/Users.native.jsx b/modules/user/client-react/containers/Users.native.jsx index 0a91e06a5b..6ceedfbf84 100644 --- a/modules/user/client-react/containers/Users.native.jsx +++ b/modules/user/client-react/containers/Users.native.jsx @@ -1,7 +1,8 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; import PropTypes from 'prop-types'; -import { compose } from 'react-apollo'; + +import { compose } from '@gqlapp/core-common'; import UsersList from '../components/UsersListView'; import UsersFilter from '../components/UsersFilterView'; diff --git a/package.json b/package.json index 571c78e572..9397a1e50f 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ "sass-loader": "^7.1.0", "shelljs": "^0.8.1", "source-list-map": "^2.0.0", - "style-loader": "^0.23.0", + "style-loader": "^0.24.0", "stylus": "^0.54.5", "stylus-loader": "^3.0.2", "ts-loader": "^4.5.0", @@ -191,7 +191,7 @@ "hard-source-webpack-plugin": "https://github.com/conorh/hard-source-webpack-plugin", "kleur": "^3.0.3", "immutability-helper": "2.8.1", - "graphql": "14.1.1", + "graphql": "14.3.1", "iterall": "^1.2.2", "upath": "^1.1.0", "watchpack": "https://github.com/Globegitter/watchpack" diff --git a/packages/client-angular/package.json b/packages/client-angular/package.json index 2561542d9f..77fa3a491e 100644 --- a/packages/client-angular/package.json +++ b/packages/client-angular/package.json @@ -62,7 +62,7 @@ "apollo-link-ws": "^1.0.17", "apollo-logger": "^0.3.2", "apollo-upload-client": "^10.0.1", - "graphql": "^14.1.1", + "graphql": "^14.3.1", "minilog": "^3.1.0", "rxjs": "^6.5.2", "subscriptions-transport-ws": "^0.9.4", diff --git a/packages/client-vue/package.json b/packages/client-vue/package.json index 3bee2fc8d4..a3b40cf00c 100644 --- a/packages/client-vue/package.json +++ b/packages/client-vue/package.json @@ -54,7 +54,7 @@ "error-stack-parser": "^2.0.1", "extract-files": "^5.0.0", "filesize": "^3.5.11", - "graphql": "^14.1.1", + "graphql": "^14.3.1", "graphql-iso-date": "^3.5.0", "graphql-tag": "^2.6.0", "history": "^4.7.2", diff --git a/packages/client/package.json b/packages/client/package.json index b1a6bee423..c67ccb94e0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -71,7 +71,7 @@ "extract-files": "^5.0.0", "filesize": "^3.5.11", "formik": "^1.3.1", - "graphql": "^14.1.1", + "graphql": "^14.3.1", "graphql-iso-date": "^3.5.0", "graphql-tag": "^2.6.0", "history": "^4.7.2", @@ -82,7 +82,7 @@ "minilog": "^3.1.0", "prop-types": "^15.6.0", "react": "16.8.3", - "react-apollo": "^2.5.5", + "react-apollo": "^3.0.0", "react-art": "^16.8.0", "react-cookie": "^2.2.0", "react-debounce-input": "^3.1.0", diff --git a/packages/common/package.json b/packages/common/package.json index dc0f8b8c94..563514713a 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -18,7 +18,7 @@ "apollo-logger": "^0.3.2", "apollo-utilities": "^1.0.11", "connected-react-router": "^5.0.0", - "graphql": "^14.1.1", + "graphql": "^14.3.1", "i18next": "^11.2.3", "i18next-browser-languagedetector": "^2.1.0", "lodash": "^4.17.4", diff --git a/packages/mobile/package.json b/packages/mobile/package.json index ae06167512..81503d7bdf 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -59,7 +59,7 @@ "expo-secure-store": "^5.0.1", "extract-files": "^5.0.0", "filesize": "^3.5.11", - "graphql": "^14.1.1", + "graphql": "^14.3.1", "graphql-iso-date": "^3.5.0", "graphql-tag": "^2.6.0", "i18next": "^11.2.3", @@ -70,7 +70,7 @@ "native-base": "^2.3.5", "prop-types": "^15.6.0", "react": "16.8.3", - "react-apollo": "^2.3.1", + "react-apollo": "^3.0.0", "react-debounce-input": "^3.1.0", "react-i18next": "^7.6.0", "react-native": "https://github.com/expo/react-native/archive/sdk-33.0.0.tar.gz", diff --git a/packages/server/package.json b/packages/server/package.json index b94a80787b..255e378caf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -85,7 +85,7 @@ "excel4node": "^1.7.0", "express": "^4.16.2", "filesize": "^3.5.11", - "graphql": "^14.1.1", + "graphql": "^14.3.1", "graphql-auth": "0.2.6", "graphql-iso-date": "^3.5.0", "graphql-resolve-batch": "^1.0.2", @@ -115,7 +115,7 @@ "pg": "^7.4.0", "prop-types": "^15.6.0", "react": "16.8.3", - "react-apollo": "^2.3.1", + "react-apollo": "^3.0.0", "react-art": "^16.8.0", "react-cookie": "^2.2.0", "react-debounce-input": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 0955fbea50..0ffa24b654 100644 --- a/yarn.lock +++ b/yarn.lock @@ -117,6 +117,55 @@ resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-2.0.1.tgz#021c3f5c1df8b1d01c25b705366c597e7cbb3ca5" integrity sha512-SqiNhgoivKczEqIJc/9hntgtvmq4R3Ef73ehibqDPAT059IjsXXM7nze0S5P8F4HP76jgPiv5od+2JUhQl/nig== +"@apollo/react-common@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@apollo/react-common/-/react-common-3.0.0.tgz#2357518c4b3bf1fd680ee2ac114f565f527ec55d" + integrity sha512-EqHASkcmxipy2hU8rja+lD1S1HoTdodKKyJZZ3dgewnAHXnzXnnC3rw1+lkrgXPFsI2n2d2N2LYisD79OCdPmw== + dependencies: + ts-invariant "^0.4.4" + tslib "^1.10.0" + +"@apollo/react-components@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@apollo/react-components/-/react-components-3.0.0.tgz#ca489ff8f70c6a7224f0c2a8a0baedda0448a815" + integrity sha512-IF5HZWT4Vc+6JXenFApjc+QsfZccd7UVSV1Z8l4Y5+EoXkLbmM3fuu8lUQamZqzdVVh6coA8bdI0gafB7PU+1A== + dependencies: + "@apollo/react-common" "^3.0.0" + "@apollo/react-hooks" "^3.0.0" + prop-types "^15.7.2" + ts-invariant "^0.4.4" + tslib "^1.10.0" + +"@apollo/react-hoc@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@apollo/react-hoc/-/react-hoc-3.0.0.tgz#cdcb81f1f28246de1c15d601b9c0c075df18e0f9" + integrity sha512-hZaxumdxHrHtTxzHwY1e7FA43x43dLNhZYLcib8ACbV1W3uH7betPdpzlMcL7aVEL7U+7YwQtbc++e1GxxvTQw== + dependencies: + "@apollo/react-common" "^3.0.0" + "@apollo/react-components" "^3.0.0" + hoist-non-react-statics "^3.3.0" + ts-invariant "^0.4.4" + tslib "^1.10.0" + +"@apollo/react-hooks@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@apollo/react-hooks/-/react-hooks-3.0.0.tgz#5fe4ff7812020f3e1b91b8628af8c03276496d78" + integrity sha512-7kaV6rkx2WZjDYcBmp52oyhTxbNn5Jc4AUmsXZVEnDu9uuvNYURA8bLlJNF8yu4zS7ed8D+ZebC0y0bhrz8wIg== + dependencies: + "@apollo/react-common" "^3.0.0" + "@wry/equality" "^0.1.9" + ts-invariant "^0.4.4" + tslib "^1.10.0" + +"@apollo/react-ssr@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@apollo/react-ssr/-/react-ssr-3.0.0.tgz#a31455f90ec87af0b3b597a6468a9e2732ce738b" + integrity sha512-lgEnvP4lwgqOv4rZA2dDyIcOLdCYkRms54aGxvErHxh7GGfsJFLnx6pRoa+uUvFjr8/edOVQtaHADnaMbtAMbA== + dependencies: + "@apollo/react-common" "^3.0.0" + "@apollo/react-hooks" "^3.0.0" + tslib "^1.10.0" + "@apollographql/apollo-tools@^0.3.6": version "0.3.7" resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.3.7.tgz#3bc9c35b9fff65febd4ddc0c1fc04677693a3d40" @@ -4274,7 +4323,7 @@ "@types/node" ">=6" tslib "^1.9.3" -"@wry/equality@^0.1.2": +"@wry/equality@^0.1.2", "@wry/equality@^0.1.9": version "0.1.9" resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.9.tgz#b13e18b7a8053c6858aa6c85b54911fb31e3a909" integrity sha512-mB6ceGjpMGz1ZTza8HYnrPGos2mC6So4NhS1PtZ8s4Qt0K7fBiIGhpSxUbQmhwcSWE3no+bYxmI2OL6KuXYmoQ== @@ -11828,10 +11877,10 @@ graphql-upload@^8.0.2: http-errors "^1.7.2" object-path "^0.11.4" -graphql@0.13.2, graphql@14.1.1, graphql@^14.1.1: - version "14.1.1" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.1.1.tgz#d5d77df4b19ef41538d7215d1e7a28834619fac0" - integrity sha512-C5zDzLqvfPAgTtP8AUPIt9keDabrdRAqSWjj2OPRKrKxI9Fb65I36s1uCs1UUBFnSWTdO7hyHi7z1ZbwKMKF6Q== +graphql@0.13.2, graphql@14.3.1, graphql@^14.3.1: + version "14.3.1" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.3.1.tgz#b3aa50e61a841ada3c1f9ccda101c483f8e8c807" + integrity sha512-FZm7kAa3FqKdXy8YSSpAoTtyDFMIYSpCDOr+3EqlI1bxmtHu+Vv/I2vrSeT1sBOEnEniX3uo4wFhFdS/8XN6gA== dependencies: iterall "^1.2.2" @@ -14916,7 +14965,7 @@ lodash.isempty@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" integrity sha1-b4bL7di+TsmHvpqvM8loTbGzHn4= -lodash.isequal@4.5.0, lodash.isequal@^4.5.0: +lodash.isequal@4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= @@ -19528,18 +19577,16 @@ react-addons-test-utils@^16.0.0-alpha.3: fbjs "^0.8.9" object-assign "^4.1.0" -react-apollo@^2.3.1, react-apollo@^2.5.5: - version "2.5.8" - resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-2.5.8.tgz#c7a593b027efeefdd8399885e0ac6bec3b32623c" - integrity sha512-60yOQrnNosxU/tRbOxGDaYNLFcOKmQqxHPhxyvKTlGIaF/rRCXQRKixUgWVffpEupSHHD7psY5k5ZOuZsdsSGQ== +react-apollo@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/react-apollo/-/react-apollo-3.0.0.tgz#2a0bccd32e11ce86b140d5d0284356972b7e8e11" + integrity sha512-dxUml6Z91kRg/dQhKac2aTwLkDNmDa6APd3jmeGE48nAg0/a282zQryX7HXk0M6l3qaRISclGDhLINqdSXBLyA== dependencies: - apollo-utilities "^1.3.0" - fast-json-stable-stringify "^2.0.0" - hoist-non-react-statics "^3.3.0" - lodash.isequal "^4.5.0" - prop-types "^15.7.2" - ts-invariant "^0.4.2" - tslib "^1.9.3" + "@apollo/react-common" "^3.0.0" + "@apollo/react-components" "^3.0.0" + "@apollo/react-hoc" "^3.0.0" + "@apollo/react-hooks" "^3.0.0" + "@apollo/react-ssr" "^3.0.0" react-art@^16.8.0: version "16.8.6" @@ -21445,6 +21492,14 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" +schema-utils@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.1.0.tgz#940363b6b1ec407800a22951bdcc23363c039393" + integrity sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw== + dependencies: + ajv "^6.1.0" + ajv-keywords "^3.1.0" + scriptjs@^2.5.8: version "2.5.9" resolved "https://registry.yarnpkg.com/scriptjs/-/scriptjs-2.5.9.tgz#343915cd2ec2ed9bfdde2b9875cd28f59394b35f" @@ -22611,7 +22666,7 @@ strong-log-transformer@^2.0.0: minimist "^1.2.0" through "^2.3.4" -style-loader@^0.23.0, style-loader@^0.23.1: +style-loader@^0.23.1: version "0.23.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925" integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg== @@ -22619,6 +22674,14 @@ style-loader@^0.23.0, style-loader@^0.23.1: loader-utils "^1.1.0" schema-utils "^1.0.0" +style-loader@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz#1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82" + integrity sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw== + dependencies: + loader-utils "^1.2.3" + schema-utils "^2.0.1" + styled-components@^4.3.1: version "4.3.2" resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-4.3.2.tgz#4ca81918c812d3006f60ac5fdec7d6b64a9509cc" @@ -23325,7 +23388,7 @@ ts-invariant@^0.3.2: dependencies: tslib "^1.9.3" -ts-invariant@^0.4.0, ts-invariant@^0.4.2: +ts-invariant@^0.4.0, ts-invariant@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86" integrity sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA== @@ -23348,7 +23411,7 @@ ts-pnp@^1.1.2: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.2.tgz#be8e4bfce5d00f0f58e0666a82260c34a57af552" integrity sha512-f5Knjh7XCyRIzoC/z1Su1yLLRrPrFCgtUAh/9fCSP6NKbATwpOL1+idQVXQokK9GRFURn/jYPGPfegIctwunoA== -tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: +tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== From ca419d30dd78f17b7b4416db7dc66d47bac3d3b2 Mon Sep 17 00:00:00 2001 From: Victor Vlasenko Date: Mon, 12 Aug 2019 14:30:23 +0300 Subject: [PATCH 6/7] Use bionic dist --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 26b830181d..b068aeb4db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js node_js: - '10' cache: yarn -dist: xenial +dist: bionic os: - linux script: From 8ecedcae94416f97fce06caff1947bef46bf6c43 Mon Sep 17 00:00:00 2001 From: Victor Vlasenko Date: Mon, 12 Aug 2019 14:37:06 +0300 Subject: [PATCH 7/7] Use style-loader 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9397a1e50f..f1f2b8845c 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ "sass-loader": "^7.1.0", "shelljs": "^0.8.1", "source-list-map": "^2.0.0", - "style-loader": "^0.24.0", + "style-loader": "^1.0.0", "stylus": "^0.54.5", "stylus-loader": "^3.0.2", "ts-loader": "^4.5.0",