yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 22:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into eslint-update

Browse Source 
# Conflicts:
#	yarn.lock
This commit is contained in:
Abdón Rodríguez Davila 2019-09-09 16:45:56 +02:00
commit d4b72a958c
5 changed files with 32 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-plugin-documentation/package.json
View File

@ -16,7 +16,7 @@
"fs-extra": "^8.0.1",
"immutable": "^3.8.2",
"invariant": "^2.2.4",
"koa-static": "^4.0.1",
"koa-static": "^5.0.0",
"lodash": "^4.17.11",
"moment": "^2.24.0",
"path-to-regexp": "^3.0.0",

8
packages/strapi-plugin-graphql/package.json
View File

@ -11,23 +11,23 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"apollo-server-koa": "^2.5.0",
"apollo-server-koa": "^2.9.0",
"dataloader": "^1.4.0",
"glob": "^7.1.4",
"graphql": "^14.3.0",
"graphql-depth-limit": "^1.1.0",
"graphql-playground-middleware-koa": "^1.6.12",
"graphql-playground-middleware-koa": "^1.6.0",
"graphql-tools": "^4.0.4",
"graphql-type-datetime": "^0.2.4",
"graphql-type-json": "^0.3.0",
"graphql-type-long": "^0.1.1",
"koa-compose": "^4.0.0",
"koa-compose": "^4.1.0",
"pluralize": "^7.0.0",
"strapi-utils": "3.0.0-beta.16"
},
"devDependencies": {
"cross-env": "^5.2.0",
"koa": "^2.1.0",
"koa": "^2.8.0",
"rimraf": "^2.6.3"
},
"author": {

2
packages/strapi-plugin-users-permissions/package.json
View File

@ -36,7 +36,7 @@
"uuid": "^3.1.0"
},
"devDependencies": {
"koa": "^2.1.0"
"koa": "^2.8.0"
},
"author": {
"name": "Strapi team",

10
packages/strapi/package.json
View File

@ -23,10 +23,10 @@
"fs-extra": "^7.0.0",
"glob": "^7.1.2",
"inquirer": "^6.2.1",
"koa": "^2.1.0",
"koa": "^2.8.0",
"koa-body": "^4.1.0",
"koa-compose": "^4.0.0",
"koa-compress": "^2.0.0",
"koa-compose": "^4.1.0",
"koa-compress": "^3.0.0",
"koa-convert": "^1.2.0",
"koa-favicon": "^2.0.0",
"koa-i18n": "^2.1.0",
@ -35,8 +35,8 @@
"koa-lusca": "~2.2.0",
"koa-qs": "^2.0.0",
"koa-router": "^7.4.0",
"koa-session": "^5.5.1",
"koa-static": "^4.0.1",
"koa-session": "^5.12.0",
"koa-static": "^5.0.0",
"lodash": "^4.17.5",
"minimatch": "^3.0.4",
"node-fetch": "^1.7.3",

57
yarn.lock
View File

@ -3205,7 +3205,7 @@ apollo-server-errors@^2.3.3:
resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.3.tgz#83763b00352c10dc68fbb0d41744ade66de549ff"
integrity sha512-MO4oJ129vuCcbqwr5ZwgxqGGiLz3hCyowz0bstUF7MR+vNGe4oe3DWajC9lv4CxrhcqUHQOeOPViOdIo1IxE3g==
apollo-server-koa@^2.5.0:
apollo-server-koa@^2.9.0:
version "2.9.3"
resolved "https://registry.yarnpkg.com/apollo-server-koa/-/apollo-server-koa-2.9.3.tgz#1280249e191d9ea34e4bcba0212ba9269725fe5c"
integrity sha512-dBvW32IEv3Bm9PJzxv/yVz9iHjFlFwyb6RNg/JC4Fb+sh2p0QtyEgsW4rxaRSraPckrCKpp4FX0y/9xmMCHJHw==
@ -4266,16 +4266,11 @@ bytes@3.0.0:
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
bytes@3.1.0:
bytes@3.1.0, bytes@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
bytes@^2.3.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.5.0.tgz#4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"
integrity sha1-TJQj6i0lLCcMQbK97+/5u2tiwGo=
cacache@^12.0.0, cacache@^12.0.2, cacache@^12.0.3:
version "12.0.3"
resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
@ -5800,7 +5795,7 @@ debug@2.2.0:
dependencies:
ms "0.7.1"
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.1, debug@^2.6.3, debug@^2.6.9:
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.1, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@ -8344,7 +8339,7 @@ graphql-playground-html@1.6.13:
resolved "https://registry.yarnpkg.com/graphql-playground-html/-/graphql-playground-html-1.6.13.tgz#16d61416161d96f2725bc37b0b64d135a189f252"
integrity sha512-5DNtVeaWrfxrobA2Vp3ypWjAQYGPIXyZ3rdQXy4m4nDJnc4UALPSZRh9y+U4kp8GaoPp1aCgIJerDSRBOT9HnA==
graphql-playground-middleware-koa@^1.6.12:
graphql-playground-middleware-koa@^1.6.0:
version "1.6.12"
resolved "https://registry.yarnpkg.com/graphql-playground-middleware-koa/-/graphql-playground-middleware-koa-1.6.12.tgz#f75e456026fe3dd2a34ec33899e7a85ef99ec748"
integrity sha512-ofacd4B+FFSkKLPHsC/vUVg5XI3T+RPFNClOru1e0mgFNnoX5PM32AxYEe4Q3Yt3R8ayFQmoztBJrKXJCCZ1Kg==
@ -8786,7 +8781,7 @@ http-errors@1.7.2:
statuses ">= 1.5.0 < 2"
toidentifier "1.0.0"
http-errors@1.7.3, http-errors@^1.3.1, http-errors@^1.6.1, http-errors@^1.6.3, http-errors@^1.7.2, http-errors@~1.7.2:
http-errors@1.7.3, http-errors@^1.3.1, http-errors@^1.6.3, http-errors@^1.7.2, http-errors@~1.7.2:
version "1.7.3"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
@ -10711,7 +10706,7 @@ koa-compose@^3.0.0:
dependencies:
any-promise "^1.1.0"
koa-compose@^4.0.0, koa-compose@^4.1.0:
koa-compose@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-4.1.0.tgz#507306b9371901db41121c812e923d0d67d3e877"
integrity sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==
@ -10721,12 +10716,12 @@ koa-compose@~2.3.0:
resolved "https://registry.yarnpkg.com/koa-compose/-/koa-compose-2.3.0.tgz#4617fa832a16412a56967334304efd797d6ed35c"
integrity sha1-Rhf6gyoWQSpWlnM0ME79eX1u01w=
koa-compress@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/koa-compress/-/koa-compress-2.0.0.tgz#7b7eb2921b847746b5e122ba9f5cd8a671e8ea3a"
integrity sha1-e36ykhuEd0a14SK6n1zYpnHo6jo=
koa-compress@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/koa-compress/-/koa-compress-3.0.0.tgz#3194059c215cbc24e59bbc84c2c7453a4c88564f"
integrity sha512-xol+LkNB1mozKJkB5Kj6nYXbJXhkLkZlXl9BsGBPjujVfZ8MsIXwU4GHRTT7TlSfUcl2DU3JtC+j6wOWcovfuQ==
dependencies:
bytes "^2.3.0"
bytes "^3.0.0"
compressible "^2.0.0"
koa-is-json "^1.0.0"
statuses "^1.0.0"
@ -10810,16 +10805,6 @@ koa-router@^7.4.0:
path-to-regexp "^1.1.1"
urijs "^1.19.0"
koa-send@^4.1.3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-4.1.3.tgz#0822207bbf5253a414c8f1765ebc29fa41353cb6"
integrity sha512-3UetMBdaXSiw24qM2Mx5mKmxLKw5ZTPRjACjfhK6Haca55RKm9hr/uHDrkrxhSl5/S1CKI/RivZVIopiatZuTA==
dependencies:
debug "^2.6.3"
http-errors "^1.6.1"
mz "^2.6.0"
resolve-path "^1.4.0"
koa-send@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/koa-send/-/koa-send-5.0.0.tgz#5e8441e07ef55737734d7ced25b842e50646e7eb"
@ -10830,7 +10815,7 @@ koa-send@^5.0.0:
mz "^2.7.0"
resolve-path "^1.4.0"
koa-session@^5.5.1:
koa-session@^5.12.0:
version "5.12.3"
resolved "https://registry.yarnpkg.com/koa-session/-/koa-session-5.12.3.tgz#c3a10b5195e1f49d13cf48e78efd6724599e16d7"
integrity sha512-r1vRerk6z+J54TtgXPG+oYGj1vwrd889bz55hS7VykWvbtmPNb0q/N7arOHGV8dnstlRyZPP3xCJL20wIf9LwA==
@ -10840,13 +10825,13 @@ koa-session@^5.5.1:
is-type-of "^1.0.0"
uuid "^3.3.2"
koa-static@^4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-4.0.3.tgz#5f93ad00fb1905db9ce46667c0e8bb7d22abfcd8"
integrity sha512-JGmxTuPWy4bH7bt6gD/OMWkhprawvRmzJSr8TWKmTL4N7+IMv3s0SedeQi5S4ilxM9Bo6ptkCyXj/7wf+VS5tg==
koa-static@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/koa-static/-/koa-static-5.0.0.tgz#5e92fc96b537ad5219f425319c95b64772776943"
integrity sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==
dependencies:
debug "^3.1.0"
koa-send "^4.1.3"
koa-send "^5.0.0"
koa-views@^6.2.0:
version "6.2.1"
@ -10869,7 +10854,7 @@ koa2-ratelimit@^0.9.0:
promise-redis "0.0.5"
sequelize "^5.8.7"
koa@2.8.1, koa@^2.1.0:
koa@2.8.1, koa@^2.8.0:
version "2.8.1"
resolved "https://registry.yarnpkg.com/koa/-/koa-2.8.1.tgz#98e13b267ab8a1868f015a4b41b5a52e31457ce5"
integrity sha512-iCgjRkntcVud5amnioi+79r7TPVhKPfCY8UzL9GjyU+nIWTE9xsqyrJ6kib3InT9JYRyUu9Y67i5apCjf997TQ==
@ -17953,9 +17938,9 @@ terser@^3.14.1:
source-map-support "~0.5.10"
terser@^4.1.2, terser@^4.1.3:
version "4.3.0"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.0.tgz#0259070576ff34d89c5cd2b8d91055cdce0212d5"
integrity sha512-w5CzrvQOwYAH54aG22IrUJI4yX1w62XQmMdEOM6H4w0ii6rc3HJ89fmcOGN5mRwBWfUgaqO7RJTp4aoY/uE+qQ==
version "4.3.1"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.3.1.tgz#09820bcb3398299c4b48d9a86aefc65127d0ed65"
integrity sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==
dependencies:
commander "^2.20.0"
source-map "~0.6.1"