From c3eff49770b6ef3e34c98dfbf76c95a4498c80a6 Mon Sep 17 00:00:00 2001
From: markkaylor <mark.kaylor@strapi.io>
Date: Wed, 18 Aug 2021 11:12:21 +0200
Subject: [PATCH 1/6] add tracking event to strapi awesome banner (#10701)

---
 .../{PluginBanner => MarketplaceBanner}/Wrapper.js  |  0
 .../{PluginBanner => MarketplaceBanner}/index.js    | 13 ++++++++-----
 .../admin/src/containers/MarketplacePage/index.js   |  4 ++--
 .../strapi-admin/admin/src/translations/en.json     |  6 +++---
 yarn.lock                                           |  8 ++++----
 5 files changed, 17 insertions(+), 14 deletions(-)
 rename packages/strapi-admin/admin/src/containers/MarketplacePage/{PluginBanner => MarketplaceBanner}/Wrapper.js (100%)
 rename packages/strapi-admin/admin/src/containers/MarketplacePage/{PluginBanner => MarketplaceBanner}/index.js (59%)

diff --git a/packages/strapi-admin/admin/src/containers/MarketplacePage/PluginBanner/Wrapper.js b/packages/strapi-admin/admin/src/containers/MarketplacePage/MarketplaceBanner/Wrapper.js
similarity index 100%
rename from packages/strapi-admin/admin/src/containers/MarketplacePage/PluginBanner/Wrapper.js
rename to packages/strapi-admin/admin/src/containers/MarketplacePage/MarketplaceBanner/Wrapper.js
diff --git a/packages/strapi-admin/admin/src/containers/MarketplacePage/PluginBanner/index.js b/packages/strapi-admin/admin/src/containers/MarketplacePage/MarketplaceBanner/index.js
similarity index 59%
rename from packages/strapi-admin/admin/src/containers/MarketplacePage/PluginBanner/index.js
rename to packages/strapi-admin/admin/src/containers/MarketplacePage/MarketplaceBanner/index.js
index db33e9612d..30b6e1ce12 100644
--- a/packages/strapi-admin/admin/src/containers/MarketplacePage/PluginBanner/index.js
+++ b/packages/strapi-admin/admin/src/containers/MarketplacePage/MarketplaceBanner/index.js
@@ -1,29 +1,32 @@
 import React from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
+import { useGlobalContext } from 'strapi-helper-plugin';
 import Wrapper from './Wrapper';
 import LogoStrapi from '../../../assets/images/banner_strapi-rocket.png';
 
-const PluginBanner = () => {
+const MarketplaceBanner = () => {
   const { formatMessage } = useIntl();
+  const { emitEvent } = useGlobalContext();
 
   return (
     <Wrapper>
       <img
         className="bannerImage"
         src={LogoStrapi}
-        alt={formatMessage({ id: 'app.components.PluginBanner.image.alt' })}
+        alt={formatMessage({ id: 'app.components.MarketplaceBanner.image.alt' })}
       />
       <div>
         <div>
-          <FormattedMessage id="app.components.PluginBanner" />
+          <FormattedMessage id="app.components.MarketplaceBanner" />
         </div>
         <a
           href="https://github.com/strapi/awesome-strapi"
           target="_blank"
           rel="noopener noreferrer"
           className="bannerLink"
+          onClick={() => emitEvent('didGoToStrapiAwesome')}
         >
-          <FormattedMessage id="app.components.PluginBanner.link" />
+          <FormattedMessage id="app.components.MarketplaceBanner.link" />
           <i className="fa fa-external-link-alt" />
         </a>
       </div>
@@ -31,4 +34,4 @@ const PluginBanner = () => {
   );
 };
 
-export default PluginBanner;
+export default MarketplaceBanner;
diff --git a/packages/strapi-admin/admin/src/containers/MarketplacePage/index.js b/packages/strapi-admin/admin/src/containers/MarketplacePage/index.js
index 2af9c0f2fd..b04aea4230 100644
--- a/packages/strapi-admin/admin/src/containers/MarketplacePage/index.js
+++ b/packages/strapi-admin/admin/src/containers/MarketplacePage/index.js
@@ -7,7 +7,7 @@ import { useFetchPluginsFromMarketPlace } from '../../hooks';
 import PageTitle from '../../components/PageTitle';
 import PluginCard from './PluginCard';
 import Wrapper from './Wrapper';
-import PluginBanner from './PluginBanner';
+import MarketplaceBanner from './MarketplaceBanner';
 
 const MarketPlacePage = () => {
   const history = useHistory();
@@ -78,7 +78,7 @@ const MarketPlacePage = () => {
             id: 'app.components.InstallPluginPage.description',
           })}
         />
-        <PluginBanner />
+        <MarketplaceBanner />
         <div className="row" style={{ paddingTop: '4.1rem' }}>
           {data.map(plugin => {
             return (
diff --git a/packages/strapi-admin/admin/src/translations/en.json b/packages/strapi-admin/admin/src/translations/en.json
index ce5094564d..68e7582da2 100644
--- a/packages/strapi-admin/admin/src/translations/en.json
+++ b/packages/strapi-admin/admin/src/translations/en.json
@@ -228,14 +228,14 @@
   "app.components.ListPluginsPage.title": "Plugins",
   "app.components.Logout.logout": "Logout",
   "app.components.Logout.profile": "Profile",
+  "app.components.MarketplaceBanner": "Discover plugins built by the community, and many more awesome things to kickstart your project, on Strapi Awesome.",
+  "app.components.MarketplaceBanner.image.alt": "a strapi rocket logo",
+  "app.components.MarketplaceBanner.link": "Check it out now",
   "app.components.NotFoundPage.back": "Back to homepage",
   "app.components.NotFoundPage.description": "Not Found",
   "app.components.Official": "Official",
   "app.components.Onboarding.label.completed": "% completed",
   "app.components.Onboarding.title": "Get Started Videos",
-  "app.components.PluginBanner": "Discover plugins built by the community, and many more awesome things to kickstart your project, on Strapi Awesome.",
-  "app.components.PluginBanner.image.alt": "a strapi rocket logo",
-  "app.components.PluginBanner.link": "Check it out now",
   "app.components.PluginCard.Button.label.download": "Download",
   "app.components.PluginCard.Button.label.install": "Already installed",
   "app.components.PluginCard.PopUpWarning.install.impossible.autoReload.needed": "The autoReload feature needs to be enabled. Please start your app with `yarn develop`.",
diff --git a/yarn.lock b/yarn.lock
index b89d963933..8e24e24e68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19557,10 +19557,10 @@ tar-stream@^2.0.1, tar-stream@^2.1.0, tar-stream@^2.1.2, tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz#1f045a90a6eb23557a603595f41a16c57d47adc6"
-  integrity sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q==
+tar@6.1.4:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.4.tgz#9f0722b772a5e00dba7d52e1923b37a7ec3799b3"
+  integrity sha512-kcPWrO8S5ABjuZ/v1xQHP8xCEvj1dQ1d9iAb6Qs4jLYzaAIYWwST2IQpz7Ud8VNYRI+fGhFjrnzRKmRggKWg3g==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"

From 9baf1af73e9ff6cec4045c1b85272c7331590462 Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Wed, 18 Aug 2021 16:57:18 +0200
Subject: [PATCH 2/6] Fix i18n copy attributes

---
 .../plugins/i18n/services/__tests__/localizations.test.js   | 6 ++----
 packages/plugins/i18n/services/localizations.js             | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/plugins/i18n/services/__tests__/localizations.test.js b/packages/plugins/i18n/services/__tests__/localizations.test.js
index 1b73486556..abc3099f10 100644
--- a/packages/plugins/i18n/services/__tests__/localizations.test.js
+++ b/packages/plugins/i18n/services/__tests__/localizations.test.js
@@ -173,9 +173,7 @@ describe('localizations service', () => {
       setGlobalStrapi();
 
       const update = jest.fn();
-      global.strapi.query = () => {
-        return { update };
-      };
+      global.strapi.entityService = { update };
 
       const entry = {
         id: 1,
@@ -188,7 +186,7 @@ describe('localizations service', () => {
       await syncNonLocalizedAttributes(entry, { model });
 
       expect(update).toHaveBeenCalledTimes(1);
-      expect(update).toHaveBeenCalledWith({ where: { id: 2 }, data: { stars: 1 } });
+      expect(update).toHaveBeenCalledWith(model.uid, 2, { data: { stars: 1 } });
     });
   });
 });
diff --git a/packages/plugins/i18n/services/localizations.js b/packages/plugins/i18n/services/localizations.js
index 0f770df7e7..96d7973fb8 100644
--- a/packages/plugins/i18n/services/localizations.js
+++ b/packages/plugins/i18n/services/localizations.js
@@ -53,7 +53,7 @@ const syncNonLocalizedAttributes = async (entry, { model }) => {
     }
 
     const updateLocalization = id => {
-      return strapi.query(model.uid).update({ where: { id }, data: nonLocalizedAttributes });
+      return strapi.entityService.update(model.uid, id, { data: nonLocalizedAttributes });
     };
 
     await Promise.all(entry.localizations.map(({ id }) => updateLocalization(id)));

From 84984cf030082112ad6fd48fea0c7c39d47154a9 Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Wed, 18 Aug 2021 19:49:13 +0200
Subject: [PATCH 3/6] Fix singleType entity service find

---
 packages/core/strapi/lib/services/entity-service/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core/strapi/lib/services/entity-service/index.js b/packages/core/strapi/lib/services/entity-service/index.js
index 9ec81ea1e5..f31dc22a1e 100644
--- a/packages/core/strapi/lib/services/entity-service/index.js
+++ b/packages/core/strapi/lib/services/entity-service/index.js
@@ -68,9 +68,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const query = transformParamsToQuery(uid, params);
 
-    // return first element and ignore filters
     if (kind === 'singleType') {
-      return db.query(uid).findOne({});
+      return db.query(uid).findOne(query);
     }
 
     return db.query(uid).findMany(query);

From fb7f280e1a48cac0b3eee4dcd57eb5bbb8f32a17 Mon Sep 17 00:00:00 2001
From: Richard Nsama <kasonde.nsama@gmail.com>
Date: Thu, 19 Aug 2021 09:29:11 +0200
Subject: [PATCH 4/6] Added a POST route to the SSO routes to support SAML
 login callbacks (#10690)

---
 .../strapi-admin/ee/middlewares/features-routes/routes.js    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/strapi-admin/ee/middlewares/features-routes/routes.js b/packages/strapi-admin/ee/middlewares/features-routes/routes.js
index 8d4b63fa1b..249bfde4f8 100644
--- a/packages/strapi-admin/ee/middlewares/features-routes/routes.js
+++ b/packages/strapi-admin/ee/middlewares/features-routes/routes.js
@@ -12,6 +12,11 @@ module.exports = {
       path: '/connect/:provider',
       handler: 'authentication.providerLogin',
     },
+    {
+      method: 'POST',
+      path: '/connect/:provider',
+      handler: 'authentication.providerLogin',
+    },
     {
       method: 'GET',
       path: '/providers/options',

From 5202c4ed5c96d5e39823e8e6e936bb75c2c59a33 Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Thu, 19 Aug 2021 09:32:12 +0200
Subject: [PATCH 5/6] v3.6.7

---
 examples/getstarted/package.json              | 36 +++++++++----------
 lerna.json                                    |  2 +-
 packages/create-strapi-app/package.json       |  4 +--
 packages/create-strapi-starter/package.json   |  4 +--
 packages/strapi-admin/package.json            |  6 ++--
 .../strapi-connector-bookshelf/package.json   |  4 +--
 .../strapi-connector-mongoose/package.json    |  4 +--
 packages/strapi-database/package.json         |  4 +--
 packages/strapi-generate-api/package.json     |  4 +--
 .../strapi-generate-controller/package.json   |  4 +--
 packages/strapi-generate-model/package.json   |  4 +--
 packages/strapi-generate-new/package.json     |  2 +-
 packages/strapi-generate-plugin/package.json  |  4 +--
 packages/strapi-generate-policy/package.json  |  4 +--
 packages/strapi-generate-service/package.json |  4 +--
 packages/strapi-generate/package.json         |  4 +--
 packages/strapi-helper-plugin/package.json    |  2 +-
 packages/strapi-hook-ejs/package.json         |  2 +-
 packages/strapi-hook-redis/package.json       |  4 +--
 packages/strapi-middleware-views/package.json |  2 +-
 .../package.json                              |  6 ++--
 .../package.json                              | 10 +++---
 .../strapi-plugin-documentation/package.json  |  4 +--
 packages/strapi-plugin-email/package.json     |  8 ++---
 packages/strapi-plugin-graphql/package.json   |  4 +--
 packages/strapi-plugin-i18n/package.json      |  4 +--
 packages/strapi-plugin-sentry/package.json    |  2 +-
 packages/strapi-plugin-upload/package.json    |  8 ++---
 .../package.json                              |  6 ++--
 .../package.json                              |  4 +--
 .../package.json                              |  4 +--
 .../package.json                              |  2 +-
 .../package.json                              |  4 +--
 .../package.json                              |  4 +--
 .../package.json                              |  2 +-
 .../package.json                              |  2 +-
 .../strapi-provider-upload-local/package.json |  2 +-
 .../package.json                              |  2 +-
 packages/strapi-utils/package.json            |  2 +-
 packages/strapi/package.json                  | 22 ++++++------
 40 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json
index 15d9b8fae9..6c628680e8 100644
--- a/examples/getstarted/package.json
+++ b/examples/getstarted/package.json
@@ -1,7 +1,7 @@
 {
   "name": "getstarted",
   "private": true,
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "A Strapi application.",
   "scripts": {
     "develop": "strapi develop",
@@ -17,23 +17,23 @@
     "mysql": "2.18.1",
     "pg": "8.6.0",
     "sqlite3": "5.0.0",
-    "strapi": "3.6.6",
-    "strapi-admin": "3.6.6",
-    "strapi-connector-bookshelf": "3.6.6",
-    "strapi-connector-mongoose": "3.6.6",
-    "strapi-middleware-views": "3.6.6",
-    "strapi-plugin-content-manager": "3.6.6",
-    "strapi-plugin-content-type-builder": "3.6.6",
-    "strapi-plugin-documentation": "3.6.6",
-    "strapi-plugin-email": "3.6.6",
-    "strapi-plugin-graphql": "3.6.6",
-    "strapi-plugin-i18n": "3.6.6",
-    "strapi-plugin-upload": "3.6.6",
-    "strapi-plugin-users-permissions": "3.6.6",
-    "strapi-provider-email-mailgun": "3.6.6",
-    "strapi-provider-upload-aws-s3": "3.6.6",
-    "strapi-provider-upload-cloudinary": "3.6.6",
-    "strapi-utils": "3.6.6"
+    "strapi": "3.6.7",
+    "strapi-admin": "3.6.7",
+    "strapi-connector-bookshelf": "3.6.7",
+    "strapi-connector-mongoose": "3.6.7",
+    "strapi-middleware-views": "3.6.7",
+    "strapi-plugin-content-manager": "3.6.7",
+    "strapi-plugin-content-type-builder": "3.6.7",
+    "strapi-plugin-documentation": "3.6.7",
+    "strapi-plugin-email": "3.6.7",
+    "strapi-plugin-graphql": "3.6.7",
+    "strapi-plugin-i18n": "3.6.7",
+    "strapi-plugin-upload": "3.6.7",
+    "strapi-plugin-users-permissions": "3.6.7",
+    "strapi-provider-email-mailgun": "3.6.7",
+    "strapi-provider-upload-aws-s3": "3.6.7",
+    "strapi-provider-upload-cloudinary": "3.6.7",
+    "strapi-utils": "3.6.7"
   },
   "strapi": {
     "uuid": "getstarted"
diff --git a/lerna.json b/lerna.json
index d9be575e91..8f289fe561 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.6.6",
+  "version": "3.6.7",
   "packages": [
     "packages/*",
     "examples/*"
diff --git a/packages/create-strapi-app/package.json b/packages/create-strapi-app/package.json
index d3e842f699..d0e326b3e4 100644
--- a/packages/create-strapi-app/package.json
+++ b/packages/create-strapi-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-app",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a new Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://strapi.io",
@@ -21,7 +21,7 @@
     "inquirer": "8.1.0",
     "js-yaml": "4.1.0",
     "node-fetch": "^2.6.1",
-    "strapi-generate-new": "3.6.6"
+    "strapi-generate-new": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/create-strapi-starter/package.json b/packages/create-strapi-starter/package.json
index f7ca6af307..194ecf961e 100644
--- a/packages/create-strapi-starter/package.json
+++ b/packages/create-strapi-starter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-starter",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a new Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://strapi.io",
@@ -26,7 +26,7 @@
     "js-yaml": "4.1.0",
     "node-fetch": "^2.6.1",
     "ora": "5.4.0",
-    "strapi-generate-new": "3.6.6",
+    "strapi-generate-new": "3.6.7",
     "tar": "6.1.4"
   },
   "scripts": {
diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index 12f7f88155..7df92ab1e3 100644
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-admin",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -101,8 +101,8 @@
     "sanitize.css": "^4.1.0",
     "semver": "7.3.5",
     "sift": "13.5.0",
-    "strapi-helper-plugin": "3.6.6",
-    "strapi-utils": "3.6.6",
+    "strapi-helper-plugin": "3.6.7",
+    "strapi-utils": "3.6.7",
     "style-loader": "^0.23.1",
     "styled-components": "^5.2.3",
     "terser-webpack-plugin": "^1.2.3",
diff --git a/packages/strapi-connector-bookshelf/package.json b/packages/strapi-connector-bookshelf/package.json
index ceee50427b..f0b8e93112 100644
--- a/packages/strapi-connector-bookshelf/package.json
+++ b/packages/strapi-connector-bookshelf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-connector-bookshelf",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Bookshelf hook for the Strapi framework",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -23,7 +23,7 @@
     "p-map": "4.0.0",
     "pluralize": "^8.0.0",
     "rimraf": "3.0.2",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "peerDependencies": {
     "knex": "0.21.18"
diff --git a/packages/strapi-connector-mongoose/package.json b/packages/strapi-connector-mongoose/package.json
index 9df9e71f62..5f2be9de7b 100644
--- a/packages/strapi-connector-mongoose/package.json
+++ b/packages/strapi-connector-mongoose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-connector-mongoose",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Mongoose hook for the Strapi framework",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -22,7 +22,7 @@
     "p-map": "4.0.0",
     "pluralize": "^8.0.0",
     "semver": "^7.3.5",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "author": {
     "email": "hi@strapi.io",
diff --git a/packages/strapi-database/package.json b/packages/strapi-database/package.json
index 5d65cb9bb3..03d0744d9e 100644
--- a/packages/strapi-database/package.json
+++ b/packages/strapi-database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-database",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "main": "./lib/index.js",
@@ -31,7 +31,7 @@
     "debug": "4.3.1",
     "lodash": "4.17.21",
     "p-map": "4.0.0",
-    "strapi-utils": "3.6.6",
+    "strapi-utils": "3.6.7",
     "verror": "^1.10.0"
   },
   "gitHead": "231263a3535658bab1e9492c6aaaed8692d62a53"
diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json
index 3a2b7c9cd9..dc793c4047 100644
--- a/packages/strapi-generate-api/package.json
+++ b/packages/strapi-generate-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-api",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate an API for a Strapi application.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "dependencies": {
     "lodash": "4.17.21",
     "pluralize": "^8.0.0",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json
index ea10b17132..7c958bb636 100644
--- a/packages/strapi-generate-controller/package.json
+++ b/packages/strapi-generate-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-controller",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a controller for a Strapi API.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "lodash": "4.17.21",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json
index b4b6c4c218..e278116b16 100644
--- a/packages/strapi-generate-model/package.json
+++ b/packages/strapi-generate-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-model",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a model for a Strapi API.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -16,7 +16,7 @@
   "dependencies": {
     "lodash": "4.17.21",
     "pluralize": "^8.0.0",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json
index c60beaab14..c6a22a2d5e 100644
--- a/packages/strapi-generate-new/package.json
+++ b/packages/strapi-generate-new/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-new",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a new Strapi application.",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json
index 97c8b4033d..45fdc3b5b9 100644
--- a/packages/strapi-generate-plugin/package.json
+++ b/packages/strapi-generate-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-plugin",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate an plugin for a Strapi application.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "dependencies": {
     "fs-extra": "^9.1.0",
     "lodash": "4.17.21",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json
index 8137bd25a6..d2dc548475 100644
--- a/packages/strapi-generate-policy/package.json
+++ b/packages/strapi-generate-policy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-policy",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a policy for a Strapi API.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "lodash": "4.17.21",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json
index 8f3be3394a..661a5e2197 100644
--- a/packages/strapi-generate-service/package.json
+++ b/packages/strapi-generate-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-service",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a service for a Strapi API.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "lodash": "4.17.21",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json
index 263a679003..7807d61b62 100644
--- a/packages/strapi-generate/package.json
+++ b/packages/strapi-generate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Master of ceremonies for the Strapi generators.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -20,7 +20,7 @@
     "fs-extra": "^9.1.0",
     "lodash": "4.17.21",
     "reportback": "^2.0.2",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index 528243a611..86fae909d7 100644
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-helper-plugin",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Helper for Strapi plugins development",
   "files": [
     "dist"
diff --git a/packages/strapi-hook-ejs/package.json b/packages/strapi-hook-ejs/package.json
index ccb2d70aef..66c820608e 100644
--- a/packages/strapi-hook-ejs/package.json
+++ b/packages/strapi-hook-ejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-hook-ejs",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "EJS hook for the Strapi framework",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/strapi-hook-redis/package.json b/packages/strapi-hook-redis/package.json
index 58988b4a6e..fb7b9ffc20 100644
--- a/packages/strapi-hook-redis/package.json
+++ b/packages/strapi-hook-redis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-hook-redis",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Redis hook for the Strapi framework",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -19,7 +19,7 @@
     "lodash": "4.17.21",
     "rimraf": "3.0.2",
     "stack-trace": "0.0.10",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "author": {
     "email": "hi@strapi.io",
diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json
index 2563a5a945..46b4be8a51 100644
--- a/packages/strapi-middleware-views/package.json
+++ b/packages/strapi-middleware-views/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-middleware-views",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Views middleware to enable server-side rendering for the Strapi framework",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index c1f34f5a55..8a7f73065b 100644
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-manager",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "A powerful UI to easily manage your data.",
   "strapi": {
     "name": "Content Manager",
@@ -45,8 +45,8 @@
     "redux-immutable": "^4.0.0",
     "reselect": "^4.0.0",
     "sanitize-html": "2.3.3",
-    "strapi-helper-plugin": "3.6.6",
-    "strapi-utils": "3.6.6",
+    "strapi-helper-plugin": "3.6.7",
+    "strapi-utils": "3.6.7",
     "yup": "^0.32.9"
   },
   "author": {
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index 58f17008b0..d7ca5ef479 100644
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-type-builder",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Strapi plugin to create content type (API).",
   "strapi": {
     "name": "Content Type Builder",
@@ -29,10 +29,10 @@
     "redux": "^4.0.1",
     "redux-immutable": "^4.0.0",
     "reselect": "^4.0.0",
-    "strapi-generate": "3.6.6",
-    "strapi-generate-api": "3.6.6",
-    "strapi-helper-plugin": "3.6.6",
-    "strapi-utils": "3.6.6",
+    "strapi-generate": "3.6.7",
+    "strapi-generate-api": "3.6.7",
+    "strapi-helper-plugin": "3.6.7",
+    "strapi-utils": "3.6.7",
     "yup": "^0.32.9"
   },
   "author": {
diff --git a/packages/strapi-plugin-documentation/package.json b/packages/strapi-plugin-documentation/package.json
index 31ca8569a2..e90d4f5c8a 100644
--- a/packages/strapi-plugin-documentation/package.json
+++ b/packages/strapi-plugin-documentation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-documentation",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.",
   "strapi": {
     "name": "Documentation",
@@ -35,7 +35,7 @@
     "redux": "^4.0.1",
     "redux-immutable": "^4.0.0",
     "reselect": "^4.0.0",
-    "strapi-helper-plugin": "3.6.6",
+    "strapi-helper-plugin": "3.6.7",
     "swagger-ui-dist": "3.47.1"
   },
   "author": {
diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json
index e1697dfdda..2099c4224f 100644
--- a/packages/strapi-plugin-email/package.json
+++ b/packages/strapi-plugin-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-email",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Easily configure your Strapi application to send emails.",
   "strapi": {
     "name": "Email",
@@ -13,12 +13,12 @@
   },
   "dependencies": {
     "lodash": "4.17.21",
-    "strapi-provider-email-sendmail": "3.6.6",
-    "strapi-utils": "3.6.6"
+    "strapi-provider-email-sendmail": "3.6.7",
+    "strapi-utils": "3.6.7"
   },
   "devDependencies": {
     "rimraf": "3.0.2",
-    "strapi-helper-plugin": "3.6.6"
+    "strapi-helper-plugin": "3.6.7"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-graphql/package.json b/packages/strapi-plugin-graphql/package.json
index 74fa03400a..c95081e364 100644
--- a/packages/strapi-plugin-graphql/package.json
+++ b/packages/strapi-plugin-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-graphql",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Adds GraphQL endpoint with default API methods.",
   "strapi": {
     "name": "graphql",
@@ -27,7 +27,7 @@
     "koa-compose": "^4.1.0",
     "lodash": "4.17.21",
     "pluralize": "^8.0.0",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
diff --git a/packages/strapi-plugin-i18n/package.json b/packages/strapi-plugin-i18n/package.json
index da60738e8d..5eee17d439 100644
--- a/packages/strapi-plugin-i18n/package.json
+++ b/packages/strapi-plugin-i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-i18n",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "This plugin enables to create, to read and to update content in different languages, both from the Admin Panel and from the API",
   "strapi": {
     "name": "Internationalization",
@@ -12,7 +12,7 @@
     "lodash": "4.17.21",
     "p-map": "4.0.0",
     "pluralize": "8.0.0",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "author": {
     "name": "A Strapi developer",
diff --git a/packages/strapi-plugin-sentry/package.json b/packages/strapi-plugin-sentry/package.json
index 9caf580114..5b49cb5ccf 100644
--- a/packages/strapi-plugin-sentry/package.json
+++ b/packages/strapi-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-sentry",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Send Strapi error events to Sentry",
   "strapi": {
     "name": "Sentry",
diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json
index 00e54938c4..e06f79d0b1 100644
--- a/packages/strapi-plugin-upload/package.json
+++ b/packages/strapi-plugin-upload/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-upload",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Makes it easy to upload images and files to your Strapi Application.",
   "strapi": {
     "name": "Media Library",
@@ -36,9 +36,9 @@
     "react-router-dom": "^5.0.0",
     "reactstrap": "8.4.1",
     "sharp": "0.28.1",
-    "strapi-helper-plugin": "3.6.6",
-    "strapi-provider-upload-local": "3.6.6",
-    "strapi-utils": "3.6.6",
+    "strapi-helper-plugin": "3.6.7",
+    "strapi-provider-upload-local": "3.6.7",
+    "strapi-utils": "3.6.7",
     "stream-to-array": "^2.3.0",
     "uuid": "^3.2.1"
   },
diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json
index 2d69c54895..fc18f90d3c 100644
--- a/packages/strapi-plugin-users-permissions/package.json
+++ b/packages/strapi-plugin-users-permissions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-users-permissions",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Protect your API with a full-authentication process based on JWT",
   "strapi": {
     "name": "Roles & Permissions",
@@ -35,8 +35,8 @@
     "reactstrap": "8.4.1",
     "redux-saga": "^0.16.0",
     "request": "^2.83.0",
-    "strapi-helper-plugin": "3.6.6",
-    "strapi-utils": "3.6.6",
+    "strapi-helper-plugin": "3.6.7",
+    "strapi-utils": "3.6.7",
     "uuid": "^3.1.0"
   },
   "devDependencies": {
diff --git a/packages/strapi-provider-email-amazon-ses/package.json b/packages/strapi-provider-email-amazon-ses/package.json
index 08e7961fa2..768963441f 100644
--- a/packages/strapi-provider-email-amazon-ses/package.json
+++ b/packages/strapi-provider-email-amazon-ses/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-provider-email-amazon-ses",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Amazon SES provider for strapi email",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "main": "./lib",
   "dependencies": {
     "node-ses": "^3.0.3",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "author": {
     "email": "nikolay@tsenkov.net",
diff --git a/packages/strapi-provider-email-mailgun/package.json b/packages/strapi-provider-email-mailgun/package.json
index acae5e42e4..05d42c2568 100644
--- a/packages/strapi-provider-email-mailgun/package.json
+++ b/packages/strapi-provider-email-mailgun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-provider-email-mailgun",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Mailgun provider for strapi email plugin",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -14,7 +14,7 @@
   "main": "./lib",
   "dependencies": {
     "mailgun-js": "0.22.0",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "strapi": {
     "isProvider": true
diff --git a/packages/strapi-provider-email-nodemailer/package.json b/packages/strapi-provider-email-nodemailer/package.json
index 4d179c75c3..3a50d9e8f7 100644
--- a/packages/strapi-provider-email-nodemailer/package.json
+++ b/packages/strapi-provider-email-nodemailer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-provider-email-nodemailer",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Nodemailer provider for Strapi 3",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/strapi-provider-email-sendgrid/package.json b/packages/strapi-provider-email-sendgrid/package.json
index 365c1ee463..7d99a52946 100644
--- a/packages/strapi-provider-email-sendgrid/package.json
+++ b/packages/strapi-provider-email-sendgrid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-provider-email-sendgrid",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Sendgrid provider for strapi email",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -14,7 +14,7 @@
   "main": "./lib",
   "dependencies": {
     "@sendgrid/mail": "6.4.0",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "strapi": {
     "isProvider": true
diff --git a/packages/strapi-provider-email-sendmail/package.json b/packages/strapi-provider-email-sendmail/package.json
index c1a16f6cef..a689a6050c 100644
--- a/packages/strapi-provider-email-sendmail/package.json
+++ b/packages/strapi-provider-email-sendmail/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-provider-email-sendmail",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Sendmail provider for strapi email",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -13,7 +13,7 @@
   "main": "./lib",
   "dependencies": {
     "sendmail": "^1.6.1",
-    "strapi-utils": "3.6.6"
+    "strapi-utils": "3.6.7"
   },
   "strapi": {
     "isProvider": true
diff --git a/packages/strapi-provider-upload-aws-s3/package.json b/packages/strapi-provider-upload-aws-s3/package.json
index 3f38618d23..9c0f816005 100644
--- a/packages/strapi-provider-upload-aws-s3/package.json
+++ b/packages/strapi-provider-upload-aws-s3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-provider-upload-aws-s3",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "AWS S3 provider for strapi upload",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/strapi-provider-upload-cloudinary/package.json b/packages/strapi-provider-upload-cloudinary/package.json
index 20474f60f2..694059ef12 100644
--- a/packages/strapi-provider-upload-cloudinary/package.json
+++ b/packages/strapi-provider-upload-cloudinary/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-provider-upload-cloudinary",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Cloudinary provider for strapi upload",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/strapi-provider-upload-local/package.json b/packages/strapi-provider-upload-local/package.json
index f143e4edba..f35e06d86d 100644
--- a/packages/strapi-provider-upload-local/package.json
+++ b/packages/strapi-provider-upload-local/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-provider-upload-local",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Local provider for strapi upload",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/strapi-provider-upload-rackspace/package.json b/packages/strapi-provider-upload-rackspace/package.json
index c639ced06f..4cb5e1a560 100644
--- a/packages/strapi-provider-upload-rackspace/package.json
+++ b/packages/strapi-provider-upload-rackspace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-provider-upload-rackspace",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Rackspace provider for strapi upload",
   "main": "./lib",
   "keywords": [],
diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json
index a3e7062d2f..c93348207b 100644
--- a/packages/strapi-utils/package.json
+++ b/packages/strapi-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-utils",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Shared utilities for the Strapi packages",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/strapi/package.json b/packages/strapi/package.json
index 3aade16151..97e2c68d4c 100644
--- a/packages/strapi/package.json
+++ b/packages/strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MongoDB, MySQL, MariaDB, PostgreSQL, SQLite",
   "homepage": "https://strapi.io",
   "directories": {
@@ -55,16 +55,16 @@
     "resolve-cwd": "^3.0.0",
     "rimraf": "^3.0.2",
     "semver": "7.3.5",
-    "strapi-database": "3.6.6",
-    "strapi-generate": "3.6.6",
-    "strapi-generate-api": "3.6.6",
-    "strapi-generate-controller": "3.6.6",
-    "strapi-generate-model": "3.6.6",
-    "strapi-generate-new": "3.6.6",
-    "strapi-generate-plugin": "3.6.6",
-    "strapi-generate-policy": "3.6.6",
-    "strapi-generate-service": "3.6.6",
-    "strapi-utils": "3.6.6"
+    "strapi-database": "3.6.7",
+    "strapi-generate": "3.6.7",
+    "strapi-generate-api": "3.6.7",
+    "strapi-generate-controller": "3.6.7",
+    "strapi-generate-model": "3.6.7",
+    "strapi-generate-new": "3.6.7",
+    "strapi-generate-plugin": "3.6.7",
+    "strapi-generate-policy": "3.6.7",
+    "strapi-generate-service": "3.6.7",
+    "strapi-utils": "3.6.7"
   },
   "scripts": {
     "postinstall": "node lib/utils/success.js"

From 4fbd411f69ef2e81ee8e92b728f81961b53b968b Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Thu, 19 Aug 2021 23:28:29 +0200
Subject: [PATCH 6/6] Fix lint

---
 .../admin/src/pages/MarketplacePage/MarketplaceBanner/Wrapper.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/Wrapper.js b/packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/Wrapper.js
index 4870210d29..a86e131434 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/Wrapper.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/Wrapper.js
@@ -11,7 +11,6 @@ const Wrapper = styled.div`
   padding: 8px 16px;
 
   .bannerImage {
-    margin-right: 1rem;
     width: 48px;
     height: 48px;
     margin-right: 16px;