From 266627f5c0de33d07b3f0284bf48e4296f3ec3af Mon Sep 17 00:00:00 2001
From: Boegie19 <Bramboegheim@gmail.com>
Date: Wed, 26 Apr 2023 13:00:22 +0200
Subject: [PATCH 01/28] fix testMatch /ignore

---
 jest-preset.front.js | 10 +++++-----
 jest-preset.unit.js  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jest-preset.front.js b/jest-preset.front.js
index 438f6bfccb..b761ed7b58 100644
--- a/jest-preset.front.js
+++ b/jest-preset.front.js
@@ -33,7 +33,7 @@ const moduleNameMapper = {
 module.exports = {
   rootDir: __dirname,
   moduleNameMapper,
-  testPathIgnorePatterns: ['/node_modules/', '__tests__'],
+  testPathIgnorePatterns: ['node_modules/', '__tests__'],
   globalSetup: path.join(__dirname, 'test/config/front/global-setup.js'),
   setupFiles: [
     path.join(__dirname, 'packages/admin-test-utils/lib/setup/test-bundler.js'),
@@ -45,9 +45,9 @@ module.exports = {
     path.join(__dirname, 'packages/admin-test-utils/lib/mocks/mockRangeApi.js'),
   ],
   setupFilesAfterEnv: [
-    path.join(__dirname, '/packages/admin-test-utils/lib/setup/styled-components.js'),
-    path.join(__dirname, '/packages/admin-test-utils/lib/setup/strapi.js'),
-    path.join(__dirname, '/packages/admin-test-utils/lib/setup/prop-types.js'),
+    path.join(__dirname, 'packages/admin-test-utils/lib/setup/styled-components.js'),
+    path.join(__dirname, 'packages/admin-test-utils/lib/setup/strapi.js'),
+    path.join(__dirname, 'packages/admin-test-utils/lib/setup/prop-types.js'),
   ],
   testEnvironment: 'jsdom',
   transform: {
@@ -75,7 +75,7 @@ module.exports = {
   transformIgnorePatterns: [
     'node_modules/(?!(react-dnd|dnd-core|react-dnd-html5-backend|@strapi/design-system|@strapi/icons|fractional-indexing)/)',
   ],
-  testMatch: ['/**/tests/**/?(*.)+(spec|test).[jt]s?(x)'],
+  testMatch: ['**/tests/**/?(*.)+(spec|test).[jt]s?(x)'],
   testEnvironmentOptions: {
     url: 'http://localhost:1337/admin',
   },
diff --git a/jest-preset.unit.js b/jest-preset.unit.js
index 18da25e7f1..79f1f7560e 100644
--- a/jest-preset.unit.js
+++ b/jest-preset.unit.js
@@ -4,7 +4,7 @@ module.exports = {
   setupFilesAfterEnv: [__dirname + '/test/unit.setup.js'],
   modulePathIgnorePatterns: ['.cache', 'dist'],
   testPathIgnorePatterns: ['.testdata.js', '.test.utils.js'],
-  testMatch: ['/**/__tests__/**/*.[jt]s?(x)'],
+  testMatch: ['**/__tests__/**/*.[jt]s?(x)'],
   // Use `jest-watch-typeahead` version 0.6.5. Newest version 1.0.0 does not support jest@26
   // Reference: https://github.com/jest-community/jest-watch-typeahead/releases/tag/v1.0.0
   watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],

From 74c84c78dee8e42d12762eebc22275aedd3c154b Mon Sep 17 00:00:00 2001
From: Boegie19 <Bramboegheim@gmail.com>
Date: Wed, 26 Apr 2023 13:04:52 +0200
Subject: [PATCH 02/28] reset jest front end

---
 jest-preset.front.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jest-preset.front.js b/jest-preset.front.js
index b761ed7b58..438f6bfccb 100644
--- a/jest-preset.front.js
+++ b/jest-preset.front.js
@@ -33,7 +33,7 @@ const moduleNameMapper = {
 module.exports = {
   rootDir: __dirname,
   moduleNameMapper,
-  testPathIgnorePatterns: ['node_modules/', '__tests__'],
+  testPathIgnorePatterns: ['/node_modules/', '__tests__'],
   globalSetup: path.join(__dirname, 'test/config/front/global-setup.js'),
   setupFiles: [
     path.join(__dirname, 'packages/admin-test-utils/lib/setup/test-bundler.js'),
@@ -45,9 +45,9 @@ module.exports = {
     path.join(__dirname, 'packages/admin-test-utils/lib/mocks/mockRangeApi.js'),
   ],
   setupFilesAfterEnv: [
-    path.join(__dirname, 'packages/admin-test-utils/lib/setup/styled-components.js'),
-    path.join(__dirname, 'packages/admin-test-utils/lib/setup/strapi.js'),
-    path.join(__dirname, 'packages/admin-test-utils/lib/setup/prop-types.js'),
+    path.join(__dirname, '/packages/admin-test-utils/lib/setup/styled-components.js'),
+    path.join(__dirname, '/packages/admin-test-utils/lib/setup/strapi.js'),
+    path.join(__dirname, '/packages/admin-test-utils/lib/setup/prop-types.js'),
   ],
   testEnvironment: 'jsdom',
   transform: {
@@ -75,7 +75,7 @@ module.exports = {
   transformIgnorePatterns: [
     'node_modules/(?!(react-dnd|dnd-core|react-dnd-html5-backend|@strapi/design-system|@strapi/icons|fractional-indexing)/)',
   ],
-  testMatch: ['**/tests/**/?(*.)+(spec|test).[jt]s?(x)'],
+  testMatch: ['/**/tests/**/?(*.)+(spec|test).[jt]s?(x)'],
   testEnvironmentOptions: {
     url: 'http://localhost:1337/admin',
   },

From d6b6cc3d74f841cfc99f79f928aa8ced310244b6 Mon Sep 17 00:00:00 2001
From: Boegie19 <Bramboegheim@gmail.com>
Date: Wed, 26 Apr 2023 13:09:24 +0200
Subject: [PATCH 03/28] fix front

---
 jest-preset.front.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jest-preset.front.js b/jest-preset.front.js
index 37dac4fc8d..ecd061c335 100644
--- a/jest-preset.front.js
+++ b/jest-preset.front.js
@@ -30,7 +30,7 @@ const moduleNameMapper = {
 module.exports = {
   rootDir: __dirname,
   moduleNameMapper,
-  testPathIgnorePatterns: ['/node_modules/', '__tests__'],
+  testPathIgnorePatterns: ['node_modules/', '__tests__'],
   globalSetup: '@strapi/admin-test-utils/global-setup',
   setupFiles: ['@strapi/admin-test-utils/environment'],
   setupFilesAfterEnv: ['@strapi/admin-test-utils/after-env'],
@@ -60,7 +60,7 @@ module.exports = {
   transformIgnorePatterns: [
     'node_modules/(?!(react-dnd|dnd-core|react-dnd-html5-backend|@strapi/design-system|@strapi/icons|fractional-indexing)/)',
   ],
-  testMatch: ['/**/tests/**/?(*.)+(spec|test).[jt]s?(x)'],
+  testMatch: ['**/tests/**/?(*.)+(spec|test).[jt]s?(x)'],
   testEnvironmentOptions: {
     url: 'http://localhost:1337/admin',
   },

From ea59675dc5d5d61d435fddcebea386a5aa348c3c Mon Sep 17 00:00:00 2001
From: dome4 <dominic.seitz@gmx.de>
Date: Thu, 27 Apr 2023 17:24:27 +0200
Subject: [PATCH 04/28] remove dependency react-router

---
 packages/core/admin/webpack.alias.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/core/admin/webpack.alias.js b/packages/core/admin/webpack.alias.js
index c2bac6cc9d..7079129d5c 100644
--- a/packages/core/admin/webpack.alias.js
+++ b/packages/core/admin/webpack.alias.js
@@ -25,7 +25,6 @@ const aliasExactMatch = [
   'react-intl',
   'react-query',
   'react-redux',
-  'react-router',
   'react-router-dom',
   'react-window',
   'react-select',

From a62d6f592b54595a17530228ffaf63f69d652274 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Apr 2023 13:52:42 +0000
Subject: [PATCH 05/28] Bump resolve from 1.20.0 to 1.22.2

Bumps [resolve](https://github.com/browserify/resolve) from 1.20.0 to 1.22.2.
- [Release notes](https://github.com/browserify/resolve/releases)
- [Commits](https://github.com/browserify/resolve/compare/v1.20.0...v1.22.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../babel-plugin-switch-ee-ce/package.json    |  2 +-
 yarn.lock                                     | 36 +++++++++++--------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/packages/utils/babel-plugin-switch-ee-ce/package.json b/packages/utils/babel-plugin-switch-ee-ce/package.json
index 62d5a5598f..922aaa54cd 100644
--- a/packages/utils/babel-plugin-switch-ee-ce/package.json
+++ b/packages/utils/babel-plugin-switch-ee-ce/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@babel/template": "^7.20.7",
     "reselect": "4.1.7",
-    "resolve": "1.20.0"
+    "resolve": "1.22.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.20.7",
diff --git a/yarn.lock b/yarn.lock
index 31d50d1cab..d66e48933d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7415,7 +7415,7 @@ __metadata:
     "@babel/preset-env": ^7.20.2
     "@babel/template": ^7.20.7
     reselect: 4.1.7
-    resolve: 1.20.0
+    resolve: 1.22.2
   languageName: unknown
   linkType: soft
 
@@ -19591,7 +19591,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.2.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
+"is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
   version: 2.9.0
   resolution: "is-core-module@npm:2.9.0"
   dependencies:
@@ -25927,7 +25927,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-parse@npm:^1.0.6, path-parse@npm:^1.0.7":
+"path-parse@npm:^1.0.7":
   version: 1.0.7
   resolution: "path-parse@npm:1.0.7"
   checksum: 49abf3d81115642938a8700ec580da6e830dde670be21893c62f4e10bd7dd4c3742ddc603fe24f898cba7eb0c6bc1777f8d9ac14185d34540c6d4d80cd9cae8a
@@ -28251,13 +28251,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:1.20.0":
-  version: 1.20.0
-  resolution: "resolve@npm:1.20.0"
+"resolve@npm:1.22.2":
+  version: 1.22.2
+  resolution: "resolve@npm:1.22.2"
   dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: 40cf70b2cde00ef57f99daf2dc63c6a56d6c14a1b7fc51735d06a6f0a3b97cb67b4fb7ef6c747b4e13a7baba83b0ef625d7c4ce92a483cd5af923c3b65fd16fe
+    is-core-module: ^2.11.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: 7e5df75796ebd429445d102d5824482ee7e567f0070b2b45897b29bb4f613dcbc262e0257b8aeedb3089330ccaea0d6a0464df1a77b2992cf331dcda0f4cb549
   languageName: node
   linkType: hard
 
@@ -28287,13 +28290,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@1.20.0#~builtin<compat/resolve>":
-  version: 1.20.0
-  resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin<compat/resolve>::version=1.20.0&hash=c3c19d"
+"resolve@patch:resolve@1.22.2#~builtin<compat/resolve>":
+  version: 1.22.2
+  resolution: "resolve@patch:resolve@npm%3A1.22.2#~builtin<compat/resolve>::version=1.22.2&hash=c3c19d"
   dependencies:
-    is-core-module: ^2.2.0
-    path-parse: ^1.0.6
-  checksum: a0dd7d16a8e47af23afa9386df2dff10e3e0debb2c7299a42e581d9d9b04d7ad5d2c53f24f1e043f7b3c250cbdc71150063e53d0b6559683d37f790b7c8c3cd5
+    is-core-module: ^2.11.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: 66cc788f13b8398de18eb4abb3aed90435c84bb8935953feafcf7231ba4cd191b2c10b4a87b1e9681afc34fb138c705f91f7330ff90bfa36f457e5584076a2b8
   languageName: node
   linkType: hard
 

From 5b8969ab7b867e72688358c473502a07520a2121 Mon Sep 17 00:00:00 2001
From: Paul <45032974+hide-me@users.noreply.github.com>
Date: Thu, 4 May 2023 15:37:00 +0300
Subject: [PATCH 06/28] Upd ru from en.json

Added 7 new strings
---
 packages/core/admin/admin/src/translations/ru.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/core/admin/admin/src/translations/ru.json b/packages/core/admin/admin/src/translations/ru.json
index 564da4aa04..e13e626ed4 100644
--- a/packages/core/admin/admin/src/translations/ru.json
+++ b/packages/core/admin/admin/src/translations/ru.json
@@ -219,6 +219,11 @@
   "Settings.profile.form.section.experience.title": "Опыт",
   "Settings.profile.form.section.helmet.title": "Профиль пользователя",
   "Settings.profile.form.section.profile.page.title": "Страница профиля",
+  "Settings.review-workflows.page.title": "Просмотр рабочих процессов",
+  "Settings.review-workflows.page.subtitle": "{count, plural, =0 {# этапов} one {# этап} other {# этапа}}",
+  "Settings.review-workflows.page.isLoading": "Рабочие процессы загружаются",
+  "Settings.review-workflows.page.delete.confirm.body": "Все записи, назначенные удаленным этапам, будут перемещены на предыдущий этап. Вы уверены, что хотите сохранить?",
+  "Settings.review-workflows.stage.name.label": "Имя этапа",
   "Settings.roles.create.description": "Определите права, предоставленные ролью",
   "Settings.roles.create.title": "Создать роль",
   "Settings.roles.created": "Роль создана",
@@ -321,6 +326,7 @@
   "Users.components.List.empty": "Нет пользователей...",
   "Users.components.List.empty.withFilters": "Нет пользователей с применёнными фильтрами...",
   "Users.components.List.empty.withSearch": "Нет пользователей, соответствующих запросу ({search})...",
+  "admin.pages.MarketPlacePage.sort.label": "Сортировка",
   "admin.pages.MarketPlacePage.filters.categories": "Категории",
   "admin.pages.MarketPlacePage.filters.categoriesSelected": "Выбрано {count, plural, =0 {# категорий} one {# категория} other {# категории}}",
   "admin.pages.MarketPlacePage.filters.collections": "Коллекции",
@@ -803,6 +809,7 @@
   "content-manager.relation.notAvailable": "Нет отношений",
   "content-manager.relation.publicationState.draft": "Черновик",
   "content-manager.relation.publicationState.published": "Опубликовано",
+  "content-manager.reviewWorkflows.stage.label": "Просмотреть этап",
   "content-manager.select.currently.selected": "{count} выбрано",
   "content-manager.success.record.delete": "Удалено",
   "content-manager.success.record.publish": "Опубликовано",

From d62fe6d8b247b93a75853b906d8d7ae19b68d605 Mon Sep 17 00:00:00 2001
From: Paul <45032974+hide-me@users.noreply.github.com>
Date: Thu, 4 May 2023 16:40:25 +0300
Subject: [PATCH 07/28] Create ru.json

---
 .../i18n/admin/src/translations/ru.json       | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 packages/plugins/i18n/admin/src/translations/ru.json

diff --git a/packages/plugins/i18n/admin/src/translations/ru.json b/packages/plugins/i18n/admin/src/translations/ru.json
new file mode 100644
index 0000000000..823587f789
--- /dev/null
+++ b/packages/plugins/i18n/admin/src/translations/ru.json
@@ -0,0 +1,62 @@
+{
+  "CMEditViewCopyLocale.copy-failure": "Не удалось скопировать перевод",
+  "CMEditViewCopyLocale.copy-success": "Перевод скопирована",
+  "CMEditViewCopyLocale.copy-text": "Заполните данные из другого языка",
+  "CMEditViewCopyLocale.submit-text": "Да, заполнить",
+  "CMListView.popover.display-locales.label": "Отображать переведенные языки",
+  "CheckboxConfirmation.Modal.body": "Вы хотите выключить это?",
+  "CheckboxConfirmation.Modal.button-confirm": "Да, выключить",
+  "CheckboxConfirmation.Modal.content": "Отключение перевода приведет к удалению всего вашего контента, кроме того, который связан с вашим языком по умолчанию (если вообще он существует).",
+  "Field.localized": "Это значение уникально для выбранного перевода",
+  "Field.not-localized": "Это значение является общим для всех переводов",
+  "Settings.list.actions.add": "Добавить новый перевод",
+  "Settings.list.actions.delete": "Удалить перевод",
+  "Settings.list.actions.deleteAdditionalInfos": "Это приведет к удалению активных версий перевода <em>(из плагина интернационализации)</em>",
+  "Settings.list.actions.edit": "Редактировать перевод",
+  "Settings.list.description": "Настройте параметры для плагина интернационализации",
+  "Settings.list.empty.description": "Это необычное поведение, означающее, что всё-таки вы изменили базу данных вручную. Убедитесь, что базе данных сохранён хотя бы один перевод, чтобы иметь возможность правильно использовать Strapi.",
+  "Settings.list.empty.title": "Переводов нет.",
+  "Settings.locales.default": "По умолчанию",
+  "Settings.locales.list.sort.default": "Сортировать переводы по умолчанию",
+  "Settings.locales.list.sort.displayName": "Сортировать по отображаемому имени",
+  "Settings.locales.list.sort.id": "Сортировать по ID",
+  "Settings.locales.modal.advanced": "Расширенные настройки",
+  "Settings.locales.modal.advanced.setAsDefault": "Установить в качестве перевода по умолчанию",
+  "Settings.locales.modal.advanced.setAsDefault.hint": "Необходим один перевод по умолчанию, вы можете изменить его выбрав другой перевод",
+  "Settings.locales.modal.advanced.settings": "Настройки",
+  "Settings.locales.modal.base": "Основные настройки",
+  "Settings.locales.modal.create.alreadyExist": "Этот перевод уже существует",
+  "Settings.locales.modal.create.defaultLocales.loading": "Загрузка доступных переводов...",
+  "Settings.locales.modal.create.success": "Перевод успешно добавлен",
+  "Settings.locales.modal.create.tab.label": "Переключение между основными настройками этого плагина и расширенными настройками",
+  "Settings.locales.modal.delete.confirm": "Да, удалить",
+  "Settings.locales.modal.delete.message": "Удаление этого перевода приведет к удалению всего связанного с ним содержимого. Если вы хотите сохранить какой-то контент, обязательно сначала перенесите его в другой язык (перераспределите в другой перевод).",
+  "Settings.locales.modal.delete.secondMessage": "Вы хотите удалить этот перевод?",
+  "Settings.locales.modal.delete.success": "Перевод успешно удалён",
+  "Settings.locales.modal.edit.confirmation": "Готово!",
+  "Settings.locales.modal.edit.locales.label": "Переводы",
+  "Settings.locales.modal.edit.success": "Перевод успешно отредактирован",
+  "Settings.locales.modal.edit.tab.label": "Переключение между основными настройками этого плагина и расширенными настройками",
+  "Settings.locales.modal.locales.displayName": "Отображаемое имя перевода",
+  "Settings.locales.modal.locales.displayName.description": "Перевод будет отображаться под этим именем в панели администратора",
+  "Settings.locales.modal.locales.displayName.error": "Отображаемое имя перевода может содержать не более 50 символов.",
+  "Settings.locales.modal.locales.label": "Переводы",
+  "Settings.locales.modal.locales.loaded": "Переводы были успешно загружены.",
+  "Settings.locales.modal.title": "Настройки",
+  "Settings.locales.row.default-locale": "Перевод по умолчанию",
+  "Settings.locales.row.displayName": "Отображаемое имя",
+  "Settings.locales.row.id": "ID",
+  "Settings.permissions.loading": "Разрешения на загрузку",
+  "Settings.permissions.read.denied.description": "Чтобы иметь возможность прочитать это, обязательно свяжитесь с администратором вашей системы.",
+  "Settings.permissions.read.denied.title": "У вас нет прав доступа к этому контенту.",
+  "actions.select-locale": "Выбрать перевод",
+  "components.Select.locales.not-available": "Нет доступного контента",
+  "plugin.description.long": "Этот плагин позволяет создавать, читать и обновлять контент (словом, производить всевозможные действия с контентом) на разных языках, как из панели администратора, так и через API.",
+  "plugin.description.short": "Этот плагин позволяет создавать, читать и обновлять контент на разных языках, как из панели администратора, так и через API.",
+  "plugin.name": "Интернационализация",
+  "plugin.schema.i18n.ensure-unique-localization": "Уникальные поля должны быть переведены",
+  "plugin.schema.i18n.localized.description-content-type": "Позволяет перевести запись на разные языки",
+  "plugin.schema.i18n.localized.description-field": "Поле может иметь разные значения на каждом языке",
+  "plugin.schema.i18n.localized.label-content-type": "Интернационализация",
+  "plugin.schema.i18n.localized.label-field": "Включить перевод для этого поля"
+}

From 5acae2e2a967ccf40e21a7989097ab64073e6787 Mon Sep 17 00:00:00 2001
From: Josh <37798644+joshuaellis@users.noreply.github.com>
Date: Fri, 5 May 2023 18:47:48 +0100
Subject: [PATCH 08/28] chore: remove tracking mocks

---
 packages/admin-test-utils/custom.d.ts           |  1 +
 packages/admin-test-utils/src/environment.ts    |  1 +
 .../pages/EditSettingsView/tests/index.test.js  |  1 -
 .../pages/ListSettingsView/tests/index.test.js  | 17 +++++++++--------
 .../admin/src/pages/Admin/tests/index.test.js   |  1 -
 .../src/pages/Admin/tests/useTrackUsage.test.js |  4 ----
 .../src/pages/HomePage/tests/index.test.js      |  1 -
 .../pages/MarketplacePage/tests/index.test.js   |  2 --
 .../pages/MarketplacePage/tests/plugins.test.js |  2 --
 .../MarketplacePage/tests/providers.test.js     |  2 --
 .../src/pages/ProfilePage/tests/index.test.js   |  1 -
 .../components/SettingsNav/tests/index.test.js  |  5 -----
 .../DeleteButton/tests/DeleteButton.test.js     |  5 -----
 .../ApiTokens/EditView/tests/index.test.js      |  1 -
 .../CustomizationInfos/tests/index.test.js      |  3 ---
 .../pages/Roles/CreatePage/tests/index.test.js  |  1 -
 .../pages/Roles/EditPage/tests/index.test.js    |  1 -
 .../TransferTokens/EditView/tests/index.test.js |  1 -
 .../components/Stages/Stage/tests/Stage.test.js |  5 -----
 .../components/Stages/tests/Stages.test.js      |  5 -----
 .../tests/ReviewWorkflows.test.js               |  1 -
 .../pages/SingleSignOn/tests/index.test.js      |  1 -
 .../AttributeOptions/tests/index.test.js        |  3 ---
 .../tests/index.test.js                         |  6 ------
 .../src/pages/ListView/tests/index.test.js      |  1 -
 .../BrowseStep/SearchAsset/tests/index.test.js  |  5 -----
 .../AssetDialog/BrowseStep/tests/index.test.js  |  1 -
 .../AssetDialog/tests/AssetDialog.test.js       |  1 -
 .../tests/EditFolderDialog.test.js              |  1 -
 .../Carousel/tests/CarouselAssets.test.js       |  1 -
 .../TableList/tests/TableList.test.js           |  1 -
 .../tests/PendingAssetStep.test.js              |  1 -
 .../admin/src/hooks/tests/useConfig.test.js     |  1 -
 .../src/hooks/tests/useModalQueryParams.test.js |  5 -----
 .../pages/EmailTemplates/tests/index.test.js    |  3 ---
 .../src/pages/Providers/tests/index.test.js     |  1 -
 .../pages/Roles/CreatePage/tests/index.test.js  |  1 -
 37 files changed, 11 insertions(+), 83 deletions(-)

diff --git a/packages/admin-test-utils/custom.d.ts b/packages/admin-test-utils/custom.d.ts
index ac37bd91b2..19947d3565 100644
--- a/packages/admin-test-utils/custom.d.ts
+++ b/packages/admin-test-utils/custom.d.ts
@@ -10,6 +10,7 @@ declare global {
         isEnabled: (featureName?: string) => boolean;
       };
       projectType: string;
+      telemetryDisabled: boolean;
     };
   }
 }
diff --git a/packages/admin-test-utils/src/environment.ts b/packages/admin-test-utils/src/environment.ts
index 1fe0082818..43ab46155a 100644
--- a/packages/admin-test-utils/src/environment.ts
+++ b/packages/admin-test-utils/src/environment.ts
@@ -57,6 +57,7 @@ window.strapi = {
     isEnabled: () => false,
   },
   projectType: 'Community',
+  telemetryDisabled: true,
 };
 
 /* -------------------------------------------------------------------------------------------------
diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/index.test.js
index 66c85a1021..a29bb43f60 100644
--- a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/index.test.js
+++ b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/tests/index.test.js
@@ -17,7 +17,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   // eslint-disable-next-line
   CheckPermissions: ({ children }) => <div>{children}</div>,
   useNotification: jest.fn(),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
 }));
 
 const client = new QueryClient({
diff --git a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/index.test.js
index d1caf4f434..b5c6eae036 100644
--- a/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/index.test.js
+++ b/packages/core/admin/admin/src/content-manager/pages/ListSettingsView/tests/index.test.js
@@ -13,7 +13,6 @@ import ModelsContext from '../../../contexts/ModelsContext';
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useNotification: jest.fn(),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
 }));
 
 const client = new QueryClient({
@@ -191,24 +190,26 @@ describe('ADMIN | CM | LV | Configure the view', () => {
         screen.getByText("This value overrides the label displayed in the table's head")
       ).toBeInTheDocument();
     });
-    
+
     it('should close edit modal onSubmit', async () => {
       const history = createMemoryHistory();
-      
+
       const { queryByText } = render(makeApp(history));
       await waitFor(() =>
         expect(screen.getByText('Configure the view - Michka')).toBeInTheDocument()
       );
-      
+
       fireEvent.click(screen.getByLabelText('Edit address'));
-      
+
       expect(
         screen.getByText("This value overrides the label displayed in the table's head")
       ).toBeInTheDocument();
-      
+
       fireEvent.click(screen.getByText('Finish'));
-      
-      expect(queryByText("This value overrides the label displayed in the table's head")).not.toBeInTheDocument();
+
+      expect(
+        queryByText("This value overrides the label displayed in the table's head")
+      ).not.toBeInTheDocument();
     });
 
     it('should not show sortable toggle input if field not sortable', async () => {
diff --git a/packages/core/admin/admin/src/pages/Admin/tests/index.test.js b/packages/core/admin/admin/src/pages/Admin/tests/index.test.js
index 48818785c8..25e73b869c 100644
--- a/packages/core/admin/admin/src/pages/Admin/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/Admin/tests/index.test.js
@@ -17,7 +17,6 @@ jest.mock('react-redux', () => ({
 jest.mock('@strapi/helper-plugin', () => ({
   LoadingIndicatorPage: () => <div>Loading</div>,
   useStrapiApp: jest.fn(() => ({ menu: [] })),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   NotFound: () => <div>not found</div>,
   CheckPagePermissions: ({ children }) => children,
   useGuidedTour: jest.fn(() => ({
diff --git a/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js b/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js
index 52bbda94f6..9eff7ad3b7 100644
--- a/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js
+++ b/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js
@@ -9,10 +9,6 @@ jest.mock('react-redux', () => ({
   useSelector: jest.fn(() => 'init'),
 }));
 
-jest.mock('@strapi/helper-plugin', () => ({
-  useTracking: jest.fn(() => ({ trackUsage: trackUsageMock })),
-}));
-
 describe('Admin | pages | Admin | useTrackUsage', () => {
   it('should call the trackUsage method on mount with didAccessAuthenticatedAdministration', () => {
     const { rerender } = renderHook(() => useTrackUsage());
diff --git a/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js b/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js
index dd98adf599..40ff2e2a4d 100644
--- a/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/HomePage/tests/index.test.js
@@ -11,7 +11,6 @@ import { useModels } from '../../../hooks';
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useAppInfo: jest.fn(() => ({ communityEdition: true })),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useGuidedTour: jest.fn(() => ({
     isGuidedTourVisible: false,
     guidedTourState: {
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js
index 138b21e12a..f68a8e5daa 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js
@@ -20,9 +20,7 @@ jest.mock('@strapi/helper-plugin', () => ({
   useNotification: jest.fn(() => {
     return toggleNotification;
   }),
-  pxToRem: jest.fn(),
   CheckPagePermissions: ({ children }) => children,
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useAppInfo: jest.fn(() => ({
     autoReload: true,
     dependencies: {
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
index 8a787b017f..cd94b25372 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/plugins.test.js
@@ -20,9 +20,7 @@ jest.mock('@strapi/helper-plugin', () => ({
   useNotification: jest.fn(() => {
     return toggleNotification;
   }),
-  pxToRem: jest.fn(),
   CheckPagePermissions: ({ children }) => children,
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useAppInfo: jest.fn(() => ({
     autoReload: true,
     dependencies: {
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
index 799a3404d1..9399fcb6e0 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/providers.test.js
@@ -22,9 +22,7 @@ jest.mock('@strapi/helper-plugin', () => ({
   useNotification: jest.fn(() => {
     return toggleNotification;
   }),
-  pxToRem: jest.fn(),
   CheckPagePermissions: ({ children }) => children,
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useAppInfo: jest.fn(() => ({
     autoReload: true,
     dependencies: {
diff --git a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js
index f3e21314f1..24c31ebb51 100644
--- a/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/ProfilePage/tests/index.test.js
@@ -20,7 +20,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   useFocusWhenNavigate: jest.fn(),
   useAppInfo: jest.fn(() => ({ setUserDisplayName: jest.fn() })),
   useOverlayBlocker: jest.fn(() => ({ lockApp: jest.fn, unlockApp: jest.fn() })),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
 }));
 
 const client = new QueryClient({
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js
index a4f730fa1b..c503ff095a 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/components/SettingsNav/tests/index.test.js
@@ -6,11 +6,6 @@ import { createMemoryHistory } from 'history';
 import { ThemeProvider, lightTheme } from '@strapi/design-system';
 import SettingsNav from '../index';
 
-jest.mock('@strapi/helper-plugin', () => ({
-  ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
-}));
-
 const menu = [
   {
     id: 'global',
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/tests/DeleteButton.test.js b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/tests/DeleteButton.test.js
index fee28f629b..3a4ba74cee 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/tests/DeleteButton.test.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/components/Tokens/Table/DeleteButton/tests/DeleteButton.test.js
@@ -6,11 +6,6 @@ import { NotificationsProvider } from '@strapi/helper-plugin';
 
 import DeleteButton from '../index';
 
-jest.mock('@strapi/helper-plugin', () => ({
-  ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
-}));
-
 function ComponentToTest(props) {
   return (
     <IntlProvider locale="en" messages={{}}>
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/index.test.js
index 1c008767d4..8f1fd7706c 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/tests/index.test.js
@@ -14,7 +14,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useNotification: jest.fn(),
   useFocusWhenNavigate: jest.fn(),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useRBAC: jest.fn(() => ({
     allowedActions: {
       canCreate: true,
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/tests/index.test.js
index a372f4b79d..46e3a2fbf7 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/CustomizationInfos/tests/index.test.js
@@ -24,9 +24,6 @@ const PROJECT_SETTINGS_DATA_FIXTURES = {
   },
 };
 
-jest.mock('@strapi/helper-plugin', () => ({
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
-}));
 jest.mock('../../../../../../../hooks', () => ({
   useConfigurations: jest.fn(() => ({
     logos: {
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/tests/index.test.js
index d3a718a201..e67f8e8c62 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/CreatePage/tests/index.test.js
@@ -19,7 +19,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useNotification: jest.fn(() => jest.fn()),
   useOverlayBlocker: jest.fn(() => ({ lockApp: jest.fn(), unlockApp: jest.fn() })),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
 }));
 
 const makeApp = (history) => (
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/index.test.js
index d872b95f20..bfe5f16ffb 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/tests/index.test.js
@@ -19,7 +19,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useNotification: jest.fn(() => jest.fn()),
   useOverlayBlocker: jest.fn(() => ({ lockApp: jest.fn(), unlockApp: jest.fn() })),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
 }));
 
 const makeApp = (history) => (
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/index.test.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/index.test.js
index 841961c905..7b171277c1 100644
--- a/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/tests/index.test.js
@@ -14,7 +14,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useNotification: jest.fn(),
   useFocusWhenNavigate: jest.fn(),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useRBAC: jest.fn(() => ({
     allowedActions: {
       canCreate: true,
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js
index 2607a5f2d3..ed8986485b 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js
@@ -15,11 +15,6 @@ import { reducer } from '../../../../reducer';
 
 import { STAGE_COLOR_DEFAULT } from '../../../../constants';
 
-jest.mock('@strapi/helper-plugin', () => ({
-  ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn().mockReturnValue({ trackUsage: jest.fn() }),
-}));
-
 const STAGES_FIXTURE = {
   id: 1,
   index: 0,
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/tests/Stages.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/tests/Stages.test.js
index c6dc9bb58f..5efca68741 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/tests/Stages.test.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/tests/Stages.test.js
@@ -21,11 +21,6 @@ jest.mock('../../../actions', () => ({
   ...jest.requireActual('../../../actions'),
 }));
 
-jest.mock('@strapi/helper-plugin', () => ({
-  ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn().mockReturnValue({ trackUsage: jest.fn() }),
-}));
-
 const STAGES_FIXTURE = [
   {
     id: 1,
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/tests/ReviewWorkflows.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/tests/ReviewWorkflows.test.js
index 7a1b43a8ed..dadeee09db 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/tests/ReviewWorkflows.test.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/tests/ReviewWorkflows.test.js
@@ -18,7 +18,6 @@ import { reducer } from '../reducer';
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useNotification: jest.fn().mockReturnValue(jest.fn()),
-  useTracking: jest.fn().mockReturnValue({ trackUsage: jest.fn() }),
   // eslint-disable-next-line react/prop-types
   CheckPagePermissions({ children }) {
     return children;
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/index.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/index.test.js
index ed5cfa0953..575452b01d 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/index.test.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/SingleSignOn/tests/index.test.js
@@ -10,7 +10,6 @@ import { SingleSignOn } from '../index';
 
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useNotification: jest.fn().mockImplementation(() => jest.fn()),
   useOverlayBlocker: jest.fn(() => ({ lockApp: jest.fn(), unlockApp: jest.fn() })),
   useRBAC: jest.fn(),
diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/tests/index.test.js b/packages/core/content-type-builder/admin/src/components/AttributeOptions/tests/index.test.js
index a87bd30853..181cca5591 100644
--- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/tests/index.test.js
+++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/tests/index.test.js
@@ -34,9 +34,6 @@ jest.mock('@strapi/helper-plugin', () => ({
     get: jest.fn().mockReturnValue(mockCustomField),
     getAll,
   }),
-  useTracking: jest.fn(() => ({
-    trackUsage: jest.fn(),
-  })),
 }));
 
 const mockAttributes = [
diff --git a/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/tests/index.test.js b/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/tests/index.test.js
index 5dc7b9f6c9..f55def79a3 100644
--- a/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/tests/index.test.js
+++ b/packages/core/content-type-builder/admin/src/components/FormModalNavigationProvider/tests/index.test.js
@@ -3,12 +3,6 @@ import { INITIAL_STATE_DATA } from '../constants';
 import FormModalNavigationProvider from '../index';
 import useFormModalNavigation from '../../../hooks/useFormModalNavigation';
 
-jest.mock('@strapi/helper-plugin', () => ({
-  useTracking: jest.fn(() => ({
-    trackUsage: jest.fn(),
-  })),
-}));
-
 const removeFunctionsFromObject = (state) => {
   const stringified = JSON.stringify(state);
   const parsed = JSON.parse(stringified);
diff --git a/packages/core/content-type-builder/admin/src/pages/ListView/tests/index.test.js b/packages/core/content-type-builder/admin/src/pages/ListView/tests/index.test.js
index b0e33a5827..b9170e0ca1 100644
--- a/packages/core/content-type-builder/admin/src/pages/ListView/tests/index.test.js
+++ b/packages/core/content-type-builder/admin/src/pages/ListView/tests/index.test.js
@@ -32,7 +32,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   // eslint-disable-next-line
   CheckPermissions: ({ children }) => <div>{children}</div>,
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
 }));
 
 const makeApp = () => {
diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/tests/index.test.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/tests/index.test.js
index 872e6d92e5..138c364d59 100644
--- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/tests/index.test.js
+++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/SearchAsset/tests/index.test.js
@@ -12,11 +12,6 @@ import SearchAsset from '../index';
 
 const handleChange = jest.fn();
 
-jest.mock('@strapi/helper-plugin', () => ({
-  ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
-}));
-
 const makeApp = (queryValue) => (
   <ThemeProvider theme={lightTheme}>
     <IntlProvider locale="en">
diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/index.test.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/index.test.js
index 044bc79329..bd77f62ce9 100644
--- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/index.test.js
+++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/index.test.js
@@ -14,7 +14,6 @@ jest.mock('../../../../hooks/useFolder');
 
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   usePersistentState: jest.fn().mockReturnValue([0, jest.fn()]),
 }));
 
diff --git a/packages/core/upload/admin/src/components/AssetDialog/tests/AssetDialog.test.js b/packages/core/upload/admin/src/components/AssetDialog/tests/AssetDialog.test.js
index 0115f3819c..82d27d6a75 100644
--- a/packages/core/upload/admin/src/components/AssetDialog/tests/AssetDialog.test.js
+++ b/packages/core/upload/admin/src/components/AssetDialog/tests/AssetDialog.test.js
@@ -15,7 +15,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useNotification: jest.fn(() => jest.fn()),
   useQueryParams: jest.fn(),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
 }));
 
 jest.mock('../../../hooks/useMediaLibraryPermissions');
diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/tests/EditFolderDialog.test.js b/packages/core/upload/admin/src/components/EditFolderDialog/tests/EditFolderDialog.test.js
index dfcde775b8..e45e60f38d 100644
--- a/packages/core/upload/admin/src/components/EditFolderDialog/tests/EditFolderDialog.test.js
+++ b/packages/core/upload/admin/src/components/EditFolderDialog/tests/EditFolderDialog.test.js
@@ -13,7 +13,6 @@ import { useMediaLibraryPermissions } from '../../../hooks/useMediaLibraryPermis
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useQueryParams: jest.fn().mockReturnValue([{ query: {} }]),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useFetchClient: jest.fn().mockReturnValue({
     put: jest.fn().mockImplementation({}),
   }),
diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/tests/CarouselAssets.test.js b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/tests/CarouselAssets.test.js
index 454aead461..7aa8ed4fa2 100644
--- a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/tests/CarouselAssets.test.js
+++ b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/tests/CarouselAssets.test.js
@@ -11,7 +11,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   useNotification: jest.fn(() => ({
     toggleNotification: jest.fn(),
   })),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
 }));
 
 const ASSET_FIXTURES = [
diff --git a/packages/core/upload/admin/src/components/TableList/tests/TableList.test.js b/packages/core/upload/admin/src/components/TableList/tests/TableList.test.js
index 9006a54dc7..17a3ee5631 100644
--- a/packages/core/upload/admin/src/components/TableList/tests/TableList.test.js
+++ b/packages/core/upload/admin/src/components/TableList/tests/TableList.test.js
@@ -8,7 +8,6 @@ import { TableList } from '..';
 
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useQueryParams: jest.fn(() => [{ query: {} }]),
 }));
 
diff --git a/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/tests/PendingAssetStep.test.js b/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/tests/PendingAssetStep.test.js
index 976bfe0565..b8432873e3 100644
--- a/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/tests/PendingAssetStep.test.js
+++ b/packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/tests/PendingAssetStep.test.js
@@ -9,7 +9,6 @@ jest.mock('../../../../utils/getTrad', () => (x) => x);
 
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
 }));
 
 const queryClient = new QueryClient({
diff --git a/packages/core/upload/admin/src/hooks/tests/useConfig.test.js b/packages/core/upload/admin/src/hooks/tests/useConfig.test.js
index f17c00b956..b5cd0218ba 100644
--- a/packages/core/upload/admin/src/hooks/tests/useConfig.test.js
+++ b/packages/core/upload/admin/src/hooks/tests/useConfig.test.js
@@ -25,7 +25,6 @@ const notificationStatusMock = jest.fn();
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
   useNotification: () => notificationStatusMock,
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useFetchClient: jest.fn().mockReturnValue({
     put: jest.fn().mockResolvedValue({ data: { data: {} } }),
     get: jest.fn(),
diff --git a/packages/core/upload/admin/src/hooks/tests/useModalQueryParams.test.js b/packages/core/upload/admin/src/hooks/tests/useModalQueryParams.test.js
index 5089fcfbee..8da6994592 100644
--- a/packages/core/upload/admin/src/hooks/tests/useModalQueryParams.test.js
+++ b/packages/core/upload/admin/src/hooks/tests/useModalQueryParams.test.js
@@ -8,11 +8,6 @@ import { ThemeProvider, lightTheme } from '@strapi/design-system';
 
 import useModalQueryParams from '../useModalQueryParams';
 
-jest.mock('@strapi/helper-plugin', () => ({
-  ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
-}));
-
 const refetchQueriesMock = jest.fn();
 
 jest.mock('react-query', () => ({
diff --git a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/index.test.js
index 9e126e5145..b44c36af41 100644
--- a/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/index.test.js
+++ b/packages/plugins/users-permissions/admin/src/pages/EmailTemplates/tests/index.test.js
@@ -14,9 +14,6 @@ jest.mock('@strapi/helper-plugin', () => ({
   useOverlayBlocker: jest.fn(() => ({ lockApp: jest.fn, unlockApp: jest.fn() })),
   useRBAC: jest.fn(),
   CheckPagePermissions: ({ children }) => children,
-  useTracking: jest.fn(() => ({
-    trackUsage: jest.fn(),
-  })),
 }));
 
 const client = new QueryClient({
diff --git a/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js
index c47a5596a4..a6d3afab2d 100644
--- a/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js
+++ b/packages/plugins/users-permissions/admin/src/pages/Providers/tests/index.test.js
@@ -9,7 +9,6 @@ import { ProvidersPage } from '../index';
 
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
-  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useNotification: jest.fn(),
   useOverlayBlocker: jest.fn(() => ({ lockApp: jest.fn(), unlockApp: jest.fn() })),
   useRBAC: jest.fn(),
diff --git a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/index.test.js b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/index.test.js
index b023ce465a..9fc158cc83 100644
--- a/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/index.test.js
+++ b/packages/plugins/users-permissions/admin/src/pages/Roles/CreatePage/tests/index.test.js
@@ -19,7 +19,6 @@ jest.mock('@strapi/helper-plugin', () => {
     ...jest.requireActual('@strapi/helper-plugin'),
     useNotification: mockUseNotification,
     useOverlayBlocker: jest.fn(() => ({ lockApp: jest.fn(), unlockApp: jest.fn() })),
-    useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   };
 });
 

From 870865d7b975e13c8b8a58c28057411f786ec0f2 Mon Sep 17 00:00:00 2001
From: Josh <37798644+joshuaellis@users.noreply.github.com>
Date: Fri, 5 May 2023 19:06:07 +0100
Subject: [PATCH 09/28] chore: make default context so we don't need provider
 or mocking

---
 packages/core/admin/admin/src/pages/Admin/index.js        | 3 +++
 .../core/admin/admin/src/pages/Admin/tests/index.test.js  | 2 +-
 .../admin/src/pages/Admin/tests/useTrackUsage.test.js     | 6 +++++-
 .../tests/__snapshots__/index.test.js.snap                | 5 +++++
 .../admin/src/pages/MarketplacePage/tests/index.test.js   | 1 +
 packages/core/helper-plugin/src/features/Tracking.js      | 8 ++++++--
 .../helper-plugin/src/features/tests/Tracking.test.js     | 4 ++++
 7 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/packages/core/admin/admin/src/pages/Admin/index.js b/packages/core/admin/admin/src/pages/Admin/index.js
index bdf50dc97f..f9264d2118 100644
--- a/packages/core/admin/admin/src/pages/Admin/index.js
+++ b/packages/core/admin/admin/src/pages/Admin/index.js
@@ -44,6 +44,9 @@ const SettingsPage = lazy(() =>
 );
 
 // Simple hook easier for testing
+/**
+ * TODO: remove this, it's bad.
+ */
 const useTrackUsage = () => {
   const { trackUsage } = useTracking();
   const dispatch = useDispatch();
diff --git a/packages/core/admin/admin/src/pages/Admin/tests/index.test.js b/packages/core/admin/admin/src/pages/Admin/tests/index.test.js
index 25e73b869c..18eb1b5310 100644
--- a/packages/core/admin/admin/src/pages/Admin/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/Admin/tests/index.test.js
@@ -15,6 +15,7 @@ jest.mock('react-redux', () => ({
 }));
 
 jest.mock('@strapi/helper-plugin', () => ({
+  ...jest.requireActual('@strapi/helper-plugin'),
   LoadingIndicatorPage: () => <div>Loading</div>,
   useStrapiApp: jest.fn(() => ({ menu: [] })),
   NotFound: () => <div>not found</div>,
@@ -33,7 +34,6 @@ jest.mock('@strapi/helper-plugin', () => ({
 
 jest.mock('../../../hooks', () => ({
   useMenu: jest.fn(() => ({ isLoading: true, generalSectionLinks: [], pluginsSectionLinks: [] })),
-  useTrackUsage: jest.fn(),
   useReleaseNotification: jest.fn(),
   useConfigurations: jest.fn(() => ({ showTutorials: false })),
 }));
diff --git a/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js b/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js
index 9eff7ad3b7..3f66f0f314 100644
--- a/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js
+++ b/packages/core/admin/admin/src/pages/Admin/tests/useTrackUsage.test.js
@@ -1,8 +1,12 @@
 import { renderHook } from '@testing-library/react-hooks';
-import { useTrackUsage } from '..';
+import { useTrackUsage } from '../index';
 
 const trackUsageMock = jest.fn();
 
+jest.mock('@strapi/helper-plugin', () => ({
+  useTracking: jest.fn(() => ({ trackUsage: trackUsageMock })),
+}));
+
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
   useDispatch: jest.fn(() => jest.fn()),
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap
index f7aa37d1bb..2f88f54a35 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/__snapshots__/index.test.js.snap
@@ -115,10 +115,14 @@ exports[`Marketplace page - layout renders the online layout 1`] = `
 
 .c63 {
   color: #666687;
+  width: 0.75rem;
+  height: 0.75rem;
 }
 
 .c65 {
   color: #f29d41;
+  width: 0.75rem;
+  height: 0.75rem;
 }
 
 .c68 {
@@ -1114,6 +1118,7 @@ exports[`Marketplace page - layout renders the online layout 1`] = `
 }
 
 .c70 {
+  width: 0.75rem;
   -webkit-transform: rotate(90deg);
   -ms-transform: rotate(90deg);
   transform: rotate(90deg);
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js
index f68a8e5daa..2f7237a815 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/tests/index.test.js
@@ -17,6 +17,7 @@ jest.mock('../../../hooks/useNavigatorOnLine', () => jest.fn(() => true));
 
 jest.mock('@strapi/helper-plugin', () => ({
   ...jest.requireActual('@strapi/helper-plugin'),
+  useTracking: jest.fn(() => ({ trackUsage: jest.fn() })),
   useNotification: jest.fn(() => {
     return toggleNotification;
   }),
diff --git a/packages/core/helper-plugin/src/features/Tracking.js b/packages/core/helper-plugin/src/features/Tracking.js
index a60b74cac6..d74cc72783 100644
--- a/packages/core/helper-plugin/src/features/Tracking.js
+++ b/packages/core/helper-plugin/src/features/Tracking.js
@@ -21,7 +21,7 @@ import { useAppInfo } from './AppInfo';
  * @typedef {Object} TrackingContextValue
  * @property {string | boolean} uuid
  * @property {string | undefined} deviceId
- * @property {TelemetryProperties} telemetryProperties
+ * @property {TelemetryProperties | undefined} telemetryProperties
  */
 
 /* -------------------------------------------------------------------------------------------------
@@ -32,7 +32,11 @@ import { useAppInfo } from './AppInfo';
  * @preserve
  * @type {React.Context<TrackingContextValue>}
  */
-const TrackingContext = React.createContext();
+const TrackingContext = React.createContext({
+  uuid: false,
+  deviceId: undefined,
+  telemetryProperties: undefined,
+});
 
 /* -------------------------------------------------------------------------------------------------
  * Provider
diff --git a/packages/core/helper-plugin/src/features/tests/Tracking.test.js b/packages/core/helper-plugin/src/features/tests/Tracking.test.js
index 55e118aaea..3c2a2dad63 100644
--- a/packages/core/helper-plugin/src/features/tests/Tracking.test.js
+++ b/packages/core/helper-plugin/src/features/tests/Tracking.test.js
@@ -34,6 +34,10 @@ const setup = (props) =>
   });
 
 describe('useTracking', () => {
+  beforeAll(() => {
+    window.strapi.telemetryDisabled = false;
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
   });

From 8732f348a46da325306001bef577f49dbb8f298e Mon Sep 17 00:00:00 2001
From: Amandeep Singh Malhotra <amandeep.malhotra.894@gmail.com>
Date: Sun, 7 May 2023 18:13:52 +0530
Subject: [PATCH 10/28] fix: change alignment from stretch to center

---
 .../admin/admin/src/pages/AuthPage/components/Register/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js
index 7bf8f569fb..e0f3789c0b 100644
--- a/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js
+++ b/packages/core/admin/admin/src/pages/AuthPage/components/Register/index.js
@@ -149,7 +149,7 @@ const Register = ({ authType, fieldsToDisable, noSignin, onSubmit, schema }) =>
             return (
               <Form noValidate>
                 <Main>
-                  <Flex direction="column" alignItems="stretch" gap={3}>
+                  <Flex direction="column" alignItems="center" gap={3}>
                     <Logo />
 
                     <Typography as="h1" variant="alpha" textAlign="center">

From 47878c928e70b30c812fb930f78bf52143d716d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 7 May 2023 22:57:46 +0000
Subject: [PATCH 11/28] chore(deps): bump mysql2 from 3.2.0 to 3.3.0

Bumps [mysql2](https://github.com/sidorares/node-mysql2) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/sidorares/node-mysql2/releases)
- [Changelog](https://github.com/sidorares/node-mysql2/blob/master/Changelog.md)
- [Commits](https://github.com/sidorares/node-mysql2/compare/v3.2.0...v3.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 examples/getstarted/package.json |  2 +-
 yarn.lock                        | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json
index 78729480f9..cb2d77c69c 100644
--- a/examples/getstarted/package.json
+++ b/examples/getstarted/package.json
@@ -27,7 +27,7 @@
     "better-sqlite3": "8.3.0",
     "lodash": "4.17.21",
     "mysql": "2.18.1",
-    "mysql2": "3.2.0",
+    "mysql2": "3.3.0",
     "passport-google-oauth2": "0.2.0",
     "pg": "8.8.0",
     "react": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 982bf1eeee..13445eba61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18172,7 +18172,7 @@ __metadata:
     better-sqlite3: 8.3.0
     lodash: 4.17.21
     mysql: 2.18.1
-    mysql2: 3.2.0
+    mysql2: 3.3.0
     passport-google-oauth2: 0.2.0
     pg: 8.8.0
     react: ^17.0.2
@@ -23227,6 +23227,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^8.0.0":
+  version: 8.0.5
+  resolution: "lru-cache@npm:8.0.5"
+  checksum: 87d72196d8f46e8299c4ab576ed2ec8a07e3cbef517dc9874399c0b2470bd9bf62aacec3b67f84ed6d74aaa1ef31636d048edf996f76248fd17db72bfb631609
+  languageName: node
+  linkType: hard
+
 "lru_map@npm:^0.3.3":
   version: 0.3.3
   resolution: "lru_map@npm:0.3.3"
@@ -24346,19 +24353,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mysql2@npm:3.2.0":
-  version: 3.2.0
-  resolution: "mysql2@npm:3.2.0"
+"mysql2@npm:3.3.0":
+  version: 3.3.0
+  resolution: "mysql2@npm:3.3.0"
   dependencies:
     denque: ^2.1.0
     generate-function: ^2.3.1
     iconv-lite: ^0.6.3
     long: ^5.2.1
-    lru-cache: ^7.14.1
+    lru-cache: ^8.0.0
     named-placeholders: ^1.1.3
     seq-queue: ^0.0.5
     sqlstring: ^2.3.2
-  checksum: 7885d3b4f575e7321754de14bb4fadb80d4705d5b00f8b645d760ae7a0f3170ac6d4fe6e7b9307e698fe84c3ee047d7c2652f01b95c9393f56eace993f2952ab
+  checksum: a3418ab9371d5d329438eb91ecbac45f32fa8cc1b2d64773dd79a2989ad73979826492e44ac948008030177c5aba2b18b990553bd7c4f279dcbadfd345424a4f
   languageName: node
   linkType: hard
 

From fe0cee13b1aecfbd2a97d638db1987999ae4f218 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 7 May 2023 22:58:40 +0000
Subject: [PATCH 12/28] chore(deps): bump webpack from 5.76.0 to 5.82.0

Bumps [webpack](https://github.com/webpack/webpack) from 5.76.0 to 5.82.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.76.0...v5.82.0)

---
updated-dependencies:
- dependency-name: webpack
  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/helper-plugin/package.json |   2 +-
 yarn.lock                                | 259 +++++++++++++++++++++--
 3 files changed, 247 insertions(+), 16 deletions(-)

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index a5e61b0aa9..609488ed25 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -134,7 +134,7 @@
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
     "typescript": "5.0.4",
-    "webpack": "^5.76.0",
+    "webpack": "^5.82.0",
     "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.13.1",
     "webpackbar": "^5.0.2",
diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json
index 89ac30569e..874df40d09 100644
--- a/packages/core/helper-plugin/package.json
+++ b/packages/core/helper-plugin/package.json
@@ -77,7 +77,7 @@
     "rimraf": "3.0.2",
     "styled-components": "5.3.3",
     "typescript": "5.0.4",
-    "webpack": "^5.76.0",
+    "webpack": "^5.82.0",
     "webpack-cli": "^5.0.1"
   },
   "peerDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 982bf1eeee..14617e446a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7806,7 +7806,7 @@ __metadata:
     style-loader: 3.3.1
     styled-components: 5.3.3
     typescript: 5.0.4
-    webpack: ^5.76.0
+    webpack: ^5.82.0
     webpack-bundle-analyzer: ^4.8.0
     webpack-cli: ^5.0.1
     webpack-dev-server: ^4.13.1
@@ -8004,7 +8004,7 @@ __metadata:
     rimraf: 3.0.2
     styled-components: 5.3.3
     typescript: 5.0.4
-    webpack: ^5.76.0
+    webpack: ^5.82.0
     webpack-cli: ^5.0.1
   peerDependencies:
     "@strapi/design-system": ^1.7.3
@@ -9098,6 +9098,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/estree@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "@types/estree@npm:1.0.1"
+  checksum: e9aa175eacb797216fafce4d41e8202c7a75555bc55232dee0f9903d7171f8f19f0ae7d5191bb1a88cb90e65468be508c0df850a9fb81b4433b293a5a749899d
+  languageName: node
+  linkType: hard
+
 "@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.18":
   version: 4.17.30
   resolution: "@types/express-serve-static-core@npm:4.17.30"
@@ -10237,6 +10244,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/ast@npm:1.11.5, @webassemblyjs/ast@npm:^1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/ast@npm:1.11.5"
+  dependencies:
+    "@webassemblyjs/helper-numbers": 1.11.5
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
+  checksum: 7df16d8d4364d40e2506776330f8114fddc6494e6e18e8d5ec386312a0881a564cef136b0a74cc4a6ba284e2ff6bad890ddc029a0ba6cf45cc15186e638db118
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/ast@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/ast@npm:1.9.0"
@@ -10255,6 +10272,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/floating-point-hex-parser@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.5"
+  checksum: a6f35e3035a1ec4e446fa43da01539f3ed7e0f4b53d152f36ff34be1b63b08d86c4b09b6af375c95472a75f0c37b3b98b07199d157e767b8b3274e7a3962890c
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/floating-point-hex-parser@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.9.0"
@@ -10269,6 +10293,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/helper-api-error@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/helper-api-error@npm:1.11.5"
+  checksum: 717a6ffb3283bd24a7b74710c9bd3d71ec331a26c15446441af19fae9f087e36acb8dcf25b900b6897a1d1eff838e463fe678d66281e7eccee9a3ac0e3447372
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/helper-api-error@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-api-error@npm:1.9.0"
@@ -10283,6 +10314,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/helper-buffer@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/helper-buffer@npm:1.11.5"
+  checksum: 2c0925b1c3c9b115c183b88d9cf1a12e87fa4fc83ef985aa2a65d72cda543eba6b73b378d231b4feb810b17d3aa6cd297bd603199854346f8a50e3458d7ebbc0
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/helper-buffer@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-buffer@npm:1.9.0"
@@ -10326,6 +10364,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/helper-numbers@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/helper-numbers@npm:1.11.5"
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser": 1.11.5
+    "@webassemblyjs/helper-api-error": 1.11.5
+    "@xtuc/long": 4.2.2
+  checksum: 49c8bbf561d4df38009e38e6357c396f4454773fd31a03579a8e050a2b28053f5c47f675f00a37f79a65082c938c2159fa603049688ac01b1bafdb472c21110c
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/helper-wasm-bytecode@npm:1.11.1":
   version: 1.11.1
   resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.1"
@@ -10333,6 +10382,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/helper-wasm-bytecode@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.5"
+  checksum: 4e868de92587e131a7f22bc4eb44eee60c178d4c2c3eeabcb973b4eac73ec477f25d5f838394797265dbe4b600e781c6e150c762a45f249b94bf0711e73409a7
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.9.0"
@@ -10352,6 +10408,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/helper-wasm-section@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.5"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.5
+    "@webassemblyjs/helper-buffer": 1.11.5
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
+    "@webassemblyjs/wasm-gen": 1.11.5
+  checksum: 1752d7e0dbbf236a5cdc2257e1626a3562bfb0a7d2e967dc5e798c73088f18f20a991491565e2ffee61615f08035b4760e7aa080380bb60b86b393b6eb7486ae
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/helper-wasm-section@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/helper-wasm-section@npm:1.9.0"
@@ -10373,6 +10441,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/ieee754@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/ieee754@npm:1.11.5"
+  dependencies:
+    "@xtuc/ieee754": ^1.2.0
+  checksum: 68a855a3e3dd488fff4d2d100e491cb6ac07f728c9432f3216b8e1bb0a374b397b0a5f58fd3b71195e525d49c0c827db15c18897e1c220c629e759b19978e64c
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/ieee754@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/ieee754@npm:1.9.0"
@@ -10391,6 +10468,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/leb128@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/leb128@npm:1.11.5"
+  dependencies:
+    "@xtuc/long": 4.2.2
+  checksum: 555314708b6615c203c31a9dd810141c6de728e0043c2169ca69905ccf4d8603102994cb74ac5d057ac229bfc2be40f69cad2edd134ef2b909ef694eefe7bba6
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/leb128@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/leb128@npm:1.9.0"
@@ -10407,6 +10493,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/utf8@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/utf8@npm:1.11.5"
+  checksum: d8f67a5650d9bf26810da76e72d0547211a44f30f35657953f547e08185facb39ff326920bddec96d35b5cc65e4e66b1f23c6461847e2f93fad2a60b0bb20211
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/utf8@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/utf8@npm:1.9.0"
@@ -10446,6 +10539,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wasm-edit@npm:^1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/wasm-edit@npm:1.11.5"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.5
+    "@webassemblyjs/helper-buffer": 1.11.5
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
+    "@webassemblyjs/helper-wasm-section": 1.11.5
+    "@webassemblyjs/wasm-gen": 1.11.5
+    "@webassemblyjs/wasm-opt": 1.11.5
+    "@webassemblyjs/wasm-parser": 1.11.5
+    "@webassemblyjs/wast-printer": 1.11.5
+  checksum: 790142a1e282848201c7b68860aabc0141ee44a98a62c3f0af05f8de3cc69b439c3af54ae9a06acbbfbf7fd192b30ee97fb31eda3e08973cae373534ad2135c7
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wasm-gen@npm:1.11.1":
   version: 1.11.1
   resolution: "@webassemblyjs/wasm-gen@npm:1.11.1"
@@ -10459,6 +10568,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wasm-gen@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/wasm-gen@npm:1.11.5"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.5
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
+    "@webassemblyjs/ieee754": 1.11.5
+    "@webassemblyjs/leb128": 1.11.5
+    "@webassemblyjs/utf8": 1.11.5
+  checksum: 0122df4e5ce52d873f19f34b3ebe8237072e9e6a69667cbec42a2d98ba49f85ea2ed3d935195e6a7ad4f64b9dd7da42883f057fe1103d2062bc90f3428b063fe
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wasm-gen@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-gen@npm:1.9.0"
@@ -10484,6 +10606,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wasm-opt@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/wasm-opt@npm:1.11.5"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.5
+    "@webassemblyjs/helper-buffer": 1.11.5
+    "@webassemblyjs/wasm-gen": 1.11.5
+    "@webassemblyjs/wasm-parser": 1.11.5
+  checksum: f9416b0dece071e308616fb30e560f0c3c53b5bb23cc4409781b8c47d31e935b27e9a248c65aee9dd9136271e37a4c5cb0971b27e5adf623020fbb298423fe55
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wasm-opt@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-opt@npm:1.9.0"
@@ -10510,6 +10644,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wasm-parser@npm:1.11.5, @webassemblyjs/wasm-parser@npm:^1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/wasm-parser@npm:1.11.5"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.5
+    "@webassemblyjs/helper-api-error": 1.11.5
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
+    "@webassemblyjs/ieee754": 1.11.5
+    "@webassemblyjs/leb128": 1.11.5
+    "@webassemblyjs/utf8": 1.11.5
+  checksum: 094b3df07532cd2a1db91710622cbaf3d7467a361f9f73dc564999385a472fcc08497d8ccf9294bd7c8813d5e2056c06a81e032abb60520168899605fde9b12c
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wasm-parser@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wasm-parser@npm:1.9.0"
@@ -10548,6 +10696,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@webassemblyjs/wast-printer@npm:1.11.5":
+  version: 1.11.5
+  resolution: "@webassemblyjs/wast-printer@npm:1.11.5"
+  dependencies:
+    "@webassemblyjs/ast": 1.11.5
+    "@xtuc/long": 4.2.2
+  checksum: c2995224c56b403be7fce7afbb3ad6b2ceadce07a47b28bce745eabb0435fa363c0180bca907d28703ece02422d0de219e689253b55de288c79b8f92416c1d71
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/wast-printer@npm:1.9.0":
   version: 1.9.0
   resolution: "@webassemblyjs/wast-printer@npm:1.9.0"
@@ -15706,6 +15864,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"enhanced-resolve@npm:^5.13.0":
+  version: 5.13.0
+  resolution: "enhanced-resolve@npm:5.13.0"
+  dependencies:
+    graceful-fs: ^4.2.4
+    tapable: ^2.2.0
+  checksum: 76d6844c4393d76beed5b3ce6cf5a98dee3ad5c84a9887f49ccde1224e3b7af201dfbd5a57ebf2b49f623b74883df262d50ff480d3cc02fc2881fc58b84e1bbe
+  languageName: node
+  linkType: hard
+
 "enquirer@npm:~2.3.6":
   version: 2.3.6
   resolution: "enquirer@npm:2.3.6"
@@ -15953,6 +16121,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-module-lexer@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "es-module-lexer@npm:1.2.1"
+  checksum: c4145b853e1491eaa5d591e4580926d242978c38071ad3d09165c3b6d50314cc0ae3bf6e1dec81a9e53768b9299df2063d2e4a67d7742a5029ddeae6c4fc26f0
+  languageName: node
+  linkType: hard
+
 "es-set-tostringtag@npm:^2.0.1":
   version: 2.0.1
   resolution: "es-set-tostringtag@npm:2.0.1"
@@ -29149,6 +29324,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"schema-utils@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "schema-utils@npm:3.1.2"
+  dependencies:
+    "@types/json-schema": ^7.0.8
+    ajv: ^6.12.5
+    ajv-keywords: ^3.5.2
+  checksum: 39683edfe3beff018cdb1ae4fa296fc55cea13a080aa2b4d9351895cd64b22ba4d87e2e548c2a2ac1bc76e60980670adb0f413a58104479f1a0c12e5663cb8ca
+  languageName: node
+  linkType: hard
+
 "scripts-front@workspace:scripts/front":
   version: 0.0.0-use.local
   resolution: "scripts-front@workspace:scripts/front"
@@ -29311,6 +29497,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"serialize-javascript@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "serialize-javascript@npm:6.0.1"
+  dependencies:
+    randombytes: ^2.1.0
+  checksum: 3c4f4cb61d0893b988415bdb67243637333f3f574e9e9cc9a006a2ced0b390b0b3b44aef8d51c951272a9002ec50885eefdc0298891bc27eb2fe7510ea87dc4f
+  languageName: node
+  linkType: hard
+
 "serve-favicon@npm:^2.5.0":
   version: 2.5.0
   resolution: "serve-favicon@npm:2.5.0"
@@ -31092,6 +31287,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"terser-webpack-plugin@npm:^5.3.7":
+  version: 5.3.8
+  resolution: "terser-webpack-plugin@npm:5.3.8"
+  dependencies:
+    "@jridgewell/trace-mapping": ^0.3.17
+    jest-worker: ^27.4.5
+    schema-utils: ^3.1.1
+    serialize-javascript: ^6.0.1
+    terser: ^5.16.8
+  peerDependencies:
+    webpack: ^5.1.0
+  peerDependenciesMeta:
+    "@swc/core":
+      optional: true
+    esbuild:
+      optional: true
+    uglify-js:
+      optional: true
+  checksum: 0ffc2a1949b1fd60ef9c815c4629b9817656db612bb58c5db96e3b04204c86afd142b115392e48733364edc7bf95131f54c10174c05f046ba8f2adead6b06c3c
+  languageName: node
+  linkType: hard
+
 "terser@npm:^4.1.2, terser@npm:^4.6.3":
   version: 4.8.1
   resolution: "terser@npm:4.8.1"
@@ -31147,6 +31364,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"terser@npm:^5.16.8":
+  version: 5.17.1
+  resolution: "terser@npm:5.17.1"
+  dependencies:
+    "@jridgewell/source-map": ^0.3.2
+    acorn: ^8.5.0
+    commander: ^2.20.0
+    source-map-support: ~0.5.20
+  bin:
+    terser: bin/terser
+  checksum: 69b0e80e3c4084db2819de4d6ae8a2ba79f2fcd7ed6df40fe4b602ec7bfd8e889cc63c7d5268f30990ffecbf6eeda18f857adad9386fe2c2331b398d58ed855c
+  languageName: node
+  linkType: hard
+
 "test-exclude@npm:^6.0.0":
   version: 6.0.0
   resolution: "test-exclude@npm:6.0.0"
@@ -32992,21 +33223,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack@npm:^5.76.0":
-  version: 5.76.0
-  resolution: "webpack@npm:5.76.0"
+"webpack@npm:^5.82.0":
+  version: 5.82.0
+  resolution: "webpack@npm:5.82.0"
   dependencies:
     "@types/eslint-scope": ^3.7.3
-    "@types/estree": ^0.0.51
-    "@webassemblyjs/ast": 1.11.1
-    "@webassemblyjs/wasm-edit": 1.11.1
-    "@webassemblyjs/wasm-parser": 1.11.1
+    "@types/estree": ^1.0.0
+    "@webassemblyjs/ast": ^1.11.5
+    "@webassemblyjs/wasm-edit": ^1.11.5
+    "@webassemblyjs/wasm-parser": ^1.11.5
     acorn: ^8.7.1
     acorn-import-assertions: ^1.7.6
     browserslist: ^4.14.5
     chrome-trace-event: ^1.0.2
-    enhanced-resolve: ^5.10.0
-    es-module-lexer: ^0.9.0
+    enhanced-resolve: ^5.13.0
+    es-module-lexer: ^1.2.1
     eslint-scope: 5.1.1
     events: ^3.2.0
     glob-to-regexp: ^0.4.1
@@ -33015,9 +33246,9 @@ __metadata:
     loader-runner: ^4.2.0
     mime-types: ^2.1.27
     neo-async: ^2.6.2
-    schema-utils: ^3.1.0
+    schema-utils: ^3.1.2
     tapable: ^2.1.1
-    terser-webpack-plugin: ^5.1.3
+    terser-webpack-plugin: ^5.3.7
     watchpack: ^2.4.0
     webpack-sources: ^3.2.3
   peerDependenciesMeta:
@@ -33025,7 +33256,7 @@ __metadata:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: e897b3b34068222fe910d8894837cbf39f5e66b4772fe8d24dfc0090cd13e19337a3a757a97bc185be6c64d9d5a7b1ae372821b65a6079ce8c7ceba606edb409
+  checksum: 499e7f5f24fccaa76f64f2a01f91f371073416f568ef6171dc73187a89078f0c33410d4c9f40d411f0827bab8455f8476eabd803ef4d2920d9a2e5f17efa2703
   languageName: node
   linkType: hard
 

From f7d7dcc79254b6202e9a4f1ea39675bcbb6190d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 7 May 2023 22:59:32 +0000
Subject: [PATCH 13/28] chore(deps-dev): bump lint-staged from 13.0.3 to 13.2.2

Bumps [lint-staged](https://github.com/okonet/lint-staged) from 13.0.3 to 13.2.2.
- [Release notes](https://github.com/okonet/lint-staged/releases)
- [Commits](https://github.com/okonet/lint-staged/compare/v13.0.3...v13.2.2)

---
updated-dependencies:
- dependency-name: lint-staged
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 111 +++++++++++++++++++++++++++++++--------------------
 2 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/package.json b/package.json
index a4a24b6da3..6160f35726 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "jest-environment-jsdom": "29.0.3",
     "jest-watch-typeahead": "2.2.2",
     "lerna": "6.5.1",
-    "lint-staged": "13.0.3",
+    "lint-staged": "13.2.2",
     "lodash": "4.17.21",
     "nx": "15.8.3",
     "plop": "2.7.6",
diff --git a/yarn.lock b/yarn.lock
index 982bf1eeee..ac0936a7d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13072,6 +13072,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chalk@npm:5.2.0, chalk@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "chalk@npm:5.2.0"
+  checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa
+  languageName: node
+  linkType: hard
+
 "chalk@npm:^1.1.3":
   version: 1.1.3
   resolution: "chalk@npm:1.1.3"
@@ -13106,13 +13113,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "chalk@npm:5.2.0"
-  checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa
-  languageName: node
-  linkType: hard
-
 "change-case@npm:^3.1.0":
   version: 3.1.0
   resolution: "change-case@npm:3.1.0"
@@ -13711,7 +13711,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:2.0.19, colorette@npm:^2.0.10, colorette@npm:^2.0.14, colorette@npm:^2.0.16, colorette@npm:^2.0.17":
+"colorette@npm:2.0.19, colorette@npm:^2.0.10, colorette@npm:^2.0.14":
   version: 2.0.19
   resolution: "colorette@npm:2.0.19"
   checksum: 888cf5493f781e5fcf54ce4d49e9d7d698f96ea2b2ef67906834bb319a392c667f9ec69f4a10e268d2946d13a9503d2d19b3abaaaf174e3451bfe91fb9d82427
@@ -13725,6 +13725,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"colorette@npm:^2.0.19":
+  version: 2.0.20
+  resolution: "colorette@npm:2.0.20"
+  checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d
+  languageName: node
+  linkType: hard
+
 "colors@npm:~1.2.1":
   version: 1.2.5
   resolution: "colors@npm:1.2.5"
@@ -13775,6 +13782,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:^10.0.0":
+  version: 10.0.1
+  resolution: "commander@npm:10.0.1"
+  checksum: 436901d64a818295803c1996cd856621a74f30b9f9e28a588e726b2b1670665bccd7c1a77007ebf328729f0139838a88a19265858a0fa7a8728c4656796db948
+  languageName: node
+  linkType: hard
+
 "commander@npm:^2.19.0, commander@npm:^2.20.0, commander@npm:^2.20.3":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
@@ -13803,7 +13817,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^9.1.0, commander@npm:^9.3.0, commander@npm:^9.4.1":
+"commander@npm:^9.1.0, commander@npm:^9.4.1":
   version: 9.5.0
   resolution: "commander@npm:9.5.0"
   checksum: c7a3e27aa59e913b54a1bafd366b88650bc41d6651f0cbe258d4ff09d43d6a7394232a4dadd0bf518b3e696fdf595db1028a0d82c785b88bd61f8a440cecfade
@@ -16817,20 +16831,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "execa@npm:6.1.0"
+"execa@npm:^7.0.0":
+  version: 7.1.1
+  resolution: "execa@npm:7.1.1"
   dependencies:
     cross-spawn: ^7.0.3
     get-stream: ^6.0.1
-    human-signals: ^3.0.1
+    human-signals: ^4.3.0
     is-stream: ^3.0.0
     merge-stream: ^2.0.0
     npm-run-path: ^5.1.0
     onetime: ^6.0.0
     signal-exit: ^3.0.7
     strip-final-newline: ^3.0.0
-  checksum: 1a4af799839134f5c72eb63d525b87304c1114a63aa71676c91d57ccef2e26f2f53e14c11384ab11c4ec479be1efa83d11c8190e00040355c2c5c3364327fa8e
+  checksum: 21fa46fc69314ace4068cf820142bdde5b643a5d89831c2c9349479c1555bff137a291b8e749e7efca36535e4e0a8c772c11008ca2e84d2cbd6ca141a3c8f937
   languageName: node
   linkType: hard
 
@@ -19446,10 +19460,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"human-signals@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "human-signals@npm:3.0.1"
-  checksum: f252a7769c8094a5c9dc6772816bdb417b188820b04c8b42d0fc468e03a0ba905b1dd07afabe9385cc83504af1ccc2b985cd1e4aeeeb8e0029896c5af2e6f354
+"human-signals@npm:^4.3.0":
+  version: 4.3.1
+  resolution: "human-signals@npm:4.3.1"
+  checksum: 6f12958df3f21b6fdaf02d90896c271df00636a31e2bbea05bddf817a35c66b38a6fdac5863e2df85bd52f34958997f1f50350ff97249e1dff8452865d5235d1
   languageName: node
   linkType: hard
 
@@ -22784,10 +22798,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:2.0.5":
-  version: 2.0.5
-  resolution: "lilconfig@npm:2.0.5"
-  checksum: f7bb9e42656f06930ad04e583026f087508ae408d3526b8b54895e934eb2a966b7aafae569656f2c79a29fe6d779b3ec44ba577e80814734c8655d6f71cdf2d1
+"lilconfig@npm:2.1.0":
+  version: 2.1.0
+  resolution: "lilconfig@npm:2.1.0"
+  checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117
   languageName: node
   linkType: hard
 
@@ -22814,39 +22828,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lint-staged@npm:13.0.3":
-  version: 13.0.3
-  resolution: "lint-staged@npm:13.0.3"
+"lint-staged@npm:13.2.2":
+  version: 13.2.2
+  resolution: "lint-staged@npm:13.2.2"
   dependencies:
+    chalk: 5.2.0
     cli-truncate: ^3.1.0
-    colorette: ^2.0.17
-    commander: ^9.3.0
+    commander: ^10.0.0
     debug: ^4.3.4
-    execa: ^6.1.0
-    lilconfig: 2.0.5
-    listr2: ^4.0.5
+    execa: ^7.0.0
+    lilconfig: 2.1.0
+    listr2: ^5.0.7
     micromatch: ^4.0.5
     normalize-path: ^3.0.0
-    object-inspect: ^1.12.2
+    object-inspect: ^1.12.3
     pidtree: ^0.6.0
     string-argv: ^0.3.1
-    yaml: ^2.1.1
+    yaml: ^2.2.2
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 53d585007df06e162febab6b0836b55016d902586a267823c8a1158529d8c742dc7297e523f7023dff02250bef3eb0d6934f4ec4f9961adfc2ebbed5f54162d0
+  checksum: f34f6e2e85e827364658ab8717bf8b35239473c2d4959d746b053a4cf158ac657348444c755820a8ef3eac2d4753a37c52e9db3e201ee20b085f26d2f2fbc9ed
   languageName: node
   linkType: hard
 
-"listr2@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "listr2@npm:4.0.5"
+"listr2@npm:^5.0.7":
+  version: 5.0.8
+  resolution: "listr2@npm:5.0.8"
   dependencies:
     cli-truncate: ^2.1.0
-    colorette: ^2.0.16
+    colorette: ^2.0.19
     log-update: ^4.0.0
     p-map: ^4.0.0
     rfdc: ^1.3.0
-    rxjs: ^7.5.5
+    rxjs: ^7.8.0
     through: ^2.3.8
     wrap-ansi: ^7.0.0
   peerDependencies:
@@ -22854,7 +22868,7 @@ __metadata:
   peerDependenciesMeta:
     enquirer:
       optional: true
-  checksum: 7af31851abe25969ef0581c6db808117e36af15b131401795182427769d9824f451ba9e8aff6ccd25b6a4f6c8796f816292caf08e5f1f9b1775e8e9c313dc6c5
+  checksum: 8be9f5632627c4df0dc33f452c98d415a49e5f1614650d3cab1b103c33e95f2a7a0e9f3e1e5de00d51bf0b4179acd8ff11b25be77dbe097cf3773c05e728d46c
   languageName: node
   linkType: hard
 
@@ -28972,6 +28986,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^7.8.0":
+  version: 7.8.1
+  resolution: "rxjs@npm:7.8.1"
+  dependencies:
+    tslib: ^2.1.0
+  checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:5.1.1":
   version: 5.1.1
   resolution: "safe-buffer@npm:5.1.1"
@@ -30171,7 +30194,7 @@ __metadata:
     jest-environment-jsdom: 29.0.3
     jest-watch-typeahead: 2.2.2
     lerna: 6.5.1
-    lint-staged: 13.0.3
+    lint-staged: 13.2.2
     lodash: 4.17.21
     nx: 15.8.3
     plop: 2.7.6
@@ -33514,10 +33537,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.1.1":
-  version: 2.1.3
-  resolution: "yaml@npm:2.1.3"
-  checksum: 91316062324a93f9cb547469092392e7d004ff8f70c40fecb420f042a4870b2181557350da56c92f07bd44b8f7a252b0be26e6ade1f548e1f4351bdd01c9d3c7
+"yaml@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "yaml@npm:2.2.2"
+  checksum: d90c235e099e30094dcff61ba3350437aef53325db4a6bcd04ca96e1bfe7e348b191f6a7a52b5211e2dbc4eeedb22a00b291527da030de7c189728ef3f2b4eb3
   languageName: node
   linkType: hard
 

From 2145a3c1f5c2781acfdc6de4ccb455f9ca7d680c Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Thu, 4 May 2023 14:53:21 +0200
Subject: [PATCH 14/28] Fix: Add border to stage color badges

---
 .../ReviewWorkflowsStage/ReviewWorkflowsStageEE.js       | 2 +-
 .../Stages/Stage/components/OptionColor/OptionColor.js   | 9 ++++++++-
 .../components/SingleValueColor/SingleValueColor.js      | 9 ++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js
index 7904b05f0d..929a6a735f 100644
--- a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js
+++ b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js
@@ -6,7 +6,7 @@ import { pxToRem } from '@strapi/helper-plugin';
 export function ReviewWorkflowsStageEE({ color, name }) {
   return (
     <Flex alignItems="center" gap={2} maxWidth={pxToRem(300)}>
-      <Box height={2} background={color} hasRadius shrink={0} width={2} />
+      <Box height={2} background={color} borderColor="neutral150" hasRadius shrink={0} width={2} />
 
       <Typography fontWeight="regular" textColor="neutral700" ellipsis>
         {name}
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/OptionColor/OptionColor.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/OptionColor/OptionColor.js
index 6285e4982a..57a8e7c39e 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/OptionColor/OptionColor.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/OptionColor/OptionColor.js
@@ -9,7 +9,14 @@ export function OptionColor({ children, ...props }) {
   return (
     <components.Option {...props}>
       <Flex alignItems="center" gap={2}>
-        <Flex height={2} background={color} hasRadius shrink={0} width={2} />
+        <Flex
+          height={2}
+          background={color}
+          borderColor="neutral150"
+          hasRadius
+          shrink={0}
+          width={2}
+        />
 
         <Typography textColor="neutral800" ellipsis>
           {children}
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js
index c3346aac39..ff785c6d3c 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js
@@ -9,7 +9,14 @@ export function SingleValueColor({ children, ...props }) {
   return (
     <components.SingleValue {...props}>
       <Flex alignItems="center" gap={2}>
-        <Flex height={2} background={color} hasRadius shrink={0} width={2} />
+        <Flex
+          height={2}
+          background={color}
+          borderColor="neutral150"
+          hasRadius
+          shrink={0}
+          width={2}
+        />
 
         <Typography textColor="neutral800" ellipsis>
           {children}

From 94ce1a8e4d11c837f1864c803bb3e4726cf16ff3 Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Thu, 4 May 2023 16:04:44 +0200
Subject: [PATCH 15/28] Fix: Limit border of stage color badges to neutral0
 (white)

---
 .../ReviewWorkflowsStage/ReviewWorkflowsStageEE.js  | 13 ++++++++++++-
 .../Stage/components/OptionColor/OptionColor.js     |  5 ++++-
 .../components/SingleValueColor/SingleValueColor.js |  5 ++++-
 .../pages/ReviewWorkflows/utils/colors.js           |  4 +++-
 .../ReviewWorkflows/utils/tests/colors.test.js      |  5 +++++
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js
index 929a6a735f..830e760b96 100644
--- a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js
+++ b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js
@@ -3,10 +3,21 @@ import PropTypes from 'prop-types';
 import { Box, Flex, Typography } from '@strapi/design-system';
 import { pxToRem } from '@strapi/helper-plugin';
 
+import { getStageColorByHex } from '../../../../../pages/SettingsPage/pages/ReviewWorkflows/utils/colors';
+
 export function ReviewWorkflowsStageEE({ color, name }) {
+  const { themeColorName } = getStageColorByHex(color);
+
   return (
     <Flex alignItems="center" gap={2} maxWidth={pxToRem(300)}>
-      <Box height={2} background={color} borderColor="neutral150" hasRadius shrink={0} width={2} />
+      <Box
+        height={2}
+        background={color}
+        borderColor={themeColorName === 'neutral0' ? 'neutral150' : 'transparent'}
+        hasRadius
+        shrink={0}
+        width={2}
+      />
 
       <Typography fontWeight="regular" textColor="neutral700" ellipsis>
         {name}
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/OptionColor/OptionColor.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/OptionColor/OptionColor.js
index 57a8e7c39e..ff7c25a25a 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/OptionColor/OptionColor.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/OptionColor/OptionColor.js
@@ -3,8 +3,11 @@ import PropTypes from 'prop-types';
 import { components } from 'react-select';
 import { Flex, Typography } from '@strapi/design-system';
 
+import { getStageColorByHex } from '../../../../../utils/colors';
+
 export function OptionColor({ children, ...props }) {
   const { color } = props.data;
+  const { themeColorName } = getStageColorByHex(color);
 
   return (
     <components.Option {...props}>
@@ -12,7 +15,7 @@ export function OptionColor({ children, ...props }) {
         <Flex
           height={2}
           background={color}
-          borderColor="neutral150"
+          borderColor={themeColorName === 'neutral0' ? 'neutral150' : 'transparent'}
           hasRadius
           shrink={0}
           width={2}
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js
index ff785c6d3c..f8a5b63b63 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js
@@ -3,8 +3,11 @@ import PropTypes from 'prop-types';
 import { components } from 'react-select';
 import { Flex, Typography } from '@strapi/design-system';
 
+import { getStageColorByHex } from '../../../../../utils/colors';
+
 export function SingleValueColor({ children, ...props }) {
   const { color } = props.data;
+  const { themeColorName } = getStageColorByHex(color);
 
   return (
     <components.SingleValue {...props}>
@@ -12,7 +15,7 @@ export function SingleValueColor({ children, ...props }) {
         <Flex
           height={2}
           background={color}
-          borderColor="neutral150"
+          borderColor={themeColorName === 'neutral0' ? 'neutral150' : 'transparent'}
           hasRadius
           shrink={0}
           width={2}
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js
index 0d10447f33..9abd323d70 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js
@@ -6,7 +6,9 @@ export function getStageColorByHex(hex) {
   // there are multiple colors with the same hex code in the design tokens. In order to find
   // the correct one we have to find all matching colors and then check, which ones are usable
   // for stages.
-  const themeColors = Object.entries(lightTheme.colors).filter(([, value]) => value === hex);
+  const themeColors = Object.entries(lightTheme.colors).filter(
+    ([, value]) => value.toUpperCase() === hex.toUpperCase()
+  );
   const themeColorName = themeColors.reduce((acc, [name]) => {
     if (STAGE_COLORS?.[name]) {
       acc = name;
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/tests/colors.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/tests/colors.test.js
index 73b198c4d5..8102e94d24 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/tests/colors.test.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/tests/colors.test.js
@@ -22,6 +22,11 @@ describe('Settings | Review Workflows | colors', () => {
       themeColorName: 'primary600',
     });
 
+    expect(getStageColorByHex('#4945FF')).toStrictEqual({
+      name: 'Blue',
+      themeColorName: 'primary600',
+    });
+
     expect(getStageColorByHex('random')).toStrictEqual(null);
     expect(getStageColorByHex()).toStrictEqual(null);
   });

From a69bc50ddbe46dd7b23d258bd458bd925367503b Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Thu, 4 May 2023 16:58:55 +0200
Subject: [PATCH 16/28] Fix: do not crash if no color can be displayed

---
 .../Stage/components/SingleValueColor/SingleValueColor.js    | 5 ++++-
 .../pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js
index f8a5b63b63..8ec7c57151 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js
@@ -7,7 +7,10 @@ import { getStageColorByHex } from '../../../../../utils/colors';
 
 export function SingleValueColor({ children, ...props }) {
   const { color } = props.data;
-  const { themeColorName } = getStageColorByHex(color);
+  // in case an entity was not assigned to a stage (which displays an error)
+  // there is no color to display and we have to make sure the component does
+  // not crash
+  const { themeColorName } = color ? getStageColorByHex(color) : {};
 
   return (
     <components.SingleValue {...props}>
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js
index 9abd323d70..09f76438a2 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js
@@ -3,6 +3,10 @@ import { lightTheme } from '@strapi/design-system';
 import { STAGE_COLORS } from '../constants';
 
 export function getStageColorByHex(hex) {
+  if (!hex) {
+    return null;
+  }
+
   // there are multiple colors with the same hex code in the design tokens. In order to find
   // the correct one we have to find all matching colors and then check, which ones are usable
   // for stages.

From 56413f25c6fb971f9248654efe78b02509f8ca64 Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Thu, 4 May 2023 17:00:52 +0200
Subject: [PATCH 17/28] Chore: Update tests

---
 .../ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js  | 2 +-
 .../EditView/InformationBox/tests/InformationBoxEE.test.js   | 5 +++--
 .../pages/ReviewWorkflows/reducer/tests/index.test.js        | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js
index 36a9e30e59..ff92710118 100644
--- a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js
+++ b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/tests/ReviewWorkflowsStage.test.js
@@ -17,7 +17,7 @@ const setup = (props) => render(<ComponentFixture {...props} />);
 
 describe('DynamicTable | ReviewWorkflowsStage', () => {
   test('render stage name', () => {
-    const { getByText } = setup({ color: 'red', name: 'reviewed' });
+    const { getByText } = setup({ color: '#4945FF', name: 'reviewed' });
 
     expect(getByText('reviewed')).toBeInTheDocument();
   });
diff --git a/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/tests/InformationBoxEE.test.js b/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/tests/InformationBoxEE.test.js
index f433fcafa0..1a73943410 100644
--- a/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/tests/InformationBoxEE.test.js
+++ b/packages/core/admin/ee/admin/content-manager/pages/EditView/InformationBox/tests/InformationBoxEE.test.js
@@ -12,7 +12,7 @@ import { InformationBoxEE } from '../InformationBoxEE';
 const STAGE_ATTRIBUTE_NAME = 'strapi_reviewWorkflows_stage';
 const STAGE_FIXTURE = {
   id: 1,
-  color: 'red',
+  color: '#4945FF',
   name: 'Stage 1',
   worklow: 1,
 };
@@ -36,11 +36,12 @@ jest.mock(
             stages: [
               {
                 id: 1,
+                color: '#4945FF',
                 name: 'Stage 1',
               },
-
               {
                 id: 2,
+                color: '#4945FF',
                 name: 'Stage 2',
               },
             ],
diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/tests/index.test.js b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/tests/index.test.js
index 60563a58a9..083708ea9a 100644
--- a/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/tests/index.test.js
+++ b/packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/tests/index.test.js
@@ -14,12 +14,13 @@ const WORKFLOWS_FIXTURE = [
     stages: [
       {
         id: 1,
-        color: 'red',
+        color: '#4945FF',
         name: 'stage-1',
       },
 
       {
         id: 2,
+        color: '#4945FF',
         name: 'stage-2',
       },
     ],
@@ -353,7 +354,7 @@ describe('Admin | Settings | Review Workflows | reducer', () => {
               stages: expect.arrayContaining([
                 {
                   id: 1,
-                  color: 'red',
+                  color: '#4945FF',
                   name: 'stage-1-modified',
                 },
               ]),

From 81c9189bd79dbb59dc11c0ad0a4701f66d7b4b02 Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Mon, 8 May 2023 12:08:19 +0200
Subject: [PATCH 18/28] Chore: Remove unnecessary styled overwrite

---
 .../src/components/DynamicTable/index.js           | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/core/helper-plugin/src/components/DynamicTable/index.js b/packages/core/helper-plugin/src/components/DynamicTable/index.js
index 2f96166f8e..b78003e8d5 100644
--- a/packages/core/helper-plugin/src/components/DynamicTable/index.js
+++ b/packages/core/helper-plugin/src/components/DynamicTable/index.js
@@ -3,21 +3,13 @@ import PropTypes from 'prop-types';
 import { Box, Flex, Button, Typography, Table as TableCompo } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 import { Trash } from '@strapi/icons';
-import styled from 'styled-components';
+
 import useQueryParams from '../../hooks/useQueryParams';
 import { useTracking } from '../../features/Tracking';
 import ConfirmDialog from '../ConfirmDialog';
 import EmptyBodyTable from '../EmptyBodyTable';
 import TableHead from './TableHead';
 
-const BlockActions = styled(Flex)`
-  & > * + * {
-    margin-left: ${({ theme }) => theme.spaces[2]};
-  }
-
-  margin-left: ${({ pullRight }) => (pullRight ? 'auto' : undefined)};
-`;
-
 const Table = ({
   action,
   children,
@@ -133,7 +125,7 @@ const Table = ({
         <Box>
           <Box paddingBottom={4}>
             <Flex justifyContent="space-between">
-              <BlockActions>
+              <Flex gap={3}>
                 <Typography variant="epsilon" textColor="neutral600">
                   {formatMessage(
                     {
@@ -151,7 +143,7 @@ const Table = ({
                 >
                   {formatMessage({ id: 'global.delete', defaultMessage: 'Delete' })}
                 </Button>
-              </BlockActions>
+              </Flex>
             </Flex>
           </Box>
         </Box>

From b2e08defbb368394b826617cf446d3d2d9245772 Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Mon, 8 May 2023 12:15:44 +0200
Subject: [PATCH 19/28] Chore: Remove styled overwrites

---
 .../BrowseStep/PaginationFooter/Pagination.js | 18 ++++++------------
 .../AssetDialog/BrowseStep/index.js           | 19 ++++---------------
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/Pagination.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/Pagination.js
index dbce37140e..352020d403 100644
--- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/Pagination.js
+++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/PaginationFooter/Pagination.js
@@ -1,24 +1,18 @@
 import React, { useMemo } from 'react';
-import styled from 'styled-components';
 import PropTypes from 'prop-types';
-import { Flex } from '@strapi/design-system';
+import { Box, Flex } from '@strapi/design-system';
 import { PaginationContext } from './PaginationContext';
 
-const PaginationWrapper = styled.nav``;
-const PaginationList = styled(Flex)`
-  & > * + * {
-    margin-left: ${({ theme }) => theme.spaces[1]};
-  }
-`;
-
 export const Pagination = ({ children, label, activePage, pageCount }) => {
   const paginationValue = useMemo(() => ({ activePage, pageCount }), [activePage, pageCount]);
 
   return (
     <PaginationContext.Provider value={paginationValue}>
-      <PaginationWrapper aria-label={label}>
-        <PaginationList as="ul">{children}</PaginationList>
-      </PaginationWrapper>
+      <Box as="nav" aria-label={label}>
+        <Flex as="ul" gap={1}>
+          {children}
+        </Flex>
+      </Box>
     </PaginationContext.Provider>
   );
 };
diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/index.js b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/index.js
index eb0e78abaf..8d0d8f0dbd 100644
--- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/index.js
+++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/index.js
@@ -40,17 +40,6 @@ import PageSize from './PageSize';
 import SearchAsset from './SearchAsset';
 import { isSelectable } from './utils/isSelectable';
 
-const StartBlockActions = styled(Flex)`
-  & > * + * {
-    margin-left: ${({ theme }) => theme.spaces[2]};
-  }
-  margin-left: ${({ pullRight }) => (pullRight ? 'auto' : undefined)};
-`;
-
-const EndBlockActions = styled(StartBlockActions)`
-  flex-shrink: 0;
-`;
-
 const TypographyMaxWidth = styled(Typography)`
   max-width: 100%;
 `;
@@ -131,7 +120,7 @@ export const BrowseStep = ({
         <Box paddingBottom={4}>
           <Flex justifyContent="space-between" alignItems="flex-start">
             {(assetCount > 0 || folderCount > 0 || isFiltering) && (
-              <StartBlockActions wrap="wrap">
+              <Flex gap={2} wrap="wrap">
                 {multiple && isGridView && (
                   <Flex
                     paddingLeft={2}
@@ -157,11 +146,11 @@ export const BrowseStep = ({
                   appliedFilters={queryObject?.filters?.$and}
                   onChangeFilters={onChangeFilters}
                 />
-              </StartBlockActions>
+              </Flex>
             )}
 
             {(assetCount > 0 || folderCount > 0 || isSearching) && (
-              <EndBlockActions pullRight>
+              <Flex marginLeft="auto" shrink={0}>
                 <ActionContainer paddingTop={1} paddingBottom={1}>
                   <IconButton
                     icon={isGridView ? <List /> : <Grid />}
@@ -180,7 +169,7 @@ export const BrowseStep = ({
                   />
                 </ActionContainer>
                 <SearchAsset onChangeSearch={onChangeSearch} queryValue={queryObject._q || ''} />
-              </EndBlockActions>
+              </Flex>
             )}
           </Flex>
         </Box>

From f7200674bb8149ec29e7f2a1f63943f1be50ed1e Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Mon, 8 May 2023 12:36:24 +0200
Subject: [PATCH 20/28] Chore: Increase dependabot open-pr limit to 10

---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 82cb946a0e..c96b9fd8f8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,6 +6,7 @@ updates:
       interval: weekly
       day: sunday
       time: '22:00'
+    open-pull-requests-limit: 10
     versioning-strategy: increase
     ignore:
       # Only allow patch as minor babel versions need to be upgraded all together
@@ -23,6 +24,7 @@ updates:
       - 'source: dependencies'
       - 'pr: chore'
   - package-ecosystem: github-actions
+    open-pull-requests-limit: 10
     directory: /
     schedule:
       interval: weekly

From 9c6c9ad5604a7d3b437a83389514dbea4c2be693 Mon Sep 17 00:00:00 2001
From: Gustav Hansen <gustav.hansen@strapi.io>
Date: Mon, 8 May 2023 13:10:30 +0200
Subject: [PATCH 21/28] Chore: Update snapshot tests

---
 .../tests/__snapshots__/index.test.js.snap    | 502 +++++++++---------
 1 file changed, 260 insertions(+), 242 deletions(-)

diff --git a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/__snapshots__/index.test.js.snap b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/__snapshots__/index.test.js.snap
index 64ac053f50..37bec859d1 100644
--- a/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/__snapshots__/index.test.js.snap
+++ b/packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/__snapshots__/index.test.js.snap
@@ -14,7 +14,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   padding-bottom: 16px;
 }
 
-.c6 {
+.c5 {
   background: #4945ff;
   padding: 8px;
   padding-right: 16px;
@@ -25,12 +25,19 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   cursor: pointer;
 }
 
-.c16 {
+.c13 {
+  margin-left: auto;
+  -webkit-flex-shrink: 0;
+  -ms-flex-negative: 0;
+  flex-shrink: 0;
+}
+
+.c15 {
   padding-top: 4px;
   padding-bottom: 4px;
 }
 
-.c18 {
+.c17 {
   background: #ffffff;
   padding: 8px;
   border-radius: 4px;
@@ -41,19 +48,19 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   cursor: pointer;
 }
 
-.c22 {
+.c21 {
   padding-top: 12px;
 }
 
-.c31 {
+.c30 {
   padding-bottom: 8px;
 }
 
-.c35 {
+.c34 {
   position: relative;
 }
 
-.c38 {
+.c37 {
   background: #ffffff;
   padding: 12px;
   border-radius: 4px;
@@ -64,7 +71,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   cursor: pointer;
 }
 
-.c39 {
+.c38 {
   background: #eaf5ff;
   color: #66b7f1;
   padding-top: 8px;
@@ -74,30 +81,30 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   border-radius: 4px;
 }
 
-.c41 {
+.c40 {
   position: relative;
   overflow: hidden;
   max-width: 100%;
 }
 
-.c44 {
+.c43 {
   padding: 4px;
   max-width: 100%;
 }
 
-.c46 {
+.c45 {
   max-width: 100%;
 }
 
-.c53 {
+.c52 {
   right: 16px;
 }
 
-.c56 {
+.c55 {
   padding-top: 16px;
 }
 
-.c61 {
+.c60 {
   background: #ffffff;
   padding-right: 12px;
   padding-left: 12px;
@@ -108,24 +115,24 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   cursor: default;
 }
 
-.c64 {
+.c63 {
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
 }
 
-.c70 {
+.c69 {
   padding-left: 8px;
 }
 
-.c11 {
+.c10 {
   font-size: 0.75rem;
   line-height: 1.33;
   font-weight: 600;
   color: #ffffff;
 }
 
-.c32 {
+.c31 {
   font-weight: 500;
   font-size: 1rem;
   line-height: 1.25;
@@ -133,7 +140,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   color: #32324d;
 }
 
-.c48 {
+.c47 {
   font-size: 0.875rem;
   line-height: 1.43;
   display: block;
@@ -144,7 +151,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   color: #32324d;
 }
 
-.c50 {
+.c49 {
   font-size: 0.75rem;
   line-height: 1.33;
   display: block;
@@ -154,14 +161,14 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   color: #666687;
 }
 
-.c59 {
+.c58 {
   font-size: 0.75rem;
   line-height: 1.33;
   font-weight: 600;
   color: #32324d;
 }
 
-.c66 {
+.c65 {
   font-size: 0.875rem;
   line-height: 1.43;
   display: block;
@@ -171,7 +178,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   color: #32324d;
 }
 
-.c71 {
+.c70 {
   font-size: 0.875rem;
   line-height: 1.43;
   color: #666687;
@@ -225,9 +232,10 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
+  gap: 8px;
 }
 
-.c7 {
+.c6 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -242,7 +250,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   gap: 8px;
 }
 
-.c12 {
+.c11 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -256,7 +264,24 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   flex-direction: row;
 }
 
-.c19 {
+.c14 {
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  -webkit-flex-shrink: 0;
+  -ms-flex-negative: 0;
+  flex-shrink: 0;
+}
+
+.c18 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -274,7 +299,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   justify-content: center;
 }
 
-.c42 {
+.c41 {
   -webkit-align-items: flex-start;
   -webkit-box-align: flex-start;
   -ms-flex-align: flex-start;
@@ -288,7 +313,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   flex-direction: column;
 }
 
-.c47 {
+.c46 {
   -webkit-align-items: start;
   -webkit-box-align: start;
   -ms-flex-align: start;
@@ -302,7 +327,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   flex-direction: column;
 }
 
-.c57 {
+.c56 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -320,7 +345,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   justify-content: space-between;
 }
 
-.c58 {
+.c57 {
   -webkit-align-items: stretch;
   -webkit-box-align: stretch;
   -ms-flex-align: stretch;
@@ -335,7 +360,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   gap: 4px;
 }
 
-.c62 {
+.c61 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -354,7 +379,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   justify-content: space-between;
 }
 
-.c65 {
+.c64 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -369,26 +394,41 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   gap: 12px;
 }
 
-.c8 {
+.c71 {
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+  -ms-flex-direction: row;
+  flex-direction: row;
+  gap: 4px;
+}
+
+.c7 {
   position: relative;
   outline: none;
 }
 
-.c8 > svg {
+.c7 > svg {
   height: 12px;
   width: 12px;
 }
 
-.c8 > svg > g,
-.c8 > svg path {
+.c7 > svg > g,
+.c7 > svg path {
   fill: #ffffff;
 }
 
-.c8[aria-disabled='true'] {
+.c7[aria-disabled='true'] {
   pointer-events: none;
 }
 
-.c8:after {
+.c7:after {
   -webkit-transition-property: all;
   transition-property: all;
   -webkit-transition-duration: 0.2s;
@@ -403,11 +443,11 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   border: 2px solid transparent;
 }
 
-.c8:focus-visible {
+.c7:focus-visible {
   outline: none;
 }
 
-.c8:focus-visible:after {
+.c7:focus-visible:after {
   border-radius: 8px;
   content: '';
   position: absolute;
@@ -418,7 +458,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   border: 2px solid #4945ff;
 }
 
-.c21 {
+.c20 {
   border: 0;
   -webkit-clip: rect(0 0 0 0);
   clip: rect(0 0 0 0);
@@ -430,70 +470,70 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   width: 1px;
 }
 
-.c9 {
+.c8 {
   height: 2rem;
   border: 1px solid #dcdce4;
   background: #ffffff;
 }
 
-.c9[aria-disabled='true'] {
+.c8[aria-disabled='true'] {
   border: 1px solid #dcdce4;
   background: #eaeaef;
 }
 
-.c9[aria-disabled='true'] .c10 {
+.c8[aria-disabled='true'] .c9 {
   color: #666687;
 }
 
-.c9[aria-disabled='true'] svg > g,.c9[aria-disabled='true'] svg path {
+.c8[aria-disabled='true'] svg > g,.c8[aria-disabled='true'] svg path {
   fill: #666687;
 }
 
-.c9[aria-disabled='true']:active {
+.c8[aria-disabled='true']:active {
   border: 1px solid #dcdce4;
   background: #eaeaef;
 }
 
-.c9[aria-disabled='true']:active .c10 {
+.c8[aria-disabled='true']:active .c9 {
   color: #666687;
 }
 
-.c9[aria-disabled='true']:active svg > g,.c9[aria-disabled='true']:active svg path {
+.c8[aria-disabled='true']:active svg > g,.c8[aria-disabled='true']:active svg path {
   fill: #666687;
 }
 
-.c9:hover {
+.c8:hover {
   background-color: #f6f6f9;
 }
 
-.c9:active {
+.c8:active {
   background-color: #eaeaef;
 }
 
-.c9 .c10 {
+.c8 .c9 {
   color: #32324d;
 }
 
-.c9 svg > g,
-.c9 svg path {
+.c8 svg > g,
+.c8 svg path {
   fill: #32324d;
 }
 
-.c54 > * {
+.c53 > * {
   margin-left: 0;
   margin-right: 0;
 }
 
-.c54 > * + * {
+.c53 > * + * {
   margin-left: 8px;
 }
 
-.c55 {
+.c54 {
   position: absolute;
   top: 12px;
 }
 
-.c60 {
+.c59 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -504,7 +544,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   align-items: center;
 }
 
-.c13 {
+.c12 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -515,12 +555,12 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   align-items: center;
 }
 
-.c13 svg {
+.c12 svg {
   height: 4px;
   width: 6px;
 }
 
-.c63 {
+.c62 {
   border: 1px solid #dcdce4;
   min-height: 2rem;
   outline: none;
@@ -531,34 +571,34 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   transition-duration: 0.2s;
 }
 
-.c63[aria-disabled='true'] {
+.c62[aria-disabled='true'] {
   color: #666687;
 }
 
-.c63:focus-visible {
+.c62:focus-visible {
   outline: none;
 }
 
-.c63:focus-within {
+.c62:focus-within {
   border: 1px solid #4945ff;
   box-shadow: #4945ff 0px 0px 0px 2px;
 }
 
-.c69 > svg {
+.c68 > svg {
   width: 0.375rem;
 }
 
-.c69 > svg > path {
+.c68 > svg > path {
   fill: #666687;
 }
 
-.c67 {
+.c66 {
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
 }
 
-.c68 {
+.c67 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -569,66 +609,66 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   flex-wrap: wrap;
 }
 
-.c78[data-state='checked'] .c10 {
+.c77[data-state='checked'] .c9 {
   font-weight: bold;
   color: #4945ff;
 }
 
-.c33 {
+.c32 {
   display: grid;
   grid-template-columns: repeat(12,1fr);
   gap: 16px;
 }
 
-.c34 {
+.c33 {
   grid-column: span 3;
   max-width: 100%;
 }
 
-.c20 svg > g,
-.c20 svg path {
+.c19 svg > g,
+.c19 svg path {
   fill: #8e8ea9;
 }
 
-.c20:hover svg > g,
-.c20:hover svg path {
+.c19:hover svg > g,
+.c19:hover svg path {
   fill: #666687;
 }
 
-.c20:active svg > g,
-.c20:active svg path {
+.c19:active svg > g,
+.c19:active svg path {
   fill: #a5a5ba;
 }
 
-.c20[aria-disabled='true'] svg path {
+.c19[aria-disabled='true'] svg path {
   fill: #666687;
 }
 
-.c26 {
+.c25 {
   padding-top: 4px;
   padding-right: 8px;
   padding-bottom: 4px;
   padding-left: 8px;
 }
 
-.c28 {
+.c27 {
   padding-right: 4px;
   padding-left: 4px;
 }
 
-.c27 {
+.c26 {
   font-size: 0.75rem;
   line-height: 1.33;
   color: #32324d;
 }
 
-.c29 {
+.c28 {
   font-size: 0.75rem;
   line-height: 1.33;
   color: #8e8ea9;
 }
 
-.c23 {
+.c22 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -642,7 +682,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   flex-direction: row;
 }
 
-.c25 {
+.c24 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -656,11 +696,11 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   flex-direction: row;
 }
 
-.c24:first-child {
+.c23:first-child {
   margin-left: calc(-1*8px);
 }
 
-.c30 {
+.c29 {
   border-radius: 4px;
   color: #666687;
   font-size: 0.75rem;
@@ -670,13 +710,13 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   text-decoration: none;
 }
 
-.c30:hover,
-.c30:focus {
+.c29:hover,
+.c29:focus {
   background-color: #dcdce4;
   color: #4a4a6a;
 }
 
-.c37 {
+.c36 {
   height: 100%;
   left: 0;
   position: absolute;
@@ -685,46 +725,42 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   width: 100%;
 }
 
-.c37:hover,
-.c37:focus {
+.c36:hover,
+.c36:focus {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c40 path {
+.c39 path {
   fill: currentColor;
 }
 
-.c52 {
+.c51 {
   display: none;
 }
 
-.c36:hover .c51,
-.c36:focus-within .c51 {
+.c35:hover .c50,
+.c35:focus-within .c50 {
   display: block;
 }
 
-.c43 {
+.c42 {
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
-.c45:focus {
+.c44:focus {
   outline: 2px solid #4945ff;
   outline-offset: -2px;
 }
 
-.c72 > * + * {
-  margin-left: 4px;
-}
-
-.c77 {
+.c76 {
   line-height: revert;
 }
 
-.c73 {
+.c72 {
   padding: 12px;
   border-radius: 4px;
   -webkit-text-decoration: none;
@@ -737,7 +773,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   outline: none;
 }
 
-.c73:after {
+.c72:after {
   -webkit-transition-property: all;
   transition-property: all;
   -webkit-transition-duration: 0.2s;
@@ -752,11 +788,55 @@ exports[`BrowseStep renders and match snapshot 1`] = `
   border: 2px solid transparent;
 }
 
-.c73:focus-visible {
+.c72:focus-visible {
   outline: none;
 }
 
-.c73:focus-visible:after {
+.c72:focus-visible:after {
+  border-radius: 8px;
+  content: '';
+  position: absolute;
+  top: -5px;
+  bottom: -5px;
+  left: -5px;
+  right: -5px;
+  border: 2px solid #4945ff;
+}
+
+.c74 {
+  padding: 12px;
+  border-radius: 4px;
+  box-shadow: 0px 1px 4px rgba(33,33,52,0.1);
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  position: relative;
+  outline: none;
+}
+
+.c74:after {
+  -webkit-transition-property: all;
+  transition-property: all;
+  -webkit-transition-duration: 0.2s;
+  transition-duration: 0.2s;
+  border-radius: 8px;
+  content: '';
+  position: absolute;
+  top: -4px;
+  bottom: -4px;
+  left: -4px;
+  right: -4px;
+  border: 2px solid transparent;
+}
+
+.c74:focus-visible {
+  outline: none;
+}
+
+.c74:focus-visible:after {
   border-radius: 8px;
   content: '';
   position: absolute;
@@ -768,106 +848,44 @@ exports[`BrowseStep renders and match snapshot 1`] = `
 }
 
 .c75 {
-  padding: 12px;
-  border-radius: 4px;
-  box-shadow: 0px 1px 4px rgba(33,33,52,0.1);
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  position: relative;
-  outline: none;
-}
-
-.c75:after {
-  -webkit-transition-property: all;
-  transition-property: all;
-  -webkit-transition-duration: 0.2s;
-  transition-duration: 0.2s;
-  border-radius: 8px;
-  content: '';
-  position: absolute;
-  top: -4px;
-  bottom: -4px;
-  left: -4px;
-  right: -4px;
-  border: 2px solid transparent;
-}
-
-.c75:focus-visible {
-  outline: none;
-}
-
-.c75:focus-visible:after {
-  border-radius: 8px;
-  content: '';
-  position: absolute;
-  top: -5px;
-  bottom: -5px;
-  left: -5px;
-  right: -5px;
-  border: 2px solid #4945ff;
-}
-
-.c76 {
   color: #271fe0;
   background: #ffffff;
 }
 
-.c76:hover {
+.c75:hover {
   box-shadow: 0px 1px 4px rgba(33,33,52,0.1);
 }
 
-.c74 {
+.c73 {
   font-size: 0.7rem;
   pointer-events: none;
 }
 
-.c74 svg path {
+.c73 svg path {
   fill: #c0c0cf;
 }
 
-.c74:focus svg path,
-.c74:hover svg path {
+.c73:focus svg path,
+.c73:hover svg path {
   fill: #c0c0cf;
 }
 
-.c5 > * + * {
-  margin-left: 8px;
-}
-
-.c14 {
-  margin-left: auto;
-}
-
-.c14 > * + * {
-  margin-left: 8px;
-}
-
-.c15 {
-  -webkit-flex-shrink: 0;
-  -ms-flex-negative: 0;
-  flex-shrink: 0;
-}
-
-.c49 {
+.c48 {
   max-width: 100%;
 }
 
-.c17 svg path {
+.c16 svg path {
   fill: #8e8ea9;
 }
 
 @media (max-width:68.75rem) {
-  .c34 {
+  .c33 {
     grid-column: span;
   }
 }
 
 @media (max-width:34.375rem) {
-  .c34 {
+  .c33 {
     grid-column: span;
   }
 }
@@ -886,7 +904,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
         class="c3"
       >
         <div
-          class="c4 c5"
+          class="c4"
           wrap="wrap"
         >
           <div>
@@ -895,21 +913,21 @@ exports[`BrowseStep renders and match snapshot 1`] = `
               aria-disabled="false"
               aria-expanded="false"
               aria-haspopup="true"
-              class="c6 c7 c8 c9"
+              class="c5 c6 c7 c8"
               label="Sort by"
               type="button"
             >
               <span
-                class="c10 c11"
+                class="c9 c10"
               >
                 Sort by
               </span>
               <div
                 aria-hidden="true"
-                class="c12"
+                class="c11"
               >
                 <span
-                  class="c13"
+                  class="c12"
                 >
                   <svg
                     aria-hidden="true"
@@ -932,7 +950,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
           </div>
           <button
             aria-disabled="false"
-            class="c6 c7 c8 c9"
+            class="c5 c6 c7 c8"
             type="button"
           >
             <div
@@ -955,28 +973,28 @@ exports[`BrowseStep renders and match snapshot 1`] = `
               </svg>
             </div>
             <span
-              class="c10 c11"
+              class="c9 c10"
             >
               Filters
             </span>
           </button>
         </div>
         <div
-          class="c12 c14 c15"
+          class="c13 c14"
         >
           <div
-            class="c16 c17"
+            class="c15 c16"
           >
             <span>
               <button
                 aria-disabled="false"
                 aria-labelledby="1"
-                class="c18 c19 c8 c20"
+                class="c17 c18 c7 c19"
                 tabindex="0"
                 type="button"
               >
                 <span
-                  class="c21"
+                  class="c20"
                 >
                   List View
                 </span>
@@ -1001,12 +1019,12 @@ exports[`BrowseStep renders and match snapshot 1`] = `
             <button
               aria-disabled="false"
               aria-labelledby="2"
-              class="c18 c19 c8 c20"
+              class="c17 c18 c7 c19"
               tabindex="0"
               type="button"
             >
               <span
-                class="c21"
+                class="c20"
               >
                 Search
               </span>
@@ -1032,64 +1050,64 @@ exports[`BrowseStep renders and match snapshot 1`] = `
       </div>
     </div>
     <div
-      class="c22"
+      class="c21"
     >
       <nav
         aria-label="Folders navigation"
         class=""
       >
         <ol
-          class="c23 c24"
+          class="c22 c23"
         >
           <li
-            class="c25"
+            class="c24"
           >
             <div
-              class="c26"
+              class="c25"
             >
               <span
                 aria-current="false"
-                class="c27"
+                class="c26"
               >
                 Media Library
               </span>
             </div>
             <div
               aria-hidden="true"
-              class="c28"
+              class="c27"
             >
               <span
-                class="c29"
+                class="c28"
               >
                 /
               </span>
             </div>
           </li>
           <li
-            class="c25"
+            class="c24"
           >
             <button
-              class="c30"
+              class="c29"
               type="button"
             >
               Folder 2
             </button>
             <div
               aria-hidden="true"
-              class="c28"
+              class="c27"
             >
               <span
-                class="c29"
+                class="c28"
               >
                 /
               </span>
             </div>
           </li>
           <li
-            class="c25"
+            class="c24"
           >
             <button
-              class="c30"
+              class="c29"
               type="button"
             >
               Folder 1
@@ -1102,42 +1120,42 @@ exports[`BrowseStep renders and match snapshot 1`] = `
       class=""
     >
       <div
-        class="c31"
+        class="c30"
       >
         <h2
-          class="c10 c32"
+          class="c9 c31"
         >
           Folders (1)
         </h2>
       </div>
       <div
-        class="c33"
+        class="c32"
       >
         <div
-          class="c34"
+          class="c33"
         >
           <div
             class=""
           >
             <div
-              class="c35 c36"
+              class="c34 c35"
               tabindex="0"
             >
               <button
                 aria-hidden="true"
                 aria-label="Folder 1"
-                class="c37"
+                class="c36"
                 tabindex="-1"
                 type="button"
               />
               <div
-                class="c38 c7"
+                class="c37 c6"
               >
                 <div
-                  class="c39"
+                  class="c38"
                 >
                   <svg
-                    class="c40"
+                    class="c39"
                     fill="none"
                     height="1.5rem"
                     viewBox="0 0 24 24"
@@ -1151,29 +1169,29 @@ exports[`BrowseStep renders and match snapshot 1`] = `
                   </svg>
                 </div>
                 <div
-                  class="c41 c42 c43"
+                  class="c40 c41 c42"
                   id="folder-1-1-title"
                   overflow="hidden"
                 >
                   <button
-                    class="c44 c45"
+                    class="c43 c44"
                     type="button"
                   >
                     <h2
-                      class="c46 c47"
+                      class="c45 c46"
                     >
                       <span
-                        class="c10 c48 c49"
+                        class="c9 c47 c48"
                       >
                         Folder 1
                         <div
-                          class="c21"
+                          class="c20"
                         >
                           -
                         </div>
                       </span>
                       <span
-                        class="c10 c50 c49"
+                        class="c9 c49 c48"
                       >
                         1 folder, 1 asset
                       </span>
@@ -1181,18 +1199,18 @@ exports[`BrowseStep renders and match snapshot 1`] = `
                   </button>
                 </div>
                 <div
-                  class="c51 c52"
+                  class="c50 c51"
                 >
                   <div
-                    class="c53 c12 c54 c55"
+                    class="c52 c11 c53 c54"
                   >
                     <button
                       aria-disabled="false"
-                      class="c18 c19 c8 c20"
+                      class="c17 c18 c7 c19"
                       type="button"
                     >
                       <span
-                        class="c21"
+                        class="c20"
                       >
                         Edit folder
                       </span>
@@ -1222,19 +1240,19 @@ exports[`BrowseStep renders and match snapshot 1`] = `
       </div>
     </div>
     <div
-      class="c56 c57"
+      class="c55 c56"
     >
       <div
-        class="c12"
+        class="c11"
       >
         <div
           class=""
         >
           <div
-            class="c58"
+            class="c57"
           >
             <label
-              class="c10 c59 c60"
+              class="c9 c58 c59"
               for="4"
             />
             <div
@@ -1242,7 +1260,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
               aria-controls="radix-0"
               aria-describedby="4-hint 4-error"
               aria-expanded="false"
-              class="c61 c62 c63"
+              class="c60 c61 c62"
               data-state="closed"
               dir="ltr"
               id="4"
@@ -1251,24 +1269,24 @@ exports[`BrowseStep renders and match snapshot 1`] = `
               tabindex="0"
             >
               <span
-                class="c64 c65"
+                class="c63 c64"
               >
                 <span
-                  class="c10 c66 c67"
+                  class="c9 c65 c66"
                 >
                   <span
-                    class="c68"
+                    class="c67"
                   >
                     10
                   </span>
                 </span>
               </span>
               <span
-                class="c65"
+                class="c64"
               >
                 <span
                   aria-hidden="true"
-                  class="c69"
+                  class="c68"
                 >
                   <svg
                     fill="none"
@@ -1290,10 +1308,10 @@ exports[`BrowseStep renders and match snapshot 1`] = `
           </div>
         </div>
         <div
-          class="c70"
+          class="c69"
         >
           <label
-            class="c10 c71"
+            class="c9 c70"
             for="page-size"
           >
             Entries per page
@@ -1305,17 +1323,17 @@ exports[`BrowseStep renders and match snapshot 1`] = `
         class=""
       >
         <ul
-          class="c12 c72"
+          class="c71"
         >
           <li>
             <button
               aria-disabled="true"
-              class="c73 c74"
+              class="c72 c73"
               tabindex="-1"
               type="button"
             >
               <div
-                class="c21"
+                class="c20"
               >
                 Go to previous page
               </div>
@@ -1336,17 +1354,17 @@ exports[`BrowseStep renders and match snapshot 1`] = `
           </li>
           <li>
             <button
-              class="c75 c76"
+              class="c74 c75"
               type="button"
             >
               <div
-                class="c21"
+                class="c20"
               >
                 Go to page 1
               </div>
               <span
                 aria-hidden="true"
-                class="c10 c59 c77"
+                class="c9 c58 c76"
               >
                 1
               </span>
@@ -1355,12 +1373,12 @@ exports[`BrowseStep renders and match snapshot 1`] = `
           <li>
             <button
               aria-disabled="true"
-              class="c73 c74"
+              class="c72 c73"
               tabindex="-1"
               type="button"
             >
               <div
-                class="c21"
+                class="c20"
               >
                 Go to next page
               </div>
@@ -1384,7 +1402,7 @@ exports[`BrowseStep renders and match snapshot 1`] = `
     </div>
   </div>
   <div
-    class="c21"
+    class="c20"
   >
     <p
       aria-live="polite"

From d68daa2061115ae5402f6519d0006fcae424e6ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 May 2023 13:20:43 +0000
Subject: [PATCH 22/28] chore(deps): bump @strapi/icons from 1.6.5 to 1.7.3

Bumps @strapi/icons from 1.6.5 to 1.7.3.

---
updated-dependencies:
- dependency-name: "@strapi/icons"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/packages/plugins/sentry/package.json b/packages/plugins/sentry/package.json
index bc0876cb5e..2e0aaff931 100644
--- a/packages/plugins/sentry/package.json
+++ b/packages/plugins/sentry/package.json
@@ -29,7 +29,7 @@
     "@sentry/node": "6.19.7",
     "@strapi/design-system": "1.7.3",
     "@strapi/helper-plugin": "4.10.2",
-    "@strapi/icons": "1.6.5"
+    "@strapi/icons": "1.7.3"
   },
   "devDependencies": {
     "react": "^17.0.2",
diff --git a/yarn.lock b/yarn.lock
index 28ef5e9983..98c7ddb694 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8016,16 +8016,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@strapi/icons@npm:1.6.5":
-  version: 1.6.5
-  resolution: "@strapi/icons@npm:1.6.5"
-  peerDependencies:
-    react: ^17.0.2
-    react-dom: ^17.0.2
-  checksum: 4299d1390bd9452566280157c3f6c27a9eca25e166df3e7cc39b2617692d9d1160e5e430e75da8bfa05b81ad4ecfa5d5554a482598fd09bf630ba8cf95b949be
-  languageName: node
-  linkType: hard
-
 "@strapi/icons@npm:1.7.3":
   version: 1.7.3
   resolution: "@strapi/icons@npm:1.7.3"
@@ -8277,7 +8267,7 @@ __metadata:
     "@sentry/node": 6.19.7
     "@strapi/design-system": 1.7.3
     "@strapi/helper-plugin": 4.10.2
-    "@strapi/icons": 1.6.5
+    "@strapi/icons": 1.7.3
     react: ^17.0.2
     react-dom: ^17.0.2
     react-router-dom: 5.3.4

From 0a0c2d2b50318578794b58844e4603e776b54784 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 May 2023 13:21:14 +0000
Subject: [PATCH 23/28] chore(deps): bump @fingerprintjs/fingerprintjs from
 3.3.6 to 3.4.1

Bumps [@fingerprintjs/fingerprintjs](https://github.com/fingerprintjs/fingerprintjs) from 3.3.6 to 3.4.1.
- [Release notes](https://github.com/fingerprintjs/fingerprintjs/releases)
- [Commits](https://github.com/fingerprintjs/fingerprintjs/compare/v3.3.6...v3.4.1)

---
updated-dependencies:
- dependency-name: "@fingerprintjs/fingerprintjs"
  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                        | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index 609488ed25..f12fee0a30 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -46,7 +46,7 @@
     "@babel/preset-react": "^7.18.6",
     "@babel/runtime": "^7.20.13",
     "@casl/ability": "^5.4.3",
-    "@fingerprintjs/fingerprintjs": "3.3.6",
+    "@fingerprintjs/fingerprintjs": "3.4.1",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
     "@strapi/babel-plugin-switch-ee-ce": "4.10.2",
     "@strapi/data-transfer": "4.10.2",
diff --git a/yarn.lock b/yarn.lock
index 28ef5e9983..7d724f4074 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3182,12 +3182,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@fingerprintjs/fingerprintjs@npm:3.3.6":
-  version: 3.3.6
-  resolution: "@fingerprintjs/fingerprintjs@npm:3.3.6"
+"@fingerprintjs/fingerprintjs@npm:3.4.1":
+  version: 3.4.1
+  resolution: "@fingerprintjs/fingerprintjs@npm:3.4.1"
   dependencies:
-    tslib: ^2.0.1
-  checksum: 2609d1decef8a35d12424803026dfd6f3b424c6540cfbcd5d62a7e28ed3dcd89ed8accd753f6eafdefeb58d5e923cd81c8abf7ee0ddb3ea95f9d216512b318de
+    tslib: ^2.4.1
+  checksum: 20db8cd1ed42c0f237eebf59c731c45dc1929ed6bbc62bfaf887bddce2bdb261dec077c7ecf94995bd3ae8a0e9f317b01281c230baa1b73f2f0d7466f0d8f180
   languageName: node
   linkType: hard
 
@@ -7709,7 +7709,7 @@ __metadata:
     "@babel/preset-react": ^7.18.6
     "@babel/runtime": ^7.20.13
     "@casl/ability": ^5.4.3
-    "@fingerprintjs/fingerprintjs": 3.3.6
+    "@fingerprintjs/fingerprintjs": 3.4.1
     "@pmmmwh/react-refresh-webpack-plugin": 0.5.10
     "@strapi/babel-plugin-switch-ee-ce": 4.10.2
     "@strapi/data-transfer": 4.10.2
@@ -31842,6 +31842,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.4.1":
+  version: 2.5.0
+  resolution: "tslib@npm:2.5.0"
+  checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1
+  languageName: node
+  linkType: hard
+
 "tsscmp@npm:1.0.6":
   version: 1.0.6
   resolution: "tsscmp@npm:1.0.6"

From f58fcc2208c184f3949e0aae4701e04529696103 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 May 2023 13:22:21 +0000
Subject: [PATCH 24/28] chore(deps-dev): bump msw from 1.0.0 to 1.2.1

Bumps [msw](https://github.com/mswjs/msw) from 1.0.0 to 1.2.1.
- [Release notes](https://github.com/mswjs/msw/releases)
- [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mswjs/msw/compare/v1.0.0...v1.2.1)

---
updated-dependencies:
- dependency-name: msw
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 packages/core/admin/package.json              |  2 +-
 packages/core/email/package.json              |  2 +-
 packages/core/upload/package.json             |  2 +-
 packages/plugins/documentation/package.json   |  2 +-
 packages/plugins/i18n/package.json            |  2 +-
 .../plugins/users-permissions/package.json    |  2 +-
 yarn.lock                                     | 81 +++++++------------
 7 files changed, 33 insertions(+), 60 deletions(-)

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index 609488ed25..e5325a1a3c 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -147,7 +147,7 @@
     "@testing-library/user-event": "14.4.3",
     "duplicate-dependencies-webpack-plugin": "^1.0.2",
     "glob": "8.0.3",
-    "msw": "1.0.1",
+    "msw": "1.2.1",
     "react-test-renderer": "^17.0.2",
     "speed-measure-webpack-plugin": "1.5.0",
     "webpack-bundle-analyzer": "^4.8.0"
diff --git a/packages/core/email/package.json b/packages/core/email/package.json
index 1192eeef19..76b799ec85 100644
--- a/packages/core/email/package.json
+++ b/packages/core/email/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "@strapi/helper-plugin": "4.10.2",
     "@testing-library/react": "12.1.4",
-    "msw": "1.0.0",
+    "msw": "1.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "5.3.4",
diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json
index d0ba3c3d55..14ed12cc89 100644
--- a/packages/core/upload/package.json
+++ b/packages/core/upload/package.json
@@ -58,7 +58,7 @@
     "@testing-library/react": "12.1.4",
     "@testing-library/react-hooks": "8.0.1",
     "@testing-library/user-event": "14.4.3",
-    "msw": "1.0.1",
+    "msw": "1.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "5.3.4",
diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json
index 3b6cc21444..ab307c1111 100644
--- a/packages/plugins/documentation/package.json
+++ b/packages/plugins/documentation/package.json
@@ -65,7 +65,7 @@
     "@apidevtools/swagger-parser": "^10.1.0",
     "@testing-library/react": "12.1.4",
     "history": "^4.9.0",
-    "msw": "1.0.1",
+    "msw": "1.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "5.3.4",
diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
index b25cfb6f1c..fbf4ded17c 100644
--- a/packages/plugins/i18n/package.json
+++ b/packages/plugins/i18n/package.json
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "@testing-library/react": "12.1.4",
-    "msw": "1.0.1",
+    "msw": "1.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "5.3.4",
diff --git a/packages/plugins/users-permissions/package.json b/packages/plugins/users-permissions/package.json
index 2ed99c49e6..4f52782c38 100644
--- a/packages/plugins/users-permissions/package.json
+++ b/packages/plugins/users-permissions/package.json
@@ -56,7 +56,7 @@
     "@testing-library/react-hooks": "8.0.1",
     "@testing-library/user-event": "14.4.3",
     "history": "^4.9.0",
-    "msw": "1.0.1",
+    "msw": "1.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "5.3.4",
diff --git a/yarn.lock b/yarn.lock
index 28ef5e9983..597f702680 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7772,7 +7772,7 @@ __metadata:
     markdown-it-sub: ^1.0.0
     markdown-it-sup: 1.0.0
     mini-css-extract-plugin: 2.7.2
-    msw: 1.0.1
+    msw: 1.2.1
     node-schedule: 2.1.0
     p-map: 4.0.0
     passport-local: 1.0.0
@@ -8148,7 +8148,7 @@ __metadata:
     immer: 9.0.19
     koa-static: ^5.0.0
     lodash: 4.17.21
-    msw: 1.0.1
+    msw: 1.2.1
     path-to-regexp: 6.2.1
     pluralize: 8.0.0
     react: ^17.0.2
@@ -8185,7 +8185,7 @@ __metadata:
     "@strapi/utils": 4.10.2
     "@testing-library/react": 12.1.4
     lodash: 4.17.21
-    msw: 1.0.0
+    msw: 1.2.1
     prop-types: ^15.7.2
     react: ^17.0.2
     react-dom: ^17.0.2
@@ -8250,7 +8250,7 @@ __metadata:
     formik: 2.2.9
     immer: 9.0.19
     lodash: 4.17.21
-    msw: 1.0.1
+    msw: 1.2.1
     prop-types: ^15.7.2
     qs: 6.11.1
     react: ^17.0.2
@@ -8315,7 +8315,7 @@ __metadata:
     koa-static: 5.0.0
     lodash: 4.17.21
     mime-types: 2.1.35
-    msw: 1.0.1
+    msw: 1.2.1
     prop-types: ^15.7.2
     qs: 6.11.1
     react: ^17.0.2
@@ -8362,7 +8362,7 @@ __metadata:
     koa: ^2.13.4
     koa2-ratelimit: ^1.1.2
     lodash: 4.17.21
-    msw: 1.0.1
+    msw: 1.2.1
     prop-types: ^15.7.2
     purest: 4.0.2
     react: ^17.0.2
@@ -19181,7 +19181,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"headers-polyfill@npm:^3.1.0":
+"headers-polyfill@npm:^3.1.0, headers-polyfill@npm:^3.1.2":
   version: 3.1.2
   resolution: "headers-polyfill@npm:3.1.2"
   checksum: 510ca9637ef652404dbd432e680418f8d418ba18094ef2f64c3d8de955ebf6e68d553c7f0aeaa5fc937d130b139c1e2d7c2066cd4cf0f740a4627924eaaee9db
@@ -20435,10 +20435,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-node-process@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-node-process@npm:1.0.1"
-  checksum: 3ddb8a892a00f6eb9c2aea7e7e1426b8683512d9419933d95114f4f64b5455e26601c23a31c0682463890032136dd98a326988a770ab6b4eed54a43ade8bed50
+"is-node-process@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "is-node-process@npm:1.2.0"
+  checksum: 930765cdc6d81ab8f1bbecbea4a8d35c7c6d88a3ff61f3630e0fc7f22d624d7661c1df05c58547d0eb6a639dfa9304682c8e342c4113a6ed51472b704cee2928
   languageName: node
   linkType: hard
 
@@ -24432,9 +24432,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"msw@npm:1.0.0":
-  version: 1.0.0
-  resolution: "msw@npm:1.0.0"
+"msw@npm:1.2.1":
+  version: 1.2.1
+  resolution: "msw@npm:1.2.1"
   dependencies:
     "@mswjs/cookies": ^0.2.2
     "@mswjs/interceptors": ^0.17.5
@@ -24445,58 +24445,24 @@ __metadata:
     chokidar: ^3.4.2
     cookie: ^0.4.2
     graphql: ^15.0.0 || ^16.0.0
-    headers-polyfill: ^3.1.0
+    headers-polyfill: ^3.1.2
     inquirer: ^8.2.0
-    is-node-process: ^1.0.1
+    is-node-process: ^1.2.0
     js-levenshtein: ^1.1.6
     node-fetch: ^2.6.7
-    outvariant: ^1.3.0
+    outvariant: ^1.4.0
     path-to-regexp: ^6.2.0
     strict-event-emitter: ^0.4.3
     type-fest: ^2.19.0
     yargs: ^17.3.1
   peerDependencies:
-    typescript: ">= 4.4.x <= 4.9.x"
+    typescript: ">= 4.4.x <= 5.0.x"
   peerDependenciesMeta:
     typescript:
       optional: true
   bin:
     msw: cli/index.js
-  checksum: fa1e7abb0f3acfb70723ad5e2717bf9d6168f853100a2ac83473804a9181a36641fc9a8e98e792f6440be7935982847063be378d7555397206b877ecee474446
-  languageName: node
-  linkType: hard
-
-"msw@npm:1.0.1":
-  version: 1.0.1
-  resolution: "msw@npm:1.0.1"
-  dependencies:
-    "@mswjs/cookies": ^0.2.2
-    "@mswjs/interceptors": ^0.17.5
-    "@open-draft/until": ^1.0.3
-    "@types/cookie": ^0.4.1
-    "@types/js-levenshtein": ^1.1.1
-    chalk: 4.1.1
-    chokidar: ^3.4.2
-    cookie: ^0.4.2
-    graphql: ^15.0.0 || ^16.0.0
-    headers-polyfill: ^3.1.0
-    inquirer: ^8.2.0
-    is-node-process: ^1.0.1
-    js-levenshtein: ^1.1.6
-    node-fetch: ^2.6.7
-    outvariant: ^1.3.0
-    path-to-regexp: ^6.2.0
-    strict-event-emitter: ^0.4.3
-    type-fest: ^2.19.0
-    yargs: ^17.3.1
-  peerDependencies:
-    typescript: ">= 4.4.x <= 4.9.x"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  bin:
-    msw: cli/index.js
-  checksum: e5d6cbe67067ca46f42aaa33011f53a4e5a873abcf81c52a6996536b3c41a88f522821d3a4cf589658252581506afddb58fd8c3dfd79a5cbf06e26e14f9570b6
+  checksum: 97b9c5ffc81b4380dd24ff40ac52ca02f406c88f86d8209ba991da19aad0bcfc37e807794aa1b9bf29f89cd86fd31e492bf4418c5ff02559b4f80d6ce4fb417b
   languageName: node
   linkType: hard
 
@@ -25875,13 +25841,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"outvariant@npm:^1.2.1, outvariant@npm:^1.3.0":
+"outvariant@npm:^1.2.1":
   version: 1.3.0
   resolution: "outvariant@npm:1.3.0"
   checksum: ac76ca375c1c642989e1c74f0e9ebac84c05bc9fdc8f28be949c16fae1658e9f1f2fb1133fe3cc1e98afabef78fe4298fe9360b5734baf8e6ad440c182680848
   languageName: node
   linkType: hard
 
+"outvariant@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "outvariant@npm:1.4.0"
+  checksum: ec32dfc315c464bb6e4906b2f450d259ce0b86caf70b70b249054359d9af21a7fccf53a8b6aa232f8d718449e31c1cfa594e6ebffaafe7bf908b502495256d7b
+  languageName: node
+  linkType: hard
+
 "p-all@npm:^2.1.0":
   version: 2.1.0
   resolution: "p-all@npm:2.1.0"

From 6bbbf5fac2edcb56e9376631312a208534894622 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 May 2023 13:22:51 +0000
Subject: [PATCH 25/28] chore(deps): bump webpack-cli from 5.0.1 to 5.1.0

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 5.0.1 to 5.1.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@5.0.1...webpack-cli@5.1.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 +-
 packages/core/helper-plugin/package.json |  2 +-
 yarn.lock                                | 36 ++++++++++++------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index 609488ed25..8a5b1cba7c 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -135,7 +135,7 @@
     "styled-components": "5.3.3",
     "typescript": "5.0.4",
     "webpack": "^5.82.0",
-    "webpack-cli": "^5.0.1",
+    "webpack-cli": "^5.1.0",
     "webpack-dev-server": "^4.13.1",
     "webpackbar": "^5.0.2",
     "yup": "^0.32.9"
diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json
index 874df40d09..40159a1b4e 100644
--- a/packages/core/helper-plugin/package.json
+++ b/packages/core/helper-plugin/package.json
@@ -78,7 +78,7 @@
     "styled-components": "5.3.3",
     "typescript": "5.0.4",
     "webpack": "^5.82.0",
-    "webpack-cli": "^5.0.1"
+    "webpack-cli": "^5.1.0"
   },
   "peerDependencies": {
     "@strapi/design-system": "^1.7.3",
diff --git a/yarn.lock b/yarn.lock
index 28ef5e9983..f47795f6ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7808,7 +7808,7 @@ __metadata:
     typescript: 5.0.4
     webpack: ^5.82.0
     webpack-bundle-analyzer: ^4.8.0
-    webpack-cli: ^5.0.1
+    webpack-cli: ^5.1.0
     webpack-dev-server: ^4.13.1
     webpackbar: ^5.0.2
     yup: ^0.32.9
@@ -8005,7 +8005,7 @@ __metadata:
     styled-components: 5.3.3
     typescript: 5.0.4
     webpack: ^5.82.0
-    webpack-cli: ^5.0.1
+    webpack-cli: ^5.1.0
   peerDependencies:
     "@strapi/design-system": ^1.7.3
     "@strapi/icons": ^1.7.3
@@ -10717,13 +10717,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webpack-cli/configtest@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@webpack-cli/configtest@npm:2.0.1"
+"@webpack-cli/configtest@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "@webpack-cli/configtest@npm:2.1.0"
   peerDependencies:
     webpack: 5.x.x
     webpack-cli: 5.x.x
-  checksum: 15d0ca835f2e16ec99e9f295f07b676435b9e706d7700df0ad088692fea065e34772fc44b96a4f6a86178b9ca8cf1ff941fbce15269587cf0925d70b18928cea
+  checksum: b875fccd8be9a936924e24986725823347703e3eb72ea884e74669ca20f007704e859855a6a05940d5d3805ce2fc08b183a0f1658d5395b5454b3f5f88293081
   languageName: node
   linkType: hard
 
@@ -10737,16 +10737,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@webpack-cli/serve@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@webpack-cli/serve@npm:2.0.1"
+"@webpack-cli/serve@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "@webpack-cli/serve@npm:2.0.3"
   peerDependencies:
     webpack: 5.x.x
     webpack-cli: 5.x.x
   peerDependenciesMeta:
     webpack-dev-server:
       optional: true
-  checksum: 75c55f8398dd60e4821f81bec6e96287cebb3ab1837ef016779bc2f0c76a1d29c45b99e53daa99ba1fa156b5e2b61c19abf58098de20c2b58391b1f496ecc145
+  checksum: 1a133d8222d9a3b286cbc670a920af1a2ee66f136b61cb1448767bc481cdc3db65f06eae132a7093b4059ad7aa9a1a5b4810099f8698402843e7c39796804dd0
   languageName: node
   linkType: hard
 
@@ -13940,7 +13940,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^10.0.0":
+"commander@npm:^10.0.0, commander@npm:^10.0.1":
   version: 10.0.1
   resolution: "commander@npm:10.0.1"
   checksum: 436901d64a818295803c1996cd856621a74f30b9f9e28a588e726b2b1670665bccd7c1a77007ebf328729f0139838a88a19265858a0fa7a8728c4656796db948
@@ -32986,16 +32986,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-cli@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "webpack-cli@npm:5.0.1"
+"webpack-cli@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "webpack-cli@npm:5.1.0"
   dependencies:
     "@discoveryjs/json-ext": ^0.5.0
-    "@webpack-cli/configtest": ^2.0.1
+    "@webpack-cli/configtest": ^2.1.0
     "@webpack-cli/info": ^2.0.1
-    "@webpack-cli/serve": ^2.0.1
+    "@webpack-cli/serve": ^2.0.3
     colorette: ^2.0.14
-    commander: ^9.4.1
+    commander: ^10.0.1
     cross-spawn: ^7.0.3
     envinfo: ^7.7.3
     fastest-levenshtein: ^1.0.12
@@ -33014,7 +33014,7 @@ __metadata:
       optional: true
   bin:
     webpack-cli: bin/cli.js
-  checksum: b1544eea669442e78c3dba9f79c0f8d0136759b8b2fe9cd32c0d410250fd719988ae037778ba88993215d44971169f2c268c0c934068be561711615f1951bd53
+  checksum: 73749b9e27e16007011266dcd7b935168cc61cd4e346e4c09a697be066a310b822c1f386ba4a87417851eedd6df5812389918be68e275542c8a18e05ca1a719c
   languageName: node
   linkType: hard
 

From cc647e1a60e0ccbc80270b440a5ca40413bf0d86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 May 2023 06:31:50 +0000
Subject: [PATCH 26/28] chore(deps): bump webpack-dev-server from 4.13.1 to
 4.15.0

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.13.1 to 4.15.0.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.13.1...v4.15.0)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  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                        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index db2af8ef5a..42a2b5e324 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -136,7 +136,7 @@
     "typescript": "5.0.4",
     "webpack": "^5.82.0",
     "webpack-cli": "^5.1.0",
-    "webpack-dev-server": "^4.13.1",
+    "webpack-dev-server": "^4.15.0",
     "webpackbar": "^5.0.2",
     "yup": "^0.32.9"
   },
diff --git a/yarn.lock b/yarn.lock
index 9d33271a94..874011acb7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7809,7 +7809,7 @@ __metadata:
     webpack: ^5.82.0
     webpack-bundle-analyzer: ^4.8.0
     webpack-cli: ^5.1.0
-    webpack-dev-server: ^4.13.1
+    webpack-dev-server: ^4.15.0
     webpackbar: ^5.0.2
     yup: ^0.32.9
   peerDependencies:
@@ -33061,9 +33061,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-dev-server@npm:^4.13.1":
-  version: 4.13.1
-  resolution: "webpack-dev-server@npm:4.13.1"
+"webpack-dev-server@npm:^4.15.0":
+  version: 4.15.0
+  resolution: "webpack-dev-server@npm:4.15.0"
   dependencies:
     "@types/bonjour": ^3.5.9
     "@types/connect-history-api-fallback": ^1.3.5
@@ -33104,7 +33104,7 @@ __metadata:
       optional: true
   bin:
     webpack-dev-server: bin/webpack-dev-server.js
-  checksum: f70611544b7d964a31eb3d934d7c2b376b97e6927a89e03b2e21cfa5812bb639625cd18fd350de1604ba6c455b324135523a894032f28c69d90d90682e4f3b7d
+  checksum: 6fe375089b061be2e4ed6d6a8b20743734d304cd0c34757271c6685f97642b028f253c627f899b629c97c067c294484f906e394fd1c104ee795237b8725f2701
   languageName: node
   linkType: hard
 

From 7b717f1ebbe1146de47357ed7d88105963157a32 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Tue, 9 May 2023 12:22:17 +0200
Subject: [PATCH 27/28] move confirmation messages outside of engine

---
 .../core/data-transfer/src/engine/index.ts    | 97 +++++--------------
 .../lib/commands/actions/import/action.js     | 27 +-----
 .../lib/commands/actions/transfer/action.js   | 27 +-----
 .../lib/commands/utils/data-transfer.js       | 78 ++++++++++++++-
 4 files changed, 106 insertions(+), 123 deletions(-)

diff --git a/packages/core/data-transfer/src/engine/index.ts b/packages/core/data-transfer/src/engine/index.ts
index 23a50a1548..336cddc50e 100644
--- a/packages/core/data-transfer/src/engine/index.ts
+++ b/packages/core/data-transfer/src/engine/index.ts
@@ -4,8 +4,8 @@ import { EOL } from 'os';
 import { isEmpty, uniq, last, isNumber, difference, omit, set } from 'lodash/fp';
 import { diff as semverDiff } from 'semver';
 import type { Schema } from '@strapi/strapi';
+import * as utils from '../utils';
 
-import chalk from 'chalk';
 import type {
   IAsset,
   IDestinationProvider,
@@ -108,6 +108,8 @@ class TransferEngine<
 
   #metadata: { source?: IMetadata; destination?: IMetadata } = {};
 
+  #ignoredDiffs: Record<string, utils.json.Diff[]> = {};
+
   // Progress of the current stage
   progress: {
     // metrics on the progress such as size and record count
@@ -147,8 +149,8 @@ class TransferEngine<
   /**
    * Report a fatal error and throw it
    */
-  #panic(error: Error) {
-    this.#reportError(error, 'fatal');
+  panic(error: Error) {
+    this.reportError(error, 'fatal');
 
     throw error;
   }
@@ -156,7 +158,7 @@ class TransferEngine<
   /**
    * Report an error diagnostic
    */
-  #reportError(error: Error, severity: ErrorDiagnosticSeverity) {
+  reportError(error: Error, severity: ErrorDiagnosticSeverity) {
     this.diagnostics.report({
       kind: 'error',
       details: {
@@ -172,7 +174,7 @@ class TransferEngine<
   /**
    * Report a warning diagnostic
    */
-  #reportWarning(message: string, origin?: string) {
+  reportWarning(message: string, origin?: string) {
     this.diagnostics.report({
       kind: 'warning',
       details: { createdAt: new Date(), message, origin },
@@ -182,7 +184,7 @@ class TransferEngine<
   /**
    * Report an info diagnostic
    */
-  #reportInfo(message: string, params?: unknown) {
+  reportInfo(message: string, params?: unknown) {
     this.diagnostics.report({
       kind: 'info',
       details: { createdAt: new Date(), message, params },
@@ -517,7 +519,7 @@ class TransferEngine<
 
       results.forEach((state) => {
         if (state.status === 'rejected') {
-          this.#reportWarning(state.reason, `transfer(${stage})`);
+          this.reportWarning(state.reason, `transfer(${stage})`);
         }
       });
 
@@ -544,7 +546,7 @@ class TransferEngine<
         .on('error', (e) => {
           updateEndTime();
           this.#emitStageUpdate('error', stage);
-          this.#reportError(e, 'error');
+          this.reportError(e, 'error');
           destination.destroy(e);
           reject(e);
         })
@@ -591,7 +593,7 @@ class TransferEngine<
 
     results.forEach((result) => {
       if (result.status === 'rejected') {
-        this.#panic(result.reason);
+        this.panic(result.reason);
       }
     });
   }
@@ -607,7 +609,7 @@ class TransferEngine<
 
     results.forEach((result) => {
       if (result.status === 'rejected') {
-        this.#panic(result.reason);
+        this.panic(result.reason);
       }
     });
   }
@@ -644,77 +646,26 @@ class TransferEngine<
         this.#assertSchemasMatching(sourceSchemas, destinationSchemas);
       }
     } catch (error) {
-      // if this is a schema matching error
+      // if this is a schema matching error, allow handlers to resolve it
       if (error instanceof TransferEngineValidationError && error.details?.details?.diffs) {
         const schemaDiffs = error.details?.details?.diffs as Record<string, Diff[]>;
 
         const context = {
+          ignoreDiffs: {},
           diffs: schemaDiffs,
           source: this.sourceProvider,
           destination: this.destinationProvider,
         };
 
-        let workflowsStatus;
-        const source = 'Schema Integrity';
-
-        Object.entries(context.diffs).forEach(([uid, diffs]) => {
-          for (const diff of diffs) {
-            const path = `${uid}.${diff.path.join('.')}`;
-            const endPath = diff.path[diff.path.length - 1];
-
-            // Catch known features
-            // TODO: can this be moved outside of the engine?
-            if (
-              uid === 'admin::workflow' ||
-              uid === 'admin::workflow-stage' ||
-              endPath.startsWith('strapi_reviewWorkflows_')
-            ) {
-              workflowsStatus = diff.kind;
-            }
-            // handle generic cases
-            else if (diff.kind === 'added') {
-              this.#reportWarning(
-                chalk.red(`${chalk.bold(path)} does not exist on destination`),
-                source
-              );
-            } else if (diff.kind === 'deleted') {
-              this.#reportWarning(
-                chalk.red(`${chalk.bold(path)} does not exist on source`),
-                source
-              );
-            } else if (diff.kind === 'modified') {
-              this.#reportWarning(
-                chalk.red(`${chalk.bold(path)} has a different data type`),
-                source
-              );
-            }
-          }
-        });
-
-        // output the known feature warnings
-        if (workflowsStatus === 'added') {
-          this.#reportWarning(
-            chalk.red(`Review workflows feature does not exist on destination`),
-            source
-          );
-        } else if (workflowsStatus === 'deleted') {
-          this.#reportWarning(
-            chalk.red(`Review workflows feature does not exist on source`),
-            source
-          );
-        } else if (workflowsStatus === 'modified') {
-          this.#panic(
-            new TransferEngineInitializationError(
-              'Unresolved differences in schema [review workflows]'
-            )
-          );
-        }
-
         await runMiddleware<typeof context>(context, this.#handlers.schemaDiff);
 
-        if (Object.keys(context.diffs).length) {
-          this.#panic(new TransferEngineInitializationError('Unresolved differences in schema'));
+        this.#ignoredDiffs = context.ignoreDiffs;
+
+        // if there are any remaining diffs that weren't ignored
+        if (utils.json.diff(context.diffs, this.#ignoredDiffs).length) {
+          this.panic(new TransferEngineInitializationError('Unresolved differences in schema'));
         }
+
         return;
       }
 
@@ -756,7 +707,7 @@ class TransferEngine<
         e instanceof Error &&
         (!lastDiagnostic || lastDiagnostic.kind !== 'error' || lastDiagnostic.details.error !== e)
       ) {
-        this.#reportError(e, (e as DataTransferError).severity || 'fatal');
+        this.reportError(e, (e as DataTransferError).severity || 'fatal');
       }
 
       // Rollback the destination provider if an exception is thrown during the transfer
@@ -780,9 +731,9 @@ class TransferEngine<
       } catch (error) {
         // Error happening during the before transfer step should be considered fatal errors
         if (error instanceof Error) {
-          this.#panic(error);
+          this.panic(error);
         } else {
-          this.#panic(
+          this.panic(
             new Error(`Unknwon error when executing "beforeTransfer" on the ${origin} provider`)
           );
         }
@@ -821,6 +772,7 @@ class TransferEngine<
             return callback(null, entity);
           }
 
+          // TODO: this would be safer if we only ignored things in ignoredDiffs, otherwise continue and let an error be thrown
           const availableContentTypes = Object.entries(schemas)
             .filter(([, schema]) => schema.modelType === 'contentType')
             .map(([uid]) => uid);
@@ -861,6 +813,7 @@ class TransferEngine<
             return callback(null, link);
           }
 
+          // TODO: this would be safer if we only ignored things in ignoredDiffs, otherwise continue and let an error be thrown
           const availableContentTypes = Object.entries(schemas)
             .filter(([, schema]) => schema.modelType === 'contentType')
             .map(([uid]) => uid);
diff --git a/packages/core/strapi/lib/commands/actions/import/action.js b/packages/core/strapi/lib/commands/actions/import/action.js
index 5fde4b5f94..5f0ceea4bc 100644
--- a/packages/core/strapi/lib/commands/actions/import/action.js
+++ b/packages/core/strapi/lib/commands/actions/import/action.js
@@ -22,9 +22,9 @@ const {
   abortTransfer,
   getTransferTelemetryPayload,
   setSignalHandler,
+  getDiffHandler,
 } = require('../../utils/data-transfer');
 const { exitWith } = require('../../utils/helpers');
-const { confirmMessage } = require('../../utils/commander');
 
 /**
  * @typedef {import('@strapi/data-transfer/src/file/providers').ILocalFileSourceProviderOptions} ILocalFileSourceProviderOptions
@@ -113,30 +113,7 @@ module.exports = async (opts) => {
 
   const { updateLoader } = loadersFactory();
 
-  engine.onSchemaDiff(async (context, next) => {
-    // if we abort here, we need to actually exit the process because of conflict with inquirer prompt
-    setSignalHandler(async () => {
-      await abortTransfer({ engine, strapi });
-      exitWith(1, exitMessageText('import', true));
-    });
-
-    const confirmed = await confirmMessage(
-      'There are differences in schema between the source and destination, and the data listed above will be lost. Are you sure you want to continue?',
-      {
-        force: opts.force,
-      }
-    );
-
-    // reset handler back to normal
-    setSignalHandler(() => abortTransfer({ engine, strapi }));
-
-    if (confirmed) {
-      context.diffs = [];
-      return next(context);
-    }
-
-    return next(context);
-  });
+  engine.onSchemaDiff(getDiffHandler(engine, { force: opts.force }));
 
   progress.on(`stage::start`, ({ stage, data }) => {
     updateLoader(stage, data).start();
diff --git a/packages/core/strapi/lib/commands/actions/transfer/action.js b/packages/core/strapi/lib/commands/actions/transfer/action.js
index bfb0576c91..507a6d4935 100644
--- a/packages/core/strapi/lib/commands/actions/transfer/action.js
+++ b/packages/core/strapi/lib/commands/actions/transfer/action.js
@@ -23,9 +23,9 @@ const {
   abortTransfer,
   getTransferTelemetryPayload,
   setSignalHandler,
+  getDiffHandler,
 } = require('../../utils/data-transfer');
 const { exitWith } = require('../../utils/helpers');
-const { confirmMessage } = require('../../utils/commander');
 
 /**
  * @typedef TransferCommandOptions Options given to the CLI transfer command
@@ -148,30 +148,7 @@ module.exports = async (opts) => {
 
   const { updateLoader } = loadersFactory();
 
-  engine.onSchemaDiff(async (context, next) => {
-    // if we abort here, we need to actually exit the process because of conflict with inquirer prompt
-    setSignalHandler(async () => {
-      await abortTransfer({ engine, strapi });
-      exitWith(1, exitMessageText('transfer', true));
-    });
-
-    const confirmed = await confirmMessage(
-      'There are differences in schema between the source and destination, and the data listed above will be lost. Are you sure you want to continue?',
-      {
-        force: opts.force,
-      }
-    );
-
-    // reset handler back to normal
-    setSignalHandler(() => abortTransfer({ engine, strapi }));
-
-    if (confirmed) {
-      context.diffs = [];
-      return next(context);
-    }
-
-    return next(context);
-  });
+  engine.onSchemaDiff(getDiffHandler(engine, { force: opts.force }));
 
   progress.on(`stage::start`, ({ stage, data }) => {
     updateLoader(stage, data).start();
diff --git a/packages/core/strapi/lib/commands/utils/data-transfer.js b/packages/core/strapi/lib/commands/utils/data-transfer.js
index 413f7ee95c..9aef8343d3 100644
--- a/packages/core/strapi/lib/commands/utils/data-transfer.js
+++ b/packages/core/strapi/lib/commands/utils/data-transfer.js
@@ -12,9 +12,11 @@ const {
   createLogger,
 } = require('@strapi/logger');
 const ora = require('ora');
+const { TransferEngineInitializationError } = require('@strapi/data-transfer/dist/engine/errors');
+const { merge } = require('lodash/fp');
 const { readableBytes, exitWith } = require('./helpers');
 const strapi = require('../../index');
-const { getParseListWithChoices, parseInteger } = require('./commander');
+const { getParseListWithChoices, parseInteger, confirmMessage } = require('./commander');
 
 const exitMessageText = (process, error = false) => {
   const processCapitalized = process[0].toUpperCase() + process.slice(1);
@@ -266,6 +268,79 @@ const getTransferTelemetryPayload = (engine) => {
   };
 };
 
+/**
+ * Get a transfer engine schema diff handler that confirms with the user before bypassing a schema check
+ */
+const getDiffHandler = (engine, { force }) => {
+  return async (context, next) => {
+    // if we abort here, we need to actually exit the process because of conflict with inquirer prompt
+    setSignalHandler(async () => {
+      await abortTransfer({ engine, strapi });
+      exitWith(1, exitMessageText('import', true));
+    });
+
+    let workflowsStatus;
+    const source = 'Schema Integrity';
+
+    Object.entries(context.diffs).forEach(([uid, diffs]) => {
+      for (const diff of diffs) {
+        const path = `${uid}.${diff.path.join('.')}`;
+        const endPath = diff.path[diff.path.length - 1];
+
+        // Catch known features
+        if (
+          uid === 'admin::workflow' ||
+          uid === 'admin::workflow-stage' ||
+          endPath.startsWith('strapi_reviewWorkflows_')
+        ) {
+          workflowsStatus = diff.kind;
+        }
+        // handle generic cases
+        else if (diff.kind === 'added') {
+          engine.reportWarning(
+            chalk.red(`${chalk.bold(path)} does not exist on destination`),
+            source
+          );
+        } else if (diff.kind === 'deleted') {
+          engine.reportWarning(chalk.red(`${chalk.bold(path)} does not exist on source`), source);
+        } else if (diff.kind === 'modified') {
+          engine.reportWarning(chalk.red(`${chalk.bold(path)} has a different data type`), source);
+        }
+      }
+    });
+
+    // output the known feature warnings
+    if (workflowsStatus === 'added') {
+      engine.reportWarning(
+        chalk.red(`Review workflows feature does not exist on destination`),
+        source
+      );
+    } else if (workflowsStatus === 'deleted') {
+      engine.reportWarning(chalk.red(`Review workflows feature does not exist on source`), source);
+    } else if (workflowsStatus === 'modified') {
+      engine.panic(
+        new TransferEngineInitializationError('Unresolved differences in schema [review workflows]')
+      );
+    }
+
+    const confirmed = await confirmMessage(
+      'There are differences in schema between the source and destination, and the data listed above will be lost. Are you sure you want to continue?',
+      {
+        force,
+      }
+    );
+
+    // reset handler back to normal
+    setSignalHandler(() => abortTransfer({ engine, strapi }));
+
+    if (confirmed) {
+      context.ignoreDiffs = merge(context.diffs, context.ignoredDiffs);
+    }
+
+    return next(context);
+  };
+};
+
 module.exports = {
   loadersFactory,
   buildTransferTable,
@@ -281,4 +356,5 @@ module.exports = {
   formatDiagnostic,
   abortTransfer,
   setSignalHandler,
+  getDiffHandler,
 };

From fb217926447b40f3f4a696124e39628628bacbbf Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Tue, 9 May 2023 13:53:49 +0200
Subject: [PATCH 28/28] add missing mocks

---
 .../lib/commands/actions/export/__tests__/export.test.js       | 2 ++
 .../lib/commands/actions/import/__tests__/import.test.js       | 3 +++
 .../lib/commands/actions/transfer/__tests__/transfer.test.js   | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/packages/core/strapi/lib/commands/actions/export/__tests__/export.test.js b/packages/core/strapi/lib/commands/actions/export/__tests__/export.test.js
index 42d013d411..bae65eae92 100644
--- a/packages/core/strapi/lib/commands/actions/export/__tests__/export.test.js
+++ b/packages/core/strapi/lib/commands/actions/export/__tests__/export.test.js
@@ -75,6 +75,8 @@ describe('Export', () => {
       };
     }),
     exitMessageText: jest.fn(),
+    getDiffHandler: jest.fn(),
+    setSignalHandler: jest.fn(),
   };
   jest.mock(
     '../../../utils/data-transfer.js',
diff --git a/packages/core/strapi/lib/commands/actions/import/__tests__/import.test.js b/packages/core/strapi/lib/commands/actions/import/__tests__/import.test.js
index 9356976f46..b8057c1f90 100644
--- a/packages/core/strapi/lib/commands/actions/import/__tests__/import.test.js
+++ b/packages/core/strapi/lib/commands/actions/import/__tests__/import.test.js
@@ -32,6 +32,7 @@ const createTransferEngine = jest.fn(() => {
       on: jest.fn().mockReturnThis(),
       onDiagnostic: jest.fn().mockReturnThis(),
     },
+    onSchemaDiff: jest.fn(),
   };
 });
 
@@ -81,6 +82,8 @@ describe('Import', () => {
       };
     }),
     exitMessageText: jest.fn(),
+    getDiffHandler: jest.fn(),
+    setSignalHandler: jest.fn(),
   };
   jest.mock(
     '../../../utils/data-transfer.js',
diff --git a/packages/core/strapi/lib/commands/actions/transfer/__tests__/transfer.test.js b/packages/core/strapi/lib/commands/actions/transfer/__tests__/transfer.test.js
index ca7d6d8cfc..66e0a41f7a 100644
--- a/packages/core/strapi/lib/commands/actions/transfer/__tests__/transfer.test.js
+++ b/packages/core/strapi/lib/commands/actions/transfer/__tests__/transfer.test.js
@@ -24,6 +24,8 @@ describe('Transfer', () => {
       };
     }),
     exitMessageText: jest.fn(),
+    getDiffHandler: jest.fn(),
+    setSignalHandler: jest.fn(),
   };
   jest.mock(
     '../../../utils/data-transfer.js',
@@ -66,6 +68,7 @@ describe('Transfer', () => {
             on: jest.fn().mockReturnThis(),
             onDiagnostic: jest.fn().mockReturnThis(),
           },
+          onSchemaDiff: jest.fn(),
         };
       },
     },