Merge branch 'strapi:master' into fix/populate-user

.github/actions/check-pr-status/package.json

@@ -1,6 +1,6 @@
 {
   "name": "check-pr-status",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "main": "dist/index.js",
   "license": "MIT",
   "private": true,
@@ -9,7 +9,7 @@
     "watch": "NODE_ENV=production ncc build index.js -w -o dist --minify"
   },
   "devDependencies": {
-    "@actions/core": "1.6.0",
+    "@actions/core": "1.8.0",
     "@actions/github": "5.0.0",
     "@vercel/ncc": "0.33.3"
   }

README.md

@@ -118,7 +118,7 @@ For general help using Strapi, please refer to [the official Strapi documentatio
 - [Discord](https://discord.strapi.io) (For live discussion with the Community and Strapi team)
 - [GitHub](https://github.com/strapi/strapi) (Bug reports, Contributions)
 - [Community Forum](https://forum.strapi.io) (Questions and Discussions)
-- [ProductBoard](https://portal.productboard.com/strapi/tabs/2-under-consideration) (Roadmap, Feature requests)
+- [Feedback section](https://feedback.strapi.io) (Roadmap, Feature requests)
 - [Twitter](https://twitter.com/strapijs) (Get the news fast)
 - [Facebook](https://www.facebook.com/Strapi-616063331867161)
 - [YouTube Channel](https://www.youtube.com/strapi) (Learn from Video Tutorials)
@@ -129,7 +129,7 @@ Follow our [migration guides](https://docs.strapi.io/developer-docs/latest/updat
 
 ## Roadmap
 
-Check out our [roadmap](https://portal.productboard.com/strapi) to get informed of the latest features released and the upcoming ones. You may also give us insights and vote for a specific feature.
+Check out our [roadmap](https://feedback.strapi.io) to get informed of the latest features released and the upcoming ones. You may also give us insights and vote for a specific feature.
 
 ## Documentation
 

examples/getstarted/package.json

@@ -1,7 +1,7 @@
 {
   "name": "getstarted",
   "private": true,
-  "version": "4.1.8",
+  "version": "4.1.9",
   "description": "A Strapi application.",
   "scripts": {
     "develop": "strapi develop",
@@ -12,17 +12,17 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/admin": "4.1.8",
-    "@strapi/plugin-documentation": "4.1.8",
-    "@strapi/plugin-graphql": "4.1.8",
-    "@strapi/plugin-i18n": "4.1.8",
-    "@strapi/plugin-sentry": "4.1.8",
-    "@strapi/plugin-users-permissions": "4.1.8",
-    "@strapi/provider-email-mailgun": "4.1.8",
-    "@strapi/provider-upload-aws-s3": "4.1.8",
-    "@strapi/provider-upload-cloudinary": "4.1.8",
-    "@strapi/strapi": "4.1.8",
-    "@strapi/utils": "4.1.8",
+    "@strapi/admin": "4.1.9",
+    "@strapi/plugin-documentation": "4.1.9",
+    "@strapi/plugin-graphql": "4.1.9",
+    "@strapi/plugin-i18n": "4.1.9",
+    "@strapi/plugin-sentry": "4.1.9",
+    "@strapi/plugin-users-permissions": "4.1.9",
+    "@strapi/provider-email-mailgun": "4.1.9",
+    "@strapi/provider-upload-aws-s3": "4.1.9",
+    "@strapi/provider-upload-cloudinary": "4.1.9",
+    "@strapi/strapi": "4.1.9",
+    "@strapi/utils": "4.1.9",
     "@vscode/sqlite3": "5.0.8",
     "better-sqlite3": "7.4.6",
     "lodash": "4.17.21",

examples/kitchensink/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kitchensink",
   "private": true,
-  "version": "4.1.8",
+  "version": "4.1.9",
   "description": "A Strapi application.",
   "scripts": {
     "develop": "strapi develop",
@@ -12,12 +12,12 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/admin": "4.1.8",
-    "@strapi/provider-email-mailgun": "4.1.8",
-    "@strapi/provider-upload-aws-s3": "4.1.8",
-    "@strapi/provider-upload-cloudinary": "4.1.8",
-    "@strapi/strapi": "4.1.8",
-    "@strapi/utils": "4.1.8",
+    "@strapi/admin": "4.1.9",
+    "@strapi/provider-email-mailgun": "4.1.9",
+    "@strapi/provider-upload-aws-s3": "4.1.9",
+    "@strapi/provider-upload-cloudinary": "4.1.9",
+    "@strapi/strapi": "4.1.9",
+    "@strapi/utils": "4.1.9",
     "lodash": "4.17.21",
     "mysql": "2.18.1",
     "passport-google-oauth2": "0.2.0",

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.1.8",
+  "version": "4.1.9",
   "packages": [
     "packages/*",
     "examples/*"

package.json

@@ -71,7 +71,7 @@
     "@babel/polyfill": "7.12.1"
   },
   "devDependencies": {
-    "@swc-node/jest": "1.4.3",
+    "@swc-node/jest": "1.5.0",
     "@testing-library/react": "11.2.7",
     "@testing-library/react-hooks": "3.7.0",
     "@testing-library/user-event": "13.5.0",
@@ -90,10 +90,10 @@
     "eslint-plugin-jsx-a11y": "6.5.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-react": "7.29.4",
-    "eslint-plugin-react-hooks": "4.4.0",
+    "eslint-plugin-react-hooks": "4.5.0",
     "eslint-plugin-redux-saga": "1.3.2",
     "execa": "1.0.0",
-    "fs-extra": "10.0.1",
+    "fs-extra": "10.1.0",
     "get-port": "5.1.1",
     "glob": "7.2.0",
     "husky": "3.1.0",

packages/admin-test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin-test-utils",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "private": true,
   "description": "Test utilities for the Strapi administration panel",
   "license": "MIT",

packages/cli/create-strapi-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-app",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "description": "Generate a new Strapi application.",
   "keywords": [
     "create-strapi-app",
@@ -38,7 +38,7 @@
     "test": "echo \"no tests yet\""
   },
   "dependencies": {
-    "@strapi/generate-new": "4.1.8",
+    "@strapi/generate-new": "4.1.9",
     "commander": "6.1.0",
     "inquirer": "8.2.0"
   },

packages/cli/create-strapi-starter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-starter",
-  "version": "4.1.8",
+  "version": "4.1.9",
   "description": "Generate a new Strapi application.",
   "keywords": [
     "create-strapi-starter",
@@ -38,7 +38,7 @@
     "test": "echo \"no tests yet\""
   },
   "dependencies": {
-    "@strapi/generate-new": "4.1.8",
+    "@strapi/generate-new": "4.1.9",
     "chalk": "4.1.1",
     "ci-info": "3.1.1",
     "commander": "7.1.0",

packages/core/admin/admin/src/components/GuidedTour/Homepage/components/tests/Stepper.test.js

@@ -97,20 +97,24 @@ describe('GuidedTour Stepper', () => {
       }
 
       .c0 {
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
         display: flex;
         -webkit-flex-direction: row;
         -ms-flex-direction: row;
         flex-direction: row;
+      }
+
+      .c3 {
         -webkit-align-items: center;
         -webkit-box-align: center;
         -ms-flex-align: center;
         align-items: center;
-      }
-
-      .c3 {
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
@@ -122,24 +126,20 @@ describe('GuidedTour Stepper', () => {
         -webkit-justify-content: center;
         -ms-flex-pack: center;
         justify-content: center;
-        -webkit-align-items: center;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center;
       }
 
       .c6 {
+        -webkit-align-items: flex-start;
+        -webkit-box-align: flex-start;
+        -ms-flex-align: flex-start;
+        align-items: flex-start;
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
         display: flex;
         -webkit-flex-direction: row;
         -ms-flex-direction: row;
         flex-direction: row;
-        -webkit-align-items: flex-start;
-        -webkit-box-align: flex-start;
-        -ms-flex-align: flex-start;
-        align-items: flex-start;
       }
 
       .c4 {
@@ -357,20 +357,24 @@ describe('GuidedTour Stepper', () => {
       }
 
       .c0 {
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
         display: flex;
         -webkit-flex-direction: row;
         -ms-flex-direction: row;
         flex-direction: row;
+      }
+
+      .c3 {
         -webkit-align-items: center;
         -webkit-box-align: center;
         -ms-flex-align: center;
         align-items: center;
-      }
-
-      .c3 {
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
@@ -382,24 +386,20 @@ describe('GuidedTour Stepper', () => {
         -webkit-justify-content: center;
         -ms-flex-pack: center;
         justify-content: center;
-        -webkit-align-items: center;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center;
       }
 
       .c7 {
+        -webkit-align-items: flex-start;
+        -webkit-box-align: flex-start;
+        -ms-flex-align: flex-start;
+        align-items: flex-start;
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
         display: flex;
         -webkit-flex-direction: row;
         -ms-flex-direction: row;
         flex-direction: row;
-        -webkit-align-items: flex-start;
-        -webkit-box-align: flex-start;
-        -ms-flex-align: flex-start;
-        align-items: flex-start;
       }
 
       .c4 {
@@ -617,20 +617,24 @@ describe('GuidedTour Stepper', () => {
       }
 
       .c0 {
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
         display: flex;
         -webkit-flex-direction: row;
         -ms-flex-direction: row;
         flex-direction: row;
+      }
+
+      .c3 {
         -webkit-align-items: center;
         -webkit-box-align: center;
         -ms-flex-align: center;
         align-items: center;
-      }
-
-      .c3 {
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
@@ -642,24 +646,20 @@ describe('GuidedTour Stepper', () => {
         -webkit-justify-content: center;
         -ms-flex-pack: center;
         justify-content: center;
-        -webkit-align-items: center;
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        align-items: center;
       }
 
       .c7 {
+        -webkit-align-items: flex-start;
+        -webkit-box-align: flex-start;
+        -ms-flex-align: flex-start;
+        align-items: flex-start;
         display: -webkit-box;
         display: -webkit-flex;
         display: -ms-flexbox;
         display: flex;
         -webkit-flex-direction: row;
         -ms-flex-direction: row;
         flex-direction: row;
-        -webkit-align-items: flex-start;
-        -webkit-box-align: flex-start;
-        -ms-flex-align: flex-start;
-        align-items: flex-start;
       }
 
       .c4 {