fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bug/update-material-ui' into develop

Browse Source
This commit is contained in:
Barry Low committed 2018-12-16 19:59:14 -08:00
2 parents 0660f4721f 2656b4da02
commit be3ef8093d
3 files changed
+184 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGELOG.md
+4
View File
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
### Changed
- [List changes here for upcoming release]
## 0.1.2 - 2018-12-16
### Change
- Client: Upgrade Material-ui to fix webpack deepmerge import bug
## 0.1.1 - 2018-12-16
### Changed
- Update Master Client integration with Notifications Module
client/package-lock.json
Generated
+178 -67
View File
@@ -78,6 +78,135 @@
"react-router-dom": "^4.3.1",
"recompose": "^0.30.0",
"subscriptions-transport-ws": "^0.9.15"
},
"dependencies": {
"@advancedalgos/web-components": {
"version": "0.0.17",
"resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.17.tgz",
"integrity": "sha512-xD+0E4XBltgIxH/9TkzMS6a6iz7973YjxOzEr2O/D93lGIeHaYJQTDwykOLtSocuSaSSYRzxFlf82pVh22wLIA==",
"dev": true,
"requires": {
"@azure/storage-blob": "^10.1.0-preview",
"@bearcanrun/react-image-cropper": "^1.3.6",
"@material-ui/core": "^3.6.1",
"@material-ui/icons": "^3.0.1",
"apollo-client": "^2.4.7",
"blob-util": "^2.0.2",
"browser-image-resizer": "^1.2.0",
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"prop-types": "^15.6.2",
"react": "^16.6.1",
"react-apollo": "^2.3.2",
"react-dom": "^16.6.1",
"react-dropzone": "^5.1.0",
"react-helmet": "^5.2.0",
"react-router-dom": "^4.3.1"
},
"dependencies": {
"@azure/storage-blob": {
"version": "10.1.0-preview",
"resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-10.1.0-preview.tgz",
"integrity": "sha512-vKY4dF8VCRCOOQ03Z1ResyjZbWg4jPOnQtRtlSEKE6a7WwFE3EuIbhE7OQfEihuNYyE+XWLkTjrHxeHDFx1hFg==",
"dev": true,
"requires": {
"events": "3.0.0",
"ms-rest-js": "0.22.425",
"tslib": "^1.9.3"
}
},
"apollo-client": {
"version": "2.4.7",
"resolved": "https://registry.npmjs.org/apollo-client/-/apollo-client-2.4.7.tgz",
"integrity": "sha512-6aAm+16AFBYZhJF8eKxrup6AbYni01InDiwTfZhMMTP2xaXQWjsQnfaHbI2oE+hd3+AZFy1drkse8RZKghR/WQ==",
"dev": true,
"requires": {
"@types/async": "2.0.50",
"@types/zen-observable": "^0.8.0",
"apollo-cache": "1.1.21",
"apollo-link": "^1.0.0",
"apollo-link-dedup": "^1.0.0",
"apollo-utilities": "1.0.26",
"symbol-observable": "^1.0.2",
"zen-observable": "^0.8.0"
}
},
"apollo-utilities": {
"version": "1.0.26",
"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.26.tgz",
"integrity": "sha512-URw7o3phymliqYCYatcird2YRPUU2eWCNvip64U9gQrX56mEfK4m99yBIDCMTpmcvOFsKLii1sIEZsHIs/bvnw==",
"dev": true,
"requires": {
"fast-json-stable-stringify": "^2.0.0"
}
},
"react-apollo": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.3.tgz",
"integrity": "sha512-y4CwwmJjp0De/An7vrvEWOJ27lxmS/SXT8z22I8aOEBC2wzdcavDPjKzeLYJKs+hv1MGS3h84PSwFtlU4Em/bA==",
"dev": true,
"requires": {
"fbjs": "^1.0.0",
"hoist-non-react-statics": "^3.0.0",
"invariant": "^2.2.2",
"lodash.flowright": "^3.5.0",
"lodash.isequal": "^4.5.0",
"prop-types": "^15.6.0"
}
}
}
},
"apollo-cache": {
"version": "1.1.21",
"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.21.tgz",
"integrity": "sha512-5ErNb78KHtrJNimkDBTEigcvHkIqUmS7QJIk4lpZZ+XLVVgvk2fD+GhD1PLP+s8vHfAKVbO6vdbRxCCjGGrh5w==",
"dev": true,
"requires": {
"apollo-utilities": "^1.0.26"
},
"dependencies": {
"apollo-utilities": {
"version": "1.0.26",
"resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.26.tgz",
"integrity": "sha512-URw7o3phymliqYCYatcird2YRPUU2eWCNvip64U9gQrX56mEfK4m99yBIDCMTpmcvOFsKLii1sIEZsHIs/bvnw==",
"dev": true,
"requires": {
"fast-json-stable-stringify": "^2.0.0"
}
}
}
},
"core-js": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.0.tgz",
"integrity": "sha512-kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==",
"dev": true
},
"fbjs": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz",
"integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==",
"dev": true,
"requires": {
"core-js": "^2.4.1",
"fbjs-css-vars": "^1.0.0",
"isomorphic-fetch": "^2.1.1",
"loose-envify": "^1.0.0",
"object-assign": "^4.1.0",
"promise": "^7.1.1",
"setimmediate": "^1.0.5",
"ua-parser-js": "^0.7.18"
}
},
"hoist-non-react-statics": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz",
"integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==",
"dev": true,
"requires": {
"react-is": "^16.3.2"
}
}
}
},
"@advancedalgos/users-client": {
@@ -145,14 +274,14 @@
}
},
"@advancedalgos/web-components": {
"version": "0.0.17",
"resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.17.tgz",
"integrity": "sha512-xD+0E4XBltgIxH/9TkzMS6a6iz7973YjxOzEr2O/D93lGIeHaYJQTDwykOLtSocuSaSSYRzxFlf82pVh22wLIA==",
"version": "0.0.18",
"resolved": "https://registry.npmjs.org/@advancedalgos/web-components/-/web-components-0.0.18.tgz",
"integrity": "sha512-zkfIRdiyJwRhtdcyTEltx3gQcVZPFh8IYMIDiFbFBfWbihwYLHpDQctR9DjSOCFeUsNqbV6OCzaSD7pZa51w8Q==",
"dev": true,
"requires": {
"@azure/storage-blob": "^10.1.0-preview",
"@bearcanrun/react-image-cropper": "^1.3.6",
"@material-ui/core": "^3.6.1",
"@material-ui/core": "^3.6.2",
"@material-ui/icons": "^3.0.1",
"apollo-client": "^2.4.7",
"blob-util": "^2.0.2",
@@ -179,41 +308,6 @@
"tslib": "^1.9.3"
}
},
"@material-ui/core": {
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.6.1.tgz",
"integrity": "sha512-jmDtLQVXYHzvv6TljspaoHazGXkgmgnLUosFateBdB3Vva6WVJZ7WY5LaAGOqtuTEUW6KUKDumaGoOQs4xuJWA==",
"dev": true,
"requires": {
"@babel/runtime": "7.1.2",
"@material-ui/utils": "^3.0.0-alpha.0",
"@types/jss": "^9.5.6",
"@types/react-transition-group": "^2.0.8",
"brcast": "^3.0.1",
"classnames": "^2.2.5",
"csstype": "^2.5.2",
"debounce": "^1.1.0",
"deepmerge": "^2.0.1",
"dom-helpers": "^3.2.1",
"hoist-non-react-statics": "^3.0.0",
"is-plain-object": "^2.0.4",
"jss": "^9.3.3",
"jss-camel-case": "^6.0.0",
"jss-default-unit": "^8.0.2",
"jss-global": "^3.0.0",
"jss-nested": "^6.0.1",
"jss-props-sort": "^6.0.0",
"jss-vendor-prefixer": "^7.0.0",
"keycode": "^2.1.9",
"normalize-scroll-left": "^0.1.2",
"popper.js": "^1.14.1",
"prop-types": "^15.6.0",
"react-event-listener": "^0.6.2",
"react-transition-group": "^2.2.1",
"recompose": "0.28.0 - 0.30.0",
"warning": "^4.0.1"
}
},
"apollo-cache": {
"version": "1.1.21",
"resolved": "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.1.21.tgz",
@@ -280,9 +374,9 @@
}
},
"react-apollo": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.2.tgz",
"integrity": "sha512-3lU9iqmj4KMIZvlWWSuLihxMGLEAL6oNmnSTWrb3/mRP36Zy0zJD4rdaonDx4WzqFYQAnUPaOiFnHGp0UQUTwA==",
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.3.3.tgz",
"integrity": "sha512-y4CwwmJjp0De/An7vrvEWOJ27lxmS/SXT8z22I8aOEBC2wzdcavDPjKzeLYJKs+hv1MGS3h84PSwFtlU4Em/bA==",
"dev": true,
"requires": {
"fbjs": "^1.0.0",
@@ -1391,20 +1485,21 @@
}
},
"@material-ui/core": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.3.2.tgz",
"integrity": "sha512-3yYGrWBzML7OhzmgwBvWpQnFq9ROWj+so+ULADB+lXjpOuxbUf8IUWbR4/S4chh+8/DTNMjTGIUdpj//XeubLQ==",
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/@material-ui/core/-/core-3.6.2.tgz",
"integrity": "sha512-ONWU8ZCrhzzmeh6QXbYwicZxD0wSxj32UOSmPHXReZs4RTaeXOtLVloIxh7810fIR/GkfGXa/UJIK/woSHW4/Q==",
"requires": {
"@babel/runtime": "7.1.2",
"@material-ui/utils": "^3.0.0-alpha.0",
"@types/jss": "^9.5.6",
"@types/react-transition-group": "^2.0.8",
"brcast": "^3.0.1",
"classnames": "^2.2.5",
"csstype": "^2.5.2",
"debounce": "^1.1.0",
"deepmerge": "^2.0.1",
"deepmerge": "^3.0.0",
"dom-helpers": "^3.2.1",
"hoist-non-react-statics": "^2.5.0",
"hoist-non-react-statics": "^3.2.1",
"is-plain-object": "^2.0.4",
"jss": "^9.3.3",
"jss-camel-case": "^6.0.0",
@@ -1421,6 +1516,16 @@
"react-transition-group": "^2.2.1",
"recompose": "0.28.0 - 0.30.0",
"warning": "^4.0.1"
},
"dependencies": {
"hoist-non-react-statics": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz",
"integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==",
"requires": {
"react-is": "^16.3.2"
}
}
}
},
"@material-ui/icons": {
@@ -1459,7 +1564,6 @@
"version": "3.0.0-alpha.0",
"resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-3.0.0-alpha.0.tgz",
"integrity": "sha512-HwC/pBcPG81UP4Jh0BaH2i4wAY9aDOrvL5+B/7J6cyFlG/Wip5Li+qI+GDlk9MR3kpG8v0sxfpWA0IlQYcHK6g==",
"dev": true,
"requires": {
"@babel/runtime": "7.1.2"
}
@@ -1599,9 +1703,9 @@
"dev": true
},
"@types/prop-types": {
"version": "15.5.6",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.6.tgz",
"integrity": "sha512-ZBFR7TROLVzCkswA3Fmqq+IIJt62/T7aY/Dmz+QkU7CaW2QFqAitCE8Ups7IzmGhcN1YWMBT4Qcoc07jU9hOJQ=="
"version": "15.5.8",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.8.tgz",
"integrity": "sha512-3AQoUxQcQtLHsK25wtTWIoIpgYjH3vSDroZOUr7PpCHw/jLY1RB9z9E8dBT/OSmwStVgkRNvdh+ZHNiomRieaw=="
},
"@types/range-parser": {
"version": "1.2.2",
@@ -1610,9 +1714,9 @@
"dev": true
},
"@types/react": {
"version": "16.4.18",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.18.tgz",
"integrity": "sha512-eFzJKEg6pdeaukVLVZ8Xb79CTl/ysX+ExmOfAAqcFlCCK5TgFDD9kWR0S18sglQ3EmM8U+80enjUqbfnUyqpdA==",
"version": "16.7.17",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.7.17.tgz",
"integrity": "sha512-YcXcaoXaxo7A76mBCGlKlN2aZu3REQfF0DTrhiyXVJLA7PDdxVCr+wiQOrkVNn44D/zLlIyDSn3U918Ve0AaEA==",
"requires": {
"@types/prop-types": "*",
"csstype": "^2.2.0"
@@ -4952,9 +5056,9 @@
}
},
"csstype": {
"version": "2.5.7",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.7.tgz",
"integrity": "sha512-Nt5VDyOTIIV4/nRFswoCKps1R5CD1hkiyjBE9/thNaNZILLEviVw9yWQw15+O+CpNjQKB/uvdcxFFOrSflY3Yw=="
"version": "2.5.8",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.8.tgz",
"integrity": "sha512-r4DbsyNJ7slwBSKoGesxDubRWJ71ghG8W2+1HcsDlAo12KGca9dDLv0u98tfdFw7ldBdoA7XmCnI6Q8LpAJXaQ=="
},
"currently-unhandled": {
"version": "0.4.1",
@@ -5046,9 +5150,9 @@
"dev": true
},
"deepmerge": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
"integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.0.0.tgz",
"integrity": "sha512-a8z8bkgHsAML+uHLqmMS83HHlpy3PvZOOuiTQqaa3wu8ZVg3h0hqHk6aCsGdOnZV2XMM/FRimNGjUh0KCcmHBw=="
},
"default-gateway": {
"version": "2.7.2",
@@ -9141,11 +9245,18 @@
"dev": true
},
"indefinite-observable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.1.tgz",
"integrity": "sha1-CZFUI8yNb36xy3iCrRNGM8mm7cM=",
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.2.tgz",
"integrity": "sha512-Mps0898zEduHyPhb7UCgNmfzlqNZknVmaFz5qzr0mm04YQ5FGLhAyK/dJ+NaRxGyR6juQXIxh5Ev0xx+qq0nYA==",
"requires": {
"symbol-observable": "1.0.4"
"symbol-observable": "1.2.0"
},
"dependencies": {
"symbol-observable": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
}
}
},
"indent-string": {
@@ -15058,9 +15169,9 @@
"dev": true
},
"popper.js": {
"version": "1.14.4",
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz",
"integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY="
"version": "1.14.6",
"resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.6.tgz",
"integrity": "sha512-AGwHGQBKumlk/MDfrSOf0JHhJCImdDMcGNoqKmKkU+68GFazv3CQ6q9r7Ja1sKDZmYWTckY/uLyEznheTDycnA=="
},
"portfinder": {
"version": "1.0.19",
client/package.json
+2 -2
View File
@@ -29,7 +29,7 @@
"@advancedalgos/key-vault-client": "0.0.25",
"@advancedalgos/teams-client": "0.0.32",
"@advancedalgos/users-client": "0.0.24",
"@advancedalgos/web-components": "0.0.17",
"@advancedalgos/web-components": "0.0.18",
"@babel/core": "^7.1.2",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
@@ -79,7 +79,7 @@
"@fortawesome/free-brands-svg-icons": "^5.5.0",
"@fortawesome/free-solid-svg-icons": "^5.5.0",
"@fortawesome/react-fontawesome": "^0.1.3",
"@material-ui/core": "^3.2.2",
"@material-ui/core": "^3.6.2",
"@material-ui/icons": "^3.0.1",
"apollo-cache-inmemory": "^1.3.5",
"apollo-client": "^2.4.2",