Merge branch 'v4/ds-migration' of github.com:strapi/strapi into qa-board-smo

examples/kitchensink/package.json

@@ -2,29 +2,39 @@
   "name": "kitchensink",
   "private": true,
   "version": "0.1.0",
-  "description": "A Strapi application",
+  "description": "A Strapi application.",
   "scripts": {
     "develop": "strapi develop",
+    "develop:ce": "STRAPI_DISABLE_EE=true strapi develop",
     "start": "strapi start",
     "build": "strapi build",
+    "build:ce": "STRAPI_DISABLE_EE=true strapi build",
     "strapi": "strapi"
   },
-  "devDependencies": {},
   "dependencies": {
-    "@strapi/strapi": "3.6.8",
+    "@strapi/admin": "3.6.8",
-    "@strapi/plugin-users-permissions": "3.6.8",
+    "@strapi/plugin-documentation": "3.6.8",
+    "@strapi/plugin-graphql": "3.6.8",
     "@strapi/plugin-i18n": "3.6.8",
-    "sqlite3": "5.0.2"
+    "@strapi/plugin-users-permissions": "3.6.8",
-  },
+    "@strapi/provider-email-mailgun": "3.6.8",
-  "author": {
+    "@strapi/provider-upload-aws-s3": "3.6.8",
-    "name": "A Strapi developer"
+    "@strapi/provider-upload-cloudinary": "3.6.8",
+    "@strapi/strapi": "3.6.8",
+    "@strapi/utils": "3.6.8",
+    "lodash": "4.17.21",
+    "mysql": "2.18.1",
+    "passport-google-oauth2": "0.2.0",
+    "pg": "8.6.0",
+    "sqlite3": "5.0.2",
+    "strapi-middleware-views": "3.6.8"
   },
   "strapi": {
-    "uuid": "379fa84f-f1a0-4101-a6e7-40ee09ed3927"
+    "uuid": "getstarted"
   },
   "engines": {
-    "node": ">=12.x.x <=14.x.x",
+    "node": ">=12.x.x <=16.x.x",
-    "npm": "^6.0.0"
+    "npm": ">=6.0.0"
   },
-  "license": "MIT"
+  "license": "SEE LICENSE IN LICENSE"
 }

packages/core/admin/admin/src/content-manager/pages/App/tests/index.test.js

