Merge branch 'master' into fix/sso-wrong-redirect

strapi · Jan 28, 2022 · 831b7eb · 831b7eb
2 parents 4fc8e83 + 90d3c76
commit 831b7eb
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json
@@ -44,7 +44,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.2",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.1.14",
-    "axios": "0.24.0",
+    "axios": "0.25.0",
     "babel-plugin-styled-components": "2.0.2",
     "formik": "2.2.9",
     "invariant": "^2.2.1",

diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json
@@ -44,6 +44,9 @@
     "reselect": "^4.0.0",
     "swagger-ui-dist": "3.47.1"
   },
+  "peerDependencies": {
+    "@strapi/strapi": "^4.0.0"
+  },
   "engines": {
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"

diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json
@@ -51,6 +51,9 @@
     "cross-env": "^7.0.3",
     "koa": "^2.13.1"
   },
+  "peerDependencies": {
+    "@strapi/strapi": "^4.0.0"
+  },
   "engines": {
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"

diff --git a/packages/plugins/sentry/package.json b/packages/plugins/sentry/package.json
@@ -26,6 +26,9 @@
   "dependencies": {
     "@sentry/node": "6.7.1"
   },
+  "peerDependencies": {
+    "@strapi/strapi": "^4.0.0"
+  },
   "engines": {
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"

diff --git a/yarn.lock b/yarn.lock
@@ -6893,6 +6893,13 @@ axios@0.24.0:
   dependencies:
     follow-redirects "^1.14.4"
 
+axios@0.25.0:
+  version "0.25.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
+  integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
+  dependencies:
+    follow-redirects "^1.14.7"
+
 axios@^0.21.4:
   version "0.21.4"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
@@ -11047,7 +11054,7 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.4:
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.7:
   version "1.14.7"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
   integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==