diff --git a/client/package-lock.json b/client/package-lock.json index b948572c4..0dbd8d1b6 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -10,19 +10,19 @@ "integrity": "sha512-VtM158wFdArNrjYGMnB6XCn9Bo0ziBGU3Qy1+1w81zCDLeF+bGJdBtUnGPjz7nMcZnJDkCjryst/7RIM6NxPgQ==", "dev": true, "requires": { - "@material-ui/core": "3.3.2", - "@material-ui/icons": "3.0.1", - "apollo-client": "2.4.4", - "classnames": "2.2.6", - "graphql": "14.0.2", - "graphql-tag": "2.10.0", - "luxon": "1.5.0", - "material-ui-pickers": "1.0.1", - "react": "16.6.0", - "react-apollo": "2.2.4", - "react-dom": "16.6.0", - "react-router-dom": "4.3.1", - "react-sortable-hoc": "0.8.3" + "@material-ui/core": "^3.2.0", + "@material-ui/icons": "^3.0.1", + "apollo-client": "^2.4.4", + "classnames": "^2.2.6", + "graphql": "^14.0.2", + "graphql-tag": "^2.10.0", + "luxon": "^1.4.4", + "material-ui-pickers": "^1.0.1", + "react": "^16.5.2", + "react-apollo": "^2.2.4", + "react-dom": "^16.6.0", + "react-router-dom": "^4.3.1", + "react-sortable-hoc": "^0.8.3" } }, "@advancedalgos/key-vault-client": { @@ -79,9 +79,9 @@ } }, "@advancedalgos/users-client": { - "version": "0.0.17", - "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.17.tgz", - "integrity": "sha512-GyVSh7LLUqtsoJV83VmvXrp8ZZTpPCVvjN4CvSsUwUbm3x5l7siZpawBSg0GEexPugcL8OI56QwUIyDO6NqoFQ==", + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/@advancedalgos/users-client/-/users-client-0.0.18.tgz", + "integrity": "sha512-uxHVl8hOyMeAbKdyP+Jt7BmX4Gw/gE4Wm2lWvgxQxLjf6lZxwMfrQPaGZgfv/qxEkbaK0rkJzCMVT71LRyMhFg==", "dev": true, "requires": { "@material-ui/core": "^3.2.0", @@ -1008,13 +1008,8 @@ "integrity": "sha512-TOTtVeT+fekAesiCHnPz+PSkYSdOSLyLn42DI45nxg6iCdlQY6LIj/tYqpMB0y+YicoTUiYiXqF8rG6SKfhw6Q==", "dev": true, "requires": { -<<<<<<< HEAD - "@babel/helper-plugin-utils": "7.0.0", - "@babel/plugin-syntax-typescript": "7.1.5" -======= "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-syntax-typescript": "^7.0.0" ->>>>>>> Initial Sendgrid graphql resolvers } }, "@babel/plugin-transform-unicode-regex": { @@ -1174,7 +1169,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.8.tgz", "integrity": "sha512-cvcMQZ5F8WSNSGMk9uWlkmZNfDzmdsWLRrTMrNwwihHcEmWRlIuSbDt+PQ/rXsnGmJnmLQJLFBT1cse/3swxbg==", "requires": { - "@fortawesome/fontawesome-common-types": "0.2.8" + "@fortawesome/fontawesome-common-types": "^0.2.8" } }, "@fortawesome/free-brands-svg-icons": { @@ -1182,7 +1177,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.5.0.tgz", "integrity": "sha512-R2I2eARMVofGTtfxe5+VaMRXiQYQQFoDkHj2Q1qZVn37eRFszDySvSlJuKTsqFRsOxoP4Iq+xIGFy/ppoSo3Wg==", "requires": { - "@fortawesome/fontawesome-common-types": "0.2.8" + "@fortawesome/fontawesome-common-types": "^0.2.8" } }, "@fortawesome/free-solid-svg-icons": { @@ -1190,7 +1185,7 @@ "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.5.0.tgz", "integrity": "sha512-VawIT2owNP97EwehZmxkvZDhoKwEevU/1HOMkln6kc4OtfE+JKYr6DpyzQnHVWXvz/eFj36QElHNe6zT8gR+Tg==", "requires": { - "@fortawesome/fontawesome-common-types": "0.2.8" + "@fortawesome/fontawesome-common-types": "^0.2.8" } }, "@fortawesome/react-fontawesome": { @@ -1198,8 +1193,8 @@ "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.3.tgz", "integrity": "sha512-tc689l67rPZ7+ynZVUgOXY80rAt5KxvuH1qjPpJcbyJzJHzk5yhrD993BjsSEdPBLTtPqmvwynsO/XrAQqHbtg==", "requires": { - "humps": "2.0.1", - "prop-types": "15.6.2" + "humps": "^2.0.1", + "prop-types": "^15.5.10" } }, "@material-ui/core": { @@ -2274,7 +2269,7 @@ }, "array-equal": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, @@ -2734,7 +2729,7 @@ "dependencies": { "jsesc": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", "dev": true }, @@ -15515,40 +15510,6 @@ "integrity": "sha512-W1Wtqngl7BMe4s9o76odTaVs4HXVLhOHD+L5Ez+7x15yiA+98W/WVO6IPlC1q9BIkgAckRtUFmEDr0sNufXZIQ==", "dev": true, "requires": { -<<<<<<< HEAD - "autoprefixer": "9.3.1", - "browserslist": "4.3.4", - "caniuse-lite": "1.0.30000902", - "cssdb": "3.2.1", - "postcss": "7.0.5", - "postcss-attribute-case-insensitive": "4.0.0", - "postcss-color-functional-notation": "2.0.1", - "postcss-color-hex-alpha": "5.0.2", - "postcss-color-mod-function": "3.0.3", - "postcss-color-rebeccapurple": "4.0.1", - "postcss-custom-media": "7.0.7", - "postcss-custom-properties": "8.0.9", - "postcss-custom-selectors": "5.1.2", - "postcss-dir-pseudo-class": "5.0.0", - "postcss-env-function": "2.0.2", - "postcss-focus-visible": "4.0.0", - "postcss-focus-within": "3.0.0", - "postcss-font-variant": "4.0.0", - "postcss-gap-properties": "2.0.0", - "postcss-image-set-function": "3.0.1", - "postcss-initial": "3.0.0", - "postcss-lab-function": "2.0.1", - "postcss-logical": "3.0.0", - "postcss-media-minmax": "4.0.0", - "postcss-nesting": "7.0.0", - "postcss-overflow-shorthand": "2.0.0", - "postcss-page-break": "2.0.0", - "postcss-place": "4.0.1", - "postcss-pseudo-class-any-link": "6.0.0", - "postcss-replace-overflow-wrap": "3.0.0", - "postcss-selector-matches": "4.0.0", - "postcss-selector-not": "4.0.0" -======= "autoprefixer": "^9.1.5", "browserslist": "^4.1.1", "caniuse-lite": "^1.0.30000887", @@ -15581,7 +15542,6 @@ "postcss-replace-overflow-wrap": "^3.0.0", "postcss-selector-matches": "^4.0.0", "postcss-selector-not": "^4.0.0" ->>>>>>> Initial Sendgrid graphql resolvers } }, "postcss-pseudo-class-any-link": { @@ -17918,9 +17878,9 @@ "integrity": "sha512-vt2qQ9DnPLjGZ9osM2jBULdi7WfFXtYVuHvjHX8o2em7Rcla9FXIG60aWFbvvpFC1iXyATw5PWZX0B57EUOYfQ==", "dev": true, "requires": { - "babel-runtime": "6.26.0", - "invariant": "2.2.4", - "prop-types": "15.6.2" + "babel-runtime": "^6.11.6", + "invariant": "^2.2.1", + "prop-types": "^15.5.7" } }, "react-text-mask": { @@ -20440,16 +20400,6 @@ "integrity": "sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==", "dev": true, "requires": { -<<<<<<< HEAD - "cacache": "11.2.0", - "find-cache-dir": "2.0.0", - "schema-utils": "1.0.0", - "serialize-javascript": "1.5.0", - "source-map": "0.6.1", - "terser": "3.10.11", - "webpack-sources": "1.3.0", - "worker-farm": "1.6.0" -======= "cacache": "^11.0.2", "find-cache-dir": "^2.0.0", "schema-utils": "^1.0.0", @@ -20458,7 +20408,6 @@ "terser": "^3.8.1", "webpack-sources": "^1.1.0", "worker-farm": "^1.5.2" ->>>>>>> Initial Sendgrid graphql resolvers } }, "test-exclude": { diff --git a/client/package.json b/client/package.json index e4cc0cb6f..036e151d8 100644 --- a/client/package.json +++ b/client/package.json @@ -23,7 +23,7 @@ "devDependencies": { "@advancedalgos/events-client": "0.0.2", "@advancedalgos/key-vault-client": "^0.0.20", - "@advancedalgos/teams-client": "0.0.24", + "@advancedalgos/teams-client": "0.0.25", "@advancedalgos/users-client": "^0.0.18", "@advancedalgos/web-components": "0.0.13", "@babel/core": "^7.1.2",