Merge branch 'master' into haul-platform-option

This commit is contained in:
Daniel Duan 2017-10-26 18:04:02 -04:00 committed by GitHub
commit 99866cf2e6
3 changed files with 14 additions and 8 deletions

View File

@ -22,7 +22,7 @@
},
"dependencies": {
"global": "^4.3.2",
"graphiql": "^0.11.6",
"graphiql": "^0.11.9",
"graphql": "^0.11.7",
"prop-types": "^15.6.0"
},

View File

@ -34,7 +34,7 @@
"react-inspector": "^2.2.0",
"react-komposer": "^2.0.0",
"react-modal": "^2.4.1",
"react-split-pane": "^0.1.65",
"react-split-pane": "^0.1.68",
"react-treebeard": "^2.0.3",
"redux": "^3.7.2"
},

View File

@ -30,6 +30,10 @@
fuse.js "^3.0.1"
prop-types "^15.5.9"
"@types/inline-style-prefixer@^3.0.0":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@types/inline-style-prefixer/-/inline-style-prefixer-3.0.1.tgz#8541e636b029124b747952e9a28848286d2b5bf6"
"@types/mz@0.0.31":
version "0.0.31"
resolved "https://registry.yarnpkg.com/@types/mz/-/mz-0.0.31.tgz#a4d80c082fefe71e40a7c0f07d1e6555bbbc7b52"
@ -5408,9 +5412,9 @@ graceful-fs@4.1.11, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3,
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
graphiql@^0.11.6:
version "0.11.6"
resolved "https://registry.yarnpkg.com/graphiql/-/graphiql-0.11.6.tgz#5d24d3609c9dd7c8a24306f76d8402899a9dc5e0"
graphiql@^0.11.9:
version "0.11.9"
resolved "https://registry.yarnpkg.com/graphiql/-/graphiql-0.11.9.tgz#3d944e15301e385ccbdad6efbc1947454dc12a99"
dependencies:
codemirror "^5.26.0"
codemirror-graphql "^0.6.11"
@ -9820,10 +9824,12 @@ react-simple-di@^1.2.0:
babel-runtime "6.x.x"
hoist-non-react-statics "1.x.x"
react-split-pane@^0.1.65:
version "0.1.66"
resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.66.tgz#369085dd07ec1237bda123e73813dcc7dc6502c1"
react-split-pane@^0.1.68:
version "0.1.68"
resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.68.tgz#a4ed40b0e77f0578cb6c9f9e65edd32726e4b16a"
dependencies:
"@types/inline-style-prefixer" "^3.0.0"
"@types/react" "^16.0.18"
inline-style-prefixer "^3.0.6"
prop-types "^15.5.10"
react-style-proptype "^3.0.0"