@@ -307,6 +307,23 @@ describe('Content manager | App | main', () => {
         pointer-events: none;
       }
 
+      .c6 {
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        -webkit-justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
+        height: 2rem;
+        width: 2rem;
+      }
+
       .c6 svg > g,
       .c6 svg path {
         fill: #8e8ea9;
@@ -421,8 +438,6 @@ describe('Content manager | App | main', () => {
         -webkit-box-align: center;
         -ms-flex-align: center;
         align-items: center;
-        height: 1.25rem;
-        width: 1rem;
       }
 
       .c12 {

packages/core/admin/admin/src/pages/SettingsPage/pages/Users/ListPage/tests/index.test.js

@@ -555,6 +555,20 @@ describe('ADMIN | Pages | USERS | ListPage', () => {
       }
 
       .c36 {
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        -webkit-justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
+        height: 2rem;
+        width: 2rem;
         border: none;
       }
 
@@ -744,6 +758,23 @@ describe('ADMIN | Pages | USERS | ListPage', () => {
         pointer-events: none;
       }
 
+      .c20 {
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        -webkit-justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
+        height: 2rem;
+        width: 2rem;
+      }
+
       .c20 svg > g,
       .c20 svg path {
         fill: #8e8ea9;

packages/core/admin/package.json

@@ -40,8 +40,8 @@
     "@fortawesome/react-fontawesome": "^0.1.14",
     "@strapi/babel-plugin-switch-ee-ce": "1.0.0",
     "@strapi/helper-plugin": "3.6.8",
-    "@strapi/icons": "0.0.1-alpha.36",
+    "@strapi/icons": "0.0.1-alpha.37",
-    "@strapi/parts": "0.0.1-alpha.36",
+    "@strapi/parts": "0.0.1-alpha.37",
     "@strapi/utils": "3.6.8",
     "axios": "^0.21.1",
     "babel-loader": "8.2.2",

packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/tests/__snapshots__/index.test.js.snap

@@ -192,6 +192,23 @@ exports[`<ContentTypeBuilderNav /> renders and matches the snapshot 1`] = `
   margin: 0;
 }
 
+.c6 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  height: 2rem;
+  width: 2rem;
+}
+
 .c6 svg > g,
 .c6 svg path {
   fill: #8e8ea9;
@@ -372,8 +389,6 @@ exports[`<ContentTypeBuilderNav /> renders and matches the snapshot 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  height: 1.25rem;
-  width: 1rem;
 }
 
 .c43 {

packages/core/content-type-builder/admin/src/pages/ListView/tests/__snapshots__/index.test.js.snap

@@ -550,6 +550,20 @@ exports[`<ListView /> renders and matches the snapshot 1`] = `
 }
 
 .c36 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  height: 2rem;
+  width: 2rem;
   border: none;
 }
 

packages/core/helper-plugin/package.json

@@ -57,8 +57,8 @@
     "@storybook/builder-webpack5": "^6.3.7",
     "@storybook/manager-webpack5": "^6.3.7",
     "@storybook/react": "^6.3.7",
-    "@strapi/icons": "0.0.1-alpha.36",
+    "@strapi/icons": "0.0.1-alpha.37",
-    "@strapi/parts": "0.0.1-alpha.36",
+    "@strapi/parts": "0.0.1-alpha.37",
     "babel-loader": "^8.2.2",
     "cross-env": "^7.0.3",
     "enzyme": "^3.8.0",

packages/core/upload/admin/src/components/AssetCard/tests/DocAssetCard.test.js

@@ -172,6 +172,9 @@ describe('DocAssetCard', () => {
 
       .c17 {
         margin-left: auto;
+        -webkit-flex-shrink: 0;
+        -ms-flex-negative: 0;
+        flex-shrink: 0;
       }
 
       .c20 {
@@ -280,6 +283,23 @@ describe('DocAssetCard', () => {
         pointer-events: none;
       }
 
+      .c7 {
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        -webkit-justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
+        height: 2rem;
+        width: 2rem;
+      }
+
       .c7 svg > g,
       .c7 svg path {
         fill: #8e8ea9;

packages/core/upload/admin/src/components/AssetCard/tests/ImageAssetCard.test.js

@@ -167,6 +167,9 @@ describe('ImageAssetCard', () => {
 
       .c16 {
         margin-left: auto;
+        -webkit-flex-shrink: 0;
+        -ms-flex-negative: 0;
+        flex-shrink: 0;
       }
 
       .c19 {
@@ -275,6 +278,23 @@ describe('ImageAssetCard', () => {
         pointer-events: none;
       }
 
+      .c7 {
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        -webkit-justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
+        height: 2rem;
+        width: 2rem;
+      }
+
       .c7 svg > g,
       .c7 svg path {
         fill: #8e8ea9;

packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/tests/PendingAssetStep.test.js

@@ -153,6 +153,23 @@ describe('PendingAssetStep', () => {
         pointer-events: none;
       }
 
+      .c6 {
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        -webkit-justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
+        height: 2rem;
+        width: 2rem;
+      }
+
       .c6 svg > g,
       .c6 svg path {
         fill: #8e8ea9;
@@ -566,6 +583,9 @@ describe('PendingAssetStep', () => {
 
       .c31 {
         margin-left: auto;
+        -webkit-flex-shrink: 0;
+        -ms-flex-negative: 0;
+        flex-shrink: 0;
       }
 
       .c34 {

packages/core/upload/admin/src/components/UploadAssetDialog/tests/UploadAssetDialog.test.js

@@ -134,6 +134,23 @@ describe('', () => {
         pointer-events: none;
       }
 
+      .c10 {
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        -webkit-justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
+        height: 2rem;
+        width: 2rem;
+      }
+
       .c10 svg > g,
       .c10 svg path {
         fill: #8e8ea9;

packages/core/upload/admin/src/pages/App/components/tests/ListView.test.js

@@ -285,6 +285,9 @@ describe('MediaLibrary / ListView', () => {
 
       .c12 {
         margin-left: auto;
+        -webkit-flex-shrink: 0;
+        -ms-flex-negative: 0;
+        flex-shrink: 0;
       }
 
       .c15 {

packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/index.test.js

@@ -92,6 +92,20 @@ describe('ADMIN | Pages | Settings | Advanced Settings', () => {
       }
 
       .c25 {
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        -webkit-justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
+        height: 2rem;
+        width: 2rem;
         border: none;
       }
 

packages/plugins/users-permissions/admin/src/pages/Roles/ListPage/tests/index.test.js

@@ -333,6 +333,23 @@ describe('Plugin | Users and Permissions | RoleListPage', () => {
         pointer-events: none;
       }
 
+      .c22 {
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: -ms-flexbox;
+        display: flex;
+        -webkit-align-items: center;
+        -webkit-box-align: center;
+        -ms-flex-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        -webkit-justify-content: center;
+        -ms-flex-pack: center;
+        justify-content: center;
+        height: 2rem;
+        width: 2rem;
+      }
+
       .c22 svg > g,
       .c22 svg path {
         fill: #8e8ea9;

yarn.lock

@@ -4921,15 +4921,15 @@
     resolve-from "^5.0.0"
     store2 "^2.12.0"
 
-"@strapi/icons@0.0.1-alpha.36":
+"@strapi/icons@0.0.1-alpha.37":
-  version "0.0.1-alpha.36"
+  version "0.0.1-alpha.37"
-  resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.36.tgz#0d9fffbb44efa4c08532f34ade9668b08fb321be"
+  resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.37.tgz#65131221835227958d020f7c9910ab471834a515"
-  integrity sha512-MkTjtHF16Bx6pcdklo1d1++vXkdymEeE61ZR4kuSslnU7aSW+KSyUePAvwzdUnm2ys/vqNMp99CH7SGtRH8g5w==
+  integrity sha512-tUTKqQ+qQrt7V0qwoT/mHmyP/b/O1zk087nb8pjx22sjTXSyXToZW3RkMATn2RNF9MKGrKAQRswphyFY6Os+Yg==
 
-"@strapi/parts@0.0.1-alpha.36":
+"@strapi/parts@0.0.1-alpha.37":
-  version "0.0.1-alpha.36"
+  version "0.0.1-alpha.37"
-  resolved "https://registry.yarnpkg.com/@strapi/parts/-/parts-0.0.1-alpha.36.tgz#7baa4cacad61cf583b9dc6aae5efd923f793f0a3"
+  resolved "https://registry.yarnpkg.com/@strapi/parts/-/parts-0.0.1-alpha.37.tgz#1746151b0c86014da089761eec192920f4921ab0"
-  integrity sha512-O8OEjP6kbXVydqM/NweRmbSwwnLSFlaXu60/UgOEjA+z+IbK6sbsqxiFFW7zUpmnvhRhlDjcBa+c3uhforDeqA==
+  integrity sha512-KdTJj/d0N3jfobmFkpy02pqnX4rsI5oUVIQ5EVSl9zV+8aagC76Txdb3tQdHFwVYTWHjpODoXpQqPduX+IvL0A==
   dependencies:
     "@internationalized/number" "^3.0.2"
     compute-scroll-into-view "^1.0.17"