IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into report-content

Browse Source
This commit is contained in:
Grzegorz Leoniec 2019-01-18 10:47:28 +01:00
commit 08eda7916a
No known key found for this signature in database
GPG Key ID: 3AA43686D4EB1377
2 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package.json
View File

@ -28,8 +28,8 @@
"testMatch": ["**/src/**/?(*.)+(spec|test).js?(x)" ]
},
"dependencies": {
"apollo-cache-inmemory": "~1.3.12",
"apollo-client": "~2.4.8",
"apollo-cache-inmemory": "~1.4.0",
"apollo-client": "~2.4.9",
"apollo-link-http": "~1.5.9",
"apollo-server": "~2.3.1",
"bcryptjs": "~2.4.3",
@ -43,8 +43,8 @@
"graphql-iso-date": "~3.6.1",
"graphql-middleware": "~1.7.8",
"graphql-shield": "~4.1.2",
"graphql-tag": "~2.10.0",
"graphql-yoga": "~1.16.7",
"graphql-tag": "~2.10.1",
"graphql-yoga": "~1.17.0",
"jsonwebtoken": "~8.4.0",
"linkifyjs": "~2.1.7",
"lodash": "~4.17.11",

94
yarn.lock
View File

@ -644,13 +644,6 @@
core-js "^2.5.7"
regenerator-runtime "^0.12.0"
"@babel/runtime@^7.0.0-beta.40":
version "7.2.0"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f"
integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==
dependencies:
regenerator-runtime "^0.12.0"
"@babel/template@^7.0.0", "@babel/template@^7.1.0", "@babel/template@^7.1.2":
version "7.1.2"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.1.2.tgz#090484a574fef5a2d2d7726a674eceda5c5b5644"
@ -1014,32 +1007,32 @@ apollo-cache-control@^0.1.0:
dependencies:
graphql-extensions "^0.0.x"
apollo-cache-inmemory@~1.3.12:
version "1.3.12"
resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.3.12.tgz#cf7ef7c15730d0b6787d79047d5c06087ac31991"
integrity sha512-jxWcW64QoYQZ09UH6v3syvCCl3MWr6bsxT3wYYL6ORi8svdJUpnNrHTcv5qXqJYVg/a+NHhfEt+eGjJUG2ytXA==
apollo-cache-inmemory@~1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.4.0.tgz#8bcb1de8d1950dcdbd42f9af6d16fccca8e9e9ca"
integrity sha512-gqwiZCApG+hRXEbtDrNIUtNcKKeO3RTih4mydJZRJpFp+PgBf8AZ2z4/uTJFFijmR9krmUWdCRfW1Aesb5+Ktg==
dependencies:
apollo-cache "^1.1.22"
apollo-utilities "^1.0.27"
apollo-cache "^1.1.23"
apollo-utilities "^1.1.0"
optimism "^0.6.8"
apollo-cache@1.1.22, apollo-cache@^1.1.22:
version "1.1.22"
resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.22.tgz#d4682ea6e8b2508a934f61c2fd9e36b4a65041d9"
integrity sha512-8PoxhQLISj2oHwT7i/r4l+ly4y3RKZls+dtXzAewu3U77P9dNZKhYkRNAhx9iEfsrNoHgXBV8vMp64hb1uYh+g==
apollo-cache@1.1.23, apollo-cache@^1.1.23:
version "1.1.23"
resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.23.tgz#4765571223cae756ab7faf29792f1ab9a8450a91"
integrity sha512-9FcavymJQdjaYX6of1xgjFmWp8UUCtlW/S9k5bfMMnMNAAQMDnuOFVEklawdSbyAhM4hh1kSymyt/r23K1tVSA==
dependencies:
apollo-utilities "^1.0.27"
apollo-utilities "^1.1.0"
apollo-client@~2.4.8:
version "2.4.8"
resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.8.tgz#3a798f1076243465a59061d44d11bd030b68deb9"
integrity sha512-OAFbCTnGPtaIv0j+EZYzY20d+MD2JNbJ/YXZ4s0/oZlSg87bb0gjcIbccw2lnytipymZcZNr5ArFFeh0saGEwA==
apollo-client@~2.4.9:
version "2.4.9"
resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.4.9.tgz#c5fbd4d04645e228dd6a49f5b03b41cb1c2e5ae7"
integrity sha512-7IoIz+3hAk3166663ioyrsPdlTSAQa24HsJPVWw2QM/UE1wZTommu+uhwj9KugL6vpE/wyhyYgEs/9R7PlCsQA==
dependencies:
"@types/zen-observable" "^0.8.0"
apollo-cache "1.1.22"
apollo-cache "1.1.23"
apollo-link "^1.0.0"
apollo-link-dedup "^1.0.0"
apollo-utilities "1.0.27"
apollo-utilities "1.1.0"
symbol-observable "^1.0.2"
zen-observable "^0.8.0"
optionalDependencies:
@ -1298,19 +1291,20 @@ apollo-tracing@^0.1.0:
dependencies:
graphql-extensions "~0.0.9"
apollo-upload-server@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/apollo-upload-server/-/apollo-upload-server-5.0.0.tgz#c953b523608313966e0c8444637f4ae8ef77d5bc"
integrity sha512-CzbHvMo/6TO5XrovzmV/ojTft17s9Cd+vKLGngChpB0UW1ObxKlNLlcXRLD+yt6Nec32/Kt209HmA31hnwxB/g==
apollo-upload-server@^7.0.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/apollo-upload-server/-/apollo-upload-server-7.1.0.tgz#21e07b52252b3749b913468599813e13cfca805f"
integrity sha512-cD9ReCeyurYwZyEDqJYb5TOc9dt8yhPzS+MtrY3iJdqw+pqiiyPngAvVXHjN+Ca7Lajvom4/AT/PBrYVDMM3Kw==
dependencies:
"@babel/runtime" "^7.0.0-beta.40"
busboy "^0.2.14"
fs-capacitor "^1.0.0"
http-errors "^1.7.0"
object-path "^0.11.4"
apollo-utilities@1.0.27, apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.27:
version "1.0.27"
resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.27.tgz#77c550f9086552376eca3a48e234a1466b5b057e"
integrity sha512-nzrMQ89JMpNmYnVGJ4t8zN75gQbql27UDhlxNi+3OModp0Masx5g+fQmQJ5B4w2dpRuYOsdwFLmj3lQbwOKV1Q==
apollo-utilities@1.1.0, apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.1.0.tgz#e7603f834b57e4e109be6b450dc1cc1037aac94c"
integrity sha512-D3scmF6vJkCBECMasMEc0J9dNNHVULl6h2d7/oGJxWid1fgcAPHZJN5XLCZisuOfn0Dvvu3Unf/zK00Z3e49Qg==
dependencies:
fast-json-stable-stringify "^2.0.0"
@ -3469,12 +3463,12 @@ graphql-iso-date@~3.6.1:
resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.6.1.tgz#bd2d0dc886e0f954cbbbc496bbf1d480b57ffa96"
integrity sha512-AwFGIuYMJQXOEAgRlJlFL4H1ncFM8n8XmoVDTNypNOZyQ8LFDG2ppMFlsS862BSTCDcSUfHp8PD3/uJhv7t59Q==
graphql-middleware@1.7.7:
version "1.7.7"
resolved "https://registry.yarnpkg.com/graphql-middleware/-/graphql-middleware-1.7.7.tgz#0a7a7193a873c4769401df2aef4ffb9c6ca97f43"
integrity sha512-Y4aXFMVLaGiZ19ukibZ4x/RejuUPhsJteijQFRlvmkGpF+XBHG/xozeDTWt0M1aJRjJWmwjna0nko6/o/DJQRQ==
graphql-middleware@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/graphql-middleware/-/graphql-middleware-3.0.0.tgz#df498cc2c19ca5936fc67e9e39df6c484dbf4d80"
integrity sha512-m1V5G8jTatG8ZbFWLWBqrlVbHNpJv/U15LJ8U3XAoLjxm5HRY9rVXns6I4gigJqUt/0i/xYO7Lk3YkxqHi8QmQ==
dependencies:
graphql-tools "^4.0.1"
graphql-tools "^4.0.3"
graphql-middleware@~1.7.8:
version "1.7.8"
@ -3533,12 +3527,12 @@ graphql-subscriptions@^1.0.0:
dependencies:
iterall "^1.2.1"
graphql-tag@^2.9.2, graphql-tag@~2.10.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.0.tgz#87da024be863e357551b2b8700e496ee2d4353ae"
integrity sha512-9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w==
graphql-tag@^2.9.2, graphql-tag@~2.10.1:
version "2.10.1"
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02"
integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
graphql-tools@^4.0.0, graphql-tools@^4.0.1, graphql-tools@^4.0.2:
graphql-tools@^4.0.0, graphql-tools@^4.0.2, graphql-tools@^4.0.3:
version "4.0.3"
resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.3.tgz#23b5cb52c519212b1b2e4630a361464396ad264b"
integrity sha512-NNZM0WSnVLX1zIMUxu7SjzLZ4prCp15N5L2T2ro02OVyydZ0fuCnZYRnx/yK9xjGWbZA0Q58yEO//Bv/psJWrg==
@ -3559,10 +3553,10 @@ graphql-upload@^8.0.2:
http-errors "^1.7.1"
object-path "^0.11.4"
graphql-yoga@~1.16.7:
version "1.16.7"
resolved "https://registry.yarnpkg.com/graphql-yoga/-/graphql-yoga-1.16.7.tgz#05bdfadf9a4623b0409bee3c5b75b7b3f7249e6f"
integrity sha512-N82SmBpKyDD7GXXo2NbVBMPffbxFWD+YOf/Vqx3Kujj/hNOX+0s/7G+EPp4TgJZqHQjcOw5TqQ0kOANO8w6Kmg==
graphql-yoga@~1.17.0:
version "1.17.0"
resolved "https://registry.yarnpkg.com/graphql-yoga/-/graphql-yoga-1.17.0.tgz#54836fbb43720a19f5ff2357273c2f380e536ed7"
integrity sha512-2uPz7tmkOP8ktnsFIc6blRO6R5RTofWY0ugxKcvR4QlTveNcfKwOiXMVEn8yJulodEGhJLENXJklSxEIyeIbOg==
dependencies:
"@types/cors" "^2.8.4"
"@types/express" "^4.11.1"
@ -3571,7 +3565,7 @@ graphql-yoga@~1.16.7:
"@types/zen-observable" "^0.5.3"
apollo-server-express "^1.3.6"
apollo-server-lambda "1.3.6"
apollo-upload-server "^5.0.0"
apollo-upload-server "^7.0.0"
aws-lambda "^0.1.2"
body-parser-graphql "1.1.0"
cors "^2.8.4"
@ -3579,7 +3573,7 @@ graphql-yoga@~1.16.7:
graphql "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
graphql-deduplicator "^2.0.1"
graphql-import "^0.7.0"
graphql-middleware "1.7.7"
graphql-middleware "3.0.0"
graphql-playground-middleware-express "1.7.6"
graphql-playground-middleware-lambda "1.7.6"
graphql-subscriptions "^0.5.8"
@ -3763,7 +3757,7 @@ http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
setprototypeof "1.1.0"
statuses ">= 1.4.0 < 2"
http-errors@^1.7.1:
http-errors@^1.7.0, http-errors@^1.7.1:
version "1.7.1"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.1.tgz#6a4ffe5d35188e1c39f872534690585852e1f027"
integrity sha512-jWEUgtZWGSMba9I1N3gc1HmvpBUaNC9vDdA46yScAdp+C5rdEuKWUBLWTQpW9FwSWSbYYs++b6SDCxf9UEJzfw==