merged conflicting dependabot update
This commit is contained in:
Коммит
22772bfbee
|
@ -3502,25 +3502,18 @@
|
|||
"dev": true
|
||||
},
|
||||
"angular-tree-component": {
|
||||
"version": "8.5.2",
|
||||
"resolved": "https://registry.npmjs.org/angular-tree-component/-/angular-tree-component-8.5.2.tgz",
|
||||
"integrity": "sha512-3NwMB+vLq1+WHz2UVgsZA73E1LmIIWJlrrasCKXbLJ3S7NmY9O/wKcolji3Vp2W//5KQ33RXu1jiPXCOQdRzVA==",
|
||||
"version": "8.5.6",
|
||||
"resolved": "https://registry.npmjs.org/angular-tree-component/-/angular-tree-component-8.5.6.tgz",
|
||||
"integrity": "sha512-cxNem6872diZz9kIGqrjSJbKt0P3WSq9wTqZIeVJ8zsddI4Y6ShAVZlZNXUMRyJq246c9pJ6JJEAOzKVLk9xgA==",
|
||||
"requires": {
|
||||
"lodash": "^4.17.11",
|
||||
"mobx": "^5.14.2",
|
||||
"mobx-angular": "3.0.3",
|
||||
"opencollective-postinstall": "^2.0.2"
|
||||
"mobx": "^4.15.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"mobx": {
|
||||
"version": "5.15.4",
|
||||
"resolved": "https://registry.npmjs.org/mobx/-/mobx-5.15.4.tgz",
|
||||
"integrity": "sha512-xRFJxSU2Im3nrGCdjSuOTFmxVDGeqOHL+TyADCGbT0k4HHqGmx5u2yaHNryvoORpI4DfbzjJ5jPmuv+d7sioFw=="
|
||||
},
|
||||
"mobx-angular": {
|
||||
"version": "3.0.3",
|
||||
"resolved": "https://registry.npmjs.org/mobx-angular/-/mobx-angular-3.0.3.tgz",
|
||||
"integrity": "sha512-mZuuose70V+Sd0hMWDElpRe3mA6GhYjSQN3mHzqk2XWXRJ+eWQa/f3Lqhw+Me/Xd2etWsGR1hnRa1BfQ2ZDtpw=="
|
||||
"version": "4.15.7",
|
||||
"resolved": "https://registry.npmjs.org/mobx/-/mobx-4.15.7.tgz",
|
||||
"integrity": "sha512-X4uQvuf2zYKHVO5kRT5Utmr+J9fDnRgxWWnSqJ4oiccPTQU38YG+/O3nPmOhUy4jeHexl7XJJpWDBgEnEfp+8w=="
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -10674,11 +10667,6 @@
|
|||
"is-wsl": "^2.1.0"
|
||||
}
|
||||
},
|
||||
"opencollective-postinstall": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz",
|
||||
"integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw=="
|
||||
},
|
||||
"opn": {
|
||||
"version": "5.5.0",
|
||||
"resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
"@angular/platform-browser-dynamic": "~9.0.0",
|
||||
"@angular/router": "~9.0.0",
|
||||
"@types/d3-sankey": "^0.11.2",
|
||||
"angular-tree-component": "^8.3.0",
|
||||
"angular-tree-component": "^8.5.6",
|
||||
"color-convert": "^2.0.0",
|
||||
"core-js": "^2.5.4",
|
||||
"d3": "^5.9.2",
|
||||
|
|
Загрузка…
Ссылка в новой задаче