From a594f4b96adf02fbb088767d6b11611e47675e1e Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Fri, 13 May 2022 17:46:57 +0200
Subject: [PATCH 01/21] fixed unique fields empty value

---
 .../EditViewDataManagerProvider/utils/cleanData.js          | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js
index dfb777237f..d6f6d6086d 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js
@@ -17,6 +17,12 @@ const cleanData = (retrievedData, currentSchema, componentsSchema) => {
       let cleanedData;
 
       switch (attrType) {
+        case 'uid':
+        case 'email':
+        case 'text':
+        case 'string':
+          cleanedData = value || null;
+          break;
         case 'json':
           cleanedData = JSON.parse(value);
           break;

From b6b500b75355f38e0e8401257bd57e48a642149c Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Wed, 18 May 2022 10:55:58 +0200
Subject: [PATCH 02/21] feedback fix: moved reset logic to components onChange

---
 .../utils/cleanData.js                        |   7 +-
 .../utils/tests/cleanData.test.js             | 185 ++++++++++++++++++
 .../components/InputUID/index.js              |   6 +-
 .../lib/src/components/GenericInput/index.js  |  16 +-
 4 files changed, 205 insertions(+), 9 deletions(-)
 create mode 100644 packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js

diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js
index d6f6d6086d..acad9034e3 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/cleanData.js
@@ -17,12 +17,6 @@ const cleanData = (retrievedData, currentSchema, componentsSchema) => {
       let cleanedData;
 
       switch (attrType) {
-        case 'uid':
-        case 'email':
-        case 'text':
-        case 'string':
-          cleanedData = value || null;
-          break;
         case 'json':
           cleanedData = JSON.parse(value);
           break;
@@ -63,6 +57,7 @@ const cleanData = (retrievedData, currentSchema, componentsSchema) => {
           } else {
             cleanedData = value ? recursiveCleanData(value, componentsSchema[component]) : value;
           }
+
           break;
         case 'dynamiczone':
           cleanedData = value.map(componentData => {
diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js
new file mode 100644
index 0000000000..6a7ae65ae9
--- /dev/null
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/utils/tests/cleanData.test.js
@@ -0,0 +1,185 @@
+import cleanData from '../cleanData';
+
+describe('CM || components || EditViewDataManagerProvider || utils || cleanData', () => {
+  test('should parse json value', () => {
+    const result = cleanData(
+      {
+        jsonTest: '{\n  "cat": "michka"\n}',
+      },
+      {
+        attributes: {
+          jsonTest: {
+            type: 'json',
+          },
+        },
+      },
+      {}
+    );
+
+    const expected = {
+      jsonTest: { cat: 'michka' },
+    };
+
+    expect(result).toEqual(expected);
+  });
+
+  test('should parse time value', () => {
+    const result = cleanData(
+      {
+        timeTest: '11:38',
+      },
+      {
+        attributes: {
+          timeTest: {
+            type: 'time',
+          },
+        },
+      },
+      {}
+    );
+
+    const expected = {
+      timeTest: '11:38:00',
+    };
+
+    expect(result).toEqual(expected);
+  });
+
+  test('should parse media value by multiple type', () => {
+    const result = cleanData(
+      {
+        singleMediaTest: {
+          id: 60,
+          name: 'cat.png',
+          url: '/uploads/cat.png',
+        },
+        multipleMediaTest: [
+          {
+            id: 52,
+            name: 'cat.png',
+            url: '/uploads/cat.png',
+          },
+          {
+            id: 58,
+            name: 'cat.png',
+            url: '/uploads/cat.png',
+          },
+        ],
+      },
+      {
+        attributes: {
+          singleMediaTest: {
+            type: 'media',
+            multiple: false,
+          },
+          multipleMediaTest: {
+            type: 'media',
+            multiple: true,
+          },
+        },
+      },
+      {}
+    );
+
+    const expected = {
+      singleMediaTest: 60,
+      multipleMediaTest: [
+        { id: 52, name: 'cat.png', url: '/uploads/cat.png' },
+        { id: 58, name: 'cat.png', url: '/uploads/cat.png' },
+      ],
+    };
+
+    expect(result).toEqual(expected);
+  });
+
+  test('should parse component values recursively', () => {
+    const result = cleanData(
+      {
+        singleComponentTest: {
+          name: 'single',
+          time: '11:38',
+        },
+        repComponentTest: [
+          {
+            name: 'rep1',
+            time: '11:39',
+          },
+          {
+            name: 'rep2',
+            time: '11:40',
+          },
+        ],
+      },
+      {
+        attributes: {
+          singleComponentTest: {
+            type: 'component',
+            repeatable: false,
+            component: 'basic.rep',
+          },
+          repComponentTest: {
+            type: 'component',
+            repeatable: true,
+            component: 'basic.rep',
+          },
+        },
+      },
+      {
+        'basic.rep': {
+          attributes: {
+            name: {
+              type: 'string',
+            },
+            time: {
+              type: 'time',
+            },
+          },
+        },
+      }
+    );
+
+    const expected = {
+      singleComponentTest: { name: 'single', time: '11:38:00' },
+      repComponentTest: [
+        { name: 'rep1', time: '11:39:00' },
+        { name: 'rep2', time: '11:40:00' },
+      ],
+    };
+
+    expect(result).toEqual(expected);
+  });
+
+  test('should parse dynamic zone values recursively', () => {
+    const result = cleanData(
+      {
+        dynamicZoneTest: [
+          {
+            __component: 'basic.rep',
+            time: '00:02',
+          },
+        ],
+      },
+      {
+        attributes: {
+          dynamicZoneTest: {
+            type: 'dynamiczone',
+            components: ['basic.rep'],
+          },
+        },
+      },
+      {
+        'basic.rep': {
+          attributes: {
+            time: {
+              type: 'time',
+            },
+          },
+        },
+      }
+    );
+
+    const expected = { dynamicZoneTest: [{ __component: 'basic.rep', time: '00:02:00' }] };
+
+    expect(result).toEqual(expected);
+  });
+});
diff --git a/packages/core/admin/admin/src/content-manager/components/InputUID/index.js b/packages/core/admin/admin/src/content-manager/components/InputUID/index.js
index 40b1128f2b..8e4fbc44b4 100644
--- a/packages/core/admin/admin/src/content-manager/components/InputUID/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/InputUID/index.js
@@ -179,7 +179,11 @@ const InputUID = ({
       setIsCustomized(true);
     }
 
-    onChange(e);
+    if (e.target.value === '') {
+      onChange({ target: { name, value: null, type: 'text' } });
+    } else {
+      onChange(e);
+    }
   };
 
   return (
diff --git a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
index 3c71ed74e0..5d770d070b 100644
--- a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
+++ b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
@@ -271,7 +271,13 @@ const GenericInput = ({
           id={name}
           hint={hint}
           name={name}
-          onChange={onChange}
+          onChange={event => {
+            if (event.target.value === '') {
+              onChange({ target: { name, value: null, type } });
+            } else {
+              onChange({ target: { name, value: event.target.value, type } });
+            }
+          }}
           placeholder={formattedPlaceholder}
           required={required}
           type="email"
@@ -292,7 +298,13 @@ const GenericInput = ({
           id={name}
           hint={hint}
           name={name}
-          onChange={onChange}
+          onChange={event => {
+            if (event.target.value === '') {
+              onChange({ target: { name, value: null, type } });
+            } else {
+              onChange({ target: { name, value: event.target.value, type } });
+            }
+          }}
           placeholder={formattedPlaceholder}
           required={required}
           type="text"

From 681b21786c50422d8ad4d142aa1c3a217a1bfc98 Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Mon, 23 May 2022 18:23:56 +0200
Subject: [PATCH 03/21] feedback fix: moving the logic to
 EditViewDataManagerProvider

---
 .../components/EditViewDataManagerProvider/index.js       | 8 ++++++++
 .../src/content-manager/components/InputUID/index.js      | 6 +-----
 .../lib/src/components/GenericInput/index.js              | 8 +-------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
index c8dc356f04..cf86dfdd72 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
@@ -239,6 +239,14 @@ const EditViewDataManagerProvider = ({
         inputValue = null;
       }
 
+      // Allow to reset text, string, email, uid
+      if (
+        (type === 'text' || type === 'string' || type === 'email' || type === 'uid') &&
+        value === ''
+      ) {
+        inputValue = null;
+      }
+
       if (type === 'password' && !value) {
         dispatch({
           type: 'REMOVE_PASSWORD_FIELD',
diff --git a/packages/core/admin/admin/src/content-manager/components/InputUID/index.js b/packages/core/admin/admin/src/content-manager/components/InputUID/index.js
index 8e4fbc44b4..40b1128f2b 100644
--- a/packages/core/admin/admin/src/content-manager/components/InputUID/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/InputUID/index.js
@@ -179,11 +179,7 @@ const InputUID = ({
       setIsCustomized(true);
     }
 
-    if (e.target.value === '') {
-      onChange({ target: { name, value: null, type: 'text' } });
-    } else {
-      onChange(e);
-    }
+    onChange(e);
   };
 
   return (
diff --git a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
index 5d770d070b..16c869c15d 100644
--- a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
+++ b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
@@ -271,13 +271,7 @@ const GenericInput = ({
           id={name}
           hint={hint}
           name={name}
-          onChange={event => {
-            if (event.target.value === '') {
-              onChange({ target: { name, value: null, type } });
-            } else {
-              onChange({ target: { name, value: event.target.value, type } });
-            }
-          }}
+          onChange={onChange}
           placeholder={formattedPlaceholder}
           required={required}
           type="email"

From aff13a0d60dbe6969d9c55e1badf0b4540dce684 Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Wed, 25 May 2022 14:59:19 +0200
Subject: [PATCH 04/21] feedback fix - number/select empty value checked in
 EditViewDataManagerProvider

---
 .../EditViewDataManagerProvider/index.js      | 29 +++++++------------
 .../lib/src/components/GenericInput/index.js  | 16 ++--------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
index cf86dfdd72..4aef4f8544 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
@@ -233,17 +233,20 @@ const EditViewDataManagerProvider = ({
     ({ target: { name, value, type } }, shouldSetInitialValue = false) => {
       let inputValue = value;
 
-      // Empty string is not a valid date,
-      // Set the date to null when it's empty
-      if (type === 'date' && value === '') {
+      // Allow to reset text, string, email, uid, select/enum, date
+      if (
+        (type === 'text' ||
+          type === 'string' ||
+          type === 'email' ||
+          type === 'uid' ||
+          type === 'select' ||
+          type === 'select-one') &&
+        value === ''
+      ) {
         inputValue = null;
       }
 
-      // Allow to reset text, string, email, uid
-      if (
-        (type === 'text' || type === 'string' || type === 'email' || type === 'uid') &&
-        value === ''
-      ) {
+      if (type === 'number' && !value) {
         inputValue = null;
       }
 
@@ -256,16 +259,6 @@ const EditViewDataManagerProvider = ({
         return;
       }
 
-      // Allow to reset enum
-      if (type === 'select-one' && value === '') {
-        inputValue = null;
-      }
-
-      // Allow to reset number input
-      if (type === 'number' && value === '') {
-        inputValue = null;
-      }
-
       dispatch({
         type: 'ON_CHANGE',
         keys: name.split('.'),
diff --git a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
index 16c869c15d..3f8345987c 100644
--- a/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
+++ b/packages/core/helper-plugin/lib/src/components/GenericInput/index.js
@@ -250,9 +250,7 @@ const GenericInput = ({
           id={name}
           hint={hint}
           name={name}
-          onValueChange={value => {
-            onChange({ target: { name, value: value ?? null, type } });
-          }}
+          onValueChange={value => onChange({ target: { name, value, type } })}
           placeholder={formattedPlaceholder}
           required={required}
           step={step}
@@ -292,13 +290,7 @@ const GenericInput = ({
           id={name}
           hint={hint}
           name={name}
-          onChange={event => {
-            if (event.target.value === '') {
-              onChange({ target: { name, value: null, type } });
-            } else {
-              onChange({ target: { name, value: event.target.value, type } });
-            }
-          }}
+          onChange={onChange}
           placeholder={formattedPlaceholder}
           required={required}
           type="text"
@@ -358,9 +350,7 @@ const GenericInput = ({
           id={name}
           hint={hint}
           name={name}
-          onChange={value => {
-            onChange({ target: { name, value: value === '' ? null : value, type: 'select' } });
-          }}
+          onChange={value => onChange({ target: { name, value, type: 'select' } })}
           placeholder={formattedPlaceholder}
           required={required}
           value={value}

From f723fa36c24116af1a4d5666c20af20d098f7642 Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Fri, 3 Jun 2022 17:55:25 +0200
Subject: [PATCH 05/21] fixed GenericInput tests

---
 .../lib/src/components/GenericInput/tests/index.test.js     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js b/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js
index e90125c2ea..e143e96a52 100644
--- a/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js
+++ b/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js
@@ -111,13 +111,15 @@ describe('GenericInput', () => {
       });
     });
 
-    test('does call onChange callback with null on empty value', () => {
+    test('does call onChange callback with undefined on empty value', () => {
       const spy = jest.fn();
       const { input } = setupNumber({ value: 1, onChange: spy });
 
       fireEvent.change(input, { target: { value: '' } });
 
-      expect(spy).toHaveBeenCalledWith({ target: { name: 'number', type: 'number', value: null } });
+      expect(spy).toHaveBeenCalledWith({
+        target: { name: 'number', type: 'number', value: undefined },
+      });
     });
   });
 });

From 5cbaf243365b49c4d9612ca6bcc89035508afed8 Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Thu, 23 Jun 2022 17:16:57 +0200
Subject: [PATCH 06/21] feedback improvements handleChange

---
 .../content-types/aanother-test/schema.json   | 41 +++++++++++++++++++
 .../controllers/aanother-test.js              |  9 ++++
 .../api/aanother-test/routes/aanother-test.js |  9 ++++
 .../aanother-test/services/aanother-test.js   |  9 ++++
 .../EditViewDataManagerProvider/index.js      | 15 ++-----
 .../GenericInput/tests/index.test.js          | 11 -----
 6 files changed, 72 insertions(+), 22 deletions(-)
 create mode 100644 examples/getstarted/src/api/aanother-test/content-types/aanother-test/schema.json
 create mode 100644 examples/getstarted/src/api/aanother-test/controllers/aanother-test.js
 create mode 100644 examples/getstarted/src/api/aanother-test/routes/aanother-test.js
 create mode 100644 examples/getstarted/src/api/aanother-test/services/aanother-test.js

diff --git a/examples/getstarted/src/api/aanother-test/content-types/aanother-test/schema.json b/examples/getstarted/src/api/aanother-test/content-types/aanother-test/schema.json
new file mode 100644
index 0000000000..9e6b47798f
--- /dev/null
+++ b/examples/getstarted/src/api/aanother-test/content-types/aanother-test/schema.json
@@ -0,0 +1,41 @@
+{
+  "kind": "collectionType",
+  "collectionName": "aanother_tests",
+  "info": {
+    "singularName": "aanother-test",
+    "pluralName": "aanother-tests",
+    "displayName": "Aanother test"
+  },
+  "options": {
+    "draftAndPublish": true
+  },
+  "pluginOptions": {},
+  "attributes": {
+    "text": {
+      "type": "string",
+      "unique": true
+    },
+    "email": {
+      "type": "email",
+      "unique": true
+    },
+    "number": {
+      "unique": true,
+      "type": "integer"
+    },
+    "uid": {
+      "type": "uid"
+    },
+    "date": {
+      "unique": true,
+      "type": "date"
+    },
+    "enum": {
+      "type": "enumeration",
+      "enum": [
+        "this",
+        "or that"
+      ]
+    }
+  }
+}
diff --git a/examples/getstarted/src/api/aanother-test/controllers/aanother-test.js b/examples/getstarted/src/api/aanother-test/controllers/aanother-test.js
new file mode 100644
index 0000000000..bb4eb478fe
--- /dev/null
+++ b/examples/getstarted/src/api/aanother-test/controllers/aanother-test.js
@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ *  aanother-test controller
+ */
+
+const { createCoreController } = require('@strapi/strapi').factories;
+
+module.exports = createCoreController('api::aanother-test.aanother-test');
diff --git a/examples/getstarted/src/api/aanother-test/routes/aanother-test.js b/examples/getstarted/src/api/aanother-test/routes/aanother-test.js
new file mode 100644
index 0000000000..3262bfc2b4
--- /dev/null
+++ b/examples/getstarted/src/api/aanother-test/routes/aanother-test.js
@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * aanother-test router.
+ */
+
+const { createCoreRouter } = require('@strapi/strapi').factories;
+
+module.exports = createCoreRouter('api::aanother-test.aanother-test');
diff --git a/examples/getstarted/src/api/aanother-test/services/aanother-test.js b/examples/getstarted/src/api/aanother-test/services/aanother-test.js
new file mode 100644
index 0000000000..fe64fe4834
--- /dev/null
+++ b/examples/getstarted/src/api/aanother-test/services/aanother-test.js
@@ -0,0 +1,9 @@
+'use strict';
+
+/**
+ * aanother-test service.
+ */
+
+const { createCoreService } = require('@strapi/strapi').factories;
+
+module.exports = createCoreService('api::aanother-test.aanother-test');
diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
index 4aef4f8544..e2be985c63 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
@@ -235,21 +235,12 @@ const EditViewDataManagerProvider = ({
 
       // Allow to reset text, string, email, uid, select/enum, date
       if (
-        (type === 'text' ||
-          type === 'string' ||
-          type === 'email' ||
-          type === 'uid' ||
-          type === 'select' ||
-          type === 'select-one') &&
-        value === ''
+        ['text', 'string', 'email', 'uid', 'select', 'select-one', 'number'].includes(type) &&
+        !value
       ) {
         inputValue = null;
       }
 
-      if (type === 'number' && !value) {
-        inputValue = null;
-      }
-
       if (type === 'password' && !value) {
         dispatch({
           type: 'REMOVE_PASSWORD_FIELD',
@@ -259,6 +250,8 @@ const EditViewDataManagerProvider = ({
         return;
       }
 
+      console.log({ name, inputValue });
+
       dispatch({
         type: 'ON_CHANGE',
         keys: name.split('.'),
diff --git a/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js b/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js
index e143e96a52..8498024144 100644
--- a/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js
+++ b/packages/core/helper-plugin/lib/src/components/GenericInput/tests/index.test.js
@@ -110,16 +110,5 @@ describe('GenericInput', () => {
         target: { name: 'number', type: 'number', value: 0 },
       });
     });
-
-    test('does call onChange callback with undefined on empty value', () => {
-      const spy = jest.fn();
-      const { input } = setupNumber({ value: 1, onChange: spy });
-
-      fireEvent.change(input, { target: { value: '' } });
-
-      expect(spy).toHaveBeenCalledWith({
-        target: { name: 'number', type: 'number', value: undefined },
-      });
-    });
   });
 });

From 0902c9ab78a5c55bee506859c4a4563c40c666d7 Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Thu, 23 Jun 2022 17:33:15 +0200
Subject: [PATCH 07/21] clean up log

---
 .../components/EditViewDataManagerProvider/index.js             | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
index e2be985c63..c30df213bb 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
@@ -250,8 +250,6 @@ const EditViewDataManagerProvider = ({
         return;
       }
 
-      console.log({ name, inputValue });
-
       dispatch({
         type: 'ON_CHANGE',
         keys: name.split('.'),

From c943009ba10eea4259e49d375777dee1adc52e32 Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Thu, 23 Jun 2022 17:54:08 +0200
Subject: [PATCH 08/21] clean up content type test data

---
 .../content-types/aanother-test/schema.json   | 41 -------------------
 .../controllers/aanother-test.js              |  9 ----
 .../api/aanother-test/routes/aanother-test.js |  9 ----
 .../aanother-test/services/aanother-test.js   |  9 ----
 4 files changed, 68 deletions(-)
 delete mode 100644 examples/getstarted/src/api/aanother-test/content-types/aanother-test/schema.json
 delete mode 100644 examples/getstarted/src/api/aanother-test/controllers/aanother-test.js
 delete mode 100644 examples/getstarted/src/api/aanother-test/routes/aanother-test.js
 delete mode 100644 examples/getstarted/src/api/aanother-test/services/aanother-test.js

diff --git a/examples/getstarted/src/api/aanother-test/content-types/aanother-test/schema.json b/examples/getstarted/src/api/aanother-test/content-types/aanother-test/schema.json
deleted file mode 100644
index 9e6b47798f..0000000000
--- a/examples/getstarted/src/api/aanother-test/content-types/aanother-test/schema.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "kind": "collectionType",
-  "collectionName": "aanother_tests",
-  "info": {
-    "singularName": "aanother-test",
-    "pluralName": "aanother-tests",
-    "displayName": "Aanother test"
-  },
-  "options": {
-    "draftAndPublish": true
-  },
-  "pluginOptions": {},
-  "attributes": {
-    "text": {
-      "type": "string",
-      "unique": true
-    },
-    "email": {
-      "type": "email",
-      "unique": true
-    },
-    "number": {
-      "unique": true,
-      "type": "integer"
-    },
-    "uid": {
-      "type": "uid"
-    },
-    "date": {
-      "unique": true,
-      "type": "date"
-    },
-    "enum": {
-      "type": "enumeration",
-      "enum": [
-        "this",
-        "or that"
-      ]
-    }
-  }
-}
diff --git a/examples/getstarted/src/api/aanother-test/controllers/aanother-test.js b/examples/getstarted/src/api/aanother-test/controllers/aanother-test.js
deleted file mode 100644
index bb4eb478fe..0000000000
--- a/examples/getstarted/src/api/aanother-test/controllers/aanother-test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-/**
- *  aanother-test controller
- */
-
-const { createCoreController } = require('@strapi/strapi').factories;
-
-module.exports = createCoreController('api::aanother-test.aanother-test');
diff --git a/examples/getstarted/src/api/aanother-test/routes/aanother-test.js b/examples/getstarted/src/api/aanother-test/routes/aanother-test.js
deleted file mode 100644
index 3262bfc2b4..0000000000
--- a/examples/getstarted/src/api/aanother-test/routes/aanother-test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-/**
- * aanother-test router.
- */
-
-const { createCoreRouter } = require('@strapi/strapi').factories;
-
-module.exports = createCoreRouter('api::aanother-test.aanother-test');
diff --git a/examples/getstarted/src/api/aanother-test/services/aanother-test.js b/examples/getstarted/src/api/aanother-test/services/aanother-test.js
deleted file mode 100644
index fe64fe4834..0000000000
--- a/examples/getstarted/src/api/aanother-test/services/aanother-test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-/**
- * aanother-test service.
- */
-
-const { createCoreService } = require('@strapi/strapi').factories;
-
-module.exports = createCoreService('api::aanother-test.aanother-test');

From 2ba1b0982b8da5af2abc4b6ee5f5b0decae938b3 Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Fri, 24 Jun 2022 09:34:17 +0200
Subject: [PATCH 09/21] updated handleChange comment

---
 .../components/EditViewDataManagerProvider/index.js             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
index c30df213bb..ae8d5dfeeb 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
@@ -233,7 +233,7 @@ const EditViewDataManagerProvider = ({
     ({ target: { name, value, type } }, shouldSetInitialValue = false) => {
       let inputValue = value;
 
-      // Allow to reset text, string, email, uid, select/enum, date
+      // Allow to reset text, email, uid, select/enum, and number
       if (
         ['text', 'string', 'email', 'uid', 'select', 'select-one', 'number'].includes(type) &&
         !value

From 3fba8ec9b6e98c0e6ced01ea0eb77cb093ca24fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A3=9E?= <yangfei86@vip.qq.com>
Date: Mon, 13 Jun 2022 16:53:02 +0800
Subject: [PATCH 10/21] fix: content-types builder search button tooltip

---
 .../admin/src/components/ContentTypeBuilderNav/index.js      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js
index 1f90201d36..9950c0d741 100644
--- a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js
+++ b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js
@@ -36,7 +36,10 @@ const ContentTypeBuilderNav = () => {
           id: `${getTrad('plugin.name')}`,
           defaultMessage: 'Content-Types Builder',
         })}
-        searchLabel="Search..."
+        searchLabel={formatMessage({
+          id: 'content-manager.components.LeftMenu.Search.label',
+          defaultMessage: 'Search for a content type',
+        })}
       />
       <SubNavSections>
         {menu.map(section => {

From a366392f67ebebedff67fef31d6c9276f982eaaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A3=9E?= <yangfei86@vip.qq.com>
Date: Tue, 28 Jun 2022 11:39:07 +0800
Subject: [PATCH 11/21] merge pr #13536

---
 .../admin/admin/src/content-manager/pages/ListView/index.js   | 4 ++--
 packages/core/admin/admin/src/translations/en.json            | 1 +
 packages/core/admin/admin/src/translations/zh-Hans.json       | 2 +-
 .../helper-plugin/lib/src/components/SearchURLQuery/index.js  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js
index 8fc10adce9..9c7a70769e 100644
--- a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js
+++ b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js
@@ -309,8 +309,8 @@ function ListView({
                     { target: headerLayoutTitle }
                   )}
                   placeholder={formatMessage({
-                    id: 'app.component.search.placeholder',
-                    defaultMessage: 'Search...',
+                    id: 'global.search',
+                    defaultMessage: 'Search',
                   })}
                   trackedEvent="didSearch"
                 />
diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json
index a5f7210f95..696af5c8fb 100644
--- a/packages/core/admin/admin/src/translations/en.json
+++ b/packages/core/admin/admin/src/translations/en.json
@@ -679,6 +679,7 @@
   "content-manager.apiError.This attribute must be unique": "{field} must be unique",
   "form.button.continue": "Continue",
   "form.button.done": "Done",
+  "global.search": "Search",
   "global.actions": "Actions",
   "global.back": "Back",
   "global.change-password": "Change password",
diff --git a/packages/core/admin/admin/src/translations/zh-Hans.json b/packages/core/admin/admin/src/translations/zh-Hans.json
index 8143631071..88a6e7d27a 100644
--- a/packages/core/admin/admin/src/translations/zh-Hans.json
+++ b/packages/core/admin/admin/src/translations/zh-Hans.json
@@ -604,7 +604,7 @@
   "content-type-builder.menu.section.single-types.name": "单一类型",
   "content-type-builder.plugin.name": "模型构建器",
   "form.button.done": "完成",
-  "global.Search": "搜索",
+  "global.search": "搜索",
   "global.back": "返回",
   "global.content-manager": "内容管理",
   "global.delete-target": "删除 {target}",
diff --git a/packages/core/helper-plugin/lib/src/components/SearchURLQuery/index.js b/packages/core/helper-plugin/lib/src/components/SearchURLQuery/index.js
index 0dcb4c94ac..cdecfc4983 100644
--- a/packages/core/helper-plugin/lib/src/components/SearchURLQuery/index.js
+++ b/packages/core/helper-plugin/lib/src/components/SearchURLQuery/index.js
@@ -71,7 +71,7 @@ const SearchURLQuery = ({ label, placeholder, trackedEvent }) => {
     <IconButton
       ref={iconButtonRef}
       icon={<Icon as={SearchIcon} color="neutral800" />}
-      label="Search"
+      label={formatMessage({ id: 'global.search', defaultMessage: 'Search' })}
       onClick={handleToggle}
     />
   );

From 6099fa6570010d916833b928b376da6f1fed5f0a Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Wed, 29 Jun 2022 15:45:02 +0200
Subject: [PATCH 12/21] fixed textarea

---
 .../components/EditViewDataManagerProvider/index.js       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
index ae8d5dfeeb..ff5eaf9d7e 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
@@ -233,9 +233,13 @@ const EditViewDataManagerProvider = ({
     ({ target: { name, value, type } }, shouldSetInitialValue = false) => {
       let inputValue = value;
 
-      // Allow to reset text, email, uid, select/enum, and number
+      console.log({ type, name });
+
+      // Allow to reset text, textarea, email, uid, select/enum, and number
       if (
-        ['text', 'string', 'email', 'uid', 'select', 'select-one', 'number'].includes(type) &&
+        ['text', 'textarea', 'string', 'email', 'uid', 'select', 'select-one', 'number'].includes(
+          type
+        ) &&
         !value
       ) {
         inputValue = null;

From 7ff525d56e9b036a54b3bad2ad5421fa8bd2cdc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 09:05:48 +0000
Subject: [PATCH 13/21] Bump @storybook/addon-links from 6.4.10 to 6.5.9

Bumps [@storybook/addon-links](https://github.com/storybookjs/storybook/tree/HEAD/addons/links) from 6.4.10 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.9/addons/links)

---
updated-dependencies:
- dependency-name: "@storybook/addon-links"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/core/helper-plugin/package.json |  2 +-
 yarn.lock                                | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json
index 389c261a7d..5d4d222375 100644
--- a/packages/core/helper-plugin/package.json
+++ b/packages/core/helper-plugin/package.json
@@ -70,7 +70,7 @@
     "@babel/runtime": "7.16.7",
     "@storybook/addon-actions": "6.4.10",
     "@storybook/addon-essentials": "6.4.10",
-    "@storybook/addon-links": "6.4.10",
+    "@storybook/addon-links": "6.5.9",
     "@storybook/builder-webpack5": "6.4.10",
     "@storybook/manager-webpack5": "6.4.10",
     "@storybook/react": "^6.3.7",
diff --git a/yarn.lock b/yarn.lock
index 0ffeca2b61..edfb5d5b93 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4084,16 +4084,16 @@
     regenerator-runtime "^0.13.7"
     ts-dedent "^2.0.0"
 
-"@storybook/addon-links@6.4.10":
-  version "6.4.10"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.4.10.tgz#a35ff6551965d341a12f7796ca11a46902135a1a"
-  integrity sha512-5x7Rem5CchFCoKuxDhD7BaM8axVlDG/0rjkpZZZdCtmHtobWXA8Fn/72WX4keEJgl9Z+WV4BTYZpeSxV3lC2RA==
+"@storybook/addon-links@6.5.9":
+  version "6.5.9"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-6.5.9.tgz#91cbca0c044796badf2498723fdd10dacea5748b"
+  integrity sha512-4BYC7pkxL3NLRnEgTA9jpIkObQKril+XFj1WtmY/lngF90vvK0Kc/TtvTA2/5tSgrHfxEuPevIdxMIyLJ4ejWQ==
   dependencies:
-    "@storybook/addons" "6.4.10"
-    "@storybook/client-logger" "6.4.10"
-    "@storybook/core-events" "6.4.10"
-    "@storybook/csf" "0.0.2--canary.87bc651.0"
-    "@storybook/router" "6.4.10"
+    "@storybook/addons" "6.5.9"
+    "@storybook/client-logger" "6.5.9"
+    "@storybook/core-events" "6.5.9"
+    "@storybook/csf" "0.0.2--canary.4566f4d.1"
+    "@storybook/router" "6.5.9"
     "@types/qs" "^6.9.5"
     core-js "^3.8.2"
     global "^4.4.0"

From 2bda205b18e6cfd21b881213a0c24ebabe2bcffd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 09:11:41 +0000
Subject: [PATCH 14/21] Bump cropperjs from 1.5.11 to 1.5.12

Bumps [cropperjs](https://github.com/fengyuanchen/cropperjs) from 1.5.11 to 1.5.12.
- [Release notes](https://github.com/fengyuanchen/cropperjs/releases)
- [Changelog](https://github.com/fengyuanchen/cropperjs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/fengyuanchen/cropperjs/compare/v1.5.11...v1.5.12)

---
updated-dependencies:
- dependency-name: cropperjs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/core/upload/package.json | 2 +-
 yarn.lock                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json
index c1d6175e3c..728ef23b0e 100644
--- a/packages/core/upload/package.json
+++ b/packages/core/upload/package.json
@@ -27,7 +27,7 @@
     "@strapi/provider-upload-local": "4.2.2",
     "@strapi/utils": "4.2.2",
     "byte-size": "7.0.1",
-    "cropperjs": "1.5.11",
+    "cropperjs": "1.5.12",
     "fs-extra": "10.0.0",
     "immer": "9.0.6",
     "koa-range": "0.3.0",
diff --git a/yarn.lock b/yarn.lock
index 0ffeca2b61..be61d2cd66 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9603,10 +9603,10 @@ cron-parser@^3.1.0:
     is-nan "^1.3.2"
     luxon "^1.26.0"
 
-cropperjs@1.5.11:
-  version "1.5.11"
-  resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.5.11.tgz#502ae6d8ca098b124de6813601cca70015879fc0"
-  integrity sha512-SJUeBBhtNBnnn+UrLKluhFRIXLJn7XFPv8QN1j49X5t+BIMwkgvDev541f96bmu8Xe0TgCx3gON22KmY/VddaA==
+cropperjs@1.5.12:
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.5.12.tgz#d9c0db2bfb8c0d769d51739e8f916bbc44e10f50"
+  integrity sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==
 
 cross-env@7.0.3, cross-env@^7.0.3:
   version "7.0.3"

From 81c963a9fdc27d69a96416e5bfbe5c7c289967b6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jun 2022 13:25:34 +0000
Subject: [PATCH 15/21] Bump inquirer from 8.2.0 to 8.2.4

Bumps [inquirer](https://github.com/SBoudrias/Inquirer.js) from 8.2.0 to 8.2.4.
- [Release notes](https://github.com/SBoudrias/Inquirer.js/releases)
- [Commits](https://github.com/SBoudrias/Inquirer.js/compare/inquirer@8.2.0...inquirer@8.2.4)

---
updated-dependencies:
- dependency-name: inquirer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/cli/create-strapi-app/package.json   |  2 +-
 .../cli/create-strapi-starter/package.json    |  2 +-
 packages/core/strapi/package.json             |  2 +-
 packages/generators/app/package.json          |  2 +-
 yarn.lock                                     | 33 ++++---------------
 5 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json
index 6aedaae508..6a390b6842 100644
--- a/packages/cli/create-strapi-app/package.json
+++ b/packages/cli/create-strapi-app/package.json
@@ -40,7 +40,7 @@
   "dependencies": {
     "@strapi/generate-new": "4.2.2",
     "commander": "6.1.0",
-    "inquirer": "8.2.0"
+    "inquirer": "8.2.4"
   },
   "engines": {
     "node": ">=14.19.1 <=16.x.x",
diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json
index 57646fa6e3..2dee086536 100644
--- a/packages/cli/create-strapi-starter/package.json
+++ b/packages/cli/create-strapi-starter/package.json
@@ -44,7 +44,7 @@
     "commander": "7.1.0",
     "execa": "5.1.1",
     "fs-extra": "10.0.0",
-    "inquirer": "8.2.0",
+    "inquirer": "8.2.4",
     "ora": "5.4.0"
   },
   "engines": {
diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json
index 2d59c80650..4bc7e7e2e3 100644
--- a/packages/core/strapi/package.json
+++ b/packages/core/strapi/package.json
@@ -105,7 +105,7 @@
     "fs-extra": "10.0.0",
     "glob": "7.2.0",
     "http-errors": "1.8.1",
-    "inquirer": "8.2.0",
+    "inquirer": "8.2.4",
     "is-docker": "2.2.1",
     "koa": "2.13.3",
     "koa-body": "4.2.0",
diff --git a/packages/generators/app/package.json b/packages/generators/app/package.json
index a4721daec7..a8b8a3e5bd 100644
--- a/packages/generators/app/package.json
+++ b/packages/generators/app/package.json
@@ -40,7 +40,7 @@
     "chalk": "^4.1.1",
     "execa": "^1.0.0",
     "fs-extra": "10.0.0",
-    "inquirer": "8.2.0",
+    "inquirer": "8.2.4",
     "lodash": "4.17.21",
     "node-fetch": "^2.6.1",
     "node-machine-id": "^1.1.10",
diff --git a/yarn.lock b/yarn.lock
index 03fa1fde3e..8203ab79f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13646,10 +13646,10 @@ inline-style-parser@0.1.1:
   resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
   integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
 
-inquirer@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.0.tgz#f44f008dd344bbfc4b30031f45d984e034a3ac3a"
-  integrity sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==
+inquirer@8.2.4, inquirer@^8.2.0:
+  version "8.2.4"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.4.tgz#ddbfe86ca2f67649a67daa6f1051c128f684f0b4"
+  integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==
   dependencies:
     ansi-escapes "^4.2.1"
     chalk "^4.1.1"
@@ -13661,10 +13661,11 @@ inquirer@8.2.0:
     mute-stream "0.0.8"
     ora "^5.4.1"
     run-async "^2.4.0"
-    rxjs "^7.2.0"
+    rxjs "^7.5.5"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
+    wrap-ansi "^7.0.0"
 
 inquirer@^7.1.0, inquirer@^7.3.3:
   version "7.3.3"
@@ -13685,26 +13686,6 @@ inquirer@^7.1.0, inquirer@^7.3.3:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-inquirer@^8.2.0:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.2.tgz#1310517a87a0814d25336c78a20b44c3d9b7629d"
-  integrity sha512-pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.1"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.21"
-    mute-stream "0.0.8"
-    ora "^5.4.1"
-    run-async "^2.4.0"
-    rxjs "^7.5.5"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-
 internal-slot@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
@@ -20658,7 +20639,7 @@ rxjs@^6.4.0, rxjs@^6.6.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.2.0, rxjs@^7.5.1, rxjs@^7.5.5:
+rxjs@^7.5.1, rxjs@^7.5.5:
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
   integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==

From 02d8b54a09c3b7c36a43fe1acbfcd17e073f5a2d Mon Sep 17 00:00:00 2001
From: ronronscelestes <julie.plantey@gmail.com>
Date: Thu, 30 Jun 2022 16:26:28 +0200
Subject: [PATCH 16/21] fixed log

---
 .../components/EditViewDataManagerProvider/index.js             | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
index ff5eaf9d7e..edb52a3e9e 100644
--- a/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/EditViewDataManagerProvider/index.js
@@ -233,8 +233,6 @@ const EditViewDataManagerProvider = ({
     ({ target: { name, value, type } }, shouldSetInitialValue = false) => {
       let inputValue = value;
 
-      console.log({ type, name });
-
       // Allow to reset text, textarea, email, uid, select/enum, and number
       if (
         ['text', 'textarea', 'string', 'email', 'uid', 'select', 'select-one', 'number'].includes(

From 9a0f96c0681b618c129708efd410e8bb04998cad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fei=20Yang=20=28=E6=9D=A8=E9=A3=9E=29?=
 <yangfei86@vip.qq.com>
Date: Thu, 30 Jun 2022 22:46:11 +0800
Subject: [PATCH 17/21] Update
 packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js

---
 .../admin/src/components/ContentTypeBuilderNav/index.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js
index 9950c0d741..945781fe98 100644
--- a/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js
+++ b/packages/core/content-type-builder/admin/src/components/ContentTypeBuilderNav/index.js
@@ -37,8 +37,8 @@ const ContentTypeBuilderNav = () => {
           defaultMessage: 'Content-Types Builder',
         })}
         searchLabel={formatMessage({
-          id: 'content-manager.components.LeftMenu.Search.label',
-          defaultMessage: 'Search for a content type',
+          id: 'global.search',
+          defaultMessage: 'Search',
         })}
       />
       <SubNavSections>

From 81b1c16a15ec56d8130c85def3c4edc3172d4679 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Jul 2022 11:26:59 +0000
Subject: [PATCH 18/21] Bump @storybook/builder-webpack5 from 6.4.10 to 6.5.9

Bumps [@storybook/builder-webpack5](https://github.com/storybookjs/storybook/tree/HEAD/lib/core) from 6.4.10 to 6.5.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/v6.5.9/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.5.9/lib/core)

---
updated-dependencies:
- dependency-name: "@storybook/builder-webpack5"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/core/helper-plugin/package.json |   2 +-
 yarn.lock                                | 113 ++++++++---------------
 2 files changed, 37 insertions(+), 78 deletions(-)

diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json
index 5d4d222375..5b319b34ae 100644
--- a/packages/core/helper-plugin/package.json
+++ b/packages/core/helper-plugin/package.json
@@ -71,7 +71,7 @@
     "@storybook/addon-actions": "6.4.10",
     "@storybook/addon-essentials": "6.4.10",
     "@storybook/addon-links": "6.5.9",
-    "@storybook/builder-webpack5": "6.4.10",
+    "@storybook/builder-webpack5": "6.5.9",
     "@storybook/manager-webpack5": "6.4.10",
     "@storybook/react": "^6.3.7",
     "@strapi/design-system": "1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 9df83d15ff..d737a55b99 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -170,28 +170,7 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.9.tgz#6bae81a06d95f4d0dec5bb9d74bbc1f58babdcfe"
-  integrity sha512-5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.9"
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helpers" "^7.17.9"
-    "@babel/parser" "^7.17.9"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.9"
-    "@babel/types" "^7.17.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
-"@babel/core@^7.12.10":
+"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.7.5":
   version "7.18.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.5.tgz#c597fa680e58d571c28dda9827669c78cdd7f000"
   integrity sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==
@@ -254,7 +233,7 @@
     "@babel/helper-explode-assignable-expression" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.7":
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46"
   integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==
@@ -530,7 +509,7 @@
     "@babel/traverse" "^7.18.2"
     "@babel/types" "^7.18.2"
 
-"@babel/helpers@^7.16.7", "@babel/helpers@^7.17.9":
+"@babel/helpers@^7.16.7":
   version "7.17.9"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a"
   integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==
@@ -4370,50 +4349,31 @@
     webpack-hot-middleware "^2.25.1"
     webpack-virtual-modules "^0.2.2"
 
-"@storybook/builder-webpack5@6.4.10":
-  version "6.4.10"
-  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.4.10.tgz#3ffe16892e228e2abef84285bb2b027b558e7087"
-  integrity sha512-REh1gtSCDlGtpQRcA1gAn0HBcxp6WVdFWzMbJi8R8NtUuwKAnzTAlunb/mrnq6szLq7LMT5T/pcUEvhJMOh2ng==
+"@storybook/builder-webpack5@6.5.9":
+  version "6.5.9"
+  resolved "https://registry.yarnpkg.com/@storybook/builder-webpack5/-/builder-webpack5-6.5.9.tgz#30b4e08622daff104bcccd015d3ee7902f99dd99"
+  integrity sha512-NUVZ4Qci6HWPuoH8U/zQkdBO5soGgu7QYrGC/LWU0tRfmmZxkjr7IUU14ppDpGPYgx3r7jkaQI1J/E1YEmSCWQ==
   dependencies:
     "@babel/core" "^7.12.10"
-    "@babel/plugin-proposal-class-properties" "^7.12.1"
-    "@babel/plugin-proposal-decorators" "^7.12.12"
-    "@babel/plugin-proposal-export-default-from" "^7.12.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
-    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
-    "@babel/plugin-proposal-private-methods" "^7.12.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.12"
-    "@babel/plugin-transform-classes" "^7.12.1"
-    "@babel/plugin-transform-destructuring" "^7.12.1"
-    "@babel/plugin-transform-for-of" "^7.12.1"
-    "@babel/plugin-transform-parameters" "^7.12.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
-    "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/preset-env" "^7.12.11"
-    "@babel/preset-react" "^7.12.10"
-    "@babel/preset-typescript" "^7.12.7"
-    "@storybook/addons" "6.4.10"
-    "@storybook/api" "6.4.10"
-    "@storybook/channel-postmessage" "6.4.10"
-    "@storybook/channels" "6.4.10"
-    "@storybook/client-api" "6.4.10"
-    "@storybook/client-logger" "6.4.10"
-    "@storybook/components" "6.4.10"
-    "@storybook/core-common" "6.4.10"
-    "@storybook/core-events" "6.4.10"
-    "@storybook/node-logger" "6.4.10"
-    "@storybook/preview-web" "6.4.10"
-    "@storybook/router" "6.4.10"
+    "@storybook/addons" "6.5.9"
+    "@storybook/api" "6.5.9"
+    "@storybook/channel-postmessage" "6.5.9"
+    "@storybook/channels" "6.5.9"
+    "@storybook/client-api" "6.5.9"
+    "@storybook/client-logger" "6.5.9"
+    "@storybook/components" "6.5.9"
+    "@storybook/core-common" "6.5.9"
+    "@storybook/core-events" "6.5.9"
+    "@storybook/node-logger" "6.5.9"
+    "@storybook/preview-web" "6.5.9"
+    "@storybook/router" "6.5.9"
     "@storybook/semver" "^7.3.2"
-    "@storybook/store" "6.4.10"
-    "@storybook/theming" "6.4.10"
-    "@types/node" "^14.0.10"
+    "@storybook/store" "6.5.9"
+    "@storybook/theming" "6.5.9"
+    "@types/node" "^14.0.10 || ^16.0.0"
     babel-loader "^8.0.0"
-    babel-plugin-macros "^3.0.1"
-    babel-plugin-polyfill-corejs3 "^0.1.0"
+    babel-plugin-named-exports-order "^0.0.2"
+    browser-assert "^1.2.1"
     case-sensitive-paths-webpack-plugin "^2.3.0"
     core-js "^3.8.2"
     css-loader "^5.0.1"
@@ -4422,7 +4382,7 @@
     glob-promise "^3.4.0"
     html-webpack-plugin "^5.0.0"
     path-browserify "^1.0.1"
-    react-dev-utils "^11.0.4"
+    process "^0.11.10"
     stable "^0.1.8"
     style-loader "^2.0.0"
     terser-webpack-plugin "^5.0.3"
@@ -7689,6 +7649,11 @@ babel-plugin-macros@^3.0.1:
     cosmiconfig "^7.0.0"
     resolve "^1.19.0"
 
+babel-plugin-named-exports-order@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-named-exports-order/-/babel-plugin-named-exports-order-0.0.2.tgz#ae14909521cf9606094a2048239d69847540cb09"
+  integrity sha512-OgOYHOLoRK+/mvXU9imKHlG6GkPLYrUCvFXG/CM93R/aNNO8pOOF4aS+S8CCHMDQoNSeiOYEZb/G6RwL95Jktw==
+
 babel-plugin-polyfill-corejs2@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
@@ -8080,6 +8045,11 @@ brorand@^1.0.1, brorand@^1.1.0:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
+browser-assert@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/browser-assert/-/browser-assert-1.2.1.tgz#9aaa5a2a8c74685c2ae05bfe46efd606f068c200"
+  integrity sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==
+
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
@@ -22350,7 +22320,7 @@ terser-webpack-plugin@^4.2.3:
     terser "^5.3.4"
     webpack-sources "^1.4.3"
 
-terser-webpack-plugin@^5.0.3:
+terser-webpack-plugin@^5.0.3, terser-webpack-plugin@^5.1.3:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz#8033db876dd5875487213e87c627bca323e5ed90"
   integrity sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==
@@ -22361,17 +22331,6 @@ terser-webpack-plugin@^5.0.3:
     serialize-javascript "^6.0.0"
     terser "^5.7.2"
 
-terser-webpack-plugin@^5.1.3:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
-  integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==
-  dependencies:
-    jest-worker "^27.4.5"
-    schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
-    terser "^5.7.2"
-
 terser@^4.1.2, terser@^4.6.3:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"

From ed526c1f693ece19e675f483ec4fa3e1eb51848e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 09:04:20 +0000
Subject: [PATCH 19/21] Bump webpack-cli from 4.9.1 to 4.10.0

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.9.1 to 4.10.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.9.1...webpack-cli@4.10.0)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/core/admin/package.json |  2 +-
 yarn.lock                        | 40 ++++++++++++++++----------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index a5d19994c3..32fcbdb3e1 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -129,7 +129,7 @@
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
     "webpack": "5.65.0",
-    "webpack-cli": "4.9.1",
+    "webpack-cli": "4.10.0",
     "webpack-dev-server": "4.7.3",
     "webpackbar": "5.0.0-3",
     "yup": "^0.32.9"
diff --git a/yarn.lock b/yarn.lock
index d737a55b99..1d48bf33c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6615,22 +6615,22 @@
     "@webassemblyjs/wast-parser" "1.9.0"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356"
-  integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==
+"@webpack-cli/configtest@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
+  integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
 
-"@webpack-cli/info@^1.4.0":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea"
-  integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==
+"@webpack-cli/info@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
+  integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.6.0":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe"
-  integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==
+"@webpack-cli/serve@^1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
+  integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
 
 "@xmldom/xmldom@^0.7.5":
   version "0.7.5"
@@ -23449,18 +23449,18 @@ webpack-bundle-analyzer@4.4.1:
     sirv "^1.0.7"
     ws "^7.3.1"
 
-webpack-cli@4.9.1:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.1.tgz#b64be825e2d1b130f285c314caa3b1ba9a4632b3"
-  integrity sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==
+webpack-cli@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
+  integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.1.0"
-    "@webpack-cli/info" "^1.4.0"
-    "@webpack-cli/serve" "^1.6.0"
+    "@webpack-cli/configtest" "^1.2.0"
+    "@webpack-cli/info" "^1.5.0"
+    "@webpack-cli/serve" "^1.7.0"
     colorette "^2.0.14"
     commander "^7.0.0"
-    execa "^5.0.0"
+    cross-spawn "^7.0.3"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
     interpret "^2.2.0"

From fa3e47e2b99ebffbd63f6a425d390879821a1262 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 09:05:27 +0000
Subject: [PATCH 20/21] Bump react-copy-to-clipboard from 5.0.4 to 5.1.0

Bumps [react-copy-to-clipboard](https://github.com/nkbt/react-copy-to-clipboard) from 5.0.4 to 5.1.0.
- [Release notes](https://github.com/nkbt/react-copy-to-clipboard/releases)
- [Commits](https://github.com/nkbt/react-copy-to-clipboard/compare/v5.0.4...v5.1.0)

---
updated-dependencies:
- dependency-name: react-copy-to-clipboard
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/core/admin/package.json            |  2 +-
 packages/core/upload/package.json           |  2 +-
 packages/plugins/documentation/package.json |  2 +-
 yarn.lock                                   | 14 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index a5d19994c3..de0ca17d10 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -104,7 +104,7 @@
     "prop-types": "^15.7.2",
     "qs": "6.10.1",
     "react": "^17.0.2",
-    "react-copy-to-clipboard": "^5.0.3",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dnd": "^14.0.2",
     "react-dnd-html5-backend": "^14.0.0",
     "react-dom": "^17.0.2",
diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json
index 728ef23b0e..816e703258 100644
--- a/packages/core/upload/package.json
+++ b/packages/core/upload/package.json
@@ -35,7 +35,7 @@
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
     "react": "^17.0.2",
-    "react-copy-to-clipboard": "^5.0.3",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^17.0.2",
     "react-intl": "5.20.2",
     "react-redux": "7.2.3",
diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json
index 5f3cf309e5..0a8ffddafd 100644
--- a/packages/plugins/documentation/package.json
+++ b/packages/plugins/documentation/package.json
@@ -34,7 +34,7 @@
     "path-to-regexp": "6.2.0",
     "pluralize": "8.0.0",
     "react": "^17.0.2",
-    "react-copy-to-clipboard": "^5.0.3",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^17.0.2",
     "react-intl": "5.20.2",
     "react-redux": "7.2.3",
diff --git a/yarn.lock b/yarn.lock
index d737a55b99..7d74ab5bac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9407,7 +9407,7 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-to-clipboard@^3, copy-to-clipboard@^3.3.1:
+copy-to-clipboard@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
   integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
@@ -19393,13 +19393,13 @@ react-colorful@^5.1.2:
   resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.5.1.tgz#29d9c4e496f2ca784dd2bb5053a3a4340cfaf784"
   integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg==
 
-react-copy-to-clipboard@^5.0.3:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz#42ec519b03eb9413b118af92d1780c403a5f19bf"
-  integrity sha512-IeVAiNVKjSPeGax/Gmkqfa/+PuMTBhutEvFUaMQLwE2tS0EXrAdgOpWDX26bWTXF3HrioorR7lr08NqeYUWQCQ==
+react-copy-to-clipboard@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz#09aae5ec4c62750ccb2e6421a58725eabc41255c"
+  integrity sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==
   dependencies:
-    copy-to-clipboard "^3"
-    prop-types "^15.5.8"
+    copy-to-clipboard "^3.3.1"
+    prop-types "^15.8.1"
 
 react-dev-utils@^11.0.4:
   version "11.0.4"

From f3183cc00c85b378de83e4a21599c5c75975926e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jul 2022 09:06:46 +0000
Subject: [PATCH 21/21] Bump babel-loader from 8.2.3 to 8.2.5

Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.2.3 to 8.2.5.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.2.3...v8.2.5)

---
updated-dependencies:
- dependency-name: babel-loader
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/core/admin/package.json         |  2 +-
 packages/core/helper-plugin/package.json |  2 +-
 yarn.lock                                | 14 ++------------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index a5d19994c3..af669f4bec 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -56,7 +56,7 @@
     "@strapi/icons": "1.2.0",
     "@strapi/utils": "4.2.2",
     "axios": "0.24.0",
-    "babel-loader": "8.2.3",
+    "babel-loader": "8.2.5",
     "babel-plugin-styled-components": "2.0.2",
     "bcryptjs": "2.4.3",
     "chalk": "^4.1.1",
diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json
index 5b319b34ae..a6fc20db05 100644
--- a/packages/core/helper-plugin/package.json
+++ b/packages/core/helper-plugin/package.json
@@ -76,7 +76,7 @@
     "@storybook/react": "^6.3.7",
     "@strapi/design-system": "1.2.0",
     "@strapi/icons": "1.2.0",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.5",
     "cross-env": "^7.0.3",
     "date-fns": "2.22.1",
     "rimraf": "3.0.2"
diff --git a/yarn.lock b/yarn.lock
index d737a55b99..b45ff86c17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7547,17 +7547,7 @@ babel-jest@^26.6.3:
     graceful-fs "^4.2.4"
     slash "^3.0.0"
 
-babel-loader@8.2.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
-  integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
-  dependencies:
-    find-cache-dir "^3.3.1"
-    loader-utils "^1.4.0"
-    make-dir "^3.1.0"
-    schema-utils "^2.6.5"
-
-babel-loader@^8.0.0, babel-loader@^8.2.2:
+babel-loader@8.2.5, babel-loader@^8.0.0, babel-loader@^8.2.5:
   version "8.2.5"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"
   integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==
@@ -15736,7 +15726,7 @@ loader-utils@2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-loader-utils@^1.2.3, loader-utils@^1.4.0:
+loader-utils@^1.2.3:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
   integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==