yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 18:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Alexandre Bodin 2020-01-31 18:21:42 +01:00
commit 349b28c291
6 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-connector-bookshelf/package.json
View File

@ -21,7 +21,7 @@
"inquirer": "^6.3.1",
"lodash": "^4.17.11",
"pluralize": "^7.0.0",
"rimraf": "^2.6.3",
"rimraf": "3.0.0",
"strapi-utils": "3.0.0-beta.18.7"
},
"peerDependencies": {

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

@ -38,7 +38,7 @@
"@babel/preset-react": "^7.0.0",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.8.0",
"rimraf": "^2.6.3",
"rimraf": "3.0.0",
"rollup": "^1.10.0",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^9.3.4",

2
packages/strapi-hook-redis/package.json
View File

@ -17,7 +17,7 @@
"dependencies": {
"ioredis": "^4.9.3",
"lodash": "^4.17.11",
"rimraf": "^2.6.3",
"rimraf": "3.0.0",
"stack-trace": "0.0.10",
"strapi-utils": "3.0.0-beta.18.7"
},

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

@ -18,7 +18,7 @@
},
"devDependencies": {
"react-copy-to-clipboard": "5.0.1",
"rimraf": "^2.6.3",
"rimraf": "3.0.0",
"strapi-helper-plugin": "3.0.0-beta.18.7"
},
"author": {

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

@ -29,7 +29,7 @@
"devDependencies": {
"cross-env": "^5.2.0",
"koa": "^2.8.0",
"rimraf": "^2.6.3"
"rimraf": "3.0.0"
},
"author": {
"name": "A Strapi developer",

18
yarn.lock
View File

@ -12299,22 +12299,6 @@ node-notifier@^5.4.2:
shellwords "^0.1.1"
which "^1.3.0"
node-pre-gyp@*:
version "0.14.0"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
dependencies:
detect-libc "^1.0.2"
mkdirp "^0.5.1"
needle "^2.2.1"
nopt "^4.0.1"
npm-packlist "^1.1.6"
npmlog "^4.0.2"
rc "^1.2.7"
rimraf "^2.6.1"
semver "^5.3.0"
tar "^4.4.2"
node-pre-gyp@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054"
@ -17169,7 +17153,7 @@ tar-stream@^2.1.0:
inherits "^2.0.3"
readable-stream "^3.1.1"
tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8:
tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
version "4.4.13"
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==