From 218f3c562d022ecdde7d37afe1337b3cedf45ece Mon Sep 17 00:00:00 2001
From: Tony DevOps <868644+TonyLovesDevOps@users.noreply.github.com>
Date: Wed, 15 Sep 2021 13:09:16 -0600
Subject: [PATCH 01/45] Fix broken anchor link. (#8055)

---
 docs/reference/api/system/authentication.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/api/system/authentication.md b/docs/reference/api/system/authentication.md
index d75a19237a..3209f0bf7f 100644
--- a/docs/reference/api/system/authentication.md
+++ b/docs/reference/api/system/authentication.md
@@ -341,7 +341,7 @@ List all the configured oAuth providers.
 ::: tip Configuring oAuth
 
 To learn more about setting up oAuth providers, see
-[Configuring SSO through oAuth](/guides/api-config/#oauth-single-sign-on-openid).
+[Configuring SSO through oAuth](/guides/api-config/#oauth-single-sign-on-sso-openid).
 
 :::
 

From fb53ae69804bdc40e2db49b40bb0415a69817941 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Wed, 15 Sep 2021 15:46:12 -0400
Subject: [PATCH 02/45] Don't flush schema cache on content update (#8056)

---
 api/src/cache.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/api/src/cache.ts b/api/src/cache.ts
index 3371a6bed7..276f54b337 100644
--- a/api/src/cache.ts
+++ b/api/src/cache.ts
@@ -16,7 +16,7 @@ export function getCache(): { cache: Keyv | null; schemaCache: Keyv | null } {
 	}
 
 	if (env.CACHE_SCHEMA !== false && schemaCache === null) {
-		schemaCache = getKeyvInstance(typeof env.CACHE_SCHEMA === 'string' ? ms(env.CACHE_SCHEMA) : undefined);
+		schemaCache = getKeyvInstance(typeof env.CACHE_SCHEMA === 'string' ? ms(env.CACHE_SCHEMA) : undefined, '_schema');
 		schemaCache.on('error', (err) => logger.warn(err, `[cache] ${err}`));
 	}
 
@@ -29,21 +29,25 @@ export async function flushCaches(): Promise<void> {
 	await cache?.clear();
 }
 
-function getKeyvInstance(ttl: number | undefined): Keyv {
+function getKeyvInstance(ttl: number | undefined, namespaceSuffix?: string): Keyv {
 	switch (env.CACHE_STORE) {
 		case 'redis':
-			return new Keyv(getConfig('redis', ttl));
+			return new Keyv(getConfig('redis', ttl, namespaceSuffix));
 		case 'memcache':
-			return new Keyv(getConfig('memcache', ttl));
+			return new Keyv(getConfig('memcache', ttl, namespaceSuffix));
 		case 'memory':
 		default:
-			return new Keyv(getConfig('memory', ttl));
+			return new Keyv(getConfig('memory', ttl, namespaceSuffix));
 	}
 }
 
-function getConfig(store: 'memory' | 'redis' | 'memcache' = 'memory', ttl: number | undefined): Options<any> {
+function getConfig(
+	store: 'memory' | 'redis' | 'memcache' = 'memory',
+	ttl: number | undefined,
+	namespaceSuffix = ''
+): Options<any> {
 	const config: Options<any> = {
-		namespace: env.CACHE_NAMESPACE,
+		namespace: `${env.CACHE_NAMESPACE}${namespaceSuffix}`,
 		ttl,
 	};
 

From 4e624d5c7a5e95e718ffd6b8edd75d85f2cbba51 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Wed, 15 Sep 2021 16:03:37 -0400
Subject: [PATCH 03/45] Move default module listing to app

---
 .../migrations/20210910A-move-module-setup.ts | 36 +------------------
 app/src/constants.ts                          | 34 ++++++++++++++++++
 .../_system/system-modules/system-modules.vue | 19 +++++-----
 .../views/private/components/module-bar.vue   |  3 +-
 4 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/api/src/database/migrations/20210910A-move-module-setup.ts b/api/src/database/migrations/20210910A-move-module-setup.ts
index 774430cbcc..3d8489b882 100644
--- a/api/src/database/migrations/20210910A-move-module-setup.ts
+++ b/api/src/database/migrations/20210910A-move-module-setup.ts
@@ -6,41 +6,7 @@ export async function up(knex: Knex): Promise<void> {
 	});
 
 	await knex.schema.alterTable('directus_settings', (table) => {
-		table.json('module_bar').defaultTo(
-			JSON.stringify([
-				{
-					type: 'module',
-					id: 'collections',
-					enabled: true,
-				},
-				{
-					type: 'module',
-					id: 'users',
-					enabled: true,
-				},
-				{
-					type: 'module',
-					id: 'files',
-					enabled: true,
-				},
-				{
-					type: 'module',
-					id: 'insights',
-					enabled: false,
-				},
-				{
-					type: 'module',
-					id: 'docs',
-					enabled: true,
-				},
-				{
-					type: 'module',
-					id: 'settings',
-					enabled: true,
-					locked: true,
-				},
-			])
-		);
+		table.json('module_bar');
 	});
 }
 
diff --git a/app/src/constants.ts b/app/src/constants.ts
index a436aef802..8dadf3fa18 100644
--- a/app/src/constants.ts
+++ b/app/src/constants.ts
@@ -21,3 +21,37 @@ export const DIRECTUS_LOGO = `
 ⠀⠀⠀⠀⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
 
 `;
+
+export const MODULE_BAR_DEFAULT = [
+	{
+		type: 'module',
+		id: 'collections',
+		enabled: true,
+	},
+	{
+		type: 'module',
+		id: 'users',
+		enabled: true,
+	},
+	{
+		type: 'module',
+		id: 'files',
+		enabled: true,
+	},
+	{
+		type: 'module',
+		id: 'insights',
+		enabled: false,
+	},
+	{
+		type: 'module',
+		id: 'docs',
+		enabled: true,
+	},
+	{
+		type: 'module',
+		id: 'settings',
+		enabled: true,
+		locked: true,
+	},
+];
diff --git a/app/src/interfaces/_system/system-modules/system-modules.vue b/app/src/interfaces/_system/system-modules/system-modules.vue
index 04dbb97801..9fea557f17 100644
--- a/app/src/interfaces/_system/system-modules/system-modules.vue
+++ b/app/src/interfaces/_system/system-modules/system-modules.vue
@@ -68,6 +68,7 @@ import { assign } from 'lodash';
 import { useI18n } from 'vue-i18n';
 import { nanoid } from 'nanoid';
 import { Field, DeepPartial } from '@directus/shared/types';
+import { MODULE_BAR_DEFAULT } from '@/constants';
 
 type PreviewExtra = {
 	to: string;
@@ -118,7 +119,7 @@ export default defineComponent({
 	props: {
 		value: {
 			type: Array as PropType<Settings['module_bar']>,
-			default: () => [],
+			default: () => MODULE_BAR_DEFAULT,
 		},
 	},
 	emits: ['input'],
@@ -145,12 +146,12 @@ export default defineComponent({
 
 		const valuesWithData = computed<PreviewValue[]>({
 			get() {
-				const savedModules = (props.value.filter((value) => value.type === 'module') as SettingsModuleBarModule[]).map(
-					(value) => value.id
-				);
+				const savedModules = (
+					(props.value ?? MODULE_BAR_DEFAULT).filter((value) => value.type === 'module') as SettingsModuleBarModule[]
+				).map((value) => value.id);
 
 				return valueToPreview([
-					...props.value,
+					...(props.value ?? MODULE_BAR_DEFAULT),
 					...availableModulesAsBarModule.value.filter(
 						(availableModuleAsBarModule) => savedModules.includes(availableModuleAsBarModule.id) === false
 					),
@@ -230,7 +231,7 @@ export default defineComponent({
 			let value: SettingsModuleBarLink;
 
 			if (id !== '+') {
-				value = props.value.find((val) => val.id === id) as SettingsModuleBarLink;
+				value = (props.value ?? MODULE_BAR_DEFAULT).find((val) => val.id === id) as SettingsModuleBarLink;
 			} else {
 				value = {
 					id: nanoid(),
@@ -248,11 +249,11 @@ export default defineComponent({
 
 		function save() {
 			if (editing.value === '+') {
-				emit('input', [...props.value, values.value]);
+				emit('input', [...(props.value ?? MODULE_BAR_DEFAULT), values.value]);
 			} else {
 				emit(
 					'input',
-					props.value.map((val) => (val.id === editing.value ? values.value : val))
+					(props.value ?? MODULE_BAR_DEFAULT).map((val) => (val.id === editing.value ? values.value : val))
 				);
 			}
 
@@ -263,7 +264,7 @@ export default defineComponent({
 		function remove(id: string) {
 			emit(
 				'input',
-				props.value.filter((val) => val.id !== id)
+				(props.value ?? MODULE_BAR_DEFAULT).filter((val) => val.id !== id)
 			);
 		}
 	},
diff --git a/app/src/views/private/components/module-bar.vue b/app/src/views/private/components/module-bar.vue
index f6401ba9d2..ebaef39533 100644
--- a/app/src/views/private/components/module-bar.vue
+++ b/app/src/views/private/components/module-bar.vue
@@ -34,6 +34,7 @@ import ModuleBarLogo from './module-bar-logo/';
 import ModuleBarAvatar from './module-bar-avatar/';
 import { useSettingsStore } from '@/stores/';
 import { translate } from '@/utils/translate-object-values';
+import { MODULE_BAR_DEFAULT } from '@/constants';
 
 export default defineComponent({
 	components: {
@@ -49,7 +50,7 @@ export default defineComponent({
 		const modules = computed(() => {
 			if (!settingsStore.settings) return [];
 
-			return settingsStore.settings.module_bar
+			return (settingsStore.settings.module_bar ?? MODULE_BAR_DEFAULT)
 				.filter((modulePart) => {
 					if (modulePart.type === 'link') return true;
 					return modulePart.enabled && registeredModuleIDs.value.includes(modulePart.id);

From ce8401b94022f1a3a510048ba4980c56148f322a Mon Sep 17 00:00:00 2001
From: Nitwel <mail@nitwel.de>
Date: Wed, 15 Sep 2021 22:41:08 +0200
Subject: [PATCH 04/45] Move some compositons, utils and types to shared
 (#8059)

* move composables, types and utils to shared

* move composables, utils and types to shared

* expose utils and composables in extensionsSDK

* fix missing dependencies

* Sort index.ts exports

* Do the thing

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
---
 app/src/components/v-checkbox/v-checkbox.vue  |  2 +-
 .../v-field-select/v-field-select.vue         |  5 +-
 .../v-field-template/v-field-template.vue     |  3 +-
 app/src/composables/use-collection/index.ts   |  4 --
 .../use-field-tree/use-field-tree.ts          |  5 +-
 app/src/composables/use-item/use-item.ts      |  2 +-
 app/src/composables/use-items/index.ts        |  4 --
 app/src/composables/use-items/readme.md       |  0
 app/src/composables/use-permissions.ts        |  2 +-
 app/src/composables/use-preset/use-preset.ts  |  2 +-
 app/src/composables/use-sync/index.ts         |  4 --
 app/src/composables/use-sync/readme.md        | 31 -----------
 app/src/composables/use-template-data.ts      |  4 +-
 app/src/displays/collection/collection.vue    |  2 +-
 app/src/displays/related-values/index.ts      |  4 +-
 app/src/displays/related-values/options.vue   |  3 +-
 .../related-values/related-values.vue         |  2 +-
 app/src/interfaces/list-m2a/list-m2a.vue      |  4 +-
 app/src/interfaces/list-m2m/list-m2m.vue      |  2 +-
 app/src/interfaces/list-m2m/options.vue       |  3 +-
 app/src/interfaces/list-m2m/use-relation.ts   |  5 +-
 .../list-o2m-tree-view/list-o2m-tree-view.vue |  7 ++-
 .../interfaces/list-o2m-tree-view/options.vue |  3 +-
 app/src/interfaces/list-o2m/list-o2m.vue      |  7 ++-
 app/src/interfaces/list-o2m/options.vue       |  3 +-
 .../select-dropdown-m2o/options.vue           |  3 +-
 .../select-dropdown-m2o.vue                   |  4 +-
 app/src/interfaces/translations/options.vue   |  3 +-
 .../interfaces/translations/translations.vue  |  4 +-
 app/src/layouts/calendar/index.ts             |  8 +--
 app/src/layouts/calendar/options.vue          |  2 +-
 app/src/layouts/calendar/sidebar.vue          |  2 +-
 app/src/layouts/cards/cards.vue               |  4 +-
 app/src/layouts/cards/components/header.vue   |  2 +-
 app/src/layouts/cards/index.ts                |  8 +--
 app/src/layouts/cards/options.vue             |  2 +-
 app/src/layouts/cards/sidebar.vue             |  2 +-
 app/src/layouts/map/index.ts                  |  8 +--
 app/src/layouts/map/map.vue                   |  2 +-
 app/src/layouts/map/options.vue               |  2 +-
 app/src/layouts/map/sidebar.vue               |  2 +-
 app/src/layouts/tabular/index.ts              |  6 +--
 app/src/layouts/tabular/options.vue           |  2 +-
 app/src/layouts/tabular/sidebar.vue           |  2 +-
 app/src/layouts/tabular/tabular.vue           |  5 +-
 .../collections/composables/use-navigation.ts |  2 +-
 .../modules/collections/routes/collection.vue |  2 +-
 app/src/modules/collections/routes/item.vue   |  2 +-
 app/src/modules/settings/index.ts             |  2 +-
 .../data-model/collections/collections.vue    |  2 +-
 .../components/collection-options.vue         |  2 +-
 .../field-detail/components/actions.vue       |  2 +-
 .../field-detail/components/tabs.vue          |  2 +-
 .../data-model/field-detail/field-detail.vue  |  2 +-
 .../routes/data-model/field-detail/store.ts   | 12 ++++-
 .../fields/components/fields-management.vue   |  2 +-
 .../routes/data-model/fields/fields.vue       |  2 +-
 .../routes/data-model/get-local-type.ts       |  3 +-
 .../routes/data-model/new-collection.vue      |  3 +-
 .../settings/routes/project/project.vue       |  2 +-
 .../components/permissions-overview-row.vue   |  3 +-
 .../permissions-overview-toggle.vue           |  3 +-
 .../composables/use-update-permissions.ts     |  3 +-
 .../permissions-detail/components/fields.vue  |  2 +-
 .../components/permissions.vue                |  2 +-
 .../permissions-detail/components/presets.vue |  2 +-
 .../permissions-detail/components/tabs.vue    |  2 +-
 .../components/validation.vue                 |  2 +-
 app/src/modules/users/routes/item.vue         |  2 +-
 app/src/stores/collections.ts                 |  2 +-
 app/src/stores/fields.ts                      |  3 +-
 app/src/stores/relations.ts                   |  2 +-
 .../add-related-primary-key-to-fields.ts      |  2 +-
 app/src/utils/filters-to-query/index.ts       |  4 --
 app/src/utils/filters-to-query/readme.md      | 53 -------------------
 .../get-related-collection.ts                 |  2 +-
 app/src/utils/move-in-array/index.ts          |  4 --
 app/src/utils/render-string-template.ts       |  2 +-
 .../drawer-collection/drawer-collection.vue   |  2 +-
 .../components/drawer-item/drawer-item.vue    |  5 +-
 .../export-sidebar-detail.vue                 |  2 +-
 .../filter-sidebar-detail.vue                 |  2 +-
 .../layout-sidebar-detail.vue                 |  2 +-
 .../revisions-drawer-picker.vue               |  2 +-
 .../revisions-drawer.vue                      |  2 +-
 package-lock.json                             | 22 ++------
 packages/extensions-sdk/src/index.ts          |  4 +-
 packages/shared/package.json                  |  1 +
 packages/shared/src/composables/index.ts      |  4 ++
 .../shared/src/composables}/use-collection.ts | 12 +++--
 .../src/composables/use-filter-fields.ts      | 21 ++++++++
 .../shared/src/composables}/use-items.ts      | 16 +++---
 .../shared/src/composables}/use-sync.ts       | 10 ++--
 .../shared/src/types/collection.ts            |  0
 packages/shared/src/types/index.ts            |  2 +
 .../shared}/src/types/relations.ts            |  0
 .../shared/src/utils}/filters-to-query.ts     |  6 +--
 .../src/utils/get-fields-from-template.ts     |  0
 .../shared}/src/utils/get-relation-type.ts    |  2 +-
 packages/shared/src/utils/index.ts            |  4 ++
 .../shared/src/utils}/move-in-array.ts        |  4 +-
 101 files changed, 178 insertions(+), 270 deletions(-)
 delete mode 100644 app/src/composables/use-collection/index.ts
 delete mode 100644 app/src/composables/use-items/index.ts
 delete mode 100644 app/src/composables/use-items/readme.md
 delete mode 100644 app/src/composables/use-sync/index.ts
 delete mode 100644 app/src/composables/use-sync/readme.md
 delete mode 100644 app/src/utils/filters-to-query/index.ts
 delete mode 100644 app/src/utils/filters-to-query/readme.md
 delete mode 100644 app/src/utils/move-in-array/index.ts
 rename {app/src/composables/use-collection => packages/shared/src/composables}/use-collection.ts (84%)
 create mode 100644 packages/shared/src/composables/use-filter-fields.ts
 rename {app/src/composables/use-items => packages/shared/src/composables}/use-items.ts (94%)
 rename {app/src/composables/use-sync => packages/shared/src/composables}/use-sync.ts (50%)
 rename app/src/types/collections.ts => packages/shared/src/types/collection.ts (100%)
 rename {app => packages/shared}/src/types/relations.ts (100%)
 rename {app/src/utils/filters-to-query => packages/shared/src/utils}/filters-to-query.ts (81%)
 rename {app => packages/shared}/src/utils/get-fields-from-template.ts (100%)
 rename {app => packages/shared}/src/utils/get-relation-type.ts (94%)
 rename {app/src/utils/move-in-array => packages/shared/src/utils}/move-in-array.ts (79%)

diff --git a/app/src/components/v-checkbox/v-checkbox.vue b/app/src/components/v-checkbox/v-checkbox.vue
index 395fef1240..89c1e03e58 100644
--- a/app/src/components/v-checkbox/v-checkbox.vue
+++ b/app/src/components/v-checkbox/v-checkbox.vue
@@ -21,7 +21,7 @@
 
 <script lang="ts">
 import { defineComponent, computed } from 'vue';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/components/v-field-select/v-field-select.vue b/app/src/components/v-field-select/v-field-select.vue
index fd3560ab4e..f4753e0a53 100644
--- a/app/src/components/v-field-select/v-field-select.vue
+++ b/app/src/components/v-field-select/v-field-select.vue
@@ -45,11 +45,10 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, toRefs, ref, PropType, computed } from 'vue';
 import FieldListItem from '../v-field-template/field-list-item.vue';
-import { Collection, Relation } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Collection, Relation } from '@directus/shared/types';
 import Draggable from 'vuedraggable';
 import useFieldTree from '@/composables/use-field-tree';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { FieldTree } from '../v-field-template/types';
 import hideDragImage from '@/utils/hide-drag-image';
 
diff --git a/app/src/components/v-field-template/v-field-template.vue b/app/src/components/v-field-template/v-field-template.vue
index a9c2264e1d..ecc1fcf5c0 100644
--- a/app/src/components/v-field-template/v-field-template.vue
+++ b/app/src/components/v-field-template/v-field-template.vue
@@ -33,8 +33,7 @@ import { defineComponent, toRefs, ref, watch, onMounted, onUnmounted, PropType }
 import FieldListItem from './field-list-item.vue';
 import useFieldTree from '@/composables/use-field-tree';
 import { FieldTree } from './types';
-import { Relation } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Relation } from '@directus/shared/types';
 
 export default defineComponent({
 	components: { FieldListItem },
diff --git a/app/src/composables/use-collection/index.ts b/app/src/composables/use-collection/index.ts
deleted file mode 100644
index fc45f201b1..0000000000
--- a/app/src/composables/use-collection/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { useCollection } from './use-collection';
-
-export { useCollection };
-export default useCollection;
diff --git a/app/src/composables/use-field-tree/use-field-tree.ts b/app/src/composables/use-field-tree/use-field-tree.ts
index e076929856..f584ef6b45 100644
--- a/app/src/composables/use-field-tree/use-field-tree.ts
+++ b/app/src/composables/use-field-tree/use-field-tree.ts
@@ -1,7 +1,6 @@
 import { useCollectionsStore, useFieldsStore, useRelationsStore } from '@/stores/';
-import { Relation } from '@/types';
-import { Field } from '@directus/shared/types';
-import { getRelationType } from '@/utils/get-relation-type';
+import { Field, Relation } from '@directus/shared/types';
+import { getRelationType } from '@directus/shared/utils';
 import { cloneDeep, orderBy } from 'lodash';
 import { Ref, ref, watch } from 'vue';
 
diff --git a/app/src/composables/use-item/use-item.ts b/app/src/composables/use-item/use-item.ts
index 549213d2c8..505aef1059 100644
--- a/app/src/composables/use-item/use-item.ts
+++ b/app/src/composables/use-item/use-item.ts
@@ -1,5 +1,5 @@
 import api from '@/api';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { VALIDATION_TYPES } from '@/constants';
 import { i18n } from '@/lang';
 import { APIError } from '@/types';
diff --git a/app/src/composables/use-items/index.ts b/app/src/composables/use-items/index.ts
deleted file mode 100644
index f1bf97fadb..0000000000
--- a/app/src/composables/use-items/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { useItems } from './use-items';
-
-export { useItems };
-export default useItems;
diff --git a/app/src/composables/use-items/readme.md b/app/src/composables/use-items/readme.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/src/composables/use-permissions.ts b/app/src/composables/use-permissions.ts
index 6850d08c81..1897b5689c 100644
--- a/app/src/composables/use-permissions.ts
+++ b/app/src/composables/use-permissions.ts
@@ -3,7 +3,7 @@ import { Field } from '@directus/shared/types';
 import { computed, ComputedRef, Ref } from 'vue';
 import { cloneDeep } from 'lodash';
 import { isAllowed } from '../utils/is-allowed';
-import { useCollection } from './use-collection';
+import { useCollection } from '@directus/shared/composables';
 
 type UsablePermissions = {
 	deleteAllowed: ComputedRef<boolean>;
diff --git a/app/src/composables/use-preset/use-preset.ts b/app/src/composables/use-preset/use-preset.ts
index cfbb49d1a7..82948e551e 100644
--- a/app/src/composables/use-preset/use-preset.ts
+++ b/app/src/composables/use-preset/use-preset.ts
@@ -1,4 +1,4 @@
-import { useCollection } from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { usePresetsStore, useUserStore } from '@/stores';
 import { Filter, Preset } from '@directus/shared/types';
 import { debounce, isEqual } from 'lodash';
diff --git a/app/src/composables/use-sync/index.ts b/app/src/composables/use-sync/index.ts
deleted file mode 100644
index 81e64f3b54..0000000000
--- a/app/src/composables/use-sync/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import useSync from './use-sync';
-
-export { useSync };
-export default useSync;
diff --git a/app/src/composables/use-sync/readme.md b/app/src/composables/use-sync/readme.md
deleted file mode 100644
index cb270230f3..0000000000
--- a/app/src/composables/use-sync/readme.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Use Sync
-
-```ts
-function useSync<T, K extends keyof T>(
-	props: T,
-	key: K,
-
-	emit: (event: string, ...args: any[]) => void
-): Ref<Readonly<T[K]>>;
-```
-
-Small utility composition that allows you to easily setup the two-way binding with the prop:
-
-```ts
-// Before
-
-const internalOptions = computed({
-	get() {
-		return props.options;
-	},
-	set(val) {
-		emit('update:options', val);
-	},
-});
-```
-
-```ts
-// after
-
-const internalOptions = useSync(props, 'options', emit);
-```
diff --git a/app/src/composables/use-template-data.ts b/app/src/composables/use-template-data.ts
index 3c4b1b439c..192ce6f8ac 100644
--- a/app/src/composables/use-template-data.ts
+++ b/app/src/composables/use-template-data.ts
@@ -1,6 +1,6 @@
 import api from '@/api';
-import { Collection } from '@/types';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { Collection } from '@directus/shared/types';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import { computed, Ref, ref, watch } from 'vue';
 
 type UsableTemplateData = {
diff --git a/app/src/displays/collection/collection.vue b/app/src/displays/collection/collection.vue
index 043aac4d5c..4fff33d610 100644
--- a/app/src/displays/collection/collection.vue
+++ b/app/src/displays/collection/collection.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts">
 import { defineComponent, toRefs } from 'vue';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/displays/related-values/index.ts b/app/src/displays/related-values/index.ts
index 3c38c0d833..c47897af3a 100644
--- a/app/src/displays/related-values/index.ts
+++ b/app/src/displays/related-values/index.ts
@@ -1,7 +1,7 @@
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { defineDisplay } from '@directus/shared/utils';
 import adjustFieldsForDisplays from '@/utils/adjust-fields-for-displays';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import getRelatedCollection from '@/utils/get-related-collection';
 import { ref } from 'vue';
 import options from './options.vue';
diff --git a/app/src/displays/related-values/options.vue b/app/src/displays/related-values/options.vue
index 355e478cbb..4bd188a8aa 100644
--- a/app/src/displays/related-values/options.vue
+++ b/app/src/displays/related-values/options.vue
@@ -12,8 +12,7 @@
 
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
-import { Relation } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Relation } from '@directus/shared/types';
 import { defineComponent, PropType, computed } from 'vue';
 
 export default defineComponent({
diff --git a/app/src/displays/related-values/related-values.vue b/app/src/displays/related-values/related-values.vue
index eb97cd2aee..298fca2d89 100644
--- a/app/src/displays/related-values/related-values.vue
+++ b/app/src/displays/related-values/related-values.vue
@@ -33,7 +33,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, PropType, Ref } from 'vue';
 import getRelatedCollection from '@/utils/get-related-collection';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import ValueNull from '@/views/private/components/value-null';
 
 export default defineComponent({
diff --git a/app/src/interfaces/list-m2a/list-m2a.vue b/app/src/interfaces/list-m2a/list-m2a.vue
index d65b6c80be..789d27e1e1 100644
--- a/app/src/interfaces/list-m2a/list-m2a.vue
+++ b/app/src/interfaces/list-m2a/list-m2a.vue
@@ -140,12 +140,12 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, PropType, ref, watch } from 'vue';
 import { useRelationsStore, useCollectionsStore, useFieldsStore } from '@/stores';
-import { Relation, Collection } from '@/types';
+import { Collection, Relation } from '@directus/shared/types';
 import DrawerCollection from '@/views/private/components/drawer-collection/';
 import DrawerItem from '@/views/private/components/drawer-item/';
 import api from '@/api';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import { isPlainObject, cloneDeep } from 'lodash';
 import { getEndpoint } from '@/utils/get-endpoint';
 import { hideDragImage } from '@/utils/hide-drag-image';
diff --git a/app/src/interfaces/list-m2m/list-m2m.vue b/app/src/interfaces/list-m2m/list-m2m.vue
index f7bf20f88e..5817aaa756 100644
--- a/app/src/interfaces/list-m2m/list-m2m.vue
+++ b/app/src/interfaces/list-m2m/list-m2m.vue
@@ -101,7 +101,7 @@ import usePreview from './use-preview';
 import useEdit from './use-edit';
 import useSelection from './use-selection';
 import useSort from './use-sort';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import adjustFieldsForDisplays from '@/utils/adjust-fields-for-displays';
 import { usePermissionsStore, useUserStore } from '@/stores';
 
diff --git a/app/src/interfaces/list-m2m/options.vue b/app/src/interfaces/list-m2m/options.vue
index a55c789a1a..de1b28953f 100644
--- a/app/src/interfaces/list-m2m/options.vue
+++ b/app/src/interfaces/list-m2m/options.vue
@@ -30,8 +30,7 @@
 
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
-import { Relation, Collection } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Collection, Relation } from '@directus/shared/types';
 import { defineComponent, PropType, computed } from 'vue';
 import { useCollectionsStore } from '@/stores';
 export default defineComponent({
diff --git a/app/src/interfaces/list-m2m/use-relation.ts b/app/src/interfaces/list-m2m/use-relation.ts
index 48ed5ddfc9..6b791d7480 100644
--- a/app/src/interfaces/list-m2m/use-relation.ts
+++ b/app/src/interfaces/list-m2m/use-relation.ts
@@ -1,7 +1,6 @@
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { useCollectionsStore, useRelationsStore } from '@/stores/';
-import { Collection, Relation } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Collection, Relation } from '@directus/shared/types';
 import { computed, ComputedRef, Ref } from 'vue';
 
 export type RelationInfo = {
diff --git a/app/src/interfaces/list-o2m-tree-view/list-o2m-tree-view.vue b/app/src/interfaces/list-o2m-tree-view/list-o2m-tree-view.vue
index 75f390a0d7..48f538d570 100644
--- a/app/src/interfaces/list-o2m-tree-view/list-o2m-tree-view.vue
+++ b/app/src/interfaces/list-o2m-tree-view/list-o2m-tree-view.vue
@@ -50,14 +50,13 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, ref, computed, PropType, onMounted, watch } from 'vue';
-import { useCollection } from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { useRelationsStore } from '@/stores';
 import api from '@/api';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import hideDragImage from '@/utils/hide-drag-image';
 import NestedDraggable from './nested-draggable.vue';
-import { Filter } from '@directus/shared/types';
-import { Relation } from '@/types';
+import { Filter, Relation } from '@directus/shared/types';
 import DrawerCollection from '@/views/private/components/drawer-collection';
 import DrawerItem from '@/views/private/components/drawer-item';
 
diff --git a/app/src/interfaces/list-o2m-tree-view/options.vue b/app/src/interfaces/list-o2m-tree-view/options.vue
index ce1ffe6793..3223ab90cf 100644
--- a/app/src/interfaces/list-o2m-tree-view/options.vue
+++ b/app/src/interfaces/list-o2m-tree-view/options.vue
@@ -22,8 +22,7 @@
 
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
-import { Relation } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Relation } from '@directus/shared/types';
 import { defineComponent, PropType, computed } from 'vue';
 export default defineComponent({
 	props: {
diff --git a/app/src/interfaces/list-o2m/list-o2m.vue b/app/src/interfaces/list-o2m/list-o2m.vue
index 56fb9f1ce4..2e4c76c265 100644
--- a/app/src/interfaces/list-o2m/list-o2m.vue
+++ b/app/src/interfaces/list-o2m/list-o2m.vue
@@ -82,16 +82,15 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, ref, computed, watch, PropType } from 'vue';
 import api from '@/api';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { useCollectionsStore, useRelationsStore, useFieldsStore, usePermissionsStore, useUserStore } from '@/stores/';
 import DrawerItem from '@/views/private/components/drawer-item';
 import DrawerCollection from '@/views/private/components/drawer-collection';
-import { Relation } from '@/types';
-import { Filter, Field } from '@directus/shared/types';
+import { Filter, Field, Relation } from '@directus/shared/types';
 import { isEqual, sortBy } from 'lodash';
 import { get } from 'lodash';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import { addRelatedPrimaryKeyToFields } from '@/utils/add-related-primary-key-to-fields';
 import Draggable from 'vuedraggable';
 import adjustFieldsForDisplays from '@/utils/adjust-fields-for-displays';
diff --git a/app/src/interfaces/list-o2m/options.vue b/app/src/interfaces/list-o2m/options.vue
index 8bc064b1dd..ffcc177834 100644
--- a/app/src/interfaces/list-o2m/options.vue
+++ b/app/src/interfaces/list-o2m/options.vue
@@ -30,8 +30,7 @@
 
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
-import { Relation, Collection } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Collection, Relation } from '@directus/shared/types';
 import { defineComponent, PropType, computed } from 'vue';
 import { useCollectionsStore } from '@/stores/';
 
diff --git a/app/src/interfaces/select-dropdown-m2o/options.vue b/app/src/interfaces/select-dropdown-m2o/options.vue
index 7208023f52..4891cbb304 100644
--- a/app/src/interfaces/select-dropdown-m2o/options.vue
+++ b/app/src/interfaces/select-dropdown-m2o/options.vue
@@ -12,8 +12,7 @@
 
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
-import { Relation } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Relation } from '@directus/shared/types';
 import { defineComponent, PropType, computed } from 'vue';
 
 export default defineComponent({
diff --git a/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue b/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue
index e6107f0a0e..02b6e23722 100644
--- a/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue
+++ b/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue
@@ -89,8 +89,8 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, ref, toRefs, watch, PropType } from 'vue';
 import { useCollectionsStore, useRelationsStore } from '@/stores/';
-import useCollection from '@/composables/use-collection';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { useCollection } from '@directus/shared/composables';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import api from '@/api';
 import DrawerItem from '@/views/private/components/drawer-item';
 import DrawerCollection from '@/views/private/components/drawer-collection';
diff --git a/app/src/interfaces/translations/options.vue b/app/src/interfaces/translations/options.vue
index 3e88431135..7825e0191c 100644
--- a/app/src/interfaces/translations/options.vue
+++ b/app/src/interfaces/translations/options.vue
@@ -12,8 +12,7 @@
 
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
-import { Relation } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Relation } from '@directus/shared/types';
 import { defineComponent, PropType, computed } from 'vue';
 import { useFieldsStore } from '@/stores/';
 
diff --git a/app/src/interfaces/translations/translations.vue b/app/src/interfaces/translations/translations.vue
index 8c776a34ec..10dae4dde5 100644
--- a/app/src/interfaces/translations/translations.vue
+++ b/app/src/interfaces/translations/translations.vue
@@ -49,11 +49,11 @@
 <script lang="ts">
 import LanguageSelect from './language-select.vue';
 import { computed, defineComponent, PropType, Ref, ref, toRefs, watch, unref } from 'vue';
-import useCollection from '@/composables/use-collection';
 import { useFieldsStore, useRelationsStore } from '@/stores/';
 import { useI18n } from 'vue-i18n';
 import api from '@/api';
-import { Relation } from '@/types';
+import { Relation } from '@directus/shared/types';
+import { useCollection } from '@directus/shared/composables';
 import { unexpectedError } from '@/utils/unexpected-error';
 import { cloneDeep, isEqual, assign } from 'lodash';
 import { notEmpty } from '@/utils/is-empty';
diff --git a/app/src/layouts/calendar/index.ts b/app/src/layouts/calendar/index.ts
index 59399f0893..c167388124 100644
--- a/app/src/layouts/calendar/index.ts
+++ b/app/src/layouts/calendar/index.ts
@@ -1,10 +1,10 @@
 import api from '@/api';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { formatISO, parse, format } from 'date-fns';
-import useItems from '@/composables/use-items';
+import { useItems } from '@directus/shared/composables';
 import { router } from '@/router';
 import { useAppStore } from '@/stores/app';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import getFullcalendarLocale from '@/utils/get-fullcalendar-locale';
 import { renderPlainStringTemplate } from '@/utils/render-string-template';
 import { unexpectedError } from '@/utils/unexpected-error';
@@ -21,7 +21,7 @@ import CalendarActions from './actions.vue';
 import CalendarLayout from './calendar.vue';
 import CalendarOptions from './options.vue';
 import CalendarSidebar from './sidebar.vue';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import { LayoutOptions } from './types';
 
 export default defineLayout<LayoutOptions>({
diff --git a/app/src/layouts/calendar/options.vue b/app/src/layouts/calendar/options.vue
index ddf9621562..0c57362edf 100644
--- a/app/src/layouts/calendar/options.vue
+++ b/app/src/layouts/calendar/options.vue
@@ -19,7 +19,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType } from 'vue';
 import { Field } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	inheritAttrs: false,
diff --git a/app/src/layouts/calendar/sidebar.vue b/app/src/layouts/calendar/sidebar.vue
index 290a7e101f..dc19afd884 100644
--- a/app/src/layouts/calendar/sidebar.vue
+++ b/app/src/layouts/calendar/sidebar.vue
@@ -7,7 +7,7 @@
 import { defineComponent, PropType } from 'vue';
 
 import { AppFilter } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	inheritAttrs: false,
diff --git a/app/src/layouts/cards/cards.vue b/app/src/layouts/cards/cards.vue
index c599ba9d9b..5e723dee1f 100644
--- a/app/src/layouts/cards/cards.vue
+++ b/app/src/layouts/cards/cards.vue
@@ -86,8 +86,8 @@ import Card from './components/card.vue';
 import CardsHeader from './components/header.vue';
 import useElementSize from '@/composables/use-element-size';
 import { Field, Item } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
-import { Collection } from '@/types';
+import { useSync } from '@directus/shared/composables';
+import { Collection } from '@directus/shared/types';
 
 export default defineComponent({
 	components: { Card, CardsHeader },
diff --git a/app/src/layouts/cards/components/header.vue b/app/src/layouts/cards/components/header.vue
index 223c3b44cf..6c2125a374 100644
--- a/app/src/layouts/cards/components/header.vue
+++ b/app/src/layouts/cards/components/header.vue
@@ -55,7 +55,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed } from 'vue';
 import { Field } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/layouts/cards/index.ts b/app/src/layouts/cards/index.ts
index 64f744f59b..df4aa063f9 100644
--- a/app/src/layouts/cards/index.ts
+++ b/app/src/layouts/cards/index.ts
@@ -6,14 +6,14 @@ import CardsActions from './actions.vue';
 
 import { useI18n } from 'vue-i18n';
 import { toRefs, inject, computed, ref } from 'vue';
-import useCollection from '@/composables/use-collection/';
-import useItems from '@/composables/use-items';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { useCollection } from '@directus/shared/composables';
+import { useItems } from '@directus/shared/composables';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import { useRelationsStore } from '@/stores/';
 
 import adjustFieldsForDisplays from '@/utils/adjust-fields-for-displays';
 import { clone } from 'lodash';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import { LayoutOptions, LayoutQuery } from './types';
 
 export default defineLayout<LayoutOptions, LayoutQuery>({
diff --git a/app/src/layouts/cards/options.vue b/app/src/layouts/cards/options.vue
index 1f256187a0..a8073d2c71 100644
--- a/app/src/layouts/cards/options.vue
+++ b/app/src/layouts/cards/options.vue
@@ -49,7 +49,7 @@ import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType } from 'vue';
 
 import { Field } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	inheritAttrs: false,
diff --git a/app/src/layouts/cards/sidebar.vue b/app/src/layouts/cards/sidebar.vue
index ecf2c96814..99e4cc9da4 100644
--- a/app/src/layouts/cards/sidebar.vue
+++ b/app/src/layouts/cards/sidebar.vue
@@ -13,7 +13,7 @@ import { defineComponent, PropType } from 'vue';
 
 import { LayoutQuery } from './types';
 import { AppFilter } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	inheritAttrs: false,
diff --git a/app/src/layouts/map/index.ts b/app/src/layouts/map/index.ts
index c834ea8f60..b6441e2f20 100644
--- a/app/src/layouts/map/index.ts
+++ b/app/src/layouts/map/index.ts
@@ -10,12 +10,12 @@ import { toRefs, computed, ref, watch, Ref } from 'vue';
 import { toGeoJSON } from '@/utils/geometry';
 import { layers } from './style';
 import { useRouter } from 'vue-router';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import { LayoutOptions, LayoutQuery } from './types';
 import { Filter } from '@directus/shared/types';
-import useCollection from '@/composables/use-collection/';
-import useItems from '@/composables/use-items';
-import { getFieldsFromTemplate } from '@/utils/get-fields-from-template';
+import { useCollection } from '@directus/shared/composables';
+import { useItems } from '@directus/shared/composables';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 import { Field, GeometryFormat, GeometryOptions } from '@directus/shared/types';
 
 import { cloneDeep, merge } from 'lodash';
diff --git a/app/src/layouts/map/map.vue b/app/src/layouts/map/map.vue
index 5e2c1b2b35..1bf4bef32c 100644
--- a/app/src/layouts/map/map.vue
+++ b/app/src/layouts/map/map.vue
@@ -116,7 +116,7 @@ import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType } from 'vue';
 
 import MapComponent from './components/map.vue';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import { GeometryOptions, Item } from '@directus/shared/types';
 import { Filter } from '@directus/shared/types';
 
diff --git a/app/src/layouts/map/options.vue b/app/src/layouts/map/options.vue
index d0d4ee90da..d44484c021 100644
--- a/app/src/layouts/map/options.vue
+++ b/app/src/layouts/map/options.vue
@@ -67,7 +67,7 @@ import { defineComponent, PropType, toRefs } from 'vue';
 import { useAppStore } from '@/stores';
 import { getBasemapSources } from '@/utils/geometry/basemap';
 import { GeometryOptions, Item } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	inheritAttrs: false,
diff --git a/app/src/layouts/map/sidebar.vue b/app/src/layouts/map/sidebar.vue
index ecf2c96814..99e4cc9da4 100644
--- a/app/src/layouts/map/sidebar.vue
+++ b/app/src/layouts/map/sidebar.vue
@@ -13,7 +13,7 @@ import { defineComponent, PropType } from 'vue';
 
 import { LayoutQuery } from './types';
 import { AppFilter } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	inheritAttrs: false,
diff --git a/app/src/layouts/tabular/index.ts b/app/src/layouts/tabular/index.ts
index 624ba1fa79..614e738a5c 100644
--- a/app/src/layouts/tabular/index.ts
+++ b/app/src/layouts/tabular/index.ts
@@ -11,12 +11,12 @@ import { HeaderRaw, Item } from '@/components/v-table/types';
 import { Field } from '@directus/shared/types';
 import { useRouter } from 'vue-router';
 import { debounce, clone } from 'lodash';
-import useCollection from '@/composables/use-collection';
-import useItems from '@/composables/use-items';
+import { useCollection } from '@directus/shared/composables';
+import { useItems } from '@directus/shared/composables';
 import adjustFieldsForDisplays from '@/utils/adjust-fields-for-displays';
 import hideDragImage from '@/utils/hide-drag-image';
 import { getDefaultDisplayForType } from '@/utils/get-default-display-for-type';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import { LayoutOptions, LayoutQuery } from './types';
 
 export default defineLayout<LayoutOptions, LayoutQuery>({
diff --git a/app/src/layouts/tabular/options.vue b/app/src/layouts/tabular/options.vue
index 06bc736a5d..b0d6b58fb2 100644
--- a/app/src/layouts/tabular/options.vue
+++ b/app/src/layouts/tabular/options.vue
@@ -54,7 +54,7 @@ import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType } from 'vue';
 
 import Draggable from 'vuedraggable';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import { Field } from '@directus/shared/types';
 
 export default defineComponent({
diff --git a/app/src/layouts/tabular/sidebar.vue b/app/src/layouts/tabular/sidebar.vue
index b29fd049ff..5f885bea9e 100644
--- a/app/src/layouts/tabular/sidebar.vue
+++ b/app/src/layouts/tabular/sidebar.vue
@@ -11,7 +11,7 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
 
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import { AppFilter } from '@directus/shared/types';
 import { LayoutQuery } from './types';
 
diff --git a/app/src/layouts/tabular/tabular.vue b/app/src/layouts/tabular/tabular.vue
index f74ca2554f..a613deef77 100644
--- a/app/src/layouts/tabular/tabular.vue
+++ b/app/src/layouts/tabular/tabular.vue
@@ -82,11 +82,10 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { ComponentPublicInstance, defineComponent, PropType, ref } from 'vue';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import useShortcut from '@/composables/use-shortcut';
-import { Field, Item } from '@directus/shared/types';
+import { Field, Item, Collection } from '@directus/shared/types';
 import { HeaderRaw } from '@/components/v-table/types';
-import { Collection } from '@/types';
 
 export default defineComponent({
 	inheritAttrs: false,
diff --git a/app/src/modules/collections/composables/use-navigation.ts b/app/src/modules/collections/composables/use-navigation.ts
index 8af9727055..a4cae410b8 100644
--- a/app/src/modules/collections/composables/use-navigation.ts
+++ b/app/src/modules/collections/composables/use-navigation.ts
@@ -1,5 +1,5 @@
 import { useCollectionsStore, useUserStore } from '@/stores/';
-import { Collection } from '@/types';
+import { Collection } from '@directus/shared/types';
 import { computed, ComputedRef, Ref, ref } from 'vue';
 
 export type NavItem = {
diff --git a/app/src/modules/collections/routes/collection.vue b/app/src/modules/collections/routes/collection.vue
index f4218417d6..5159ee942a 100644
--- a/app/src/modules/collections/routes/collection.vue
+++ b/app/src/modules/collections/routes/collection.vue
@@ -259,7 +259,7 @@ import CollectionsNavigation from '../components/navigation.vue';
 import CollectionsNavigationSearch from '../components/navigation-search.vue';
 import api from '@/api';
 import CollectionsNotFound from './not-found.vue';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { useLayout } from '@/composables/use-layout';
 import usePreset from '@/composables/use-preset';
 import LayoutSidebarDetail from '@/views/private/components/layout-sidebar-detail';
diff --git a/app/src/modules/collections/routes/item.vue b/app/src/modules/collections/routes/item.vue
index ae576fbd4d..9ec04fab3d 100644
--- a/app/src/modules/collections/routes/item.vue
+++ b/app/src/modules/collections/routes/item.vue
@@ -198,7 +198,7 @@ import { defineComponent, computed, toRefs, ref, ComponentPublicInstance } from
 import CollectionsNavigationSearch from '../components/navigation-search.vue';
 import CollectionsNavigation from '../components/navigation.vue';
 import CollectionsNotFound from './not-found.vue';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import RevisionsDrawerDetail from '@/views/private/components/revisions-drawer-detail';
 import CommentsSidebarDetail from '@/views/private/components/comments-sidebar-detail';
 import useItem from '@/composables/use-item';
diff --git a/app/src/modules/settings/index.ts b/app/src/modules/settings/index.ts
index 7dfd2a419a..d7cba97041 100644
--- a/app/src/modules/settings/index.ts
+++ b/app/src/modules/settings/index.ts
@@ -1,5 +1,5 @@
 import api from '@/api';
-import { useCollection } from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { defineModule } from '@directus/shared/utils';
 import { useCollectionsStore, useFieldsStore } from '@/stores';
 import RouterPass from '@/utils/router-passthrough';
diff --git a/app/src/modules/settings/routes/data-model/collections/collections.vue b/app/src/modules/settings/routes/data-model/collections/collections.vue
index 31a2ab34ba..4b83fce9b1 100644
--- a/app/src/modules/settings/routes/data-model/collections/collections.vue
+++ b/app/src/modules/settings/routes/data-model/collections/collections.vue
@@ -100,7 +100,7 @@ import { defineComponent, ref, computed } from 'vue';
 import SettingsNavigation from '../../../components/navigation.vue';
 import { HeaderRaw } from '@/components/v-table/types';
 import { useCollectionsStore } from '@/stores/';
-import { Collection } from '@/types';
+import { Collection } from '@directus/shared/types';
 import { useRouter } from 'vue-router';
 import { sortBy } from 'lodash';
 import CollectionOptions from './components/collection-options.vue';
diff --git a/app/src/modules/settings/routes/data-model/collections/components/collection-options.vue b/app/src/modules/settings/routes/data-model/collections/components/collection-options.vue
index 3a37d12b72..35563e83d5 100644
--- a/app/src/modules/settings/routes/data-model/collections/components/collection-options.vue
+++ b/app/src/modules/settings/routes/data-model/collections/components/collection-options.vue
@@ -34,7 +34,7 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, ref } from 'vue';
-import { Collection } from '@/types';
+import { Collection } from '@directus/shared/types';
 import { useCollectionsStore } from '@/stores/';
 
 export default defineComponent({
diff --git a/app/src/modules/settings/routes/data-model/field-detail/components/actions.vue b/app/src/modules/settings/routes/data-model/field-detail/components/actions.vue
index 1e74472f35..6148183f46 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/components/actions.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/components/actions.vue
@@ -20,7 +20,7 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, PropType } from 'vue';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 type Tab = {
 	text: string;
diff --git a/app/src/modules/settings/routes/data-model/field-detail/components/tabs.vue b/app/src/modules/settings/routes/data-model/field-detail/components/tabs.vue
index 14805c35eb..23b66c0ecb 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/components/tabs.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/components/tabs.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue
index ebf8e5e89b..377d81efce 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue
@@ -133,7 +133,7 @@ import api from '@/api';
 import { useFieldsStore, useRelationsStore, useCollectionsStore } from '@/stores/';
 import { useRouter } from 'vue-router';
 import { useDialogRoute } from '@/composables/use-dialog-route';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { getLocalTypeForField } from '../get-local-type';
 import { notify } from '@/utils/notify';
 import formatTitle from '@directus/format-title';
diff --git a/app/src/modules/settings/routes/data-model/field-detail/store.ts b/app/src/modules/settings/routes/data-model/field-detail/store.ts
index 05eff8761d..167bb85795 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/store.ts
+++ b/app/src/modules/settings/routes/data-model/field-detail/store.ts
@@ -7,9 +7,17 @@
 
 import { getDisplays } from '@/displays';
 import { getInterfaces } from '@/interfaces';
-import { DeepPartial, DisplayConfig, Field, InterfaceConfig, Item, LocalType } from '@directus/shared/types';
+import {
+	DeepPartial,
+	DisplayConfig,
+	Field,
+	InterfaceConfig,
+	Item,
+	LocalType,
+	Collection,
+	Relation,
+} from '@directus/shared/types';
 import { useCollectionsStore, useFieldsStore, useRelationsStore } from '@/stores/';
-import { Collection, Relation } from '@/types';
 
 import { clone, throttle } from 'lodash';
 import { computed, ComputedRef, nextTick, reactive, watch, WatchStopHandle } from 'vue';
diff --git a/app/src/modules/settings/routes/data-model/fields/components/fields-management.vue b/app/src/modules/settings/routes/data-model/fields/components/fields-management.vue
index 68da16e25d..c53f988cf5 100644
--- a/app/src/modules/settings/routes/data-model/fields/components/fields-management.vue
+++ b/app/src/modules/settings/routes/data-model/fields/components/fields-management.vue
@@ -59,7 +59,7 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, toRefs } from 'vue';
-import useCollection from '@/composables/use-collection/';
+import { useCollection } from '@directus/shared/composables';
 import Draggable from 'vuedraggable';
 import { Field } from '@directus/shared/types';
 import { useFieldsStore } from '@/stores/';
diff --git a/app/src/modules/settings/routes/data-model/fields/fields.vue b/app/src/modules/settings/routes/data-model/fields/fields.vue
index 514395ca13..33b8bc7fb6 100644
--- a/app/src/modules/settings/routes/data-model/fields/fields.vue
+++ b/app/src/modules/settings/routes/data-model/fields/fields.vue
@@ -87,7 +87,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, toRefs, ref } from 'vue';
 import SettingsNavigation from '../../../components/navigation.vue';
-import useCollection from '@/composables/use-collection/';
+import { useCollection } from '@directus/shared/composables';
 import FieldsManagement from './components/fields-management.vue';
 
 import useItem from '@/composables/use-item';
diff --git a/app/src/modules/settings/routes/data-model/get-local-type.ts b/app/src/modules/settings/routes/data-model/get-local-type.ts
index d3c40a908d..a217bfb5f0 100644
--- a/app/src/modules/settings/routes/data-model/get-local-type.ts
+++ b/app/src/modules/settings/routes/data-model/get-local-type.ts
@@ -1,6 +1,5 @@
 import { useFieldsStore, useRelationsStore } from '@/stores';
-import { Relation } from '@/types';
-import { LocalType } from '@directus/shared/types';
+import { LocalType, Relation } from '@directus/shared/types';
 
 export function getLocalTypeForField(collection: string, field: string): LocalType | null {
 	const fieldsStore = useFieldsStore();
diff --git a/app/src/modules/settings/routes/data-model/new-collection.vue b/app/src/modules/settings/routes/data-model/new-collection.vue
index 1333618999..d293e48bd9 100644
--- a/app/src/modules/settings/routes/data-model/new-collection.vue
+++ b/app/src/modules/settings/routes/data-model/new-collection.vue
@@ -124,8 +124,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, ref, reactive } from 'vue';
 import api from '@/api';
-import { Relation } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Relation } from '@directus/shared/types';
 import { useFieldsStore, useCollectionsStore, useRelationsStore } from '@/stores/';
 import { notify } from '@/utils/notify';
 import { useDialogRoute } from '@/composables/use-dialog-route';
diff --git a/app/src/modules/settings/routes/project/project.vue b/app/src/modules/settings/routes/project/project.vue
index fb6644f072..04b36f6da6 100644
--- a/app/src/modules/settings/routes/project/project.vue
+++ b/app/src/modules/settings/routes/project/project.vue
@@ -31,7 +31,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, ref, computed } from 'vue';
 import SettingsNavigation from '../../components/navigation.vue';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { useSettingsStore, useServerStore } from '@/stores';
 import ProjectInfoSidebarDetail from './components/project-info-sidebar-detail.vue';
 import { clone } from 'lodash';
diff --git a/app/src/modules/settings/routes/roles/item/components/permissions-overview-row.vue b/app/src/modules/settings/routes/roles/item/components/permissions-overview-row.vue
index 4688d37593..b8b4f48250 100644
--- a/app/src/modules/settings/routes/roles/item/components/permissions-overview-row.vue
+++ b/app/src/modules/settings/routes/roles/item/components/permissions-overview-row.vue
@@ -47,8 +47,7 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, toRefs } from 'vue';
-import { Permission } from '@directus/shared/types';
-import { Collection } from '@/types';
+import { Permission, Collection } from '@directus/shared/types';
 import PermissionsOverviewToggle from './permissions-overview-toggle.vue';
 import useUpdatePermissions from '../composables/use-update-permissions';
 
diff --git a/app/src/modules/settings/routes/roles/item/components/permissions-overview-toggle.vue b/app/src/modules/settings/routes/roles/item/components/permissions-overview-toggle.vue
index 8361cb2e92..34b4b06951 100644
--- a/app/src/modules/settings/routes/roles/item/components/permissions-overview-toggle.vue
+++ b/app/src/modules/settings/routes/roles/item/components/permissions-overview-toggle.vue
@@ -66,8 +66,7 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed, inject, ref, toRefs } from 'vue';
-import { Permission } from '@directus/shared/types';
-import { Collection } from '@/types';
+import { Permission, Collection } from '@directus/shared/types';
 import api from '@/api';
 import { useRouter } from 'vue-router';
 import useUpdatePermissions from '../composables/use-update-permissions';
diff --git a/app/src/modules/settings/routes/roles/item/composables/use-update-permissions.ts b/app/src/modules/settings/routes/roles/item/composables/use-update-permissions.ts
index 4d1b769c0d..cbacb78166 100644
--- a/app/src/modules/settings/routes/roles/item/composables/use-update-permissions.ts
+++ b/app/src/modules/settings/routes/roles/item/composables/use-update-permissions.ts
@@ -1,6 +1,5 @@
 import api from '@/api';
-import { Collection } from '@/types';
-import { Permission } from '@directus/shared/types';
+import { Permission, Collection } from '@directus/shared/types';
 import { unexpectedError } from '@/utils/unexpected-error';
 import { inject, ref, Ref } from 'vue';
 
diff --git a/app/src/modules/settings/routes/roles/permissions-detail/components/fields.vue b/app/src/modules/settings/routes/roles/permissions-detail/components/fields.vue
index 25820233b6..73bceb3ad0 100644
--- a/app/src/modules/settings/routes/roles/permissions-detail/components/fields.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/fields.vue
@@ -30,7 +30,7 @@ import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed } from 'vue';
 import { Permission, Role } from '@directus/shared/types';
 import { Field } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import { useFieldsStore } from '@/stores';
 
 export default defineComponent({
diff --git a/app/src/modules/settings/routes/roles/permissions-detail/components/permissions.vue b/app/src/modules/settings/routes/roles/permissions-detail/components/permissions.vue
index c2304b0746..d79afff077 100644
--- a/app/src/modules/settings/routes/roles/permissions-detail/components/permissions.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/permissions.vue
@@ -23,7 +23,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed } from 'vue';
 import { Permission, Role } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/modules/settings/routes/roles/permissions-detail/components/presets.vue b/app/src/modules/settings/routes/roles/permissions-detail/components/presets.vue
index 3ac2a52fba..de69167656 100644
--- a/app/src/modules/settings/routes/roles/permissions-detail/components/presets.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/presets.vue
@@ -16,7 +16,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed } from 'vue';
 import { Permission, Role } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/modules/settings/routes/roles/permissions-detail/components/tabs.vue b/app/src/modules/settings/routes/roles/permissions-detail/components/tabs.vue
index b51313cc65..b66828c43a 100644
--- a/app/src/modules/settings/routes/roles/permissions-detail/components/tabs.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/tabs.vue
@@ -9,7 +9,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/modules/settings/routes/roles/permissions-detail/components/validation.vue b/app/src/modules/settings/routes/roles/permissions-detail/components/validation.vue
index 702bc848d0..b257a0cf4a 100644
--- a/app/src/modules/settings/routes/roles/permissions-detail/components/validation.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/validation.vue
@@ -17,7 +17,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed } from 'vue';
 import { Permission, Role } from '@directus/shared/types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/modules/users/routes/item.vue b/app/src/modules/users/routes/item.vue
index 60c2aa37a6..b1500a51d3 100644
--- a/app/src/modules/users/routes/item.vue
+++ b/app/src/modules/users/routes/item.vue
@@ -190,7 +190,7 @@ import { Field } from '@directus/shared/types';
 import UserInfoSidebarDetail from '../components/user-info-sidebar-detail.vue';
 import { getRootPath } from '@/utils/get-root-path';
 import useShortcut from '@/composables/use-shortcut';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { userName } from '@/utils/user-name';
 import { usePermissions } from '@/composables/use-permissions';
 import { unexpectedError } from '@/utils/unexpected-error';
diff --git a/app/src/stores/collections.ts b/app/src/stores/collections.ts
index 1e506eaee0..c47199c372 100644
--- a/app/src/stores/collections.ts
+++ b/app/src/stores/collections.ts
@@ -1,6 +1,6 @@
 import api from '@/api';
 import { i18n } from '@/lang';
-import { Collection, CollectionRaw } from '@/types';
+import { Collection, CollectionRaw } from '@directus/shared/types';
 import { notEmpty } from '@/utils/is-empty/';
 import { notify } from '@/utils/notify';
 import { unexpectedError } from '@/utils/unexpected-error';
diff --git a/app/src/stores/fields.ts b/app/src/stores/fields.ts
index 57ca335512..9038ace3de 100644
--- a/app/src/stores/fields.ts
+++ b/app/src/stores/fields.ts
@@ -1,11 +1,10 @@
 import api from '@/api';
 import { i18n } from '@/lang';
 import { useRelationsStore } from '@/stores/';
-import { Relation } from '@/types';
 import { notEmpty } from '@/utils/is-empty/';
 import { unexpectedError } from '@/utils/unexpected-error';
 import formatTitle from '@directus/format-title';
-import { DeepPartial, Field, FieldRaw } from '@directus/shared/types';
+import { DeepPartial, Field, FieldRaw, Relation } from '@directus/shared/types';
 import { parseFilter } from '@/utils/parse-filter';
 import { merge, orderBy } from 'lodash';
 import { nanoid } from 'nanoid';
diff --git a/app/src/stores/relations.ts b/app/src/stores/relations.ts
index 82de20e14b..16f8ae128c 100644
--- a/app/src/stores/relations.ts
+++ b/app/src/stores/relations.ts
@@ -1,6 +1,6 @@
 import api from '@/api';
 import { useFieldsStore } from '@/stores/';
-import { Relation } from '@/types';
+import { Relation } from '@directus/shared/types';
 import { defineStore } from 'pinia';
 
 export const useRelationsStore = defineStore({
diff --git a/app/src/utils/add-related-primary-key-to-fields.ts b/app/src/utils/add-related-primary-key-to-fields.ts
index 39858af99a..4473f69d60 100644
--- a/app/src/utils/add-related-primary-key-to-fields.ts
+++ b/app/src/utils/add-related-primary-key-to-fields.ts
@@ -1,5 +1,5 @@
 import { useFieldsStore } from '@/stores/';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 
 /**
  * Adds the primary key field for any passed relational dot-notation field to the array of fields.
diff --git a/app/src/utils/filters-to-query/index.ts b/app/src/utils/filters-to-query/index.ts
deleted file mode 100644
index 8c8a1b983f..0000000000
--- a/app/src/utils/filters-to-query/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import filtersToQuery from './filters-to-query';
-
-export { filtersToQuery };
-export default filtersToQuery;
diff --git a/app/src/utils/filters-to-query/readme.md b/app/src/utils/filters-to-query/readme.md
deleted file mode 100644
index e5a96efd89..0000000000
--- a/app/src/utils/filters-to-query/readme.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Filters to Query
-
-Converts an array of filter objects to an object of query params.
-
-## Usage
-
-```ts
-const multipleFilters: Filter[] = [
-	{
-		field: 'title',
-		operator: 'contains',
-		value: 'directus',
-	},
-	{
-		field: 'author',
-		operator: 'eq',
-		value: 1,
-	},
-];
-
-filtersToQuery(multipleFilters);
-
-// {
-//   _and: [
-//     {
-//       title: {
-//         _contains: 'directus'
-//       }
-//     },
-//     {
-//       author: {
-//         _eq: 1
-//       }
-//     }
-//   ]
-// }
-
-const singleFilter: Filter[] = [
-	{
-		field: 'title',
-		operator: 'contains',
-		value: 'directus',
-	},
-];
-
-filtersToQuery(singleFilter);
-
-// {
-//   title: {
-//     _contains: 'directus'
-//   }
-// }
-```
diff --git a/app/src/utils/get-related-collection/get-related-collection.ts b/app/src/utils/get-related-collection/get-related-collection.ts
index 8b0e3ea248..64f7d5a97d 100644
--- a/app/src/utils/get-related-collection/get-related-collection.ts
+++ b/app/src/utils/get-related-collection/get-related-collection.ts
@@ -1,5 +1,5 @@
 import { useFieldsStore, useRelationsStore } from '@/stores/';
-import { Relation } from '@/types';
+import { Relation } from '@directus/shared/types';
 
 export default function getRelatedCollection(collection: string, field: string): string {
 	const relationsStore = useRelationsStore();
diff --git a/app/src/utils/move-in-array/index.ts b/app/src/utils/move-in-array/index.ts
deleted file mode 100644
index e4bc9d1d1a..0000000000
--- a/app/src/utils/move-in-array/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import moveInArray from './move-in-array';
-
-export { moveInArray };
-export default moveInArray;
diff --git a/app/src/utils/render-string-template.ts b/app/src/utils/render-string-template.ts
index 03351b7581..9ddd90d0e1 100644
--- a/app/src/utils/render-string-template.ts
+++ b/app/src/utils/render-string-template.ts
@@ -1,6 +1,6 @@
 import { render, renderFn, get } from 'micromustache';
 import { computed, ComputedRef, Ref, unref } from 'vue';
-import { getFieldsFromTemplate } from './get-fields-from-template';
+import { getFieldsFromTemplate } from '@directus/shared/utils';
 
 type StringTemplate = {
 	fieldsInTemplate: ComputedRef<string[]>;
diff --git a/app/src/views/private/components/drawer-collection/drawer-collection.vue b/app/src/views/private/components/drawer-collection/drawer-collection.vue
index e7acb82c9a..878f77bcc3 100644
--- a/app/src/views/private/components/drawer-collection/drawer-collection.vue
+++ b/app/src/views/private/components/drawer-collection/drawer-collection.vue
@@ -49,7 +49,7 @@ import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, ref, computed, toRefs, watch } from 'vue';
 import { Filter } from '@directus/shared/types';
 import usePreset from '@/composables/use-preset';
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { useLayout } from '@/composables/use-layout';
 import SearchInput from '@/views/private/components/search-input';
 
diff --git a/app/src/views/private/components/drawer-item/drawer-item.vue b/app/src/views/private/components/drawer-item/drawer-item.vue
index a3acd898f9..e2a4ffb3cb 100644
--- a/app/src/views/private/components/drawer-item/drawer-item.vue
+++ b/app/src/views/private/components/drawer-item/drawer-item.vue
@@ -61,10 +61,9 @@ import api, { addTokenToURL } from '@/api';
 import { getRootPath } from '@/utils/get-root-path';
 import FilePreview from '@/views/private/components/file-preview';
 
-import useCollection from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { useFieldsStore, useRelationsStore } from '@/stores';
-import { Relation } from '@/types';
-import { Field } from '@directus/shared/types';
+import { Field, Relation } from '@directus/shared/types';
 import { unexpectedError } from '@/utils/unexpected-error';
 import { usePermissions } from '@/composables/use-permissions';
 import useTemplateData from '@/composables/use-template-data';
diff --git a/app/src/views/private/components/export-sidebar-detail/export-sidebar-detail.vue b/app/src/views/private/components/export-sidebar-detail/export-sidebar-detail.vue
index 4259edee50..ec93e6347a 100644
--- a/app/src/views/private/components/export-sidebar-detail/export-sidebar-detail.vue
+++ b/app/src/views/private/components/export-sidebar-detail/export-sidebar-detail.vue
@@ -38,7 +38,7 @@ import { defineComponent, ref, PropType, computed } from 'vue';
 import { Filter } from '@directus/shared/types';
 import api from '@/api';
 import { getRootPath } from '@/utils/get-root-path';
-import filtersToQuery from '@/utils/filters-to-query';
+import { filtersToQuery } from '@directus/shared/utils';
 import { useCollectionsStore } from '@/stores/';
 
 type LayoutQuery = {
diff --git a/app/src/views/private/components/filter-sidebar-detail/filter-sidebar-detail.vue b/app/src/views/private/components/filter-sidebar-detail/filter-sidebar-detail.vue
index 184000c46b..cb12343c83 100644
--- a/app/src/views/private/components/filter-sidebar-detail/filter-sidebar-detail.vue
+++ b/app/src/views/private/components/filter-sidebar-detail/filter-sidebar-detail.vue
@@ -49,7 +49,7 @@ import FieldFilter from './field-filter.vue';
 import { nanoid } from 'nanoid';
 import { debounce } from 'lodash';
 import FieldListItem from './field-list-item.vue';
-import { useCollection } from '@/composables/use-collection';
+import { useCollection } from '@directus/shared/composables';
 import { getFilterOperatorsForType } from '@directus/shared/utils';
 import { useFieldTree } from '@/composables/use-field-tree';
 
diff --git a/app/src/views/private/components/layout-sidebar-detail/layout-sidebar-detail.vue b/app/src/views/private/components/layout-sidebar-detail/layout-sidebar-detail.vue
index 41a6984cd2..580833d72e 100644
--- a/app/src/views/private/components/layout-sidebar-detail/layout-sidebar-detail.vue
+++ b/app/src/views/private/components/layout-sidebar-detail/layout-sidebar-detail.vue
@@ -19,7 +19,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed } from 'vue';
 import { getLayouts } from '@/layouts';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/views/private/components/revisions-drawer-detail/revisions-drawer-picker.vue b/app/src/views/private/components/revisions-drawer-detail/revisions-drawer-picker.vue
index 9f81b751c6..98fdf36352 100644
--- a/app/src/views/private/components/revisions-drawer-detail/revisions-drawer-picker.vue
+++ b/app/src/views/private/components/revisions-drawer-detail/revisions-drawer-picker.vue
@@ -26,7 +26,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed, watch, ref } from 'vue';
 import { Revision } from './types';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import localizedFormat from '@/utils/localized-format';
 import { userName } from '@/utils/user-name';
 
diff --git a/app/src/views/private/components/revisions-drawer-detail/revisions-drawer.vue b/app/src/views/private/components/revisions-drawer-detail/revisions-drawer.vue
index 43da9a400e..7fe9521d91 100644
--- a/app/src/views/private/components/revisions-drawer-detail/revisions-drawer.vue
+++ b/app/src/views/private/components/revisions-drawer-detail/revisions-drawer.vue
@@ -43,7 +43,7 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed, ref } from 'vue';
-import useSync from '@/composables/use-sync';
+import { useSync } from '@directus/shared/composables';
 import { Revision } from './types';
 import RevisionsDrawerPicker from './revisions-drawer-picker.vue';
 import RevisionsDrawerPreview from './revisions-drawer-preview.vue';
diff --git a/package-lock.json b/package-lock.json
index c0906ecc22..51260a588d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4061,7 +4061,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.7.tgz",
 			"integrity": "sha512-q1W2j81xbHyfKrNcca/CeJyf0Bcx4u9UDu05l7AaiJbqOseTme2o2I3wp1hDDCtmC7k7HgX0sAygyHNJH9swuQ==",
-			"dev": true,
 			"dependencies": {
 				"@intlify/devtools-if": "9.1.7",
 				"@intlify/message-compiler": "9.1.7",
@@ -4078,7 +4077,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.7.tgz",
 			"integrity": "sha512-/DcN5FUySSkQhDqx5y1RvxfuCXO3Ot/dUEIOs472qbM7Hyb2qif+eXCnwHBzlI4+wEfQVT6L0PiM1a7Er/ro9g==",
-			"dev": true,
 			"dependencies": {
 				"@intlify/shared": "9.1.7"
 			},
@@ -4090,7 +4088,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.7.tgz",
 			"integrity": "sha512-JZNkAhr3O7tnbdbRBcpYfqr/Ai26WTzX0K/lV8Y1KVdOIj/dGiamaffdWUdFiDXUnbJRNbPiOaKxy7Pwip3KxQ==",
-			"dev": true,
 			"dependencies": {
 				"@intlify/message-resolver": "9.1.7",
 				"@intlify/shared": "9.1.7",
@@ -4104,7 +4101,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.7.tgz",
 			"integrity": "sha512-WTK+OaXJYjyquLGhuCyDvU2WHkG+kXzXeHagmVFHn+s118Jf2143zzkLLUrapP5CtZ/csuyjmYg7b3xQRQAmvw==",
-			"dev": true,
 			"engines": {
 				"node": ">= 10"
 			}
@@ -4113,7 +4109,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.7.tgz",
 			"integrity": "sha512-QURPSlzhOVnRwS2XMGpCDsDkP42kfVBh94aAORxh/gVGzdgJip2vagrIFij/J69aEqdB476WJkMhVjP8VSHmiA==",
-			"dev": true,
 			"dependencies": {
 				"@intlify/message-compiler": "9.1.7",
 				"@intlify/message-resolver": "9.1.7",
@@ -4127,7 +4122,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.7.tgz",
 			"integrity": "sha512-zt0zlUdalumvT9AjQNxPXA36UgOndUyvBMplh8uRZU0fhWHAwhnJTcf0NaG9Qvr8I1n3HPSs96+kLb/YdwTavQ==",
-			"dev": true,
 			"engines": {
 				"node": ">= 10"
 			}
@@ -4136,7 +4130,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.7.tgz",
 			"integrity": "sha512-DI5Wc0aOiohtBUGUkKAcryCWbbuaO4/PK4Pa/LaNCsFNxbtgR5qkIDmhBv9xVPYGTUhySXxaDDAMvOpBjhPJjw==",
-			"dev": true,
 			"dependencies": {
 				"@intlify/message-resolver": "9.1.7",
 				"@intlify/runtime": "9.1.7",
@@ -46606,7 +46599,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.7.tgz",
 			"integrity": "sha512-ujuuDanoHqtEd4GejWrbG/fXE9nrP51ElsEGxp0WBHfv+/ki0/wyUqkO+4fLikki2obGtXdviTPH0VNpas5K6g==",
-			"dev": true,
 			"dependencies": {
 				"@intlify/core-base": "9.1.7",
 				"@intlify/shared": "9.1.7",
@@ -50571,6 +50563,7 @@
 				"lodash": "4.17.21",
 				"pino": "*",
 				"vue": "3",
+				"vue-i18n": "9",
 				"vue-router": "4"
 			},
 			"devDependencies": {
@@ -53137,6 +53130,7 @@
 				"rimraf": "3.0.2",
 				"typescript": "4.4.3",
 				"vue": "3",
+				"vue-i18n": "9",
 				"vue-router": "4"
 			},
 			"dependencies": {
@@ -53870,7 +53864,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.7.tgz",
 			"integrity": "sha512-q1W2j81xbHyfKrNcca/CeJyf0Bcx4u9UDu05l7AaiJbqOseTme2o2I3wp1hDDCtmC7k7HgX0sAygyHNJH9swuQ==",
-			"dev": true,
 			"requires": {
 				"@intlify/devtools-if": "9.1.7",
 				"@intlify/message-compiler": "9.1.7",
@@ -53884,7 +53877,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.1.7.tgz",
 			"integrity": "sha512-/DcN5FUySSkQhDqx5y1RvxfuCXO3Ot/dUEIOs472qbM7Hyb2qif+eXCnwHBzlI4+wEfQVT6L0PiM1a7Er/ro9g==",
-			"dev": true,
 			"requires": {
 				"@intlify/shared": "9.1.7"
 			}
@@ -53893,7 +53885,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.1.7.tgz",
 			"integrity": "sha512-JZNkAhr3O7tnbdbRBcpYfqr/Ai26WTzX0K/lV8Y1KVdOIj/dGiamaffdWUdFiDXUnbJRNbPiOaKxy7Pwip3KxQ==",
-			"dev": true,
 			"requires": {
 				"@intlify/message-resolver": "9.1.7",
 				"@intlify/shared": "9.1.7",
@@ -53903,14 +53894,12 @@
 		"@intlify/message-resolver": {
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/message-resolver/-/message-resolver-9.1.7.tgz",
-			"integrity": "sha512-WTK+OaXJYjyquLGhuCyDvU2WHkG+kXzXeHagmVFHn+s118Jf2143zzkLLUrapP5CtZ/csuyjmYg7b3xQRQAmvw==",
-			"dev": true
+			"integrity": "sha512-WTK+OaXJYjyquLGhuCyDvU2WHkG+kXzXeHagmVFHn+s118Jf2143zzkLLUrapP5CtZ/csuyjmYg7b3xQRQAmvw=="
 		},
 		"@intlify/runtime": {
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/runtime/-/runtime-9.1.7.tgz",
 			"integrity": "sha512-QURPSlzhOVnRwS2XMGpCDsDkP42kfVBh94aAORxh/gVGzdgJip2vagrIFij/J69aEqdB476WJkMhVjP8VSHmiA==",
-			"dev": true,
 			"requires": {
 				"@intlify/message-compiler": "9.1.7",
 				"@intlify/message-resolver": "9.1.7",
@@ -53920,14 +53909,12 @@
 		"@intlify/shared": {
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.1.7.tgz",
-			"integrity": "sha512-zt0zlUdalumvT9AjQNxPXA36UgOndUyvBMplh8uRZU0fhWHAwhnJTcf0NaG9Qvr8I1n3HPSs96+kLb/YdwTavQ==",
-			"dev": true
+			"integrity": "sha512-zt0zlUdalumvT9AjQNxPXA36UgOndUyvBMplh8uRZU0fhWHAwhnJTcf0NaG9Qvr8I1n3HPSs96+kLb/YdwTavQ=="
 		},
 		"@intlify/vue-devtools": {
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.1.7.tgz",
 			"integrity": "sha512-DI5Wc0aOiohtBUGUkKAcryCWbbuaO4/PK4Pa/LaNCsFNxbtgR5qkIDmhBv9xVPYGTUhySXxaDDAMvOpBjhPJjw==",
-			"dev": true,
 			"requires": {
 				"@intlify/message-resolver": "9.1.7",
 				"@intlify/runtime": "9.1.7",
@@ -87972,7 +87959,6 @@
 			"version": "9.1.7",
 			"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.1.7.tgz",
 			"integrity": "sha512-ujuuDanoHqtEd4GejWrbG/fXE9nrP51ElsEGxp0WBHfv+/ki0/wyUqkO+4fLikki2obGtXdviTPH0VNpas5K6g==",
-			"dev": true,
 			"requires": {
 				"@intlify/core-base": "9.1.7",
 				"@intlify/shared": "9.1.7",
diff --git a/packages/extensions-sdk/src/index.ts b/packages/extensions-sdk/src/index.ts
index 3641f55a42..7cd8938d9d 100644
--- a/packages/extensions-sdk/src/index.ts
+++ b/packages/extensions-sdk/src/index.ts
@@ -5,5 +5,7 @@ export {
 	defineModule,
 	defineHook,
 	defineEndpoint,
+	getFieldsFromTemplate,
+	getRelationType,
 } from '@directus/shared/utils';
-export { useStores, useApi } from '@directus/shared/composables';
+export { useStores, useApi, useCollection, useSync, useFilterFields, useItems } from '@directus/shared/composables';
diff --git a/packages/shared/package.json b/packages/shared/package.json
index af52f60a64..c8ff000ef0 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -57,6 +57,7 @@
 		"lodash": "4.17.21",
 		"pino": "*",
 		"vue": "3",
+		"vue-i18n": "9",
 		"vue-router": "4"
 	},
 	"devDependencies": {
diff --git a/packages/shared/src/composables/index.ts b/packages/shared/src/composables/index.ts
index 9fb3efd5e9..74bcd98c0b 100644
--- a/packages/shared/src/composables/index.ts
+++ b/packages/shared/src/composables/index.ts
@@ -1 +1,5 @@
+export * from './use-collection';
+export * from './use-filter-fields';
+export * from './use-items';
+export * from './use-sync';
 export * from './use-system';
diff --git a/app/src/composables/use-collection/use-collection.ts b/packages/shared/src/composables/use-collection.ts
similarity index 84%
rename from app/src/composables/use-collection/use-collection.ts
rename to packages/shared/src/composables/use-collection.ts
index 05d0f2e55f..79eb093525 100644
--- a/app/src/composables/use-collection/use-collection.ts
+++ b/packages/shared/src/composables/use-collection.ts
@@ -1,6 +1,5 @@
-import { useCollectionsStore, useFieldsStore } from '@/stores/';
-import { Collection } from '@/types';
-import { Field } from '@directus/shared/types';
+import { useStores } from './use-system';
+import { Collection, Field } from '../types';
 import { computed, ref, Ref, ComputedRef } from 'vue';
 
 type UsableCollection = {
@@ -15,18 +14,21 @@ type UsableCollection = {
 };
 
 export function useCollection(collectionKey: string | Ref<string | null>): UsableCollection {
+	const { useCollectionsStore, useFieldsStore } = useStores();
 	const collectionsStore = useCollectionsStore();
 	const fieldsStore = useFieldsStore();
 
 	const collection: Ref<string | null> = typeof collectionKey === 'string' ? ref(collectionKey) : collectionKey;
 
 	const info = computed(() => {
-		return collectionsStore.collections.find(({ collection: key }) => key === collection.value) || null;
+		return (
+			(collectionsStore.collections as Collection[]).find(({ collection: key }) => key === collection.value) || null
+		);
 	});
 
 	const fields = computed(() => {
 		if (!collection.value) return [];
-		return fieldsStore.getFieldsForCollection(collection.value);
+		return fieldsStore.getFieldsForCollection(collection.value) as Field[];
 	});
 
 	const defaults = computed(() => {
diff --git a/packages/shared/src/composables/use-filter-fields.ts b/packages/shared/src/composables/use-filter-fields.ts
new file mode 100644
index 0000000000..31f0ff2cf3
--- /dev/null
+++ b/packages/shared/src/composables/use-filter-fields.ts
@@ -0,0 +1,21 @@
+import { Field } from '../types';
+import { Ref, computed } from 'vue';
+
+export function useFilterFields<T extends string>(fields: Ref<Field[]>, filters: Record<T, (field: Field) => boolean>) {
+	const fieldGroups = computed(() => {
+		const acc = {} as Record<Extract<T, string>, Field[]>;
+		for (const name in filters) {
+			acc[name] = [];
+		}
+
+		return fields.value.reduce((acc, field) => {
+			for (const name in filters) {
+				if (filters[name](field) === false) continue;
+				acc[name].push(field);
+			}
+			return acc;
+		}, acc);
+	});
+
+	return { fieldGroups };
+}
diff --git a/app/src/composables/use-items/use-items.ts b/packages/shared/src/composables/use-items.ts
similarity index 94%
rename from app/src/composables/use-items/use-items.ts
rename to packages/shared/src/composables/use-items.ts
index bbae7b0ecb..0dc3356b78 100644
--- a/app/src/composables/use-items/use-items.ts
+++ b/packages/shared/src/composables/use-items.ts
@@ -1,8 +1,7 @@
-import api from '@/api';
-import useCollection from '@/composables/use-collection';
-import { Filter, Item } from '@directus/shared/types';
-import filtersToQuery from '@/utils/filters-to-query';
-import moveInArray from '@/utils/move-in-array';
+import { useApi } from './use-system';
+import { useCollection } from './use-collection';
+import { Filter, Item } from '../types';
+import { moveInArray, filtersToQuery } from '../utils';
 import { isEqual, orderBy, throttle } from 'lodash';
 import { computed, ComputedRef, nextTick, ref, Ref, watch } from 'vue';
 
@@ -32,6 +31,7 @@ type UsableItems = {
 };
 
 export function useItems(collection: Ref<string | null>, query: Query, fetchOnInit = true): UsableItems {
+	const api = useApi();
 	const { primaryKeyField, sortField } = useCollection(collection);
 
 	let loadingTimeout: number | null = null;
@@ -144,7 +144,7 @@ export function useItems(collection: Ref<string | null>, query: Query, fetchOnIn
 
 		error.value = null;
 
-		loadingTimeout = setTimeout(() => {
+		loadingTimeout = window.setTimeout(() => {
 			loading.value = true;
 		}, 250);
 
@@ -162,8 +162,8 @@ export function useItems(collection: Ref<string | null>, query: Query, fetchOnIn
 		// Make sure all fields that are used to filter are fetched
 		if (fields.value.includes('*') === false) {
 			filters.value.forEach((filter) => {
-				if (fieldsToFetch.includes(filter.field) === false) {
-					fieldsToFetch.push(filter.field);
+				if (fieldsToFetch.includes(filter.field as string) === false) {
+					fieldsToFetch.push(filter.field as string);
 				}
 			});
 		}
diff --git a/app/src/composables/use-sync/use-sync.ts b/packages/shared/src/composables/use-sync.ts
similarity index 50%
rename from app/src/composables/use-sync/use-sync.ts
rename to packages/shared/src/composables/use-sync.ts
index 1a23af6810..8700d6c219 100644
--- a/app/src/composables/use-sync/use-sync.ts
+++ b/packages/shared/src/composables/use-sync.ts
@@ -1,10 +1,10 @@
 import { computed, Ref } from 'vue';
 
-export default function useSync<
-	T,
-	K extends keyof T & string,
-	E extends (event: `update:${K}`, ...args: any[]) => void
->(props: T, key: K, emit: E): Ref<T[K]> {
+export function useSync<T, K extends keyof T & string, E extends (event: `update:${K}`, ...args: any[]) => void>(
+	props: T,
+	key: K,
+	emit: E
+): Ref<T[K]> {
 	return computed<T[K]>({
 		get() {
 			return props[key];
diff --git a/app/src/types/collections.ts b/packages/shared/src/types/collection.ts
similarity index 100%
rename from app/src/types/collections.ts
rename to packages/shared/src/types/collection.ts
diff --git a/packages/shared/src/types/index.ts b/packages/shared/src/types/index.ts
index efb94bacd2..8deedeb503 100644
--- a/packages/shared/src/types/index.ts
+++ b/packages/shared/src/types/index.ts
@@ -1,4 +1,5 @@
 export * from './accountability';
+export * from './collection';
 export * from './displays';
 export * from './endpoints';
 export * from './extensions';
@@ -13,5 +14,6 @@ export * from './misc';
 export * from './modules';
 export * from './permissions';
 export * from './presets';
+export * from './relations';
 export * from './settings';
 export * from './users';
diff --git a/app/src/types/relations.ts b/packages/shared/src/types/relations.ts
similarity index 100%
rename from app/src/types/relations.ts
rename to packages/shared/src/types/relations.ts
diff --git a/app/src/utils/filters-to-query/filters-to-query.ts b/packages/shared/src/utils/filters-to-query.ts
similarity index 81%
rename from app/src/utils/filters-to-query/filters-to-query.ts
rename to packages/shared/src/utils/filters-to-query.ts
index a899bdf6fc..3d2024fb06 100644
--- a/app/src/utils/filters-to-query/filters-to-query.ts
+++ b/packages/shared/src/utils/filters-to-query.ts
@@ -1,7 +1,7 @@
-import { Filter } from '@directus/shared/types';
+import { Filter } from '../types';
 import { clone } from 'lodash';
 
-export default function filtersToQuery(filters: readonly Filter[]): { filter: Record<string, any> } {
+export function filtersToQuery(filters: readonly Filter[]): { filter: Record<string, any> } {
 	const filterList: Record<string, any>[] = [];
 
 	for (const filter of filters) {
@@ -30,7 +30,7 @@ export default function filtersToQuery(filters: readonly Filter[]): { filter: Re
 
 	let filterQuery: Record<string, any> = {};
 
-	if (filterList.length === 1) {
+	if (filterList.length === 1 && filterList[0] !== undefined) {
 		filterQuery = filterList[0];
 	} else if (filterList.length > 1) {
 		filterQuery = { _and: filterList };
diff --git a/app/src/utils/get-fields-from-template.ts b/packages/shared/src/utils/get-fields-from-template.ts
similarity index 100%
rename from app/src/utils/get-fields-from-template.ts
rename to packages/shared/src/utils/get-fields-from-template.ts
diff --git a/app/src/utils/get-relation-type.ts b/packages/shared/src/utils/get-relation-type.ts
similarity index 94%
rename from app/src/utils/get-relation-type.ts
rename to packages/shared/src/utils/get-relation-type.ts
index c585a20da3..9f5679b1ff 100644
--- a/app/src/utils/get-relation-type.ts
+++ b/packages/shared/src/utils/get-relation-type.ts
@@ -1,4 +1,4 @@
-import { Relation } from '@/types';
+import { Relation } from '../types';
 
 export function getRelationType(getRelationOptions: {
 	relation: Relation;
diff --git a/packages/shared/src/utils/index.ts b/packages/shared/src/utils/index.ts
index 3d205e9d12..26617fc77a 100644
--- a/packages/shared/src/utils/index.ts
+++ b/packages/shared/src/utils/index.ts
@@ -1,9 +1,13 @@
 export * from './adjust-date';
 export * from './deep-map';
 export * from './define-extension';
+export * from './filters-to-query';
 export * from './generate-joi';
+export * from './get-fields-from-template';
 export * from './get-filter-operators-for-type';
+export * from './get-relation-type';
 export * from './is-extension';
+export * from './move-in-array';
 export * from './parse-filter';
 export * from './pluralize';
 export * from './to-array';
diff --git a/app/src/utils/move-in-array/move-in-array.ts b/packages/shared/src/utils/move-in-array.ts
similarity index 79%
rename from app/src/utils/move-in-array/move-in-array.ts
rename to packages/shared/src/utils/move-in-array.ts
index df95cbe326..7f8440c690 100644
--- a/app/src/utils/move-in-array/move-in-array.ts
+++ b/packages/shared/src/utils/move-in-array.ts
@@ -1,8 +1,10 @@
-export default function moveInArray<T = any>(array: T[], fromIndex: number, toIndex: number): T[] {
+export function moveInArray<T = any>(array: T[], fromIndex: number, toIndex: number): T[] {
 	const item = array[fromIndex];
 	const length = array.length;
 	const diff = fromIndex - toIndex;
 
+	if (item === undefined) return array;
+
 	if (diff > 0) {
 		// move left
 		return [

From cc8446c626dc4d7a2be2e1420f455901cd5885bc Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Wed, 15 Sep 2021 16:45:30 -0400
Subject: [PATCH 05/45] New Crowdin updates (#8057)

* New translations en-US.yaml (German)

* New translations en-US.yaml (German)
---
 app/src/lang/translations/de-DE.yaml | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/app/src/lang/translations/de-DE.yaml b/app/src/lang/translations/de-DE.yaml
index e971e68742..f3f6da9baa 100644
--- a/app/src/lang/translations/de-DE.yaml
+++ b/app/src/lang/translations/de-DE.yaml
@@ -22,10 +22,13 @@
 published: Veröffentlicht
 draft: Entwurf
 archived: Archiviert
+module_bar: Modulleiste
+tile_size: Kachelgröße
 edit_field: Feld bearbeiten
 conditions: Bedingungen
 maps: Karten
 item_revision: Element Revision
+enter_a_name: Namen eingeben...
 duplicate_field: Feld duplizieren
 half_width: Halbe Breite
 full_width: Volle Breite
@@ -56,6 +59,7 @@ create_user: Benutzer erstellen
 create_webhook: Webhook erstellen
 invite_users: Benutzer einladen
 email_examples: "admin{'@'}beispiel.de, benutzer{'@'}beispiel.de..."
+url_example: "https://example.com"
 invite: Einladen
 email_already_invited: E-Mail "{email}" wurde bereits eingeladen
 emails: E-Mails
@@ -145,6 +149,9 @@ fields_for_role: 'Felder die von der {role} Rolle {action} werden können.'
 validation_for_role: 'Feld {action} Regeln welche durch die {role} Rolle befolgt werden muss.'
 presets_for_role: 'Feld Voreinstellungen für die {role} Rolle.'
 presentation_and_aliases: Darstellung & Aliasse
+revision_post_update: So sieht dieses Element nach dem Update aus.
+changes_made: Dies sind die spezifischen Änderungen, die in dieser Revision vorgenommen wurden.
+no_relational_data: Beachten Sie, dass relationale Daten hier nicht enthalten sind.
 hide_field_on_detail: In Detailansicht ausblenden
 show_field_on_detail: In Detailansicht einblenden
 delete_field: Feld löschen
@@ -211,6 +218,8 @@ add_m2m_to_collection: 'n:m zu "{collection}" hinzufügen'
 choose_a_type: Wähle einen Typ...
 determined_by_relationship: Bestimmt durch Beziehung
 add_note: Füge eine hilfreiche Beschreibung für die Benutzer hinzu...
+add_link: Verknüpfung hinzufügen
+custom_link: Benutzerdefinierte Verknüpfung
 default_value: Standardwert
 standard_field: Standardfeld
 single_file: Eine Datei
@@ -382,6 +391,7 @@ no_files_copy: Keine Dateien vorhanden.
 user_count: 'Keine Benutzer | Ein Benutzer | {count} Benutzer'
 no_users_copy: Es gibt noch keine Benutzer in dieser Rolle.
 webhooks_count: 'Keine Webhooks | Ein Webhook | {count} Webhooks'
+no_webhooks_copy: Es wurden noch keine Webhooks erstellt. Beginnen Sie.
 all_items: Alle Elemente
 any: Irgendein
 csv: CSV
@@ -729,6 +739,22 @@ collections: Sammlungen
 singleton: Einzelnes Element
 singleton_label: Als einzelnes Objekt behandeln
 system_fields_locked: Systemfelder sind gesperrt und können nicht bearbeitet werden
+directus_collection:
+  directus_activity: Verantwortungsprotokoll für alle Ereignisse
+  directus_collections: Weitere Konfiguration und Metadaten
+  directus_fields: Weitere Felder und Metadaten
+  directus_files: Metadaten für alle verwalteten Anlagen
+  directus_folders: Stellt virtuelle Verzeichnisse für Dateien bereit
+  directus_migrations: Welche Version der Datenbank verwenden Sie
+  directus_permissions: Zugriffsrechte für jede Rolle
+  directus_presets: Voreinstellungen für Sammlung und Lesezeichen
+  directus_relations: Relationen und Metadaten
+  directus_revisions: Speicherabzug für alle Aktivitäten
+  directus_roles: Berechtigungsgruppen für Systembenutzer
+  directus_sessions: Sitzungsinformation
+  directus_settings: Projektkonfiguration
+  directus_users: Systembenutzer für die Plattform
+  directus_webhooks: Konfiguration für ereignisbasierte HTTP-Anfragen
 fields:
   directus_activity:
     item: Item-Primärschlüssel
@@ -959,6 +985,7 @@ field_options:
     actions_delete: Löschen
     actions_login: Login
 no_fields_in_collection: 'Es gibt noch keine Felder in "{collection}"'
+no_value: Kein Wert
 do_nothing: Keine Aktion
 generate_and_save_uuid: UUID generieren und speichern
 save_current_user_id: Aktuelle Benutzer-ID speichern
@@ -1037,6 +1064,7 @@ require_value_to_be_set: Wert muss gesetzt werden
 translation: Übersetzung
 value: Wert
 view_project: Projekt anzeigen
+weeks: { }
 report_error: Fehler melden
 start: Start
 interfaces:
@@ -1247,6 +1275,8 @@ interfaces:
   translations:
     display_template: Anzeigevorlage
     no_collection: Keine Sammlung
+    toggle_split_view: Teil-Ansicht umschalten
+    language_field: Sprachfeld
   list-o2m-tree-view:
     description: Baumansicht für verschachtelte rekursive 1:n-Elemente
     recursive_only: Die Baumansicht funktioniert nur für rekursive Beziehungen.
@@ -1402,3 +1432,5 @@ layouts:
     invalid_geometry: Ungültige Geometrie
     auto_location_filter: Daten immer filtern, um Grenzen anzuzeigen
     search_this_area: Diesen Bereich durchsuchen
+    clear_data_filter: Datenfilter löschen
+    clear_location_filter: Standortfilter löschen

From 91bb10b49f30ec7032cfcf5a5654bf8e5a3f69e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 Sep 2021 16:51:52 -0400
Subject: [PATCH 06/45] Update dependency @mapbox/mapbox-gl-geocoder to v4.7.4
 (#8060)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 app/package.json  |  2 +-
 package-lock.json | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/package.json b/app/package.json
index 0474de1183..bcdf3d6795 100644
--- a/app/package.json
+++ b/app/package.json
@@ -38,7 +38,7 @@
 		"@fullcalendar/timegrid": "5.9.0",
 		"@mapbox/mapbox-gl-draw": "1.3.0",
 		"@mapbox/mapbox-gl-draw-static-mode": "1.0.1",
-		"@mapbox/mapbox-gl-geocoder": "4.7.3",
+		"@mapbox/mapbox-gl-geocoder": "4.7.4",
 		"@popperjs/core": "2.9.3",
 		"@rollup/plugin-yaml": "3.1.0",
 		"@sindresorhus/slugify": "2.1.0",
diff --git a/package-lock.json b/package-lock.json
index 51260a588d..6e84e77aae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -328,7 +328,7 @@
 				"@fullcalendar/timegrid": "5.9.0",
 				"@mapbox/mapbox-gl-draw": "1.3.0",
 				"@mapbox/mapbox-gl-draw-static-mode": "1.0.1",
-				"@mapbox/mapbox-gl-geocoder": "4.7.3",
+				"@mapbox/mapbox-gl-geocoder": "4.7.4",
 				"@popperjs/core": "2.9.3",
 				"@rollup/plugin-yaml": "3.1.0",
 				"@sindresorhus/slugify": "2.1.0",
@@ -5585,12 +5585,12 @@
 			"dev": true
 		},
 		"node_modules/@mapbox/mapbox-gl-geocoder": {
-			"version": "4.7.3",
-			"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-geocoder/-/mapbox-gl-geocoder-4.7.3.tgz",
-			"integrity": "sha512-sWSnjwtwFz7jjaV+ax7ov0DxGwR3mrWn5baLBhu0RFmOj6TCHFBHp/SPTHutLLV2+NJxBkKhamUerUG9FckCwg==",
+			"version": "4.7.4",
+			"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-geocoder/-/mapbox-gl-geocoder-4.7.4.tgz",
+			"integrity": "sha512-9PIilTgqnoSCVtzJ1MnE4f1siWIpC9GO5MPaKTOspb7hXIvcgFOp44PSWP+WlDTHoEze3Dz3WQuppti6TVWjyg==",
 			"dev": true,
 			"dependencies": {
-				"@mapbox/mapbox-sdk": "^0.13.1",
+				"@mapbox/mapbox-sdk": "^0.13.2",
 				"lodash.debounce": "^4.0.6",
 				"nanoid": "^2.0.1",
 				"subtag": "^0.5.0",
@@ -52536,7 +52536,7 @@
 				"@fullcalendar/timegrid": "5.9.0",
 				"@mapbox/mapbox-gl-draw": "1.3.0",
 				"@mapbox/mapbox-gl-draw-static-mode": "1.0.1",
-				"@mapbox/mapbox-gl-geocoder": "4.7.3",
+				"@mapbox/mapbox-gl-geocoder": "4.7.4",
 				"@popperjs/core": "2.9.3",
 				"@rollup/plugin-yaml": "3.1.0",
 				"@sindresorhus/slugify": "2.1.0",
@@ -55109,12 +55109,12 @@
 			"dev": true
 		},
 		"@mapbox/mapbox-gl-geocoder": {
-			"version": "4.7.3",
-			"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-geocoder/-/mapbox-gl-geocoder-4.7.3.tgz",
-			"integrity": "sha512-sWSnjwtwFz7jjaV+ax7ov0DxGwR3mrWn5baLBhu0RFmOj6TCHFBHp/SPTHutLLV2+NJxBkKhamUerUG9FckCwg==",
+			"version": "4.7.4",
+			"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-geocoder/-/mapbox-gl-geocoder-4.7.4.tgz",
+			"integrity": "sha512-9PIilTgqnoSCVtzJ1MnE4f1siWIpC9GO5MPaKTOspb7hXIvcgFOp44PSWP+WlDTHoEze3Dz3WQuppti6TVWjyg==",
 			"dev": true,
 			"requires": {
-				"@mapbox/mapbox-sdk": "^0.13.1",
+				"@mapbox/mapbox-sdk": "^0.13.2",
 				"lodash.debounce": "^4.0.6",
 				"nanoid": "^2.0.1",
 				"subtag": "^0.5.0",

From dd319793a595581b2ff119f5a5ed2dd4e9fed705 Mon Sep 17 00:00:00 2001
From: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Date: Thu, 16 Sep 2021 05:07:58 +0800
Subject: [PATCH 07/45] Fix sidebar glitch on resize (#7903)

* fix sidebar glitch on resize

* move scroll-padding-top property to original line

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
---
 app/src/views/private/private-view.vue | 5 ++---
 docs/guides/installation/cli.md        | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/views/private/private-view.vue b/app/src/views/private/private-view.vue
index 00c8fcba42..52f9419d37 100644
--- a/app/src/views/private/private-view.vue
+++ b/app/src/views/private/private-view.vue
@@ -146,6 +146,7 @@ export default defineComponent({
 	display: flex;
 	width: 100%;
 	height: 100%;
+	overflow-x: hidden;
 	background-color: var(--background-page);
 
 	.nav-overlay {
@@ -267,12 +268,10 @@ export default defineComponent({
 			position: relative;
 			flex-basis: 60px;
 			flex-shrink: 0;
-			transform: none;
-			transition: flex-basis var(--slow) var(--transition);
+			transition: flex-basis var(--slow) var(--transition), transform var(--slow) var(--transition);
 
 			&.is-open {
 				flex-basis: 280px;
-				transform: none;
 			}
 		}
 	}
diff --git a/docs/guides/installation/cli.md b/docs/guides/installation/cli.md
index 267e5f9419..c2ec88af40 100644
--- a/docs/guides/installation/cli.md
+++ b/docs/guides/installation/cli.md
@@ -82,4 +82,3 @@ By default, the `create-directus-project` tool will set the file permissions of
 ## Configure / Update / Upgrade your Project
 
 See the [Project Guide](/guides/projects/#upgrading-updating-a-project) to learn how to maintain your project further.
-

From 1ff2fa0110aeda1a52365ed7a5a01123f63058e2 Mon Sep 17 00:00:00 2001
From: Nicola Krumschmidt <nicola.krumschmidt@freenet.de>
Date: Thu, 16 Sep 2021 00:15:02 +0200
Subject: [PATCH 08/45] Add return type to useFilterFields (#8062)

---
 packages/extensions-sdk/src/index.ts                 | 2 +-
 packages/shared/src/composables/use-filter-fields.ts | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/extensions-sdk/src/index.ts b/packages/extensions-sdk/src/index.ts
index 7cd8938d9d..96a379651a 100644
--- a/packages/extensions-sdk/src/index.ts
+++ b/packages/extensions-sdk/src/index.ts
@@ -8,4 +8,4 @@ export {
 	getFieldsFromTemplate,
 	getRelationType,
 } from '@directus/shared/utils';
-export { useStores, useApi, useCollection, useSync, useFilterFields, useItems } from '@directus/shared/composables';
+export { useStores, useApi, useSync, useCollection, useItems, useFilterFields } from '@directus/shared/composables';
diff --git a/packages/shared/src/composables/use-filter-fields.ts b/packages/shared/src/composables/use-filter-fields.ts
index 31f0ff2cf3..b90b493712 100644
--- a/packages/shared/src/composables/use-filter-fields.ts
+++ b/packages/shared/src/composables/use-filter-fields.ts
@@ -1,7 +1,10 @@
 import { Field } from '../types';
-import { Ref, computed } from 'vue';
+import { Ref, computed, ComputedRef } from 'vue';
 
-export function useFilterFields<T extends string>(fields: Ref<Field[]>, filters: Record<T, (field: Field) => boolean>) {
+export function useFilterFields<T extends string>(
+	fields: Ref<Field[]>,
+	filters: Record<T, (field: Field) => boolean>
+): { fieldGroups: ComputedRef<Record<Extract<T, string>, Field[]>> } {
 	const fieldGroups = computed(() => {
 		const acc = {} as Record<Extract<T, string>, Field[]>;
 		for (const name in filters) {

From 159004b52d71185b6ef1952e9388282327e5c797 Mon Sep 17 00:00:00 2001
From: Jay Cammarano <67079013+jaycammarano@users.noreply.github.com>
Date: Wed, 15 Sep 2021 18:15:12 -0400
Subject: [PATCH 09/45] V button color prop (#7140)

* button type stylings

* added warning to action-archive

* changed styles to match theme

* updated to use "kind" prop

* Remove unused computed value

* Replace class

* Make button colors consistent

* Fix danger kind usage

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
---
 app/src/components/v-button/v-button.vue      | 48 ++++++++++++++++---
 .../system-mfa-setup/system-mfa-setup.vue     |  7 +--
 app/src/interfaces/map/map.vue                | 11 +----
 app/src/layouts/map/options.vue               | 24 ----------
 .../components/navigation-bookmark.vue        |  9 +---
 .../modules/collections/routes/collection.vue |  4 +-
 app/src/modules/collections/routes/item.vue   |  4 +-
 .../files/components/navigation-folder.vue    |  2 +-
 app/src/modules/files/routes/collection.vue   |  2 +-
 app/src/modules/files/routes/item.vue         |  2 +-
 .../components/collection-options.vue         |  7 +--
 .../fields/components/field-select.vue        |  7 +--
 .../routes/data-model/fields/fields.vue       |  2 +-
 .../routes/presets/collection/collection.vue  |  2 +-
 .../modules/settings/routes/presets/item.vue  |  2 +-
 .../settings/routes/roles/item/item.vue       |  2 +-
 .../settings/routes/webhooks/collection.vue   |  2 +-
 .../modules/settings/routes/webhooks/item.vue |  2 +-
 app/src/modules/users/routes/collection.vue   |  2 +-
 app/src/modules/users/routes/item.vue         |  4 +-
 .../comments-sidebar-detail/comment-input.vue |  2 -
 .../comment-item-header.vue                   |  2 +-
 22 files changed, 65 insertions(+), 84 deletions(-)

diff --git a/app/src/components/v-button/v-button.vue b/app/src/components/v-button/v-button.vue
index 764030538a..b8be8ea505 100644
--- a/app/src/components/v-button/v-button.vue
+++ b/app/src/components/v-button/v-button.vue
@@ -20,6 +20,7 @@
 					tile,
 					'full-width': fullWidth,
 				},
+				kind,
 			]"
 			:type="type"
 			:disabled="disabled"
@@ -55,6 +56,10 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		kind: {
+			type: String as PropType<'normal' | 'info' | 'success' | 'warning' | 'danger'>,
+			default: 'normal',
+		},
 		fullWidth: {
 			type: Boolean,
 			default: false,
@@ -164,7 +169,6 @@ export default defineComponent({
 
 			return false;
 		});
-
 		return { sizeClass, onClick, component, isActiveRoute, toggle };
 
 		function onClick(event: MouseEvent) {
@@ -195,11 +199,6 @@ export default defineComponent({
 	--v-button-min-width: 140px;
 }
 
-.v-button {
-	display: inline-flex;
-	align-items: center;
-}
-
 .secondary {
 	--v-button-color: var(--foreground-normal);
 	--v-button-color-hover: var(--foreground-normal);
@@ -209,6 +208,43 @@ export default defineComponent({
 	--v-button-background-color-active: var(--background-normal-alt);
 }
 
+.info {
+	--v-button-color: var(--white);
+	--v-button-color-hover: var(--white);
+	--v-button-background-color: var(--blue);
+	--v-button-background-color-hover: var(--blue-125);
+	--v-button-background-color-active: var(--blue);
+}
+
+.success {
+	--v-button-color: var(--white);
+	--v-button-color-hover: var(--white);
+	--v-button-background-color: var(--success);
+	--v-button-background-color-hover: var(--success-125);
+	--v-button-background-color-active: var(--success);
+}
+
+.warning {
+	--v-button-color: var(--white);
+	--v-button-color-hover: var(--white);
+	--v-button-background-color: var(--warning);
+	--v-button-background-color-hover: var(--warning-125);
+	--v-button-background-color-active: var(--warning);
+}
+
+.danger {
+	--v-button-color: var(--white);
+	--v-button-color-hover: var(--white);
+	--v-button-background-color: var(--danger);
+	--v-button-background-color-hover: var(--danger-125);
+	--v-button-background-color-active: var(--danger);
+}
+
+.v-button {
+	display: inline-flex;
+	align-items: center;
+}
+
 .v-button.full-width {
 	display: flex;
 	min-width: 100%;
diff --git a/app/src/interfaces/_system/system-mfa-setup/system-mfa-setup.vue b/app/src/interfaces/_system/system-mfa-setup/system-mfa-setup.vue
index d31c95f945..26db95d897 100644
--- a/app/src/interfaces/_system/system-mfa-setup/system-mfa-setup.vue
+++ b/app/src/interfaces/_system/system-mfa-setup/system-mfa-setup.vue
@@ -58,7 +58,7 @@
 						<v-error v-if="error" :error="error" />
 					</v-card-text>
 					<v-card-actions>
-						<v-button type="submit" class="disable" :loading="loading" :disabled="otp.length !== 6">
+						<v-button type="submit" kind="warning" :loading="loading" :disabled="otp.length !== 6">
 							{{ t('disable_tfa') }}
 						</v-button>
 					</v-card-actions>
@@ -237,11 +237,6 @@ export default defineComponent({
 	text-align: center;
 }
 
-.disable {
-	--v-button-background-color: var(--warning);
-	--v-button-background-color-hover: var(--warning-125);
-}
-
 .v-error {
 	margin-top: 24px;
 }
diff --git a/app/src/interfaces/map/map.vue b/app/src/interfaces/map/map.vue
index 9870e30b46..8f989811b4 100644
--- a/app/src/interfaces/map/map.vue
+++ b/app/src/interfaces/map/map.vue
@@ -31,8 +31,8 @@
 				</v-notice>
 				<template #append>
 					<v-card-actions>
-						<v-button small class="soft-reset" secondary @click="resetValue(false)">{{ t('continue') }}</v-button>
-						<v-button small class="hard-reset" @click="resetValue(true)">{{ t('reset') }}</v-button>
+						<v-button small secondary @click="resetValue(false)">{{ t('continue') }}</v-button>
+						<v-button small kind="danger" @click="resetValue(true)">{{ t('reset') }}</v-button>
 					</v-card-actions>
 				</template>
 			</v-info>
@@ -456,11 +456,4 @@ export default defineComponent({
 	-webkit-transform: translate(-50%, -50%);
 	transform: translate(-50%, -50%);
 }
-
-.v-button.hard-reset {
-	--v-button-background-color: var(--danger-10);
-	--v-button-color: var(--danger);
-	--v-button-background-color-hover: var(--danger-25);
-	--v-button-color-hover: var(--danger);
-}
 </style>
diff --git a/app/src/layouts/map/options.vue b/app/src/layouts/map/options.vue
index d44484c021..ffe7a1c552 100644
--- a/app/src/layouts/map/options.vue
+++ b/app/src/layouts/map/options.vue
@@ -34,30 +34,6 @@
 			:disabled="geometryOptions && geometryOptions.geometryType !== 'Point'"
 		/>
 	</div>
-
-	<!-- <div class="field">
-		<v-drawer
-			v-model="customLayerDrawerOpenWritable"
-			:title="t('layouts.map.custom_layers')"
-			@cancel="customLayerDrawerOpenWritable = false"
-		>
-			<template #activator="{ on }">
-				<v-button @click="on">{{ t('layouts.map.edit_custom_layers') }}</v-button>
-			</template>
-
-			<template #actions>
-				<v-button v-tooltip.bottom="t('reset')" icon rounded class="delete-action" @click="resetLayers">
-					<v-icon name="replay" />
-				</v-button>
-				<v-button v-tooltip.bottom="t('save')" icon rounded @click="updateLayers">
-					<v-icon name="check" />
-				</v-button>
-			</template>
-			<div class="custom-layers">
-				<interface-input-code v-model="customLayersWritable" language="json" type="json" :line-number="false" />
-			</div>
-		</v-drawer>
-	</div> -->
 </template>
 
 <script lang="ts">
diff --git a/app/src/modules/collections/components/navigation-bookmark.vue b/app/src/modules/collections/components/navigation-bookmark.vue
index 0150570cd3..481c6f3c42 100644
--- a/app/src/modules/collections/components/navigation-bookmark.vue
+++ b/app/src/modules/collections/components/navigation-bookmark.vue
@@ -49,7 +49,7 @@
 				<v-card-title>{{ t('delete_bookmark_copy', { bookmark: bookmark.bookmark }) }}</v-card-title>
 				<v-card-actions>
 					<v-button secondary @click="deleteActive = false">{{ t('cancel') }}</v-button>
-					<v-button :loading="deleteSaving" class="action-delete" @click="deleteSave">
+					<v-button :loading="deleteSaving" kind="danger" @click="deleteSave">
 						{{ t('delete_label') }}
 					</v-button>
 				</v-card-actions>
@@ -182,11 +182,4 @@ export default defineComponent({
 	--v-list-item-color: var(--danger);
 	--v-list-item-icon-color: var(--danger);
 }
-
-.action-delete {
-	--v-button-background-color: var(--danger-25);
-	--v-button-color: var(--danger);
-	--v-button-background-color-hover: var(--danger-50);
-	--v-button-color-hover: var(--danger);
-}
 </style>
diff --git a/app/src/modules/collections/routes/collection.vue b/app/src/modules/collections/routes/collection.vue
index 5159ee942a..7069f4c9d3 100644
--- a/app/src/modules/collections/routes/collection.vue
+++ b/app/src/modules/collections/routes/collection.vue
@@ -111,7 +111,7 @@
 							<v-button secondary @click="confirmDelete = false">
 								{{ t('cancel') }}
 							</v-button>
-							<v-button class="action-delete" :loading="deleting" @click="batchDelete">
+							<v-button kind="danger" :loading="deleting" @click="batchDelete">
 								{{ t('delete_label') }}
 							</v-button>
 						</v-card-actions>
@@ -143,7 +143,7 @@
 							<v-button secondary @click="confirmArchive = false">
 								{{ t('cancel') }}
 							</v-button>
-							<v-button class="action-archive" :loading="archiving" @click="archive">
+							<v-button kind="warning" :loading="archiving" @click="archive">
 								{{ t('archive') }}
 							</v-button>
 						</v-card-actions>
diff --git a/app/src/modules/collections/routes/item.vue b/app/src/modules/collections/routes/item.vue
index 9ec04fab3d..c69b8d1f7e 100644
--- a/app/src/modules/collections/routes/item.vue
+++ b/app/src/modules/collections/routes/item.vue
@@ -79,7 +79,7 @@
 						<v-button secondary @click="confirmDelete = false">
 							{{ t('cancel') }}
 						</v-button>
-						<v-button class="action-delete" :loading="deleting" @click="deleteAndQuit">
+						<v-button kind="danger" :loading="deleting" @click="deleteAndQuit">
 							{{ t('delete_label') }}
 						</v-button>
 					</v-card-actions>
@@ -113,7 +113,7 @@
 						<v-button secondary @click="confirmArchive = false">
 							{{ t('cancel') }}
 						</v-button>
-						<v-button class="action-archive" :loading="archiving" @click="toggleArchive">
+						<v-button kind="warning" :loading="archiving" @click="toggleArchive">
 							{{ isArchived ? t('unarchive') : t('archive') }}
 						</v-button>
 					</v-card-actions>
diff --git a/app/src/modules/files/components/navigation-folder.vue b/app/src/modules/files/components/navigation-folder.vue
index 7ef614a544..0d5177139a 100644
--- a/app/src/modules/files/components/navigation-folder.vue
+++ b/app/src/modules/files/components/navigation-folder.vue
@@ -106,7 +106,7 @@
 				</v-card-text>
 				<v-card-actions>
 					<v-button secondary @click="deleteActive = false">{{ t('cancel') }}</v-button>
-					<v-button :loading="deleteSaving" @click="deleteSave">{{ t('delete_label') }}</v-button>
+					<v-button kind="danger" :loading="deleteSaving" @click="deleteSave">{{ t('delete_label') }}</v-button>
 				</v-card-actions>
 			</v-card>
 		</v-dialog>
diff --git a/app/src/modules/files/routes/collection.vue b/app/src/modules/files/routes/collection.vue
index 535005c1eb..e743b576c0 100644
--- a/app/src/modules/files/routes/collection.vue
+++ b/app/src/modules/files/routes/collection.vue
@@ -77,7 +77,7 @@
 							<v-button secondary @click="confirmDelete = false">
 								{{ t('cancel') }}
 							</v-button>
-							<v-button class="action-delete" :loading="deleting" @click="batchDelete">
+							<v-button kind="danger" :loading="deleting" @click="batchDelete">
 								{{ t('delete_label') }}
 							</v-button>
 						</v-card-actions>
diff --git a/app/src/modules/files/routes/item.vue b/app/src/modules/files/routes/item.vue
index 6babf84b9f..5e7a20cb16 100644
--- a/app/src/modules/files/routes/item.vue
+++ b/app/src/modules/files/routes/item.vue
@@ -33,7 +33,7 @@
 						<v-button secondary @click="confirmDelete = false">
 							{{ t('cancel') }}
 						</v-button>
-						<v-button class="action-delete" :loading="deleting" @click="deleteAndQuit">
+						<v-button kind="danger" :loading="deleting" @click="deleteAndQuit">
 							{{ t('delete_label') }}
 						</v-button>
 					</v-card-actions>
diff --git a/app/src/modules/settings/routes/data-model/collections/components/collection-options.vue b/app/src/modules/settings/routes/data-model/collections/components/collection-options.vue
index 35563e83d5..bd7ee7bbe3 100644
--- a/app/src/modules/settings/routes/data-model/collections/components/collection-options.vue
+++ b/app/src/modules/settings/routes/data-model/collections/components/collection-options.vue
@@ -22,7 +22,7 @@
 					<v-button :disabled="deleting" secondary @click="deleteActive = null">
 						{{ t('cancel') }}
 					</v-button>
-					<v-button :loading="deleting" class="delete" @click="deleteCollection">
+					<v-button :loading="deleting" kind="danger" @click="deleteCollection">
 						{{ t('delete_collection') }}
 					</v-button>
 				</v-card-actions>
@@ -74,11 +74,6 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.v-button.delete {
-	--v-button-background-color: var(--danger);
-	--v-button-background-color-hover: var(--danger-125);
-}
-
 .ctx-toggle {
 	--v-icon-color: var(--foreground-subdued);
 
diff --git a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue
index 9f1d5ffdda..8461d7252f 100644
--- a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue
+++ b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue
@@ -123,7 +123,7 @@
 					<v-card-title>{{ t('delete_field_are_you_sure', { field: field.field }) }}</v-card-title>
 					<v-card-actions>
 						<v-button secondary @click="deleteActive = false">{{ t('cancel') }}</v-button>
-						<v-button :loading="deleting" class="delete" @click="deleteField">{{ t('delete_label') }}</v-button>
+						<v-button :loading="deleting" kind="danger" @click="deleteField">{{ t('delete_label') }}</v-button>
 					</v-card-actions>
 				</v-card>
 			</v-dialog>
@@ -509,11 +509,6 @@ export default defineComponent({
 	@include form-grid;
 }
 
-.delete {
-	--v-button-background-color: var(--danger);
-	--v-button-background-color-hover: var(--danger-125);
-}
-
 .required {
 	position: relative;
 	left: -8px;
diff --git a/app/src/modules/settings/routes/data-model/fields/fields.vue b/app/src/modules/settings/routes/data-model/fields/fields.vue
index 33b8bc7fb6..2103e947e5 100644
--- a/app/src/modules/settings/routes/data-model/fields/fields.vue
+++ b/app/src/modules/settings/routes/data-model/fields/fields.vue
@@ -30,7 +30,7 @@
 						<v-button secondary @click="confirmDelete = false">
 							{{ t('cancel') }}
 						</v-button>
-						<v-button class="action-delete" :loading="deleting" @click="deleteAndQuit">
+						<v-button kind="danger" :loading="deleting" @click="deleteAndQuit">
 							{{ t('delete_label') }}
 						</v-button>
 					</v-card-actions>
diff --git a/app/src/modules/settings/routes/presets/collection/collection.vue b/app/src/modules/settings/routes/presets/collection/collection.vue
index e1b6354dae..d8baccb4ec 100644
--- a/app/src/modules/settings/routes/presets/collection/collection.vue
+++ b/app/src/modules/settings/routes/presets/collection/collection.vue
@@ -23,7 +23,7 @@
 						<v-button secondary @click="confirmDelete = false">
 							{{ t('cancel') }}
 						</v-button>
-						<v-button class="action-delete" :loading="deleting" @click="deleteSelection">
+						<v-button kind="danger" :loading="deleting" @click="deleteSelection">
 							{{ t('delete_label') }}
 						</v-button>
 					</v-card-actions>
diff --git a/app/src/modules/settings/routes/presets/item.vue b/app/src/modules/settings/routes/presets/item.vue
index 5c4df2ccb6..426afca602 100644
--- a/app/src/modules/settings/routes/presets/item.vue
+++ b/app/src/modules/settings/routes/presets/item.vue
@@ -43,7 +43,7 @@
 							<v-button secondary @click="confirmDelete = false">
 								{{ t('cancel') }}
 							</v-button>
-							<v-button class="action-delete" :loading="deleting" @click="deleteAndQuit">
+							<v-button kind="danger" :loading="deleting" @click="deleteAndQuit">
 								{{ t('delete_label') }}
 							</v-button>
 						</v-card-actions>
diff --git a/app/src/modules/settings/routes/roles/item/item.vue b/app/src/modules/settings/routes/roles/item/item.vue
index 340c42b060..2b9cd9dfb4 100644
--- a/app/src/modules/settings/routes/roles/item/item.vue
+++ b/app/src/modules/settings/routes/roles/item/item.vue
@@ -28,7 +28,7 @@
 						<v-button secondary @click="confirmDelete = false">
 							{{ t('cancel') }}
 						</v-button>
-						<v-button class="action-delete" :loading="deleting" @click="deleteAndQuit">
+						<v-button kind="danger" :loading="deleting" @click="deleteAndQuit">
 							{{ t('delete_label') }}
 						</v-button>
 					</v-card-actions>
diff --git a/app/src/modules/settings/routes/webhooks/collection.vue b/app/src/modules/settings/routes/webhooks/collection.vue
index 07a15d2b06..010fc613fd 100644
--- a/app/src/modules/settings/routes/webhooks/collection.vue
+++ b/app/src/modules/settings/routes/webhooks/collection.vue
@@ -40,7 +40,7 @@
 							<v-button secondary @click="confirmDelete = false">
 								{{ t('cancel') }}
 							</v-button>
-							<v-button class="action-delete" :loading="deleting" @click="batchDelete">
+							<v-button kind="danger" :loading="deleting" @click="batchDelete">
 								{{ t('delete_label') }}
 							</v-button>
 						</v-card-actions>
diff --git a/app/src/modules/settings/routes/webhooks/item.vue b/app/src/modules/settings/routes/webhooks/item.vue
index 468e9e9bb5..021c1ed1f4 100644
--- a/app/src/modules/settings/routes/webhooks/item.vue
+++ b/app/src/modules/settings/routes/webhooks/item.vue
@@ -23,7 +23,7 @@
 						<v-button secondary @click="confirmDelete = false">
 							{{ t('cancel') }}
 						</v-button>
-						<v-button class="action-delete" :loading="deleting" @click="deleteAndQuit">
+						<v-button kind="danger" :loading="deleting" @click="deleteAndQuit">
 							{{ t('delete_label') }}
 						</v-button>
 					</v-card-actions>
diff --git a/app/src/modules/users/routes/collection.vue b/app/src/modules/users/routes/collection.vue
index fed984c1d8..0d81dd43cd 100644
--- a/app/src/modules/users/routes/collection.vue
+++ b/app/src/modules/users/routes/collection.vue
@@ -50,7 +50,7 @@
 							<v-button secondary @click="confirmDelete = false">
 								{{ t('cancel') }}
 							</v-button>
-							<v-button class="action-delete" :loading="deleting" @click="batchDelete">
+							<v-button kind="danger" :loading="deleting" @click="batchDelete">
 								{{ t('delete_label') }}
 							</v-button>
 						</v-card-actions>
diff --git a/app/src/modules/users/routes/item.vue b/app/src/modules/users/routes/item.vue
index b1500a51d3..86f28b84a0 100644
--- a/app/src/modules/users/routes/item.vue
+++ b/app/src/modules/users/routes/item.vue
@@ -32,7 +32,7 @@
 						<v-button secondary @click="confirmDelete = false">
 							{{ t('cancel') }}
 						</v-button>
-						<v-button class="action-delete" :loading="deleting" @click="deleteAndQuit">
+						<v-button kind="danger" :loading="deleting" @click="deleteAndQuit">
 							{{ t('delete_label') }}
 						</v-button>
 					</v-card-actions>
@@ -66,7 +66,7 @@
 						<v-button secondary @click="confirmArchive = false">
 							{{ t('cancel') }}
 						</v-button>
-						<v-button class="action-archive" :loading="archiving" @click="toggleArchive">
+						<v-button kind="warning" :loading="archiving" @click="toggleArchive">
 							{{ isArchived ? t('unarchive') : t('archive') }}
 						</v-button>
 					</v-card-actions>
diff --git a/app/src/views/private/components/comments-sidebar-detail/comment-input.vue b/app/src/views/private/components/comments-sidebar-detail/comment-input.vue
index 1f3747cc1a..ca405e7758 100644
--- a/app/src/views/private/components/comments-sidebar-detail/comment-input.vue
+++ b/app/src/views/private/components/comments-sidebar-detail/comment-input.vue
@@ -7,8 +7,6 @@
 		expand-on-focus
 	>
 		<template #append>
-			<!-- <v-icon name="alternate_email" class="add-mention" />
-			<v-icon name="insert_emoticon" class="add-emoji" /> -->
 			<v-button
 				:disabled="!newCommentContent || newCommentContent.length === 0"
 				:loading="saving"
diff --git a/app/src/views/private/components/comments-sidebar-detail/comment-item-header.vue b/app/src/views/private/components/comments-sidebar-detail/comment-item-header.vue
index 8d75f46dd5..aa7137e34a 100644
--- a/app/src/views/private/components/comments-sidebar-detail/comment-item-header.vue
+++ b/app/src/views/private/components/comments-sidebar-detail/comment-item-header.vue
@@ -50,7 +50,7 @@
 					<v-button secondary @click="confirmDelete = false">
 						{{ t('cancel') }}
 					</v-button>
-					<v-button class="action-delete" :loading="deleting" @click="remove">
+					<v-button kind="danger" :loading="deleting" @click="remove">
 						{{ t('delete_label') }}
 					</v-button>
 				</v-card-actions>

From 9ba43c19f8c7ae4add0394ace7f90cbc524177e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 15 Sep 2021 20:54:53 -0400
Subject: [PATCH 10/45] Update dependency @types/lodash to v4.14.173 (#8063)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 api/package.json  |  2 +-
 app/package.json  |  2 +-
 package-lock.json | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/api/package.json b/api/package.json
index ffad17fc6d..dbca5599e8 100644
--- a/api/package.json
+++ b/api/package.json
@@ -181,7 +181,7 @@
 		"@types/json2csv": "5.0.3",
 		"@types/jsonwebtoken": "8.5.5",
 		"@types/keyv": "3.1.3",
-		"@types/lodash": "4.14.172",
+		"@types/lodash": "4.14.173",
 		"@types/mime-types": "2.1.1",
 		"@types/ms": "0.7.31",
 		"@types/node": "15.12.2",
diff --git a/app/package.json b/app/package.json
index bcdf3d6795..8ad2903ffe 100644
--- a/app/package.json
+++ b/app/package.json
@@ -52,7 +52,7 @@
 		"@types/diff": "5.0.1",
 		"@types/dompurify": "2.2.3",
 		"@types/geojson": "7946.0.8",
-		"@types/lodash": "4.14.172",
+		"@types/lodash": "4.14.173",
 		"@types/mapbox__mapbox-gl-draw": "1.2.3",
 		"@types/mapbox__mapbox-gl-geocoder": "4.7.1",
 		"@types/markdown-it": "12.2.1",
diff --git a/package-lock.json b/package-lock.json
index 6e84e77aae..812c63a0eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -159,7 +159,7 @@
 				"@types/json2csv": "5.0.3",
 				"@types/jsonwebtoken": "8.5.5",
 				"@types/keyv": "3.1.3",
-				"@types/lodash": "4.14.172",
+				"@types/lodash": "4.14.173",
 				"@types/mime-types": "2.1.1",
 				"@types/ms": "0.7.31",
 				"@types/node": "15.12.2",
@@ -342,7 +342,7 @@
 				"@types/diff": "5.0.1",
 				"@types/dompurify": "2.2.3",
 				"@types/geojson": "7946.0.8",
-				"@types/lodash": "4.14.172",
+				"@types/lodash": "4.14.173",
 				"@types/mapbox__mapbox-gl-draw": "1.2.3",
 				"@types/mapbox__mapbox-gl-geocoder": "4.7.1",
 				"@types/markdown-it": "12.2.1",
@@ -7620,9 +7620,9 @@
 			}
 		},
 		"node_modules/@types/lodash": {
-			"version": "4.14.172",
-			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz",
-			"integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw=="
+			"version": "4.14.173",
+			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.173.tgz",
+			"integrity": "sha512-vv0CAYoaEjCw/mLy96GBTnRoZrSxkGE0BKzKimdR8P3OzrNYNvBgtW7p055A+E8C31vXNUhWKoFCbhq7gbyhFg=="
 		},
 		"node_modules/@types/mapbox__mapbox-gl-draw": {
 			"version": "1.2.3",
@@ -52550,7 +52550,7 @@
 				"@types/diff": "5.0.1",
 				"@types/dompurify": "2.2.3",
 				"@types/geojson": "7946.0.8",
-				"@types/lodash": "4.14.172",
+				"@types/lodash": "4.14.173",
 				"@types/mapbox__mapbox-gl-draw": "1.2.3",
 				"@types/mapbox__mapbox-gl-geocoder": "4.7.1",
 				"@types/markdown-it": "12.2.1",
@@ -56849,9 +56849,9 @@
 			}
 		},
 		"@types/lodash": {
-			"version": "4.14.172",
-			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz",
-			"integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw=="
+			"version": "4.14.173",
+			"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.173.tgz",
+			"integrity": "sha512-vv0CAYoaEjCw/mLy96GBTnRoZrSxkGE0BKzKimdR8P3OzrNYNvBgtW7p055A+E8C31vXNUhWKoFCbhq7gbyhFg=="
 		},
 		"@types/mapbox__mapbox-gl-draw": {
 			"version": "1.2.3",
@@ -65077,7 +65077,7 @@
 				"@types/json2csv": "5.0.3",
 				"@types/jsonwebtoken": "8.5.5",
 				"@types/keyv": "3.1.3",
-				"@types/lodash": "4.14.172",
+				"@types/lodash": "4.14.173",
 				"@types/mime-types": "2.1.1",
 				"@types/ms": "0.7.31",
 				"@types/node": "15.12.2",

From 45f5abadb47e2700fef121ecb22d82d5bb6cd697 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Thu, 16 Sep 2021 09:22:58 -0400
Subject: [PATCH 11/45] New translations en-US.yaml (Italian) (#8068)

---
 app/src/lang/translations/it-IT.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/lang/translations/it-IT.yaml b/app/src/lang/translations/it-IT.yaml
index 0ee38b73e3..66c7286f86 100644
--- a/app/src/lang/translations/it-IT.yaml
+++ b/app/src/lang/translations/it-IT.yaml
@@ -1064,6 +1064,7 @@ require_value_to_be_set: Richiedi di impostare il valore
 translation: Traduzione
 value: Valore
 view_project: Visualizza Progetto
+weeks: { }
 report_error: Segnala l'errore
 start: Inizio
 interfaces:
@@ -1274,6 +1275,8 @@ interfaces:
   translations:
     display_template: Display Template
     no_collection: Nessuna Raccolta
+    toggle_split_view: Attiva/disattiva la Split View
+    language_field: Campo lingua
   list-o2m-tree-view:
     description: Vista ad albero per oggetti ricorsivi annidati one-to-many
     recursive_only: L'interfaccia di visualizzazione ad albero funziona solo per le relazioni ricorsive.

From b76bad1be3095022a691c07321cf4fc880e3fc07 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 16 Sep 2021 09:31:28 -0400
Subject: [PATCH 12/45] Update dependency prettier to v2.4.1 (#8070)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 app/package.json          |  2 +-
 package-lock.json         | 22 +++++++++++-----------
 package.json              |  2 +-
 packages/cli/package.json |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/package.json b/app/package.json
index 8ad2903ffe..12b614676b 100644
--- a/app/package.json
+++ b/app/package.json
@@ -88,7 +88,7 @@
 		"nanoid": "3.1.25",
 		"p-queue": "7.1.0",
 		"pinia": "2.0.0-rc.9",
-		"prettier": "2.4.0",
+		"prettier": "2.4.1",
 		"pretty-ms": "7.0.1",
 		"qrcode": "1.4.4",
 		"rimraf": "3.0.2",
diff --git a/package-lock.json b/package-lock.json
index 812c63a0eb..a483836a8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,7 +36,7 @@
 				"npm-run-all": "4.1.5",
 				"oracledb": "5.2.0",
 				"pg": "8.7.1",
-				"prettier": "2.4.0",
+				"prettier": "2.4.1",
 				"simple-git-hooks": "2.6.1",
 				"sqlite3": "5.0.2",
 				"stylelint": "13.13.1",
@@ -378,7 +378,7 @@
 				"nanoid": "3.1.25",
 				"p-queue": "7.1.0",
 				"pinia": "2.0.0-rc.9",
-				"prettier": "2.4.0",
+				"prettier": "2.4.1",
 				"pretty-ms": "7.0.1",
 				"qrcode": "1.4.4",
 				"rimraf": "3.0.2",
@@ -37492,9 +37492,9 @@
 			}
 		},
 		"node_modules/prettier": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz",
-			"integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==",
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz",
+			"integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==",
 			"bin": {
 				"prettier": "bin-prettier.js"
 			},
@@ -50039,7 +50039,7 @@
 				"jest": "27.2.0",
 				"nock": "13.1.3",
 				"npm-run-all": "4.1.5",
-				"prettier": "2.4.0",
+				"prettier": "2.4.1",
 				"rimraf": "3.0.2",
 				"ts-jest": "27.0.5",
 				"ts-node": "10.2.1",
@@ -52586,7 +52586,7 @@
 				"nanoid": "3.1.25",
 				"p-queue": "7.1.0",
 				"pinia": "2.0.0-rc.9",
-				"prettier": "2.4.0",
+				"prettier": "2.4.1",
 				"pretty-ms": "7.0.1",
 				"qrcode": "1.4.4",
 				"rimraf": "3.0.2",
@@ -52669,7 +52669,7 @@
 				"nock": "13.1.3",
 				"npm-run-all": "4.1.5",
 				"open": "^8.2.0",
-				"prettier": "2.4.0",
+				"prettier": "2.4.1",
 				"pretty-ms": "^7.0.1",
 				"rimraf": "3.0.2",
 				"shimmer": "^1.2.1",
@@ -80759,9 +80759,9 @@
 			"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
 		},
 		"prettier": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz",
-			"integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ=="
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz",
+			"integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="
 		},
 		"prettier-bytes": {
 			"version": "1.0.4",
diff --git a/package.json b/package.json
index 3aea3202fc..d9e481523b 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
 		"npm-run-all": "4.1.5",
 		"oracledb": "5.2.0",
 		"pg": "8.7.1",
-		"prettier": "2.4.0",
+		"prettier": "2.4.1",
 		"simple-git-hooks": "2.6.1",
 		"sqlite3": "5.0.2",
 		"stylelint": "13.13.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 06c25e249a..6ba258588f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -83,7 +83,7 @@
 		"jest": "27.2.0",
 		"nock": "13.1.3",
 		"npm-run-all": "4.1.5",
-		"prettier": "2.4.0",
+		"prettier": "2.4.1",
 		"rimraf": "3.0.2",
 		"ts-jest": "27.0.5",
 		"ts-node": "10.2.1",

From a96ce53208b136506bdcc77427b0c33f378897d2 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Thu, 16 Sep 2021 09:43:44 -0400
Subject: [PATCH 13/45] New Crowdin updates (#8075)

* New translations en-US.yaml (Persian)

* Add Persian (fa-IR)
---
 app/src/lang/available-languages.yaml | 1 +
 app/src/lang/translations/fa-IR.yaml  | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 app/src/lang/translations/fa-IR.yaml

diff --git a/app/src/lang/available-languages.yaml b/app/src/lang/available-languages.yaml
index 72413eae4d..af3671d33d 100644
--- a/app/src/lang/available-languages.yaml
+++ b/app/src/lang/available-languages.yaml
@@ -25,6 +25,7 @@ ko-KR: Korean (Korea)
 lt-LT: Lithuanian (Lithuania)
 ms-MY: Malay (Malaysia)
 no-NO: Norwegian (Norway)
+fa-IR: Farci (Iran)
 pl-PL: Polish (Poland)
 pt-BR: Portuguese (Brazil)
 pt-PT: Portuguese (Portugal)
diff --git a/app/src/lang/translations/fa-IR.yaml b/app/src/lang/translations/fa-IR.yaml
new file mode 100644
index 0000000000..c4dbc17b8b
--- /dev/null
+++ b/app/src/lang/translations/fa-IR.yaml
@@ -0,0 +1,2 @@
+---
+module_bar: ماژول

From 2fe85b519bc6d6d8b78ee784a7a3154648657327 Mon Sep 17 00:00:00 2001
From: Nitwel <mail@nitwel.de>
Date: Thu, 16 Sep 2021 15:44:18 +0200
Subject: [PATCH 14/45] Fix app crashing (#8076)

* fix app not being able to access shared store

* fix imports
---
 app/src/displays/related-values/index.ts      |  10 +-
 app/src/modules/settings/index.ts             |   7 +-
 .../add-related-primary-key-to-fields.ts      |   5 +-
 package-lock.json                             | 139 +++++++-----------
 packages/shared/src/composables/use-system.ts |   4 +-
 5 files changed, 68 insertions(+), 97 deletions(-)

diff --git a/app/src/displays/related-values/index.ts b/app/src/displays/related-values/index.ts
index c47897af3a..e09e655030 100644
--- a/app/src/displays/related-values/index.ts
+++ b/app/src/displays/related-values/index.ts
@@ -1,11 +1,10 @@
-import { useCollection } from '@directus/shared/composables';
 import { defineDisplay } from '@directus/shared/utils';
 import adjustFieldsForDisplays from '@/utils/adjust-fields-for-displays';
 import { getFieldsFromTemplate } from '@directus/shared/utils';
 import getRelatedCollection from '@/utils/get-related-collection';
-import { ref } from 'vue';
 import options from './options.vue';
 import DisplayRelatedValues from './related-values.vue';
+import { useFieldsStore } from '@/stores';
 
 type Options = {
 	template: string;
@@ -22,7 +21,8 @@ export default defineDisplay({
 	groups: ['m2m', 'm2o', 'o2m'],
 	fields: (options: Options | null, { field, collection }) => {
 		const relatedCollection = getRelatedCollection(collection, field);
-		const { primaryKeyField } = useCollection(ref(relatedCollection as unknown as string));
+		const fieldsStore = useFieldsStore();
+		const primaryKeyField = fieldsStore.getPrimaryKeyFieldForCollection(relatedCollection);
 
 		if (!relatedCollection) return [];
 
@@ -30,8 +30,8 @@ export default defineDisplay({
 			? adjustFieldsForDisplays(getFieldsFromTemplate(options.template), relatedCollection as unknown as string)
 			: [];
 
-		if (primaryKeyField.value && !fields.includes(primaryKeyField.value.field)) {
-			fields.push(primaryKeyField.value.field);
+		if (primaryKeyField && !fields.includes(primaryKeyField.field)) {
+			fields.push(primaryKeyField.field);
 		}
 
 		return fields;
diff --git a/app/src/modules/settings/index.ts b/app/src/modules/settings/index.ts
index d7cba97041..bed37e5646 100644
--- a/app/src/modules/settings/index.ts
+++ b/app/src/modules/settings/index.ts
@@ -1,9 +1,7 @@
 import api from '@/api';
-import { useCollection } from '@directus/shared/composables';
 import { defineModule } from '@directus/shared/utils';
 import { useCollectionsStore, useFieldsStore } from '@/stores';
 import RouterPass from '@/utils/router-passthrough';
-import { ref } from 'vue';
 import Collections from './routes/data-model/collections/collections.vue';
 import FieldDetail from './routes/data-model/field-detail/field-detail.vue';
 import Fields from './routes/data-model/fields/fields.vue';
@@ -62,10 +60,11 @@ export default defineModule({
 					path: ':collection',
 					component: Fields,
 					async beforeEnter(to) {
-						const { info } = useCollection(ref(to.params.collection as string));
+						const collectionsStore = useCollectionsStore();
+						const info = collectionsStore.getCollection(to.params.collection as string);
 						const fieldsStore = useFieldsStore();
 
-						if (!info.value?.meta) {
+						if (!info?.meta) {
 							await api.patch(`/collections/${to.params.collection}`, { meta: {} });
 						}
 
diff --git a/app/src/utils/add-related-primary-key-to-fields.ts b/app/src/utils/add-related-primary-key-to-fields.ts
index 4473f69d60..631b46b328 100644
--- a/app/src/utils/add-related-primary-key-to-fields.ts
+++ b/app/src/utils/add-related-primary-key-to-fields.ts
@@ -1,5 +1,4 @@
 import { useFieldsStore } from '@/stores/';
-import { useCollection } from '@directus/shared/composables';
 
 /**
  * Adds the primary key field for any passed relational dot-notation field to the array of fields.
@@ -27,9 +26,9 @@ export function addRelatedPrimaryKeyToFields(currentCollection: string, fields:
 		const fieldParts = fieldName.split('.');
 
 		const field = fieldsStore.getField(currentCollection, fieldName);
-		const { primaryKeyField } = useCollection(field.collection);
+		const primaryKeyField = fieldsStore.getPrimaryKeyFieldForCollection(field?.collection ?? '');
 
-		const includeField = fieldParts.slice(0, -1).concat(primaryKeyField.value.field).join('.');
+		const includeField = fieldParts.slice(0, -1).concat(primaryKeyField.field).join('.');
 
 		if (!sanitizedFields.includes(includeField)) {
 			sanitizedFields.push(includeField);
diff --git a/package-lock.json b/package-lock.json
index a483836a8d..dccfb76b59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12549,7 +12549,7 @@
 			"version": "0.2.4",
 			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
 			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"safer-buffer": "~2.1.0"
 			}
@@ -12578,7 +12578,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
 			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true,
+			"devOptional": true,
 			"engines": {
 				"node": ">=0.8"
 			}
@@ -12840,7 +12840,7 @@
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
 			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"dev": true,
+			"devOptional": true,
 			"engines": {
 				"node": "*"
 			}
@@ -12849,7 +12849,7 @@
 			"version": "1.11.0",
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
 			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-			"dev": true
+			"devOptional": true
 		},
 		"node_modules/axe-core": {
 			"version": "4.3.3",
@@ -13341,7 +13341,7 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
 			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"tweetnacl": "^0.14.3"
 			}
@@ -13441,7 +13441,6 @@
 			"version": "0.0.9",
 			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
 			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"inherits": "~2.0.0"
@@ -14185,7 +14184,7 @@
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"dev": true
+			"devOptional": true
 		},
 		"node_modules/ccount": {
 			"version": "1.1.0",
@@ -16861,7 +16860,7 @@
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
 			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"assert-plus": "^1.0.0"
 			},
@@ -17881,7 +17880,7 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
 			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"jsbn": "~0.1.0",
 				"safer-buffer": "^2.1.0"
@@ -19852,7 +19851,7 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
 			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true,
+			"devOptional": true,
 			"engines": [
 				"node >=0.6.0"
 			]
@@ -20454,7 +20453,7 @@
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
 			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true,
+			"devOptional": true,
 			"engines": {
 				"node": "*"
 			}
@@ -20976,7 +20975,6 @@
 			"version": "1.0.12",
 			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
 			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"graceful-fs": "^4.1.2",
@@ -20992,7 +20990,6 @@
 			"version": "0.5.5",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
 			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"minimist": "^1.2.5"
@@ -21005,7 +21002,6 @@
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"glob": "^7.1.3"
@@ -24577,7 +24573,7 @@
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
 			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"assert-plus": "^1.0.0"
 			}
@@ -25528,7 +25524,7 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
 			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true,
+			"devOptional": true,
 			"engines": {
 				"node": ">=4"
 			}
@@ -25538,7 +25534,7 @@
 			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
 			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
 			"deprecated": "this library is no longer supported",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"ajv": "^6.12.3",
 				"har-schema": "^2.0.0"
@@ -26263,7 +26259,7 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
 			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"assert-plus": "^1.0.0",
 				"jsprim": "^1.2.2",
@@ -27652,7 +27648,7 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
 			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
+			"devOptional": true
 		},
 		"node_modules/istanbul-lib-coverage": {
 			"version": "3.0.0",
@@ -28494,7 +28490,7 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
 			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true
+			"devOptional": true
 		},
 		"node_modules/jsdom": {
 			"version": "16.7.0",
@@ -28629,7 +28625,7 @@
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
 			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
+			"devOptional": true
 		},
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
@@ -28645,7 +28641,7 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
 			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true
+			"devOptional": true
 		},
 		"node_modules/json2csv": {
 			"version": "5.0.6",
@@ -28867,7 +28863,7 @@
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
 			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"dev": true,
+			"devOptional": true,
 			"engines": [
 				"node >=0.6.0"
 			],
@@ -28940,7 +28936,6 @@
 			"version": "7.7.0",
 			"resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
 			"integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
-			"dev": true,
 			"hasInstallScript": true,
 			"optional": true,
 			"dependencies": {
@@ -35815,7 +35810,7 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
 			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true
+			"devOptional": true
 		},
 		"node_modules/pg": {
 			"version": "8.7.1",
@@ -39571,7 +39566,7 @@
 			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
 			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
 			"deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"aws-sign2": "~0.7.0",
 				"aws4": "^1.8.0",
@@ -39631,7 +39626,7 @@
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
 			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.6",
@@ -39645,7 +39640,7 @@
 			"version": "6.5.2",
 			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
 			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-			"dev": true,
+			"devOptional": true,
 			"engines": {
 				"node": ">=0.6"
 			}
@@ -39654,7 +39649,7 @@
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
 			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"psl": "^1.1.28",
 				"punycode": "^2.1.1"
@@ -41540,7 +41535,6 @@
 			"version": "0.5.5",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
 			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"minimist": "^1.2.5"
@@ -41553,7 +41547,6 @@
 			"version": "3.8.0",
 			"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
 			"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"fstream": "^1.0.0",
@@ -41580,7 +41573,6 @@
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
 			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"abbrev": "1"
@@ -41593,7 +41585,6 @@
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"glob": "^7.1.3"
@@ -41606,7 +41597,6 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
 			"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-			"dev": true,
 			"optional": true,
 			"bin": {
 				"semver": "bin/semver"
@@ -41617,7 +41607,6 @@
 			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
 			"integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
 			"deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"block-stream": "*",
@@ -41629,7 +41618,6 @@
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
 			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
@@ -41677,7 +41665,7 @@
 			"version": "1.16.1",
 			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
 			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-			"dev": true,
+			"devOptional": true,
 			"dependencies": {
 				"asn1": "~0.2.3",
 				"assert-plus": "^1.0.0",
@@ -45528,7 +45516,7 @@
 			"version": "0.14.5",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true
+			"devOptional": true
 		},
 		"node_modules/type": {
 			"version": "1.2.0",
@@ -46421,7 +46409,7 @@
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"dev": true,
+			"devOptional": true,
 			"engines": [
 				"node >=0.6.0"
 			],
@@ -50562,7 +50550,7 @@
 				"knex-schema-inspector": "*",
 				"lodash": "4.17.21",
 				"pino": "*",
-				"vue": "3",
+				"vue": "3.2.11",
 				"vue-i18n": "9",
 				"vue-router": "4"
 			},
@@ -53129,7 +53117,7 @@
 				"pino": "*",
 				"rimraf": "3.0.2",
 				"typescript": "4.4.3",
-				"vue": "3",
+				"vue": "3.2.11",
 				"vue-i18n": "9",
 				"vue-router": "4"
 			},
@@ -55504,7 +55492,6 @@
 			"resolved": "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz",
 			"integrity": "sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==",
 			"requires": {
-				"@oclif/config": "^1.15.1",
 				"@oclif/errors": "^1.3.3",
 				"@oclif/parser": "^3.8.3",
 				"@oclif/plugin-help": "^3",
@@ -57654,7 +57641,6 @@
 			"integrity": "sha512-pM7CR3yXB6L8Gfn6EmX7FLNE3+V/15I3o33GkSNsWvgsMp6HVGXKkXgojrcfUUauyL1LZOdvTmu4enU2RePGHw==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.11.0",
 				"@babel/helper-compilation-targets": "^7.9.6",
 				"@babel/helper-module-imports": "^7.8.3",
 				"@babel/plugin-proposal-class-properties": "^7.8.3",
@@ -57667,7 +57653,6 @@
 				"@vue/babel-plugin-jsx": "^1.0.3",
 				"@vue/babel-preset-jsx": "^1.2.4",
 				"babel-plugin-dynamic-import-node": "^2.3.3",
-				"core-js": "^3.6.5",
 				"core-js-compat": "^3.6.5",
 				"semver": "^6.1.0"
 			},
@@ -60945,7 +60930,7 @@
 			"version": "0.2.4",
 			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
 			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"safer-buffer": "~2.1.0"
 			}
@@ -60989,7 +60974,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
 			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"dev": true
+			"devOptional": true
 		},
 		"assign-symbols": {
 			"version": "1.0.0",
@@ -61201,13 +61186,13 @@
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
 			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"dev": true
+			"devOptional": true
 		},
 		"aws4": {
 			"version": "1.11.0",
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
 			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-			"dev": true
+			"devOptional": true
 		},
 		"axe-core": {
 			"version": "4.3.3",
@@ -61592,7 +61577,7 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
 			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"tweetnacl": "^0.14.3"
 			}
@@ -61677,7 +61662,6 @@
 			"version": "0.0.9",
 			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
 			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-			"dev": true,
 			"optional": true,
 			"requires": {
 				"inherits": "~2.0.0"
@@ -62291,7 +62275,7 @@
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"dev": true
+			"devOptional": true
 		},
 		"ccount": {
 			"version": "1.1.0",
@@ -64470,7 +64454,7 @@
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
 			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
@@ -65517,7 +65501,7 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
 			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"jsbn": "~0.1.0",
 				"safer-buffer": "^2.1.0"
@@ -67024,7 +67008,7 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
 			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
+			"devOptional": true
 		},
 		"fast-copy": {
 			"version": "2.1.1",
@@ -67514,7 +67498,7 @@
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
 			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
+			"devOptional": true
 		},
 		"fork-ts-checker-webpack-plugin": {
 			"version": "3.1.1",
@@ -67944,7 +67928,6 @@
 			"version": "1.0.12",
 			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
 			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-			"dev": true,
 			"optional": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
@@ -67957,7 +67940,6 @@
 					"version": "0.5.5",
 					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
 					"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"minimist": "^1.2.5"
@@ -67967,7 +67949,6 @@
 					"version": "2.7.1",
 					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"glob": "^7.1.3"
@@ -70651,7 +70632,7 @@
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
 			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
@@ -71392,13 +71373,13 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
 			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true
+			"devOptional": true
 		},
 		"har-validator": {
 			"version": "5.1.5",
 			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
 			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"ajv": "^6.12.3",
 				"har-schema": "^2.0.0"
@@ -71980,7 +71961,7 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
 			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"jsprim": "^1.2.2",
@@ -72980,7 +72961,7 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
 			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
+			"devOptional": true
 		},
 		"istanbul-lib-coverage": {
 			"version": "3.0.0",
@@ -73657,7 +73638,7 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
 			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true
+			"devOptional": true
 		},
 		"jsdom": {
 			"version": "16.7.0",
@@ -73764,7 +73745,7 @@
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
 			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
+			"devOptional": true
 		},
 		"json-schema-traverse": {
 			"version": "0.4.1",
@@ -73780,7 +73761,7 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
 			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true
+			"devOptional": true
 		},
 		"json2csv": {
 			"version": "5.0.6",
@@ -73953,7 +73934,7 @@
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
 			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"assert-plus": "1.0.0",
 				"extsprintf": "1.3.0",
@@ -74017,7 +73998,6 @@
 			"version": "7.7.0",
 			"resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
 			"integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
-			"dev": true,
 			"optional": true,
 			"requires": {
 				"node-addon-api": "^3.0.0",
@@ -79395,7 +79375,7 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
 			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true
+			"devOptional": true
 		},
 		"pg": {
 			"version": "8.7.1",
@@ -82400,7 +82380,7 @@
 			"version": "2.88.2",
 			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
 			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"aws-sign2": "~0.7.0",
 				"aws4": "^1.8.0",
@@ -82428,7 +82408,7 @@
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
 					"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-					"dev": true,
+					"devOptional": true,
 					"requires": {
 						"asynckit": "^0.4.0",
 						"combined-stream": "^1.0.6",
@@ -82439,13 +82419,13 @@
 					"version": "6.5.2",
 					"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
 					"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-					"dev": true
+					"devOptional": true
 				},
 				"tough-cookie": {
 					"version": "2.5.0",
 					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
 					"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-					"dev": true,
+					"devOptional": true,
 					"requires": {
 						"psl": "^1.1.28",
 						"punycode": "^2.1.1"
@@ -83992,7 +83972,6 @@
 					"version": "0.5.5",
 					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
 					"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"minimist": "^1.2.5"
@@ -84002,7 +83981,6 @@
 					"version": "3.8.0",
 					"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
 					"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"fstream": "^1.0.0",
@@ -84023,7 +84001,6 @@
 					"version": "3.0.6",
 					"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
 					"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"abbrev": "1"
@@ -84033,7 +84010,6 @@
 					"version": "2.7.1",
 					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"glob": "^7.1.3"
@@ -84043,14 +84019,12 @@
 					"version": "5.3.0",
 					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
 					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-					"dev": true,
 					"optional": true
 				},
 				"tar": {
 					"version": "2.2.2",
 					"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
 					"integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"block-stream": "*",
@@ -84062,7 +84036,6 @@
 					"version": "1.3.1",
 					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
 					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-					"dev": true,
 					"optional": true,
 					"requires": {
 						"isexe": "^2.0.0"
@@ -84100,7 +84073,7 @@
 			"version": "1.16.1",
 			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
 			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"asn1": "~0.2.3",
 				"assert-plus": "^1.0.0",
@@ -87109,7 +87082,7 @@
 			"version": "0.14.5",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true
+			"devOptional": true
 		},
 		"type": {
 			"version": "1.2.0",
@@ -87825,7 +87798,7 @@
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"dev": true,
+			"devOptional": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"core-util-is": "1.0.2",
diff --git a/packages/shared/src/composables/use-system.ts b/packages/shared/src/composables/use-system.ts
index 580e01f6a2..2019b1c105 100644
--- a/packages/shared/src/composables/use-system.ts
+++ b/packages/shared/src/composables/use-system.ts
@@ -5,7 +5,7 @@ import { API_INJECT, STORES_INJECT } from '../constants';
 export function useStores(): Record<string, any> {
 	const stores = inject<Record<string, any>>(STORES_INJECT);
 
-	if (!stores) throw new Error('[useStores]: This function has to be used inside a Directus extension.');
+	if (!stores) throw new Error('[useStores]: The stores could not be found.');
 
 	return stores;
 }
@@ -13,7 +13,7 @@ export function useStores(): Record<string, any> {
 export function useApi(): AxiosInstance {
 	const api = inject<AxiosInstance>(API_INJECT);
 
-	if (!api) throw new Error('[useApi]: This function has to be used inside a Directus extension.');
+	if (!api) throw new Error('[useApi]: The api could not be found.');
 
 	return api;
 }

From f3f7e883df235f5c20d396b78a311fe11f311228 Mon Sep 17 00:00:00 2001
From: Nitwel <mail@nitwel.de>
Date: Thu, 16 Sep 2021 16:59:17 +0200
Subject: [PATCH 15/45] make i18n shared (#8078)

---
 packages/shared/src/constants/extensions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/shared/src/constants/extensions.ts b/packages/shared/src/constants/extensions.ts
index 7736a61164..0422b56cee 100644
--- a/packages/shared/src/constants/extensions.ts
+++ b/packages/shared/src/constants/extensions.ts
@@ -1,4 +1,4 @@
-export const APP_SHARED_DEPS = ['@directus/extensions-sdk', 'vue', 'vue-router'];
+export const APP_SHARED_DEPS = ['@directus/extensions-sdk', 'vue', 'vue-router', 'vue-i18n'];
 export const API_SHARED_DEPS = ['@directus/extensions-sdk', 'axios'];
 
 export const APP_EXTENSION_TYPES = ['interface', 'display', 'layout', 'module'] as const;

From 6405db831bb6f71e35c5303f0c615395ff0d0d7a Mon Sep 17 00:00:00 2001
From: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Date: Thu, 16 Sep 2021 23:39:37 +0800
Subject: [PATCH 16/45] Make default values have consistent formatting (#8067)

---
 docs/reference/environment-variables.md | 44 ++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/reference/environment-variables.md b/docs/reference/environment-variables.md
index e361b91cd1..e6e236b4d0 100644
--- a/docs/reference/environment-variables.md
+++ b/docs/reference/environment-variables.md
@@ -16,25 +16,25 @@
 | `LOG_STYLE`                | Render the logs human readable (pretty) or as JSON. One of `pretty`, `raw`.                                | `pretty`      |
 | `MAX_PAYLOAD_SIZE`         | Controls the maximum request body size. Accepts number of bytes, or human readable string.                 | `100kb`       |
 | `ROOT_REDIRECT`            | Where to redirect to when navigating to `/`. Accepts a relative path, absolute URL, or `false` to disable. | `./admin`     |
-| `SERVE_APP`                | Whether or not to serve the Admin App under `/admin`.                                                      | true          |
+| `SERVE_APP`                | Whether or not to serve the Admin App under `/admin`.                                                      | `true`        |
 
 <sup>[1]</sup> The PUBLIC_URL value is used for things like oAuth redirects, forgot-password emails, and logos that
 needs to be publicly available on the internet.
 
 ## Database
 
-| Variable               | Description                                                                                                                                        | Default Value   |
-| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- |
-| `DB_CLIENT`            | **Required**. What database client to use. One of `pg` or `postgres`, `mysql`, `oracledb`, `mssql`, or `sqlite3`.                                  | --              |
-| `DB_HOST`              | Database host. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                                      | --              |
-| `DB_PORT`              | Database port. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                                      | --              |
-| `DB_DATABASE`          | Database name. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                                      | --              |
-| `DB_USER`              | Database user. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                                      | --              |
-| `DB_PASSWORD`          | Database user's password. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                           | --              |
-| `DB_FILENAME`          | Where to read/write the SQLite database. **Required** when using `sqlite3`.                                                                        | --              |
-| `DB_CONNECTION_STRING` | When using `pg`, you can submit a connection string instead of individual properties. Using this will ignore any of the other connection settings. | --              |
-| `DB_POOL_*`            | Pooling settings. Passed on to [the `tarn.js`](https://github.com/vincit/tarn.js#usage) library.                                                   | --              |
-| `DB_EXCLUDE_TABLES`    | CSV of tables you want Directus to ignore completely                                                                                               | spatial_ref_sys |
+| Variable               | Description                                                                                                                                        | Default Value     |
+| ---------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------- |
+| `DB_CLIENT`            | **Required**. What database client to use. One of `pg` or `postgres`, `mysql`, `oracledb`, `mssql`, or `sqlite3`.                                  | --                |
+| `DB_HOST`              | Database host. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                                      | --                |
+| `DB_PORT`              | Database port. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                                      | --                |
+| `DB_DATABASE`          | Database name. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                                      | --                |
+| `DB_USER`              | Database user. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                                      | --                |
+| `DB_PASSWORD`          | Database user's password. **Required** when using `pg`, `mysql`, `oracledb`, or `mssql`.                                                           | --                |
+| `DB_FILENAME`          | Where to read/write the SQLite database. **Required** when using `sqlite3`.                                                                        | --                |
+| `DB_CONNECTION_STRING` | When using `pg`, you can submit a connection string instead of individual properties. Using this will ignore any of the other connection settings. | --                |
+| `DB_POOL_*`            | Pooling settings. Passed on to [the `tarn.js`](https://github.com/vincit/tarn.js#usage) library.                                                   | --                |
+| `DB_EXCLUDE_TABLES`    | CSV of tables you want Directus to ignore completely                                                                                               | `spatial_ref_sys` |
 
 ::: tip Additional Database Variables
 
@@ -57,8 +57,8 @@ All the `DB_POOL_` prefixed options are passed [to `tarn.js`](https://github.com
 | -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | ------------------------ |
 | `KEY`                            | Unique identifier for the project.                                                                                                | --                       |
 | `SECRET`                         | Secret string for the project.                                                                                                    | --                       |
-| `ACCESS_TOKEN_TTL`               | The duration that the access token is valid.                                                                                      | 15m                      |
-| `REFRESH_TOKEN_TTL`              | The duration that the refresh token is valid, and also how long users stay logged-in to the App.                                  | 7d                       |
+| `ACCESS_TOKEN_TTL`               | The duration that the access token is valid.                                                                                      | `15m`                    |
+| `REFRESH_TOKEN_TTL`              | The duration that the refresh token is valid, and also how long users stay logged-in to the App.                                  | `7d`                     |
 | `REFRESH_TOKEN_COOKIE_DOMAIN`    | Which domain to use for the refresh cookie. Useful for development mode.                                                          | --                       |
 | `REFRESH_TOKEN_COOKIE_SECURE`    | Whether or not to use a secure cookie for the refresh token in cookie mode.                                                       | `false`                  |
 | `REFRESH_TOKEN_COOKIE_SAME_SITE` | Value for `sameSite` in the refresh token cookie when in cookie mode.                                                             | `lax`                    |
@@ -262,7 +262,7 @@ Based on your configured driver, you must also provide the following configurati
 | `STORAGE_<LOCATION>_SECRET`   | User secret | --                 |
 | `STORAGE_<LOCATION>_BUCKET`   | S3 Bucket   | --                 |
 | `STORAGE_<LOCATION>_REGION`   | S3 Region   | --                 |
-| `STORAGE_<LOCATION>_ENDPOINT` | S3 Endpoint | "s3.amazonaws.com" |
+| `STORAGE_<LOCATION>_ENDPOINT` | S3 Endpoint | `s3.amazonaws.com` |
 | `STORAGE_<LOCATION>_ACL`      | S3 ACL      | --                 |
 
 ### Azure (`azure`)
@@ -272,7 +272,7 @@ Based on your configured driver, you must also provide the following configurati
 | `STORAGE_<LOCATION>_CONTAINER_NAME` | Azure Storage container    | --                                            |
 | `STORAGE_<LOCATION>_ACCOUNT_NAME`   | Azure Storage account name | --                                            |
 | `STORAGE_<LOCATION>_ACCOUNT_KEY`    | Azure Storage key          | --                                            |
-| `STORAGE_<LOCATION>_ENDPOINT`       | Azure URL                  | "https://{ACCOUNT_KEY}.blob.core.windows.net" |
+| `STORAGE_<LOCATION>_ENDPOINT`       | Azure URL                  | `https://{ACCOUNT_KEY}.blob.core.windows.net` |
 
 ### Google Cloud Storage (`gcs`)
 
@@ -293,9 +293,9 @@ STORAGE_LOCAL_ROOT="./uploads"
 | Variable                               | Description                                                                                                | Default Value |
 | -------------------------------------- | ---------------------------------------------------------------------------------------------------------- | ------------- |
 | `ASSETS_CACHE_TTL`                     | How long assets will be cached for in the browser. Sets the `max-age` value of the `Cache-Control` header. | `30m`         |
-| `ASSETS_TRANSFORM_MAX_CONCURRENT`      | How many file transformations can be done simultaneously                                                   | 4             |
-| `ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION` | The max pixel dimensions size (width/height) that is allowed to be transformed                             | 6000          |
-| `ASSETS_TRANSFORM_MAX_OPERATIONS`      | The max number of transform operations that is allowed to be processed (excludes saved presets)            | 5             |
+| `ASSETS_TRANSFORM_MAX_CONCURRENT`      | How many file transformations can be done simultaneously                                                   | `4`           |
+| `ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION` | The max pixel dimensions size (width/height) that is allowed to be transformed                             | `6000`        |
+| `ASSETS_TRANSFORM_MAX_OPERATIONS`      | The max number of transform operations that is allowed to be processed (excludes saved presets)            | `5`           |
 
 Image transformations can be fairly heavy on memory usage. If you're using a system with 1GB or less available memory,
 we recommend lowering the allowed concurrent transformations to prevent you from overflowing your server.
@@ -363,7 +363,7 @@ Based on the `EMAIL_TRANSPORT` used, you must also provide the following configu
 | ----------------------- | --------------------------------------------------------------------------------- | ----------------- |
 | `EMAIL_MAILGUN_API_KEY` | Your Mailgun API key.                                                             | --                |
 | `EMAIL_MAILGUN_DOMAIN`  | A domain from [your Mailgun account](https://app.mailgun.com/app/sending/domains) | --                |
-| `EMAIL_MAILGUN_HOST`    | Allows you to specify a custom host.                                              | 'api.mailgun.net' |
+| `EMAIL_MAILGUN_HOST`    | Allows you to specify a custom host.                                              | `api.mailgun.net` |
 
 ## Admin Account
 
@@ -383,7 +383,7 @@ environment variable:
 
 | Variable    | Description                                                       | Default Value |
 | ----------- | ----------------------------------------------------------------- | ------------- |
-| `TELEMETRY` | Allow Directus to collect anonymized data about your environment. | true          |
+| `TELEMETRY` | Allow Directus to collect anonymized data about your environment. | `true`        |
 
 ---
 

From 306c4d261175bd320f0fbe4f3721eff945d008a5 Mon Sep 17 00:00:00 2001
From: Nicola Krumschmidt <nicola.krumschmidt@freenet.de>
Date: Thu, 16 Sep 2021 18:15:57 +0200
Subject: [PATCH 17/45] Move useCollection calls out of computed (#8081)

---
 .../related-values/related-values.vue         |   9 +-
 .../select-dropdown-m2o.vue                   |   8 +-
 .../settings/routes/project/project.vue       |   2 +-
 app/src/modules/users/routes/item.vue         |   2 +-
 .../components/drawer-item/drawer-item.vue    |   6 +-
 package-lock.json                             | 139 +++++++++++-------
 6 files changed, 91 insertions(+), 75 deletions(-)

diff --git a/app/src/displays/related-values/related-values.vue b/app/src/displays/related-values/related-values.vue
index 298fca2d89..1f43561563 100644
--- a/app/src/displays/related-values/related-values.vue
+++ b/app/src/displays/related-values/related-values.vue
@@ -31,7 +31,7 @@
 
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
-import { defineComponent, computed, PropType, Ref } from 'vue';
+import { defineComponent, computed, PropType } from 'vue';
 import getRelatedCollection from '@/utils/get-related-collection';
 import { useCollection } from '@directus/shared/composables';
 import ValueNull from '@/views/private/components/value-null';
@@ -67,12 +67,7 @@ export default defineComponent({
 			return getRelatedCollection(props.collection, props.field);
 		});
 
-		const primaryKeyField = computed(() => {
-			if (relatedCollection.value !== null) {
-				return useCollection(relatedCollection as unknown as Ref<string>).primaryKeyField.value;
-			}
-			return null;
-		});
+		const { primaryKeyField } = useCollection(relatedCollection);
 
 		const internalTemplate = computed(() => {
 			return props.template || `{{ ${primaryKeyField.value!.field} }}`;
diff --git a/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue b/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue
index 02b6e23722..f63c6b0365 100644
--- a/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue
+++ b/app/src/interfaces/select-dropdown-m2o/select-dropdown-m2o.vue
@@ -336,11 +336,9 @@ export default defineComponent({
 				return collectionsStore.getCollection(relation.value.related_collection)!;
 			});
 
-			const relatedPrimaryKeyField = computed(() => {
-				if (!relatedCollection.value?.collection) return null;
-				const { primaryKeyField } = useCollection(relatedCollection.value?.collection);
-				return primaryKeyField.value;
-			});
+			const relatedCollectionName = computed(() => relatedCollection.value?.collection ?? null);
+
+			const { primaryKeyField: relatedPrimaryKeyField } = useCollection(relatedCollectionName);
 
 			return { relation, relatedCollection, relatedPrimaryKeyField };
 		}
diff --git a/app/src/modules/settings/routes/project/project.vue b/app/src/modules/settings/routes/project/project.vue
index 04b36f6da6..c6d628c949 100644
--- a/app/src/modules/settings/routes/project/project.vue
+++ b/app/src/modules/settings/routes/project/project.vue
@@ -44,7 +44,7 @@ export default defineComponent({
 		const settingsStore = useSettingsStore();
 		const serverStore = useServerStore();
 
-		const { fields } = useCollection(ref('directus_settings'));
+		const { fields } = useCollection('directus_settings');
 
 		const initialValues = ref(clone(settingsStore.settings));
 
diff --git a/app/src/modules/users/routes/item.vue b/app/src/modules/users/routes/item.vue
index 86f28b84a0..ecf08ba343 100644
--- a/app/src/modules/users/routes/item.vue
+++ b/app/src/modules/users/routes/item.vue
@@ -224,7 +224,7 @@ export default defineComponent({
 		const { primaryKey } = toRefs(props);
 		const { breadcrumb } = useBreadcrumb();
 
-		const { info: collectionInfo } = useCollection(ref('directus_users'));
+		const { info: collectionInfo } = useCollection('directus_users');
 
 		const revisionsDrawerDetail = ref<ComponentPublicInstance | null>(null);
 
diff --git a/app/src/views/private/components/drawer-item/drawer-item.vue b/app/src/views/private/components/drawer-item/drawer-item.vue
index e2a4ffb3cb..dacdb42867 100644
--- a/app/src/views/private/components/drawer-item/drawer-item.vue
+++ b/app/src/views/private/components/drawer-item/drawer-item.vue
@@ -358,11 +358,7 @@ export default defineComponent({
 				return null;
 			});
 
-			const junctionRelatedCollectionInfo = computed(() => {
-				if (!junctionRelatedCollection.value) return null;
-				const { info } = useCollection(junctionRelatedCollection.value);
-				return info.value;
-			});
+			const { info: junctionRelatedCollectionInfo } = useCollection(junctionRelatedCollection);
 
 			return { junctionFieldInfo, junctionRelatedCollection, junctionRelatedCollectionInfo, setJunctionEdits };
 
diff --git a/package-lock.json b/package-lock.json
index dccfb76b59..a483836a8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12549,7 +12549,7 @@
 			"version": "0.2.4",
 			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
 			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"safer-buffer": "~2.1.0"
 			}
@@ -12578,7 +12578,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
 			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"devOptional": true,
+			"dev": true,
 			"engines": {
 				"node": ">=0.8"
 			}
@@ -12840,7 +12840,7 @@
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
 			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"devOptional": true,
+			"dev": true,
 			"engines": {
 				"node": "*"
 			}
@@ -12849,7 +12849,7 @@
 			"version": "1.11.0",
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
 			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-			"devOptional": true
+			"dev": true
 		},
 		"node_modules/axe-core": {
 			"version": "4.3.3",
@@ -13341,7 +13341,7 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
 			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"tweetnacl": "^0.14.3"
 			}
@@ -13441,6 +13441,7 @@
 			"version": "0.0.9",
 			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
 			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"inherits": "~2.0.0"
@@ -14184,7 +14185,7 @@
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"devOptional": true
+			"dev": true
 		},
 		"node_modules/ccount": {
 			"version": "1.1.0",
@@ -16860,7 +16861,7 @@
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
 			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"assert-plus": "^1.0.0"
 			},
@@ -17880,7 +17881,7 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
 			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"jsbn": "~0.1.0",
 				"safer-buffer": "^2.1.0"
@@ -19851,7 +19852,7 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
 			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"devOptional": true,
+			"dev": true,
 			"engines": [
 				"node >=0.6.0"
 			]
@@ -20453,7 +20454,7 @@
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
 			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"devOptional": true,
+			"dev": true,
 			"engines": {
 				"node": "*"
 			}
@@ -20975,6 +20976,7 @@
 			"version": "1.0.12",
 			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
 			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"graceful-fs": "^4.1.2",
@@ -20990,6 +20992,7 @@
 			"version": "0.5.5",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
 			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"minimist": "^1.2.5"
@@ -21002,6 +21005,7 @@
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"glob": "^7.1.3"
@@ -24573,7 +24577,7 @@
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
 			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"assert-plus": "^1.0.0"
 			}
@@ -25524,7 +25528,7 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
 			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"devOptional": true,
+			"dev": true,
 			"engines": {
 				"node": ">=4"
 			}
@@ -25534,7 +25538,7 @@
 			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
 			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
 			"deprecated": "this library is no longer supported",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"ajv": "^6.12.3",
 				"har-schema": "^2.0.0"
@@ -26259,7 +26263,7 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
 			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"assert-plus": "^1.0.0",
 				"jsprim": "^1.2.2",
@@ -27648,7 +27652,7 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
 			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"devOptional": true
+			"dev": true
 		},
 		"node_modules/istanbul-lib-coverage": {
 			"version": "3.0.0",
@@ -28490,7 +28494,7 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
 			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"devOptional": true
+			"dev": true
 		},
 		"node_modules/jsdom": {
 			"version": "16.7.0",
@@ -28625,7 +28629,7 @@
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
 			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"devOptional": true
+			"dev": true
 		},
 		"node_modules/json-schema-traverse": {
 			"version": "0.4.1",
@@ -28641,7 +28645,7 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
 			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"devOptional": true
+			"dev": true
 		},
 		"node_modules/json2csv": {
 			"version": "5.0.6",
@@ -28863,7 +28867,7 @@
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
 			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"devOptional": true,
+			"dev": true,
 			"engines": [
 				"node >=0.6.0"
 			],
@@ -28936,6 +28940,7 @@
 			"version": "7.7.0",
 			"resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
 			"integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
+			"dev": true,
 			"hasInstallScript": true,
 			"optional": true,
 			"dependencies": {
@@ -35810,7 +35815,7 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
 			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"devOptional": true
+			"dev": true
 		},
 		"node_modules/pg": {
 			"version": "8.7.1",
@@ -39566,7 +39571,7 @@
 			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
 			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
 			"deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"aws-sign2": "~0.7.0",
 				"aws4": "^1.8.0",
@@ -39626,7 +39631,7 @@
 			"version": "2.3.3",
 			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
 			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"asynckit": "^0.4.0",
 				"combined-stream": "^1.0.6",
@@ -39640,7 +39645,7 @@
 			"version": "6.5.2",
 			"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
 			"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-			"devOptional": true,
+			"dev": true,
 			"engines": {
 				"node": ">=0.6"
 			}
@@ -39649,7 +39654,7 @@
 			"version": "2.5.0",
 			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
 			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"psl": "^1.1.28",
 				"punycode": "^2.1.1"
@@ -41535,6 +41540,7 @@
 			"version": "0.5.5",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
 			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"minimist": "^1.2.5"
@@ -41547,6 +41553,7 @@
 			"version": "3.8.0",
 			"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
 			"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"fstream": "^1.0.0",
@@ -41573,6 +41580,7 @@
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
 			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"abbrev": "1"
@@ -41585,6 +41593,7 @@
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 			"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"glob": "^7.1.3"
@@ -41597,6 +41606,7 @@
 			"version": "5.3.0",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
 			"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+			"dev": true,
 			"optional": true,
 			"bin": {
 				"semver": "bin/semver"
@@ -41607,6 +41617,7 @@
 			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
 			"integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
 			"deprecated": "This version of tar is no longer supported, and will not receive security updates. Please upgrade asap.",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"block-stream": "*",
@@ -41618,6 +41629,7 @@
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
 			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+			"dev": true,
 			"optional": true,
 			"dependencies": {
 				"isexe": "^2.0.0"
@@ -41665,7 +41677,7 @@
 			"version": "1.16.1",
 			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
 			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-			"devOptional": true,
+			"dev": true,
 			"dependencies": {
 				"asn1": "~0.2.3",
 				"assert-plus": "^1.0.0",
@@ -45516,7 +45528,7 @@
 			"version": "0.14.5",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"devOptional": true
+			"dev": true
 		},
 		"node_modules/type": {
 			"version": "1.2.0",
@@ -46409,7 +46421,7 @@
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"devOptional": true,
+			"dev": true,
 			"engines": [
 				"node >=0.6.0"
 			],
@@ -50550,7 +50562,7 @@
 				"knex-schema-inspector": "*",
 				"lodash": "4.17.21",
 				"pino": "*",
-				"vue": "3.2.11",
+				"vue": "3",
 				"vue-i18n": "9",
 				"vue-router": "4"
 			},
@@ -53117,7 +53129,7 @@
 				"pino": "*",
 				"rimraf": "3.0.2",
 				"typescript": "4.4.3",
-				"vue": "3.2.11",
+				"vue": "3",
 				"vue-i18n": "9",
 				"vue-router": "4"
 			},
@@ -55492,6 +55504,7 @@
 			"resolved": "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz",
 			"integrity": "sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==",
 			"requires": {
+				"@oclif/config": "^1.15.1",
 				"@oclif/errors": "^1.3.3",
 				"@oclif/parser": "^3.8.3",
 				"@oclif/plugin-help": "^3",
@@ -57641,6 +57654,7 @@
 			"integrity": "sha512-pM7CR3yXB6L8Gfn6EmX7FLNE3+V/15I3o33GkSNsWvgsMp6HVGXKkXgojrcfUUauyL1LZOdvTmu4enU2RePGHw==",
 			"dev": true,
 			"requires": {
+				"@babel/core": "^7.11.0",
 				"@babel/helper-compilation-targets": "^7.9.6",
 				"@babel/helper-module-imports": "^7.8.3",
 				"@babel/plugin-proposal-class-properties": "^7.8.3",
@@ -57653,6 +57667,7 @@
 				"@vue/babel-plugin-jsx": "^1.0.3",
 				"@vue/babel-preset-jsx": "^1.2.4",
 				"babel-plugin-dynamic-import-node": "^2.3.3",
+				"core-js": "^3.6.5",
 				"core-js-compat": "^3.6.5",
 				"semver": "^6.1.0"
 			},
@@ -60930,7 +60945,7 @@
 			"version": "0.2.4",
 			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
 			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"safer-buffer": "~2.1.0"
 			}
@@ -60974,7 +60989,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
 			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-			"devOptional": true
+			"dev": true
 		},
 		"assign-symbols": {
 			"version": "1.0.0",
@@ -61186,13 +61201,13 @@
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
 			"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-			"devOptional": true
+			"dev": true
 		},
 		"aws4": {
 			"version": "1.11.0",
 			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
 			"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-			"devOptional": true
+			"dev": true
 		},
 		"axe-core": {
 			"version": "4.3.3",
@@ -61577,7 +61592,7 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
 			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"tweetnacl": "^0.14.3"
 			}
@@ -61662,6 +61677,7 @@
 			"version": "0.0.9",
 			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
 			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
+			"dev": true,
 			"optional": true,
 			"requires": {
 				"inherits": "~2.0.0"
@@ -62275,7 +62291,7 @@
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-			"devOptional": true
+			"dev": true
 		},
 		"ccount": {
 			"version": "1.1.0",
@@ -64454,7 +64470,7 @@
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
 			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
@@ -65501,7 +65517,7 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
 			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"jsbn": "~0.1.0",
 				"safer-buffer": "^2.1.0"
@@ -67008,7 +67024,7 @@
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
 			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"devOptional": true
+			"dev": true
 		},
 		"fast-copy": {
 			"version": "2.1.1",
@@ -67498,7 +67514,7 @@
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
 			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"devOptional": true
+			"dev": true
 		},
 		"fork-ts-checker-webpack-plugin": {
 			"version": "3.1.1",
@@ -67928,6 +67944,7 @@
 			"version": "1.0.12",
 			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
 			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+			"dev": true,
 			"optional": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
@@ -67940,6 +67957,7 @@
 					"version": "0.5.5",
 					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
 					"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+					"dev": true,
 					"optional": true,
 					"requires": {
 						"minimist": "^1.2.5"
@@ -67949,6 +67967,7 @@
 					"version": "2.7.1",
 					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+					"dev": true,
 					"optional": true,
 					"requires": {
 						"glob": "^7.1.3"
@@ -70632,7 +70651,7 @@
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
 			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0"
 			}
@@ -71373,13 +71392,13 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
 			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"devOptional": true
+			"dev": true
 		},
 		"har-validator": {
 			"version": "5.1.5",
 			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
 			"integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"ajv": "^6.12.3",
 				"har-schema": "^2.0.0"
@@ -71961,7 +71980,7 @@
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
 			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"jsprim": "^1.2.2",
@@ -72961,7 +72980,7 @@
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
 			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"devOptional": true
+			"dev": true
 		},
 		"istanbul-lib-coverage": {
 			"version": "3.0.0",
@@ -73638,7 +73657,7 @@
 			"version": "0.1.1",
 			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
 			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"devOptional": true
+			"dev": true
 		},
 		"jsdom": {
 			"version": "16.7.0",
@@ -73745,7 +73764,7 @@
 			"version": "0.2.3",
 			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
 			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"devOptional": true
+			"dev": true
 		},
 		"json-schema-traverse": {
 			"version": "0.4.1",
@@ -73761,7 +73780,7 @@
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
 			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"devOptional": true
+			"dev": true
 		},
 		"json2csv": {
 			"version": "5.0.6",
@@ -73934,7 +73953,7 @@
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
 			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"assert-plus": "1.0.0",
 				"extsprintf": "1.3.0",
@@ -73998,6 +74017,7 @@
 			"version": "7.7.0",
 			"resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
 			"integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
+			"dev": true,
 			"optional": true,
 			"requires": {
 				"node-addon-api": "^3.0.0",
@@ -79375,7 +79395,7 @@
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
 			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"devOptional": true
+			"dev": true
 		},
 		"pg": {
 			"version": "8.7.1",
@@ -82380,7 +82400,7 @@
 			"version": "2.88.2",
 			"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
 			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"aws-sign2": "~0.7.0",
 				"aws4": "^1.8.0",
@@ -82408,7 +82428,7 @@
 					"version": "2.3.3",
 					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
 					"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-					"devOptional": true,
+					"dev": true,
 					"requires": {
 						"asynckit": "^0.4.0",
 						"combined-stream": "^1.0.6",
@@ -82419,13 +82439,13 @@
 					"version": "6.5.2",
 					"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
 					"integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-					"devOptional": true
+					"dev": true
 				},
 				"tough-cookie": {
 					"version": "2.5.0",
 					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
 					"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-					"devOptional": true,
+					"dev": true,
 					"requires": {
 						"psl": "^1.1.28",
 						"punycode": "^2.1.1"
@@ -83972,6 +83992,7 @@
 					"version": "0.5.5",
 					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
 					"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+					"dev": true,
 					"optional": true,
 					"requires": {
 						"minimist": "^1.2.5"
@@ -83981,6 +84002,7 @@
 					"version": "3.8.0",
 					"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
 					"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+					"dev": true,
 					"optional": true,
 					"requires": {
 						"fstream": "^1.0.0",
@@ -84001,6 +84023,7 @@
 					"version": "3.0.6",
 					"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
 					"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+					"dev": true,
 					"optional": true,
 					"requires": {
 						"abbrev": "1"
@@ -84010,6 +84033,7 @@
 					"version": "2.7.1",
 					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+					"dev": true,
 					"optional": true,
 					"requires": {
 						"glob": "^7.1.3"
@@ -84019,12 +84043,14 @@
 					"version": "5.3.0",
 					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
 					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+					"dev": true,
 					"optional": true
 				},
 				"tar": {
 					"version": "2.2.2",
 					"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
 					"integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+					"dev": true,
 					"optional": true,
 					"requires": {
 						"block-stream": "*",
@@ -84036,6 +84062,7 @@
 					"version": "1.3.1",
 					"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
 					"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+					"dev": true,
 					"optional": true,
 					"requires": {
 						"isexe": "^2.0.0"
@@ -84073,7 +84100,7 @@
 			"version": "1.16.1",
 			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
 			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"asn1": "~0.2.3",
 				"assert-plus": "^1.0.0",
@@ -87082,7 +87109,7 @@
 			"version": "0.14.5",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"devOptional": true
+			"dev": true
 		},
 		"type": {
 			"version": "1.2.0",
@@ -87798,7 +87825,7 @@
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"devOptional": true,
+			"dev": true,
 			"requires": {
 				"assert-plus": "^1.0.0",
 				"core-util-is": "1.0.2",

From e7821f211a10b35d24f789b436aeae5595f1997f Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Thu, 16 Sep 2021 12:32:13 -0400
Subject: [PATCH 18/45] New translations en-US.yaml (Persian) (#8077)

---
 app/src/lang/translations/fa-IR.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/lang/translations/fa-IR.yaml b/app/src/lang/translations/fa-IR.yaml
index c4dbc17b8b..8932ff0bcf 100644
--- a/app/src/lang/translations/fa-IR.yaml
+++ b/app/src/lang/translations/fa-IR.yaml
@@ -1,2 +1,3 @@
 ---
 module_bar: ماژول
+edit_field: ویرایش فیلد

From 6148259beb2f34516b1049abd8bf9729772b2232 Mon Sep 17 00:00:00 2001
From: Chris Bartley <chris@chrisbartley.com>
Date: Thu, 16 Sep 2021 16:19:20 -0400
Subject: [PATCH 19/45] Fixed readByQuery's sort parameter in custom API
 endpoint example (see https://github.com/directus/directus/discussions/7867)
 (#8088)

---
 docs/guides/api-endpoints.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guides/api-endpoints.md b/docs/guides/api-endpoints.md
index 99536cace9..b1d21ea284 100644
--- a/docs/guides/api-endpoints.md
+++ b/docs/guides/api-endpoints.md
@@ -63,7 +63,7 @@ module.exports = function registerEndpoint(router, { services, exceptions }) {
 		const recipeService = new ItemsService('recipes', { schema: req.schema, accountability: req.accountability });
 
 		recipeService
-			.readByQuery({ sort: 'name', fields: ['*'] })
+			.readByQuery({ sort: [{ column : 'name', order : 'asc' }], fields: ['*'] })
 			.then((results) => res.json(results))
 			.catch((error) => {
 				return next(new ServiceUnavailableException(error.message));

From 213c5ddae04756b0d26fc88af97ec30f28f5c8c2 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Thu, 16 Sep 2021 17:17:27 -0400
Subject: [PATCH 20/45] Fix saving issue on invalid conditional rule (#8091)

Fixes #8083
---
 app/src/composables/use-item/use-item.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/composables/use-item/use-item.ts b/app/src/composables/use-item/use-item.ts
index 505aef1059..c5ef06e3f0 100644
--- a/app/src/composables/use-item/use-item.ts
+++ b/app/src/composables/use-item/use-item.ts
@@ -322,6 +322,7 @@ export function useItem(collection: Ref<string>, primaryKey: Ref<string | number
 				const conditions = [...field.meta.conditions].reverse();
 
 				const matchingCondition = conditions.find((condition) => {
+					if (!condition.rule || Object.keys(condition.rule).length !== 1) return;
 					const errors = validatePayload(condition.rule, item, { requireAll: true });
 					return errors.length === 0;
 				});

From abdabe2437dbe1a82520730627683e82190861d5 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Thu, 16 Sep 2021 17:17:57 -0400
Subject: [PATCH 21/45] New translations en-US.yaml (Czech) (#8089)

---
 app/src/lang/translations/cs-CZ.yaml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/src/lang/translations/cs-CZ.yaml b/app/src/lang/translations/cs-CZ.yaml
index eca5950944..5caf644a7f 100644
--- a/app/src/lang/translations/cs-CZ.yaml
+++ b/app/src/lang/translations/cs-CZ.yaml
@@ -1,11 +1,35 @@
 ---
+## Be aware:
+#Due to the way this is imported, JavaScript reserved words, including "delete", "private",
+#"void", etc are stripped out. See
+#https://github.com/rollup/plugins/blob/8748b8cd3bbab3c5ac6190556930219f19060e63/packages/pluginutils/src/makeLegalIdentifier.ts#L4
+#and
+#https://github.com/rollup/plugins/blob/8748b8cd3bbab3c5ac6190556930219f19060e63/packages/yaml/src/index.js#L45
+#Illegal words:
+#'break', 'case', 'class', 'catch', 'const', 'continue', 'debugger', 'default', 'delete', 'do',
+#'else', 'export', 'extends', 'finally', 'for', 'function', 'if', 'import', 'in', 'instanceof',
+#'let', 'new', 'return', 'super', 'switch', 'this', 'throw', 'try', 'typeof', 'var', 'void',
+#'while', 'with', 'yield', 'enum', 'await', 'implements', 'package', 'protected', 'static',
+#'interface', 'private', 'public', 'arguments', 'Infinity', 'NaN', 'undefined', 'null', 'true',
+#'false', 'eval', 'uneval', 'isFinite', 'isNaN', 'parseFloat', 'parseInt', 'decodeURI',
+#'decodeURIComponent', 'encodeURI', 'encodeURIComponent', 'escape', 'unescape', 'Object',
+#'Function', 'Boolean', 'Symbol', 'Error', 'EvalError', 'InternalError', 'RangeError',
+#'ReferenceError', 'SyntaxError', 'TypeError', 'URIError', 'Number', 'Math', 'Date', 'String',
+#'RegExp', 'Array', 'Int8Array', 'Uint8Array', 'Uint8ClampedArray', 'Int16Array', 'Uint16Array',
+#'Int32Array', 'Uint32Array', 'Float32Array', 'Float64Array', 'Map', 'Set', 'WeakMap', 'WeakSet',
+#'SIMD', 'ArrayBuffer', 'DataView', 'JSON', 'Promise', 'Generator', 'GeneratorFunction', 'Reflect',
+#'Proxy', 'Intl'
+published: Zveřejněno
+tile_size: Velikost dlaždice
 edit_field: Upravit pole
 conditions: Podmínky
 maps: Mapy
 item_revision: Revize položky
+enter_a_name: Zadejte název...
 duplicate_field: Duplikovat pole
 half_width: Poloviční šířka
 full_width: Plná šířka
+limit: Limit
 group: Skupina
 and: A
 or: Nebo
@@ -18,6 +42,7 @@ branch: Větev
 leaf: List
 indeterminate: Neurčitý
 edit_collection: Upravit kolekci
+exclusive: Exkluzivní
 children: Potomci
 db_only_click_to_configure: 'Pouze databáze: Klikněte pro nastavení '
 show_archived_items: Zobrazit archivované položky
@@ -30,6 +55,7 @@ create_role: Vytvořit roli
 create_user: Vytvořit uživatele
 create_webhook: Vytvořit webhook
 invite_users: Pozvat uživatele
+email_examples: "admin{'@'}stranka.cz, user{'@'}stranka.cz..."
 invite: Pozvat
 email_already_invited: E-mail "{email}" již byl pozván
 emails: E-mail

From 7163e7390047a4f90c69bb976f9559bc5b062336 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Thu, 16 Sep 2021 17:32:37 -0400
Subject: [PATCH 22/45] Tweak translations to fit big data

---
 app/src/interfaces/translations/translations.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/interfaces/translations/translations.vue b/app/src/interfaces/translations/translations.vue
index 10dae4dde5..e05c35b099 100644
--- a/app/src/interfaces/translations/translations.vue
+++ b/app/src/interfaces/translations/translations.vue
@@ -367,9 +367,7 @@ export default defineComponent({
 			}
 
 			async function loadItems() {
-				const pkField = translationsPrimaryKeyField.value;
-
-				if (pkField === null || !props.value || props.value.length === 0) return;
+				if (!translationsRelation.value?.field) return;
 
 				loading.value = true;
 
@@ -379,8 +377,8 @@ export default defineComponent({
 							fields: '*',
 							limit: -1,
 							filter: {
-								[pkField]: {
-									_in: props.value,
+								[translationsRelation.value.field]: {
+									_eq: props.primaryKey,
 								},
 							},
 						},

From f174ee0a45b4aafff9662b15fa152886bff526d6 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Thu, 16 Sep 2021 17:43:07 -0400
Subject: [PATCH 23/45] New translations en-US.yaml (Czech) (#8092)

---
 app/src/lang/translations/cs-CZ.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/lang/translations/cs-CZ.yaml b/app/src/lang/translations/cs-CZ.yaml
index 5caf644a7f..a39beecafe 100644
--- a/app/src/lang/translations/cs-CZ.yaml
+++ b/app/src/lang/translations/cs-CZ.yaml
@@ -56,6 +56,7 @@ create_user: Vytvořit uživatele
 create_webhook: Vytvořit webhook
 invite_users: Pozvat uživatele
 email_examples: "admin{'@'}stranka.cz, user{'@'}stranka.cz..."
+url_example: "https://stranka.cz"
 invite: Pozvat
 email_already_invited: E-mail "{email}" již byl pozván
 emails: E-mail

From 61a368523b1fc4968ca456a610bc7de10be46dc1 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Thu, 16 Sep 2021 18:09:55 -0400
Subject: [PATCH 24/45] v9.0.0-rc.93

---
 api/package.json                              | 22 +++++++++----------
 app/package.json                              | 10 ++++-----
 docs/package.json                             |  2 +-
 lerna.json                                    |  2 +-
 packages/cli/package.json                     |  6 ++---
 .../create-directus-extension/package.json    |  6 ++---
 packages/create-directus-project/package.json |  2 +-
 packages/drive-azure/package.json             |  4 ++--
 packages/drive-gcs/package.json               |  4 ++--
 packages/drive-s3/package.json                |  4 ++--
 packages/drive/package.json                   |  2 +-
 packages/extensions-sdk/package.json          |  4 ++--
 packages/format-title/package.json            |  2 +-
 packages/gatsby-source-directus/package.json  |  4 ++--
 packages/schema/package.json                  |  2 +-
 packages/sdk/package.json                     |  2 +-
 packages/shared/package.json                  |  2 +-
 packages/specs/package.json                   |  2 +-
 18 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/api/package.json b/api/package.json
index dbca5599e8..652f97c400 100644
--- a/api/package.json
+++ b/api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "directus",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"license": "GPL-3.0-only",
 	"homepage": "https://github.com/directus/directus#readme",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content.",
@@ -70,16 +70,16 @@
 		"example.env"
 	],
 	"dependencies": {
-		"@directus/app": "9.0.0-rc.92",
-		"@directus/drive": "9.0.0-rc.92",
-		"@directus/drive-azure": "9.0.0-rc.92",
-		"@directus/drive-gcs": "9.0.0-rc.92",
-		"@directus/drive-s3": "9.0.0-rc.92",
-		"@directus/extensions-sdk": "9.0.0-rc.92",
-		"@directus/format-title": "9.0.0-rc.92",
-		"@directus/schema": "9.0.0-rc.92",
-		"@directus/shared": "9.0.0-rc.92",
-		"@directus/specs": "9.0.0-rc.92",
+		"@directus/app": "9.0.0-rc.93",
+		"@directus/drive": "9.0.0-rc.93",
+		"@directus/drive-azure": "9.0.0-rc.93",
+		"@directus/drive-gcs": "9.0.0-rc.93",
+		"@directus/drive-s3": "9.0.0-rc.93",
+		"@directus/extensions-sdk": "9.0.0-rc.93",
+		"@directus/format-title": "9.0.0-rc.93",
+		"@directus/schema": "9.0.0-rc.93",
+		"@directus/shared": "9.0.0-rc.93",
+		"@directus/specs": "9.0.0-rc.93",
 		"@godaddy/terminus": "^4.9.0",
 		"@rollup/plugin-alias": "^3.1.2",
 		"@rollup/plugin-virtual": "^2.0.3",
diff --git a/app/package.json b/app/package.json
index 12b614676b..81577bd9fa 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/app",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"private": false,
 	"description": "Directus is an Open-Source Headless CMS & API for Managing Custom Databases",
 	"author": "Rijk van Zanten <rijkvanzanten@me.com>",
@@ -27,10 +27,10 @@
 	},
 	"gitHead": "24621f3934dc77eb23441331040ed13c676ceffd",
 	"devDependencies": {
-		"@directus/docs": "9.0.0-rc.92",
-		"@directus/extensions-sdk": "9.0.0-rc.92",
-		"@directus/format-title": "9.0.0-rc.92",
-		"@directus/shared": "9.0.0-rc.92",
+		"@directus/docs": "9.0.0-rc.93",
+		"@directus/extensions-sdk": "9.0.0-rc.93",
+		"@directus/format-title": "9.0.0-rc.93",
+		"@directus/shared": "9.0.0-rc.93",
 		"@fullcalendar/core": "5.9.0",
 		"@fullcalendar/daygrid": "5.9.0",
 		"@fullcalendar/interaction": "5.9.0",
diff --git a/docs/package.json b/docs/package.json
index bb2df89427..df1b21e877 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@directus/docs",
 	"private": false,
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "",
 	"main": "dist/index.js",
 	"scripts": {
diff --git a/lerna.json b/lerna.json
index 1a5c7dd739..7555677a78 100644
--- a/lerna.json
+++ b/lerna.json
@@ -5,7 +5,7 @@
 		"docs",
 		"api"
 	],
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"command": {
 		"bootstrap": {
 			"npmClientArgs": [
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6ba258588f..b1d475a7de 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/cli",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "The official Directus CLI",
 	"repository": {
 		"type": "git",
@@ -40,8 +40,8 @@
 	"author": "João Biondo <wolfulus@gmail.com>",
 	"license": "MIT",
 	"dependencies": {
-		"@directus/format-title": "9.0.0-rc.92",
-		"@directus/sdk": "9.0.0-rc.92",
+		"@directus/format-title": "9.0.0-rc.93",
+		"@directus/sdk": "9.0.0-rc.93",
 		"@types/yargs": "^17.0.0",
 		"app-module-path": "^2.2.0",
 		"chalk": "^4.1.0",
diff --git a/packages/create-directus-extension/package.json b/packages/create-directus-extension/package.json
index 95722aba62..d353612bc0 100644
--- a/packages/create-directus-extension/package.json
+++ b/packages/create-directus-extension/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "create-directus-extension",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "A small util that will scaffold a Directus extension.",
 	"main": "lib/index.js",
 	"bin": {
@@ -19,8 +19,8 @@
 	"license": "GPL-3.0-only",
 	"gitHead": "24621f3934dc77eb23441331040ed13c676ceffd",
 	"dependencies": {
-		"@directus/extensions-sdk": "9.0.0-rc.92",
-		"@directus/shared": "9.0.0-rc.92",
+		"@directus/extensions-sdk": "9.0.0-rc.93",
+		"@directus/shared": "9.0.0-rc.93",
 		"inquirer": "^8.1.2"
 	}
 }
diff --git a/packages/create-directus-project/package.json b/packages/create-directus-project/package.json
index 5aa4f6ae09..de3b5961b4 100644
--- a/packages/create-directus-project/package.json
+++ b/packages/create-directus-project/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "create-directus-project",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "A small installer util that will create a directory, add boilerplate folders, and install Directus through npm.",
 	"main": "lib/index.js",
 	"bin": {
diff --git a/packages/drive-azure/package.json b/packages/drive-azure/package.json
index 26048f66c9..2dd3e48feb 100644
--- a/packages/drive-azure/package.json
+++ b/packages/drive-azure/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/drive-azure",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "Azure Blob driver for @directus/drive",
 	"license": "MIT",
 	"main": "dist/index.js",
@@ -35,7 +35,7 @@
 	],
 	"dependencies": {
 		"@azure/storage-blob": "^12.6.0",
-		"@directus/drive": "9.0.0-rc.92",
+		"@directus/drive": "9.0.0-rc.93",
 		"normalize-path": "^3.0.0"
 	},
 	"devDependencies": {
diff --git a/packages/drive-gcs/package.json b/packages/drive-gcs/package.json
index 7a1368b43b..071652474b 100644
--- a/packages/drive-gcs/package.json
+++ b/packages/drive-gcs/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/drive-gcs",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "Google Cloud Storage driver for @directus/drive",
 	"license": "MIT",
 	"main": "dist/index.js",
@@ -33,7 +33,7 @@
 		"dev": "npm run build -- -w --preserveWatchOutput --incremental"
 	},
 	"dependencies": {
-		"@directus/drive": "9.0.0-rc.92",
+		"@directus/drive": "9.0.0-rc.93",
 		"@google-cloud/storage": "^5.8.5",
 		"normalize-path": "^3.0.0"
 	},
diff --git a/packages/drive-s3/package.json b/packages/drive-s3/package.json
index 68c0258a48..aae9ddbddf 100644
--- a/packages/drive-s3/package.json
+++ b/packages/drive-s3/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/drive-s3",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "AWS S3 driver for @directus/drive",
 	"license": "MIT",
 	"main": "dist/index.js",
@@ -34,7 +34,7 @@
 		"dev": "npm run build -- -w --preserveWatchOutput --incremental"
 	},
 	"dependencies": {
-		"@directus/drive": "9.0.0-rc.92",
+		"@directus/drive": "9.0.0-rc.93",
 		"aws-sdk": "^2.928.0",
 		"normalize-path": "^3.0.0"
 	},
diff --git a/packages/drive/package.json b/packages/drive/package.json
index 3a283291d7..a12ed1b9f7 100644
--- a/packages/drive/package.json
+++ b/packages/drive/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/drive",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "Flexible and Fluent way to manage storage in Node.js.",
 	"license": "MIT",
 	"main": "dist/index.js",
diff --git a/packages/extensions-sdk/package.json b/packages/extensions-sdk/package.json
index dba4034eaf..d01ce0b3e2 100644
--- a/packages/extensions-sdk/package.json
+++ b/packages/extensions-sdk/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/extensions-sdk",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "A toolkit to develop extensions to extend Directus.",
 	"main": "dist/cjs/index.js",
 	"exports": {
@@ -31,7 +31,7 @@
 	"author": "Nicola Krumschmidt",
 	"gitHead": "24621f3934dc77eb23441331040ed13c676ceffd",
 	"dependencies": {
-		"@directus/shared": "9.0.0-rc.92",
+		"@directus/shared": "9.0.0-rc.93",
 		"@rollup/plugin-commonjs": "^20.0.0",
 		"@rollup/plugin-json": "^4.1.0",
 		"@rollup/plugin-node-resolve": "^13.0.0",
diff --git a/packages/format-title/package.json b/packages/format-title/package.json
index de29658e59..5a67f6b875 100644
--- a/packages/format-title/package.json
+++ b/packages/format-title/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/format-title",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "Custom string formatter that converts any string into [Title Case](http://www.grammar-monster.com/lessons/capital_letters_title_case.htm)",
 	"keywords": [
 		"title-case",
diff --git a/packages/gatsby-source-directus/package.json b/packages/gatsby-source-directus/package.json
index 77be71a920..a676f0a0f3 100644
--- a/packages/gatsby-source-directus/package.json
+++ b/packages/gatsby-source-directus/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/gatsby-source-directus",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "Source plugin for pulling data into Gatsby from a Directus API.",
 	"author": "João Biondo <wolfulus@gmail.com>",
 	"license": "MIT",
@@ -10,7 +10,7 @@
 		"directus"
 	],
 	"dependencies": {
-		"@directus/sdk": "9.0.0-rc.92",
+		"@directus/sdk": "9.0.0-rc.93",
 		"chalk": "4.1.2",
 		"gatsby-source-filesystem": "3.13.0",
 		"gatsby-source-graphql": "3.13.0",
diff --git a/packages/schema/package.json b/packages/schema/package.json
index 8d07af4784..d0a79711d0 100644
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/schema",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "Utility for extracting information about existing DB schema",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 1287a9c62a..384885959c 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/sdk",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "The official Directus SDK for use in JavaScript!",
 	"repository": {
 		"type": "git",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index c8ff000ef0..2516b614d2 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/shared",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "Code shared between all directus packages.",
 	"exports": {
 		"./composables": {
diff --git a/packages/specs/package.json b/packages/specs/package.json
index 24e0ff5cb3..7f73801e50 100644
--- a/packages/specs/package.json
+++ b/packages/specs/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@directus/specs",
-	"version": "9.0.0-rc.92",
+	"version": "9.0.0-rc.93",
 	"description": "OpenAPI Specification of the Directus API",
 	"main": "index.js",
 	"scripts": {

From 9967274ab276a4adfe4a76b775b614cf940dcb27 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Thu, 16 Sep 2021 18:10:34 -0400
Subject: [PATCH 25/45] Update changelog.md

---
 changelog.md | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)

diff --git a/changelog.md b/changelog.md
index f137b305ed..8a8b662492 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,122 @@
 
 _Changes marked with a :warning: contain potential breaking changes depending on your use of the package._
 
+## v9.0.0-rc.93 (September 16, 2021)
+
+### :sparkles: New Features
+
+- **App**
+  - [#8012](https://github.com/directus/directus/pull/8012) Move module setup to Project Settings ([@rijkvanzanten](https://github.com/rijkvanzanten))
+- **API**
+  - [#7939](https://github.com/directus/directus/pull/7939) Add native schema migration capabilities ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7833](https://github.com/directus/directus/pull/7833) Add ability to customise database errors ([@smilledge](https://github.com/smilledge))
+
+### :rocket: Improvements
+
+- **API**
+  - [#7986](https://github.com/directus/directus/pull/7986) Align memcached configurations for multiple hosts ([@azrikahar](https://github.com/azrikahar))
+  - [#7923](https://github.com/directus/directus/pull/7923) add spatial_ref_sys as default for DB_EXCLUDE_TABLES ([@azrikahar](https://github.com/azrikahar))
+  - :warning: [#7830](https://github.com/directus/directus/pull/7830) Add custom JWTs support for static token ([@azrikahar](https://github.com/azrikahar))
+- **App**
+  - [#7974](https://github.com/directus/directus/pull/7974) Prevent v-input append slot from shrinking ([@azrikahar](https://github.com/azrikahar))
+  - [#7972](https://github.com/directus/directus/pull/7972) Various style updates ([@benhaynes](https://github.com/benhaynes))
+  - [#7964](https://github.com/directus/directus/pull/7964) Fix header icon for revisions drawer ([@azrikahar](https://github.com/azrikahar))
+  - [#7954](https://github.com/directus/directus/pull/7954) Add click event for user tooltip & navigate to the user's page ([@azrikahar](https://github.com/azrikahar))
+  - [#7948](https://github.com/directus/directus/pull/7948) Allow v-menu tooltip to stay active on hover ([@azrikahar](https://github.com/azrikahar))
+  - [#7925](https://github.com/directus/directus/pull/7925) Add possibility to translate Published, Draft and Archived strings ([@jrvidotti](https://github.com/jrvidotti))
+  - [#7913](https://github.com/directus/directus/pull/7913) Enable "Format JSON Value" to display 'geometry' ([@vidhav](https://github.com/vidhav))
+  - [#7902](https://github.com/directus/directus/pull/7902) remove auto-open feature for info sidebar ([@azrikahar](https://github.com/azrikahar))
+
+### :bug: Bug Fixes
+
+- **App**
+  - [#8091](https://github.com/directus/directus/pull/8091) Fix saving issue on invalid conditional rule ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7987](https://github.com/directus/directus/pull/7987) fix revision detail refresh for "Save and Stay" ([@azrikahar](https://github.com/azrikahar))
+  - [#7966](https://github.com/directus/directus/pull/7966) Right icon hides for numeric input ([@alesvaupotic](https://github.com/alesvaupotic))
+  - [#7963](https://github.com/directus/directus/pull/7963) Respect & show correct icon/color for collection drawers ([@azrikahar](https://github.com/azrikahar))
+  - [#7950](https://github.com/directus/directus/pull/7950) Fixed mapbox-gl-draw css not being applied and moved logo ([@Oreilles](https://github.com/Oreilles))
+  - [#7947](https://github.com/directus/directus/pull/7947) Fix user-popover location when hovered in revisions ([@azrikahar](https://github.com/azrikahar))
+  - [#7918](https://github.com/directus/directus/pull/7918) Add tileSize parameter to basemap options ([@Oreilles](https://github.com/Oreilles))
+  - [#7917](https://github.com/directus/directus/pull/7917) Fix translation keys for system collections ([@azrikahar](https://github.com/azrikahar))
+  - [#7884](https://github.com/directus/directus/pull/7884) Add scope to v-tab-items ([@Nitwel](https://github.com/Nitwel))
+  - [#7864](https://github.com/directus/directus/pull/7864) Fix reverting to created revision ([@Nitwel](https://github.com/Nitwel))
+  - [#7858](https://github.com/directus/directus/pull/7858) Fix display labels translations ([@azrikahar](https://github.com/azrikahar))
+  - [#7840](https://github.com/directus/directus/pull/7840) Fix watcher loop and filters not being applied. ([@Oreilles](https://github.com/Oreilles))
+- **API**
+  - [#8056](https://github.com/directus/directus/pull/8056) Don't flush schema cache on content update ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7910](https://github.com/directus/directus/pull/7910) Fix the collections column in directus_webhooks being nullable ([@nickrum](https://github.com/nickrum))
+  - [#7883](https://github.com/directus/directus/pull/7883) Parse created arrays in parseFilter ([@Nitwel](https://github.com/Nitwel))
+  - [#7847](https://github.com/directus/directus/pull/7847) fix default of env var EMAIL_MAILGUN_HOST ([@mooori](https://github.com/mooori))
+- **Extensions**
+  - [#7978](https://github.com/directus/directus/pull/7978) Make type-only dependency versions of shared package less strict ([@nickrum](https://github.com/nickrum))
+- **drive**
+  - [#7976](https://github.com/directus/directus/pull/7976) Update AmazonWebServicesS3Storage.ts ([@aidenfoxx](https://github.com/aidenfoxx))
+- **Misc.**
+  - [#7965](https://github.com/directus/directus/pull/7965) Add missing words to Database Abstraction ([@alesvaupotic](https://github.com/alesvaupotic))
+  - [#7893](https://github.com/directus/directus/pull/7893) fix readme emoji ([@azrikahar](https://github.com/azrikahar))
+- **Docker**
+  - [#7892](https://github.com/directus/directus/pull/7892) fix readme filename in sync-dockerhub-readme.yml ([@azrikahar](https://github.com/azrikahar))
+
+### :memo: Documentation
+
+- [#8067](https://github.com/directus/directus/pull/8067) Make default values have consistent formatting ([@azrikahar](https://github.com/azrikahar))
+- [#8055](https://github.com/directus/directus/pull/8055) Fix broken anchor link to oAuth config section. ([@TonyLovesDevOps](https://github.com/TonyLovesDevOps))
+- [#8036](https://github.com/directus/directus/pull/8036) Fix URL ([@cstork](https://github.com/cstork))
+- [#8023](https://github.com/directus/directus/pull/8023) Update cli.md: Point to update/upgrade instructions ([@cstork](https://github.com/cstork))
+- [#7967](https://github.com/directus/directus/pull/7967) Update assets.md ([@alesvaupotic](https://github.com/alesvaupotic))
+- [#7965](https://github.com/directus/directus/pull/7965) Add missing words to Database Abstraction ([@alesvaupotic](https://github.com/alesvaupotic))
+- [#7915](https://github.com/directus/directus/pull/7915) Docs: update actions for file event ([@pgegenfurtner](https://github.com/pgegenfurtner))
+- [#7893](https://github.com/directus/directus/pull/7893) fix readme emoji ([@azrikahar](https://github.com/azrikahar))
+- [#7892](https://github.com/directus/directus/pull/7892) fix readme filename in sync-dockerhub-readme.yml ([@azrikahar](https://github.com/azrikahar))
+- [#7889](https://github.com/directus/directus/pull/7889) Add github action for syncing readme to Docker Hub ([@azrikahar](https://github.com/azrikahar))
+- [#7831](https://github.com/directus/directus/pull/7831) fix url format for Azure storage endpoint ([@azrikahar](https://github.com/azrikahar))
+- [#7821](https://github.com/directus/directus/pull/7821) fix minor typo in api-hooks.md ([@azrikahar](https://github.com/azrikahar))
+
+### :package: Dependency Updates
+
+- [#8070](https://github.com/directus/directus/pull/8070) Update dependency prettier to v2.4.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8063](https://github.com/directus/directus/pull/8063) Update dependency @types/lodash to v4.14.173 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8060](https://github.com/directus/directus/pull/8060) Update dependency @mapbox/mapbox-gl-geocoder to v4.7.4 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8050](https://github.com/directus/directus/pull/8050) Update dependency dompurify to v2.3.2 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8046](https://github.com/directus/directus/pull/8046) Update dependency @types/object-hash to v2.2.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8042](https://github.com/directus/directus/pull/8042) Update dependency directory-tree to v2.4.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8039](https://github.com/directus/directus/pull/8039) Update dependency sass to v1.41.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8025](https://github.com/directus/directus/pull/8025) Update dependency @types/sharp to v0.29.2 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8018](https://github.com/directus/directus/pull/8018) Update dependency stylelint-scss to v3.21.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8014](https://github.com/directus/directus/pull/8014) Update dependency sass to v1.40.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8011](https://github.com/directus/directus/pull/8011) Pin dependency @types/deep-diff to 1.0.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8003](https://github.com/directus/directus/pull/8003) Update dependency @typescript-eslint/parser to v4.31.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#8002](https://github.com/directus/directus/pull/8002) Update dependency @typescript-eslint/eslint-plugin to v4.31.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7997](https://github.com/directus/directus/pull/7997) Update dependency @types/object-hash to v2.2.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7995](https://github.com/directus/directus/pull/7995) Update dependency vite to v2.5.7 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7989](https://github.com/directus/directus/pull/7989) Update jest monorepo to v27.2.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7982](https://github.com/directus/directus/pull/7982) Update dependency pinia to v2.0.0-rc.9 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7973](https://github.com/directus/directus/pull/7973) Update dependency typescript to v4.4.3 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7959](https://github.com/directus/directus/pull/7959) Update dependency sass to v1.39.2 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7956](https://github.com/directus/directus/pull/7956) Update dependency npm to v7.23.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7945](https://github.com/directus/directus/pull/7945) Update dependency prettier to v2.4.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7944](https://github.com/directus/directus/pull/7944) Update dependency @types/sharp to v0.29.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7940](https://github.com/directus/directus/pull/7940) Update vue monorepo to v3.2.11 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7929](https://github.com/directus/directus/pull/7929) Update dependency vite to v2.5.6 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7922](https://github.com/directus/directus/pull/7922) Update dependency @vitejs/plugin-vue to v1.6.2 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7912](https://github.com/directus/directus/pull/7912) Update jest monorepo to v27.1.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7908](https://github.com/directus/directus/pull/7908) Update dependency tinymce to v5.9.2 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7905](https://github.com/directus/directus/pull/7905) Update dependency vite to v2.5.5 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7897](https://github.com/directus/directus/pull/7897) Update vue monorepo to v3.2.10 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7896](https://github.com/directus/directus/pull/7896) Update dependency @types/sharp to v0.29.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7886](https://github.com/directus/directus/pull/7886) Update dependency vite to v2.5.4 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7882](https://github.com/directus/directus/pull/7882) Update dependency @types/keyv to v3.1.3 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7876](https://github.com/directus/directus/pull/7876) Update dependency dockerode to v3.3.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7868](https://github.com/directus/directus/pull/7868) Update dependency @types/inquirer to v8 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7866](https://github.com/directus/directus/pull/7866) Update typescript-eslint monorepo to v4.31.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7865](https://github.com/directus/directus/pull/7865) Update dependency axios to v0.21.4 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7860](https://github.com/directus/directus/pull/7860) Update dependency pino to v6.13.2 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7859](https://github.com/directus/directus/pull/7859) Update dependency @vitejs/plugin-vue to v1.6.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7848](https://github.com/directus/directus/pull/7848) Update dependency pinia to v2.0.0-rc.8 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7842](https://github.com/directus/directus/pull/7842) Update vue monorepo to v3.2.9 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7835](https://github.com/directus/directus/pull/7835) Update dependency tedious to v12.2.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7829](https://github.com/directus/directus/pull/7829) Update dependency axios to v0.21.3 ([@renovate[bot]](https://github.com/apps/renovate))
+
 ## v9.0.0-rc.92 (September 2, 2021)
 
 ### ⚠️ Potential Breaking Changes

From 890501fa66271cf749667079f80b38955f85622f Mon Sep 17 00:00:00 2001
From: Nicola Krumschmidt <nicola.krumschmidt@freenet.de>
Date: Fri, 17 Sep 2021 15:57:45 +0200
Subject: [PATCH 26/45] Fix the port being duplicated in parsed URLs (#8117)

Fixes #8114
---
 api/src/utils/url.ts |   2 +-
 package-lock.json    | 126 +++++++++++++++++++++----------------------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/api/src/utils/url.ts b/api/src/utils/url.ts
index a084a26757..42c68d267d 100644
--- a/api/src/utils/url.ts
+++ b/api/src/utils/url.ts
@@ -19,7 +19,7 @@ export class Url {
 			!isProtocolRelative && !isRootRelative && !isPathRelative
 				? parsedUrl.protocol.substring(0, parsedUrl.protocol.length - 1)
 				: null;
-		this.host = !isRootRelative && !isPathRelative ? parsedUrl.host : null;
+		this.host = !isRootRelative && !isPathRelative ? parsedUrl.hostname : null;
 		this.port = parsedUrl.port !== '' ? parsedUrl.port : null;
 		this.path = parsedUrl.pathname.split('/').filter((p) => p !== '');
 		this.query = Object.fromEntries(parsedUrl.searchParams.entries());
diff --git a/package-lock.json b/package-lock.json
index a483836a8d..6acc3caf7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,19 +57,19 @@
 		},
 		"api": {
 			"name": "directus",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "GPL-3.0-only",
 			"dependencies": {
-				"@directus/app": "9.0.0-rc.92",
-				"@directus/drive": "9.0.0-rc.92",
-				"@directus/drive-azure": "9.0.0-rc.92",
-				"@directus/drive-gcs": "9.0.0-rc.92",
-				"@directus/drive-s3": "9.0.0-rc.92",
-				"@directus/extensions-sdk": "9.0.0-rc.92",
-				"@directus/format-title": "9.0.0-rc.92",
-				"@directus/schema": "9.0.0-rc.92",
-				"@directus/shared": "9.0.0-rc.92",
-				"@directus/specs": "9.0.0-rc.92",
+				"@directus/app": "9.0.0-rc.93",
+				"@directus/drive": "9.0.0-rc.93",
+				"@directus/drive-azure": "9.0.0-rc.93",
+				"@directus/drive-gcs": "9.0.0-rc.93",
+				"@directus/drive-s3": "9.0.0-rc.93",
+				"@directus/extensions-sdk": "9.0.0-rc.93",
+				"@directus/format-title": "9.0.0-rc.93",
+				"@directus/schema": "9.0.0-rc.93",
+				"@directus/shared": "9.0.0-rc.93",
+				"@directus/specs": "9.0.0-rc.93",
 				"@godaddy/terminus": "^4.9.0",
 				"@rollup/plugin-alias": "^3.1.2",
 				"@rollup/plugin-virtual": "^2.0.3",
@@ -315,12 +315,12 @@
 		},
 		"app": {
 			"name": "@directus/app",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"devDependencies": {
-				"@directus/docs": "9.0.0-rc.92",
-				"@directus/extensions-sdk": "9.0.0-rc.92",
-				"@directus/format-title": "9.0.0-rc.92",
-				"@directus/shared": "9.0.0-rc.92",
+				"@directus/docs": "9.0.0-rc.93",
+				"@directus/extensions-sdk": "9.0.0-rc.93",
+				"@directus/format-title": "9.0.0-rc.93",
+				"@directus/shared": "9.0.0-rc.93",
 				"@fullcalendar/core": "5.9.0",
 				"@fullcalendar/daygrid": "5.9.0",
 				"@fullcalendar/interaction": "5.9.0",
@@ -448,7 +448,7 @@
 		},
 		"docs": {
 			"name": "@directus/docs",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "ISC",
 			"devDependencies": {
 				"directory-tree": "2.4.0",
@@ -49989,11 +49989,11 @@
 		},
 		"packages/cli": {
 			"name": "@directus/cli",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "MIT",
 			"dependencies": {
-				"@directus/format-title": "9.0.0-rc.92",
-				"@directus/sdk": "9.0.0-rc.92",
+				"@directus/format-title": "9.0.0-rc.93",
+				"@directus/sdk": "9.0.0-rc.93",
 				"@types/yargs": "^17.0.0",
 				"app-module-path": "^2.2.0",
 				"chalk": "^4.1.0",
@@ -50202,11 +50202,11 @@
 			}
 		},
 		"packages/create-directus-extension": {
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "GPL-3.0-only",
 			"dependencies": {
-				"@directus/extensions-sdk": "9.0.0-rc.92",
-				"@directus/shared": "9.0.0-rc.92",
+				"@directus/extensions-sdk": "9.0.0-rc.93",
+				"@directus/shared": "9.0.0-rc.93",
 				"inquirer": "^8.1.2"
 			},
 			"bin": {
@@ -50252,7 +50252,7 @@
 			"integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
 		},
 		"packages/create-directus-project": {
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "GPL-3.0-only",
 			"dependencies": {
 				"chalk": "^4.1.1",
@@ -50290,7 +50290,7 @@
 		},
 		"packages/drive": {
 			"name": "@directus/drive",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "MIT",
 			"dependencies": {
 				"fs-extra": "^10.0.0",
@@ -50309,11 +50309,11 @@
 		},
 		"packages/drive-azure": {
 			"name": "@directus/drive-azure",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "MIT",
 			"dependencies": {
 				"@azure/storage-blob": "^12.6.0",
-				"@directus/drive": "9.0.0-rc.92",
+				"@directus/drive": "9.0.0-rc.93",
 				"normalize-path": "^3.0.0"
 			},
 			"devDependencies": {
@@ -50345,10 +50345,10 @@
 		},
 		"packages/drive-gcs": {
 			"name": "@directus/drive-gcs",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "MIT",
 			"dependencies": {
-				"@directus/drive": "9.0.0-rc.92",
+				"@directus/drive": "9.0.0-rc.93",
 				"@google-cloud/storage": "^5.8.5",
 				"normalize-path": "^3.0.0"
 			},
@@ -50367,10 +50367,10 @@
 		},
 		"packages/drive-s3": {
 			"name": "@directus/drive-s3",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "MIT",
 			"dependencies": {
-				"@directus/drive": "9.0.0-rc.92",
+				"@directus/drive": "9.0.0-rc.93",
 				"aws-sdk": "^2.928.0",
 				"normalize-path": "^3.0.0"
 			},
@@ -50417,9 +50417,9 @@
 		},
 		"packages/extensions-sdk": {
 			"name": "@directus/extensions-sdk",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"dependencies": {
-				"@directus/shared": "9.0.0-rc.92",
+				"@directus/shared": "9.0.0-rc.93",
 				"@rollup/plugin-commonjs": "^20.0.0",
 				"@rollup/plugin-json": "^4.1.0",
 				"@rollup/plugin-node-resolve": "^13.0.0",
@@ -50471,7 +50471,7 @@
 		},
 		"packages/format-title": {
 			"name": "@directus/format-title",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "MIT",
 			"devDependencies": {
 				"@rollup/plugin-commonjs": "20.0.0",
@@ -50490,10 +50490,10 @@
 		},
 		"packages/gatsby-source-directus": {
 			"name": "@directus/gatsby-source-directus",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "MIT",
 			"dependencies": {
-				"@directus/sdk": "9.0.0-rc.92",
+				"@directus/sdk": "9.0.0-rc.93",
 				"chalk": "4.1.2",
 				"gatsby-source-filesystem": "3.13.0",
 				"gatsby-source-graphql": "3.13.0",
@@ -50508,7 +50508,7 @@
 		},
 		"packages/schema": {
 			"name": "@directus/schema",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "GPL-3.0",
 			"dependencies": {
 				"knex-schema-inspector": "1.6.0",
@@ -50521,7 +50521,7 @@
 		},
 		"packages/sdk": {
 			"name": "@directus/sdk",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "MIT",
 			"dependencies": {
 				"axios": "^0.21.1"
@@ -50550,7 +50550,7 @@
 		},
 		"packages/shared": {
 			"name": "@directus/shared",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"dependencies": {
 				"axios": "*",
 				"date-fns": "2.23.0",
@@ -50599,7 +50599,7 @@
 		},
 		"packages/specs": {
 			"name": "@directus/specs",
-			"version": "9.0.0-rc.92",
+			"version": "9.0.0-rc.93",
 			"license": "GPL-3.0",
 			"dependencies": {
 				"openapi3-ts": "^2.0.1"
@@ -52525,10 +52525,10 @@
 		"@directus/app": {
 			"version": "file:app",
 			"requires": {
-				"@directus/docs": "9.0.0-rc.92",
-				"@directus/extensions-sdk": "9.0.0-rc.92",
-				"@directus/format-title": "9.0.0-rc.92",
-				"@directus/shared": "9.0.0-rc.92",
+				"@directus/docs": "9.0.0-rc.93",
+				"@directus/extensions-sdk": "9.0.0-rc.93",
+				"@directus/format-title": "9.0.0-rc.93",
+				"@directus/shared": "9.0.0-rc.93",
 				"@fullcalendar/core": "5.9.0",
 				"@fullcalendar/daygrid": "5.9.0",
 				"@fullcalendar/interaction": "5.9.0",
@@ -52634,8 +52634,8 @@
 		"@directus/cli": {
 			"version": "file:packages/cli",
 			"requires": {
-				"@directus/format-title": "9.0.0-rc.92",
-				"@directus/sdk": "9.0.0-rc.92",
+				"@directus/format-title": "9.0.0-rc.93",
+				"@directus/sdk": "9.0.0-rc.93",
 				"@types/figlet": "1.5.4",
 				"@types/fs-extra": "9.0.12",
 				"@types/jest": "27.0.1",
@@ -52929,7 +52929,7 @@
 			"version": "file:packages/drive-azure",
 			"requires": {
 				"@azure/storage-blob": "^12.6.0",
-				"@directus/drive": "9.0.0-rc.92",
+				"@directus/drive": "9.0.0-rc.93",
 				"@types/fs-extra": "9.0.12",
 				"@types/jest": "27.0.1",
 				"@types/node": "15.12.2",
@@ -52959,7 +52959,7 @@
 		"@directus/drive-gcs": {
 			"version": "file:packages/drive-gcs",
 			"requires": {
-				"@directus/drive": "9.0.0-rc.92",
+				"@directus/drive": "9.0.0-rc.93",
 				"@google-cloud/storage": "^5.8.5",
 				"@lukeed/uuid": "2.0.0",
 				"@types/fs-extra": "9.0.12",
@@ -52977,7 +52977,7 @@
 		"@directus/drive-s3": {
 			"version": "file:packages/drive-s3",
 			"requires": {
-				"@directus/drive": "9.0.0-rc.92",
+				"@directus/drive": "9.0.0-rc.93",
 				"@lukeed/uuid": "2.0.0",
 				"@types/fs-extra": "9.0.12",
 				"@types/jest": "27.0.1",
@@ -53009,7 +53009,7 @@
 		"@directus/extensions-sdk": {
 			"version": "file:packages/extensions-sdk",
 			"requires": {
-				"@directus/shared": "9.0.0-rc.92",
+				"@directus/shared": "9.0.0-rc.93",
 				"@rollup/plugin-commonjs": "^20.0.0",
 				"@rollup/plugin-json": "^4.1.0",
 				"@rollup/plugin-node-resolve": "^13.0.0",
@@ -53064,7 +53064,7 @@
 		"@directus/gatsby-source-directus": {
 			"version": "file:packages/gatsby-source-directus",
 			"requires": {
-				"@directus/sdk": "9.0.0-rc.92",
+				"@directus/sdk": "9.0.0-rc.93",
 				"chalk": "4.1.2",
 				"gatsby-source-filesystem": "3.13.0",
 				"gatsby-source-graphql": "3.13.0",
@@ -63901,8 +63901,8 @@
 		"create-directus-extension": {
 			"version": "file:packages/create-directus-extension",
 			"requires": {
-				"@directus/extensions-sdk": "9.0.0-rc.92",
-				"@directus/shared": "9.0.0-rc.92",
+				"@directus/extensions-sdk": "9.0.0-rc.93",
+				"@directus/shared": "9.0.0-rc.93",
 				"inquirer": "^8.1.2"
 			},
 			"dependencies": {
@@ -65045,16 +65045,16 @@
 		"directus": {
 			"version": "file:api",
 			"requires": {
-				"@directus/app": "9.0.0-rc.92",
-				"@directus/drive": "9.0.0-rc.92",
-				"@directus/drive-azure": "9.0.0-rc.92",
-				"@directus/drive-gcs": "9.0.0-rc.92",
-				"@directus/drive-s3": "9.0.0-rc.92",
-				"@directus/extensions-sdk": "9.0.0-rc.92",
-				"@directus/format-title": "9.0.0-rc.92",
-				"@directus/schema": "9.0.0-rc.92",
-				"@directus/shared": "9.0.0-rc.92",
-				"@directus/specs": "9.0.0-rc.92",
+				"@directus/app": "9.0.0-rc.93",
+				"@directus/drive": "9.0.0-rc.93",
+				"@directus/drive-azure": "9.0.0-rc.93",
+				"@directus/drive-gcs": "9.0.0-rc.93",
+				"@directus/drive-s3": "9.0.0-rc.93",
+				"@directus/extensions-sdk": "9.0.0-rc.93",
+				"@directus/format-title": "9.0.0-rc.93",
+				"@directus/schema": "9.0.0-rc.93",
+				"@directus/shared": "9.0.0-rc.93",
+				"@directus/specs": "9.0.0-rc.93",
 				"@godaddy/terminus": "^4.9.0",
 				"@keyv/redis": "^2.1.2",
 				"@rollup/plugin-alias": "^3.1.2",

From 9d11714fb19e8bc35d2dff9d6ae4f585d39e8dbb Mon Sep 17 00:00:00 2001
From: ian <licitdev@gmail.com>
Date: Fri, 17 Sep 2021 22:03:09 +0800
Subject: [PATCH 27/45] Fixed missing documentation due to directory-tree
 update (#8115)

---
 docs/build.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/build.js b/docs/build.js
index 90218b1821..704285cda2 100644
--- a/docs/build.js
+++ b/docs/build.js
@@ -9,6 +9,7 @@ const tree = dirTree('.', {
 	extensions: /\.md$/,
 	exclude: /(node_modules|.vuepress|.vscode|dist)/,
 	normalizePath: true,
+	attributes: ['type', 'extension'],
 });
 
 const index = `export default ${generateIndex(tree.children)};`;

From 82cd7077edc5f4f41e9e4bc1ebbf31c0827796b3 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Fri, 17 Sep 2021 10:07:59 -0400
Subject: [PATCH 28/45] Update CODEOWNERS

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b6b791dc59..b5f778df2f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,6 +2,7 @@
 
 /docs/*.md @benhaynes
 
+/packages/sdk @joselcvarela
 /packages/shared @nickrum
 /packages/extensions-sdk @nickrum
 /packages/create-directus-extension @nickrum

From 62282570a5d9667df007236add8710d4d3ae2ed3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 10:51:17 -0400
Subject: [PATCH 29/45] Update dependency date-fns to v2 (#8102)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 app/package.json             |  2 +-
 package-lock.json            | 32 ++++++++++++++++----------------
 packages/shared/package.json |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/package.json b/app/package.json
index 81577bd9fa..908526399c 100644
--- a/app/package.json
+++ b/app/package.json
@@ -73,7 +73,7 @@
 		"codemirror": "5.62.3",
 		"copyfiles": "2.4.1",
 		"cropperjs": "1.5.12",
-		"date-fns": "2.23.0",
+		"date-fns": "2.24.0",
 		"diacritics": "1.3.0",
 		"dompurify": "2.3.2",
 		"escape-string-regexp": "5.0.0",
diff --git a/package-lock.json b/package-lock.json
index 6acc3caf7e..4baef6985b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -363,7 +363,7 @@
 				"codemirror": "5.62.3",
 				"copyfiles": "2.4.1",
 				"cropperjs": "1.5.12",
-				"date-fns": "2.23.0",
+				"date-fns": "2.24.0",
 				"diacritics": "1.3.0",
 				"dompurify": "2.3.2",
 				"escape-string-regexp": "5.0.0",
@@ -394,9 +394,9 @@
 			}
 		},
 		"app/node_modules/date-fns": {
-			"version": "2.23.0",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
-			"integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==",
+			"version": "2.24.0",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.24.0.tgz",
+			"integrity": "sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw==",
 			"dev": true,
 			"engines": {
 				"node": ">=0.11"
@@ -50553,7 +50553,7 @@
 			"version": "9.0.0-rc.93",
 			"dependencies": {
 				"axios": "*",
-				"date-fns": "2.23.0",
+				"date-fns": "2.24.0",
 				"express": "*",
 				"fs-extra": "10.0.0",
 				"geojson": "*",
@@ -50573,9 +50573,9 @@
 			}
 		},
 		"packages/shared/node_modules/date-fns": {
-			"version": "2.23.0",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
-			"integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==",
+			"version": "2.24.0",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.24.0.tgz",
+			"integrity": "sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw==",
 			"engines": {
 				"node": ">=0.11"
 			},
@@ -52571,7 +52571,7 @@
 				"codemirror": "5.62.3",
 				"copyfiles": "2.4.1",
 				"cropperjs": "1.5.12",
-				"date-fns": "2.23.0",
+				"date-fns": "2.24.0",
 				"diacritics": "1.3.0",
 				"dompurify": "2.3.2",
 				"escape-string-regexp": "5.0.0",
@@ -52602,9 +52602,9 @@
 			},
 			"dependencies": {
 				"date-fns": {
-					"version": "2.23.0",
-					"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
-					"integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==",
+					"version": "2.24.0",
+					"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.24.0.tgz",
+					"integrity": "sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw==",
 					"dev": true
 				},
 				"escape-string-regexp": {
@@ -53117,7 +53117,7 @@
 			"version": "file:packages/shared",
 			"requires": {
 				"axios": "*",
-				"date-fns": "2.23.0",
+				"date-fns": "2.24.0",
 				"express": "*",
 				"fs-extra": "10.0.0",
 				"geojson": "*",
@@ -53135,9 +53135,9 @@
 			},
 			"dependencies": {
 				"date-fns": {
-					"version": "2.23.0",
-					"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz",
-					"integrity": "sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA=="
+					"version": "2.24.0",
+					"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.24.0.tgz",
+					"integrity": "sha512-6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw=="
 				},
 				"fs-extra": {
 					"version": "10.0.0",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 2516b614d2..c3cc087573 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -47,7 +47,7 @@
 	"gitHead": "24621f3934dc77eb23441331040ed13c676ceffd",
 	"dependencies": {
 		"axios": "*",
-		"date-fns": "2.23.0",
+		"date-fns": "2.24.0",
 		"express": "*",
 		"fs-extra": "10.0.0",
 		"geojson": "*",

From aadb699e110b456a3613fad4278379ec047f5721 Mon Sep 17 00:00:00 2001
From: Dieter Luypaert <dieterluypaert@gmail.com>
Date: Fri, 17 Sep 2021 17:24:10 +0200
Subject: [PATCH 30/45] Add extensions-sdk watch build option (#7856)

---
 .../extensions-sdk/src/cli/commands/build.ts  | 74 +++++++++++++++++--
 packages/extensions-sdk/src/cli/run.ts        |  1 +
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/packages/extensions-sdk/src/cli/commands/build.ts b/packages/extensions-sdk/src/cli/commands/build.ts
index 885bbbef77..e4740af7eb 100644
--- a/packages/extensions-sdk/src/cli/commands/build.ts
+++ b/packages/extensions-sdk/src/cli/commands/build.ts
@@ -2,7 +2,14 @@ import path from 'path';
 import chalk from 'chalk';
 import fse from 'fs-extra';
 import ora from 'ora';
-import { OutputOptions as RollupOutputOptions, rollup, RollupOptions, Plugin } from 'rollup';
+import {
+	RollupError,
+	RollupOptions,
+	OutputOptions as RollupOutputOptions,
+	Plugin,
+	rollup,
+	watch as rollupWatch,
+} from 'rollup';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 import json from '@rollup/plugin-json';
@@ -19,7 +26,7 @@ import { getLanguageFromPath, isLanguage } from '../utils/languages';
 import { Language } from '../types';
 import loadConfig from '../utils/load-config';
 
-type BuildOptions = { type: string; input: string; output: string; language: string; force: boolean };
+type BuildOptions = { type: string; input: string; output: string; language: string; force: boolean; watch: boolean };
 
 export default async function build(options: BuildOptions): Promise<void> {
 	const packagePath = path.resolve('package.json');
@@ -75,13 +82,45 @@ export default async function build(options: BuildOptions): Promise<void> {
 	const rollupOptions = getRollupOptions(type, language, input, config.plugins);
 	const rollupOutputOptions = getRollupOutputOptions(type, output);
 
-	const bundle = await rollup(rollupOptions);
+	if (options.watch) {
+		const watcher = rollupWatch({
+			...rollupOptions,
+			output: rollupOutputOptions,
+		});
 
-	await bundle.write(rollupOutputOptions);
+		watcher.on('event', async (event) => {
+			switch (event.code) {
+				case 'ERROR': {
+					spinner.fail(chalk.bold('Failed'));
+					handleRollupError(event.error);
+					spinner.start(chalk.bold('Watching files for changes...'));
+					break;
+				}
+				case 'BUNDLE_END':
+					await event.result.close();
+					spinner.succeed(chalk.bold('Done'));
+					spinner.start(chalk.bold('Watching files for changes...'));
+					break;
+				case 'BUNDLE_START':
+					spinner.text = 'Building Directus extension...';
+					break;
+			}
+		});
+	} else {
+		try {
+			const bundle = await rollup(rollupOptions);
 
-	await bundle.close();
+			await bundle.write(rollupOutputOptions);
 
-	spinner.succeed(chalk.bold('Done'));
+			await bundle.close();
+
+			spinner.succeed(chalk.bold('Done'));
+		} catch (error) {
+			spinner.fail(chalk.bold('Failed'));
+			handleRollupError(error as RollupError);
+			process.exitCode = 1;
+		}
+	}
 }
 
 function getRollupOptions(
@@ -147,3 +186,26 @@ function getRollupOutputOptions(type: ExtensionType, output: string): RollupOutp
 		};
 	}
 }
+
+function handleRollupError(error: RollupError): void {
+	const pluginPrefix = error.plugin ? `(plugin ${error.plugin}) ` : '';
+	log('\n' + chalk.red.bold(`${pluginPrefix}${error.name}: ${error.message}`));
+
+	if (error.url) {
+		log(chalk.cyan(error.url), 'error');
+	}
+
+	if (error.loc) {
+		log(`${(error.loc.file || error.id)!} (${error.loc.line}:${error.loc.column})`);
+	} else if (error.id) {
+		log(error.id);
+	}
+
+	if (error.frame) {
+		log(chalk.dim(error.frame));
+	}
+
+	if (error.stack) {
+		log(chalk.dim(error.stack));
+	}
+}
diff --git a/packages/extensions-sdk/src/cli/run.ts b/packages/extensions-sdk/src/cli/run.ts
index ac0107d22f..5821e841fe 100644
--- a/packages/extensions-sdk/src/cli/run.ts
+++ b/packages/extensions-sdk/src/cli/run.ts
@@ -24,6 +24,7 @@ program
 	.option('-o, --output <file>', 'overwrite the output file read from package manifest')
 	.option('-l, --language <language>', 'overwrite the language to use')
 	.option('-f, --force', 'ignore the package manifest')
+	.option('-w, --watch', 'watch and rebuild on changes')
 	.action(build);
 
 program.parse(process.argv);

From db99e435e64a75189d8043f55270b9033c1e7cac Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 15:01:19 -0400
Subject: [PATCH 31/45] Update vue monorepo to v3.2.12 (#8120)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 app/package.json  |   4 +-
 package-lock.json | 208 +++++++++++++++++++++++-----------------------
 2 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/app/package.json b/app/package.json
index 908526399c..ad9768a047 100644
--- a/app/package.json
+++ b/app/package.json
@@ -67,7 +67,7 @@
 		"@vue/cli-plugin-typescript": "4.5.13",
 		"@vue/cli-plugin-vuex": "4.5.13",
 		"@vue/cli-service": "4.5.13",
-		"@vue/compiler-sfc": "3.2.11",
+		"@vue/compiler-sfc": "3.2.12",
 		"axios": "0.21.4",
 		"base-64": "1.0.0",
 		"codemirror": "5.62.3",
@@ -96,7 +96,7 @@
 		"tinymce": "5.9.2",
 		"typescript": "4.4.3",
 		"vite": "2.5.7",
-		"vue": "3.2.11",
+		"vue": "3.2.12",
 		"vue-i18n": "9.1.7",
 		"vue-router": "4.0.11",
 		"vuedraggable": "4.1.0",
diff --git a/package-lock.json b/package-lock.json
index 4baef6985b..46cccddc2b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -357,7 +357,7 @@
 				"@vue/cli-plugin-typescript": "4.5.13",
 				"@vue/cli-plugin-vuex": "4.5.13",
 				"@vue/cli-service": "4.5.13",
-				"@vue/compiler-sfc": "3.2.11",
+				"@vue/compiler-sfc": "3.2.12",
 				"axios": "0.21.4",
 				"base-64": "1.0.0",
 				"codemirror": "5.62.3",
@@ -386,7 +386,7 @@
 				"tinymce": "5.9.2",
 				"typescript": "4.4.3",
 				"vite": "2.5.7",
-				"vue": "3.2.11",
+				"vue": "3.2.12",
 				"vue-i18n": "9.1.7",
 				"vue-router": "4.0.11",
 				"vuedraggable": "4.1.0",
@@ -9849,39 +9849,39 @@
 			"dev": true
 		},
 		"node_modules/@vue/compiler-core": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.11.tgz",
-			"integrity": "sha512-bcbsLx5XyQg8WDDEGwmpX0BfEfv82wIs9fWFelpyVhNRGMaABvUTalYINyfhVT+jOqNaD4JBhJiVKd/8TmsHWg==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.12.tgz",
+			"integrity": "sha512-IGJ0JmrAaAl5KBBegPAKkoXvsfDFgN/h7K1t/+0MxqpZF1fTDVUOp3tG7q9gWa7fwzGEaIsPhjtT5C3qztdLKg==",
 			"dependencies": {
 				"@babel/parser": "^7.15.0",
 				"@babel/types": "^7.15.0",
-				"@vue/shared": "3.2.11",
+				"@vue/shared": "3.2.12",
 				"estree-walker": "^2.0.2",
 				"source-map": "^0.6.1"
 			}
 		},
 		"node_modules/@vue/compiler-dom": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz",
-			"integrity": "sha512-DNvhUHI/1Hn0/+ZYDYGAuDGasUm+XHKC3FE4GqkNCTO/fcLaJMRg/7eT1m1lkc7jPffUwwfh1rZru5mwzOjrNw==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.12.tgz",
+			"integrity": "sha512-MulvKilA2USm8ubPfvXvNY55HVTn+zHERsXeNg437TXrmM4FRCis6zjWW47QZ3ZyxEkCdqOmuiFCtXbpnuthyw==",
 			"dependencies": {
-				"@vue/compiler-core": "3.2.11",
-				"@vue/shared": "3.2.11"
+				"@vue/compiler-core": "3.2.12",
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"node_modules/@vue/compiler-sfc": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.11.tgz",
-			"integrity": "sha512-cUIaS8mgJrQ6yucj2AupWAwBRITK3W/a8wCOn9g5fJGtOl8h4APY8vN3lzP8HIJDyEeRF3I8SfRhL+oX97kSnw==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.12.tgz",
+			"integrity": "sha512-EjzeMQ7H2ICj+JRw2buSFXTocdCg8e5yWQTlNM/6h/u68sTwMbIfiOJBFEwBhG/wCG7Nb6Nnz888AfHTU3hdrA==",
 			"dependencies": {
 				"@babel/parser": "^7.15.0",
 				"@babel/types": "^7.15.0",
 				"@types/estree": "^0.0.48",
-				"@vue/compiler-core": "3.2.11",
-				"@vue/compiler-dom": "3.2.11",
-				"@vue/compiler-ssr": "3.2.11",
-				"@vue/ref-transform": "3.2.11",
-				"@vue/shared": "3.2.11",
+				"@vue/compiler-core": "3.2.12",
+				"@vue/compiler-dom": "3.2.12",
+				"@vue/compiler-ssr": "3.2.12",
+				"@vue/ref-transform": "3.2.12",
+				"@vue/shared": "3.2.12",
 				"consolidate": "^0.16.0",
 				"estree-walker": "^2.0.2",
 				"hash-sum": "^2.0.0",
@@ -10014,12 +10014,12 @@
 			"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
 		},
 		"node_modules/@vue/compiler-ssr": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.11.tgz",
-			"integrity": "sha512-+ptAdUlFDij+Z0VGCbRRkxQlNev5LkbZAntvkxrFjc08CTMhZmiV4Js48n2hAmuSXaKNEpmGkDGU26c/vf1+xw==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.12.tgz",
+			"integrity": "sha512-sY+VbLQ17FPr1CgirnqEgY+jbC7wI5c2Ma6u8le0+b4UKMYF9urI2pybAZc1nKz6O78FWA3OSnQFxTTLppe+9Q==",
 			"dependencies": {
-				"@vue/compiler-dom": "3.2.11",
-				"@vue/shared": "3.2.11"
+				"@vue/compiler-dom": "3.2.12",
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"node_modules/@vue/component-compiler-utils": {
@@ -10107,41 +10107,41 @@
 			}
 		},
 		"node_modules/@vue/reactivity": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.11.tgz",
-			"integrity": "sha512-hEQstxPQbgGZq5qApzrvbDmRdK1KP96O/j4XrwT8fVkT1ytkFs4fH2xNEh9QKwXfybbQkLs77W7OfXCv5o6qbA==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.12.tgz",
+			"integrity": "sha512-Lr5CTQjFm5mT/6DGnVNhptmba/Qg1DbD6eNWWmiHLMlpPt4q2ww9A2orEjVw0qNcdTJ04JLPEVAz5jhTZTCfIg==",
 			"dependencies": {
-				"@vue/shared": "3.2.11"
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"node_modules/@vue/ref-transform": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.11.tgz",
-			"integrity": "sha512-7rX0YsfYb7+1PeKPME1tQyUQcQgt0sIXRRnPD1Vw8Zs2KIo90YLy9CrvwalcRCxGw0ScsjBEhVjJtWIT79TElg==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.12.tgz",
+			"integrity": "sha512-lS7TDda61iSf3ljokXVfN0VbOsQdmpST6MZLjxzBydFCECCJaEAr6o+K8VZ7NhUCSrl+gKXHpdXxmcvwdk66aQ==",
 			"dependencies": {
 				"@babel/parser": "^7.15.0",
-				"@vue/compiler-core": "3.2.11",
-				"@vue/shared": "3.2.11",
+				"@vue/compiler-core": "3.2.12",
+				"@vue/shared": "3.2.12",
 				"estree-walker": "^2.0.2",
 				"magic-string": "^0.25.7"
 			}
 		},
 		"node_modules/@vue/runtime-core": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.11.tgz",
-			"integrity": "sha512-horlxjWwSvModC87WdsWswzzHE5IexmKkQA65S5vFgP5hLUBW+HRyScDeuB/RRcFmqnf+ozacNCfap0kqcpODw==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.12.tgz",
+			"integrity": "sha512-LO+ztgcmsomavYUaSq7BTteh8pmnUmvUnXUFVYdlcg3VCdYRS0ImlclpYsNHqjAk2gU+H09dr2PP0kL961xUfQ==",
 			"dependencies": {
-				"@vue/reactivity": "3.2.11",
-				"@vue/shared": "3.2.11"
+				"@vue/reactivity": "3.2.12",
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"node_modules/@vue/runtime-dom": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.11.tgz",
-			"integrity": "sha512-cOK1g0INdiCbds2xrrJKrrN+pDHuLz6esUs/crdEiupDuX7IeiMbdqrAQCkYHp5P1KLWcbGlkmwfVD7HQGii0Q==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.12.tgz",
+			"integrity": "sha512-+NSDqivgihvoPYbKFDmzFu1tW7SOzwc7r0b7T8vsJtooVPGxwtfAFZ6wyLtteOXXrCpyTR3kpyTCIp31uY7aJg==",
 			"dependencies": {
-				"@vue/runtime-core": "3.2.11",
-				"@vue/shared": "3.2.11",
+				"@vue/runtime-core": "3.2.12",
+				"@vue/shared": "3.2.12",
 				"csstype": "^2.6.8"
 			}
 		},
@@ -10151,9 +10151,9 @@
 			"integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ=="
 		},
 		"node_modules/@vue/shared": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz",
-			"integrity": "sha512-ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg=="
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.12.tgz",
+			"integrity": "sha512-5CkaifUCJwcTuru7FDwKFacPJuEoGUTw0LKSa5bw40B23s0TS+MGlYR1285nbV/ju3QUGlA6d6PD+GJkWy7uFg=="
 		},
 		"node_modules/@vue/web-component-wrapper": {
 			"version": "1.3.0",
@@ -46524,13 +46524,13 @@
 			}
 		},
 		"node_modules/vue": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.11.tgz",
-			"integrity": "sha512-JkI3/eIgfk4E0f/p319TD3EZgOwBQfftgnkRsXlT7OrRyyiyoyUXn6embPGZXSBxD3LoZ9SWhJoxLhFh5AleeA==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.12.tgz",
+			"integrity": "sha512-VV14HtubmB56uuQaSvLkJZgoocPiN8CJI3zZA9y8h7q/Z5hcknDIFkbq5d8ku0ukZ6AJPQqMsZWcq0qryF0jgg==",
 			"dependencies": {
-				"@vue/compiler-dom": "3.2.11",
-				"@vue/runtime-dom": "3.2.11",
-				"@vue/shared": "3.2.11"
+				"@vue/compiler-dom": "3.2.12",
+				"@vue/runtime-dom": "3.2.12",
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"node_modules/vue-eslint-parser": {
@@ -52565,7 +52565,7 @@
 				"@vue/cli-plugin-typescript": "4.5.13",
 				"@vue/cli-plugin-vuex": "4.5.13",
 				"@vue/cli-service": "4.5.13",
-				"@vue/compiler-sfc": "3.2.11",
+				"@vue/compiler-sfc": "3.2.12",
 				"axios": "0.21.4",
 				"base-64": "1.0.0",
 				"codemirror": "5.62.3",
@@ -52594,7 +52594,7 @@
 				"tinymce": "5.9.2",
 				"typescript": "4.4.3",
 				"vite": "2.5.7",
-				"vue": "3.2.11",
+				"vue": "3.2.12",
 				"vue-i18n": "9.1.7",
 				"vue-router": "4.0.11",
 				"vuedraggable": "4.1.0",
@@ -58704,39 +58704,39 @@
 			}
 		},
 		"@vue/compiler-core": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.11.tgz",
-			"integrity": "sha512-bcbsLx5XyQg8WDDEGwmpX0BfEfv82wIs9fWFelpyVhNRGMaABvUTalYINyfhVT+jOqNaD4JBhJiVKd/8TmsHWg==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.12.tgz",
+			"integrity": "sha512-IGJ0JmrAaAl5KBBegPAKkoXvsfDFgN/h7K1t/+0MxqpZF1fTDVUOp3tG7q9gWa7fwzGEaIsPhjtT5C3qztdLKg==",
 			"requires": {
 				"@babel/parser": "^7.15.0",
 				"@babel/types": "^7.15.0",
-				"@vue/shared": "3.2.11",
+				"@vue/shared": "3.2.12",
 				"estree-walker": "^2.0.2",
 				"source-map": "^0.6.1"
 			}
 		},
 		"@vue/compiler-dom": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz",
-			"integrity": "sha512-DNvhUHI/1Hn0/+ZYDYGAuDGasUm+XHKC3FE4GqkNCTO/fcLaJMRg/7eT1m1lkc7jPffUwwfh1rZru5mwzOjrNw==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.12.tgz",
+			"integrity": "sha512-MulvKilA2USm8ubPfvXvNY55HVTn+zHERsXeNg437TXrmM4FRCis6zjWW47QZ3ZyxEkCdqOmuiFCtXbpnuthyw==",
 			"requires": {
-				"@vue/compiler-core": "3.2.11",
-				"@vue/shared": "3.2.11"
+				"@vue/compiler-core": "3.2.12",
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"@vue/compiler-sfc": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.11.tgz",
-			"integrity": "sha512-cUIaS8mgJrQ6yucj2AupWAwBRITK3W/a8wCOn9g5fJGtOl8h4APY8vN3lzP8HIJDyEeRF3I8SfRhL+oX97kSnw==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.12.tgz",
+			"integrity": "sha512-EjzeMQ7H2ICj+JRw2buSFXTocdCg8e5yWQTlNM/6h/u68sTwMbIfiOJBFEwBhG/wCG7Nb6Nnz888AfHTU3hdrA==",
 			"requires": {
 				"@babel/parser": "^7.15.0",
 				"@babel/types": "^7.15.0",
 				"@types/estree": "^0.0.48",
-				"@vue/compiler-core": "3.2.11",
-				"@vue/compiler-dom": "3.2.11",
-				"@vue/compiler-ssr": "3.2.11",
-				"@vue/ref-transform": "3.2.11",
-				"@vue/shared": "3.2.11",
+				"@vue/compiler-core": "3.2.12",
+				"@vue/compiler-dom": "3.2.12",
+				"@vue/compiler-ssr": "3.2.12",
+				"@vue/ref-transform": "3.2.12",
+				"@vue/shared": "3.2.12",
 				"consolidate": "^0.16.0",
 				"estree-walker": "^2.0.2",
 				"hash-sum": "^2.0.0",
@@ -58833,12 +58833,12 @@
 			}
 		},
 		"@vue/compiler-ssr": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.11.tgz",
-			"integrity": "sha512-+ptAdUlFDij+Z0VGCbRRkxQlNev5LkbZAntvkxrFjc08CTMhZmiV4Js48n2hAmuSXaKNEpmGkDGU26c/vf1+xw==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.12.tgz",
+			"integrity": "sha512-sY+VbLQ17FPr1CgirnqEgY+jbC7wI5c2Ma6u8le0+b4UKMYF9urI2pybAZc1nKz6O78FWA3OSnQFxTTLppe+9Q==",
 			"requires": {
-				"@vue/compiler-dom": "3.2.11",
-				"@vue/shared": "3.2.11"
+				"@vue/compiler-dom": "3.2.12",
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"@vue/component-compiler-utils": {
@@ -58911,41 +58911,41 @@
 			"requires": {}
 		},
 		"@vue/reactivity": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.11.tgz",
-			"integrity": "sha512-hEQstxPQbgGZq5qApzrvbDmRdK1KP96O/j4XrwT8fVkT1ytkFs4fH2xNEh9QKwXfybbQkLs77W7OfXCv5o6qbA==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.12.tgz",
+			"integrity": "sha512-Lr5CTQjFm5mT/6DGnVNhptmba/Qg1DbD6eNWWmiHLMlpPt4q2ww9A2orEjVw0qNcdTJ04JLPEVAz5jhTZTCfIg==",
 			"requires": {
-				"@vue/shared": "3.2.11"
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"@vue/ref-transform": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.11.tgz",
-			"integrity": "sha512-7rX0YsfYb7+1PeKPME1tQyUQcQgt0sIXRRnPD1Vw8Zs2KIo90YLy9CrvwalcRCxGw0ScsjBEhVjJtWIT79TElg==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.12.tgz",
+			"integrity": "sha512-lS7TDda61iSf3ljokXVfN0VbOsQdmpST6MZLjxzBydFCECCJaEAr6o+K8VZ7NhUCSrl+gKXHpdXxmcvwdk66aQ==",
 			"requires": {
 				"@babel/parser": "^7.15.0",
-				"@vue/compiler-core": "3.2.11",
-				"@vue/shared": "3.2.11",
+				"@vue/compiler-core": "3.2.12",
+				"@vue/shared": "3.2.12",
 				"estree-walker": "^2.0.2",
 				"magic-string": "^0.25.7"
 			}
 		},
 		"@vue/runtime-core": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.11.tgz",
-			"integrity": "sha512-horlxjWwSvModC87WdsWswzzHE5IexmKkQA65S5vFgP5hLUBW+HRyScDeuB/RRcFmqnf+ozacNCfap0kqcpODw==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.12.tgz",
+			"integrity": "sha512-LO+ztgcmsomavYUaSq7BTteh8pmnUmvUnXUFVYdlcg3VCdYRS0ImlclpYsNHqjAk2gU+H09dr2PP0kL961xUfQ==",
 			"requires": {
-				"@vue/reactivity": "3.2.11",
-				"@vue/shared": "3.2.11"
+				"@vue/reactivity": "3.2.12",
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"@vue/runtime-dom": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.11.tgz",
-			"integrity": "sha512-cOK1g0INdiCbds2xrrJKrrN+pDHuLz6esUs/crdEiupDuX7IeiMbdqrAQCkYHp5P1KLWcbGlkmwfVD7HQGii0Q==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.12.tgz",
+			"integrity": "sha512-+NSDqivgihvoPYbKFDmzFu1tW7SOzwc7r0b7T8vsJtooVPGxwtfAFZ6wyLtteOXXrCpyTR3kpyTCIp31uY7aJg==",
 			"requires": {
-				"@vue/runtime-core": "3.2.11",
-				"@vue/shared": "3.2.11",
+				"@vue/runtime-core": "3.2.12",
+				"@vue/shared": "3.2.12",
 				"csstype": "^2.6.8"
 			},
 			"dependencies": {
@@ -58957,9 +58957,9 @@
 			}
 		},
 		"@vue/shared": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz",
-			"integrity": "sha512-ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg=="
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.12.tgz",
+			"integrity": "sha512-5CkaifUCJwcTuru7FDwKFacPJuEoGUTw0LKSa5bw40B23s0TS+MGlYR1285nbV/ju3QUGlA6d6PD+GJkWy7uFg=="
 		},
 		"@vue/web-component-wrapper": {
 			"version": "1.3.0",
@@ -87900,13 +87900,13 @@
 			}
 		},
 		"vue": {
-			"version": "3.2.11",
-			"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.11.tgz",
-			"integrity": "sha512-JkI3/eIgfk4E0f/p319TD3EZgOwBQfftgnkRsXlT7OrRyyiyoyUXn6embPGZXSBxD3LoZ9SWhJoxLhFh5AleeA==",
+			"version": "3.2.12",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-3.2.12.tgz",
+			"integrity": "sha512-VV14HtubmB56uuQaSvLkJZgoocPiN8CJI3zZA9y8h7q/Z5hcknDIFkbq5d8ku0ukZ6AJPQqMsZWcq0qryF0jgg==",
 			"requires": {
-				"@vue/compiler-dom": "3.2.11",
-				"@vue/runtime-dom": "3.2.11",
-				"@vue/shared": "3.2.11"
+				"@vue/compiler-dom": "3.2.12",
+				"@vue/runtime-dom": "3.2.12",
+				"@vue/shared": "3.2.12"
 			}
 		},
 		"vue-eslint-parser": {

From 9c53dcadf0b7fd19b2c4b8b92503bc37aaa3fa63 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Fri, 17 Sep 2021 15:57:47 -0400
Subject: [PATCH 32/45] Update changelog.md

---
 changelog.md | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 8a8b662492..6c8f620976 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,15 +2,18 @@
 
 _Changes marked with a :warning: contain potential breaking changes depending on your use of the package._
 
-## v9.0.0-rc.93 (September 16, 2021)
+## v9.0.0-rc.93 (September 17, 2021)
 
 ### :sparkles: New Features
 
 - **App**
   - [#8012](https://github.com/directus/directus/pull/8012) Move module setup to Project Settings ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7727](https://github.com/directus/directus/pull/7727) Add new translations interface ([@jaycammarano](https://github.com/jaycammarano))
 - **API**
   - [#7939](https://github.com/directus/directus/pull/7939) Add native schema migration capabilities ([@rijkvanzanten](https://github.com/rijkvanzanten))
   - [#7833](https://github.com/directus/directus/pull/7833) Add ability to customise database errors ([@smilledge](https://github.com/smilledge))
+  - [#7755](https://github.com/directus/directus/pull/7755) Make Argon2.hash parameters configurable to allow for stronger user password hashes. ([@TonyLovesDevOps](https://github.com/TonyLovesDevOps))
+  - [#7675](https://github.com/directus/directus/pull/7675) Allow custom CLI commands to be added by extensions ([@smilledge](https://github.com/smilledge))
 
 ### :rocket: Improvements
 
@@ -18,6 +21,7 @@ _Changes marked with a :warning: contain potential breaking changes depending on
   - [#7986](https://github.com/directus/directus/pull/7986) Align memcached configurations for multiple hosts ([@azrikahar](https://github.com/azrikahar))
   - [#7923](https://github.com/directus/directus/pull/7923) add spatial_ref_sys as default for DB_EXCLUDE_TABLES ([@azrikahar](https://github.com/azrikahar))
   - :warning: [#7830](https://github.com/directus/directus/pull/7830) Add custom JWTs support for static token ([@azrikahar](https://github.com/azrikahar))
+  - [#7676](https://github.com/directus/directus/pull/7676) Update logging in CLI commands ([@smilledge](https://github.com/smilledge))
 - **App**
   - [#7974](https://github.com/directus/directus/pull/7974) Prevent v-input append slot from shrinking ([@azrikahar](https://github.com/azrikahar))
   - [#7972](https://github.com/directus/directus/pull/7972) Various style updates ([@benhaynes](https://github.com/benhaynes))
@@ -27,6 +31,10 @@ _Changes marked with a :warning: contain potential breaking changes depending on
   - [#7925](https://github.com/directus/directus/pull/7925) Add possibility to translate Published, Draft and Archived strings ([@jrvidotti](https://github.com/jrvidotti))
   - [#7913](https://github.com/directus/directus/pull/7913) Enable "Format JSON Value" to display 'geometry' ([@vidhav](https://github.com/vidhav))
   - [#7902](https://github.com/directus/directus/pull/7902) remove auto-open feature for info sidebar ([@azrikahar](https://github.com/azrikahar))
+  - [#7811](https://github.com/directus/directus/pull/7811) Map selection behaviour ([@Oreilles](https://github.com/Oreilles))
+  - [#7140](https://github.com/directus/directus/pull/7140) V button color prop ([@jaycammarano](https://github.com/jaycammarano))
+- **sdk**
+  - [#7815](https://github.com/directus/directus/pull/7815) fix type for deep query with underscore prefix ([@azrikahar](https://github.com/azrikahar))
 
 ### :bug: Bug Fixes
 
@@ -43,11 +51,21 @@ _Changes marked with a :warning: contain potential breaking changes depending on
   - [#7864](https://github.com/directus/directus/pull/7864) Fix reverting to created revision ([@Nitwel](https://github.com/Nitwel))
   - [#7858](https://github.com/directus/directus/pull/7858) Fix display labels translations ([@azrikahar](https://github.com/azrikahar))
   - [#7840](https://github.com/directus/directus/pull/7840) Fix watcher loop and filters not being applied. ([@Oreilles](https://github.com/Oreilles))
+  - [#7816](https://github.com/directus/directus/pull/7816) Apply "in" to query even if array is empty ([@joselcvarela](https://github.com/joselcvarela))
+  - [#7812](https://github.com/directus/directus/pull/7812) Fix map interface controls not showing ([@Oreilles](https://github.com/Oreilles))
+  - [#7801](https://github.com/directus/directus/pull/7801) Use https for openmaptiles fonts. ([@Oreilles](https://github.com/Oreilles))
+  - [#7800](https://github.com/directus/directus/pull/7800) Fix wrong icon ([@Nitwel](https://github.com/Nitwel))
+  - [#7796](https://github.com/directus/directus/pull/7796) Fix allow false as value in filter ([@Nitwel](https://github.com/Nitwel))
+  - [#7794](https://github.com/directus/directus/pull/7794) Datetime interface "Set to now" sets seconds to 0 ([@Moeriki](https://github.com/Moeriki))
+  - [#7754](https://github.com/directus/directus/pull/7754) Fix WYSIWYG field not being cleared after "Save and Create New" ([@azrikahar](https://github.com/azrikahar))
 - **API**
   - [#8056](https://github.com/directus/directus/pull/8056) Don't flush schema cache on content update ([@rijkvanzanten](https://github.com/rijkvanzanten))
   - [#7910](https://github.com/directus/directus/pull/7910) Fix the collections column in directus_webhooks being nullable ([@nickrum](https://github.com/nickrum))
   - [#7883](https://github.com/directus/directus/pull/7883) Parse created arrays in parseFilter ([@Nitwel](https://github.com/Nitwel))
   - [#7847](https://github.com/directus/directus/pull/7847) fix default of env var EMAIL_MAILGUN_HOST ([@mooori](https://github.com/mooori))
+  - [#7820](https://github.com/directus/directus/pull/7820) make csv imports try to parse values to json ([@azrikahar](https://github.com/azrikahar))
+  - [#7816](https://github.com/directus/directus/pull/7816) Apply "in" to query even if array is empty ([@joselcvarela](https://github.com/joselcvarela))
+  - [#7814](https://github.com/directus/directus/pull/7814) Fix return error for GraphQL mutations ([@joselcvarela](https://github.com/joselcvarela))
 - **Extensions**
   - [#7978](https://github.com/directus/directus/pull/7978) Make type-only dependency versions of shared package less strict ([@nickrum](https://github.com/nickrum))
 - **drive**
@@ -66,12 +84,15 @@ _Changes marked with a :warning: contain potential breaking changes depending on
 - [#8023](https://github.com/directus/directus/pull/8023) Update cli.md: Point to update/upgrade instructions ([@cstork](https://github.com/cstork))
 - [#7967](https://github.com/directus/directus/pull/7967) Update assets.md ([@alesvaupotic](https://github.com/alesvaupotic))
 - [#7965](https://github.com/directus/directus/pull/7965) Add missing words to Database Abstraction ([@alesvaupotic](https://github.com/alesvaupotic))
+- [#7925](https://github.com/directus/directus/pull/7925) Add possibility to translate Published, Draft and Archived strings ([@jrvidotti](https://github.com/jrvidotti))
 - [#7915](https://github.com/directus/directus/pull/7915) Docs: update actions for file event ([@pgegenfurtner](https://github.com/pgegenfurtner))
 - [#7893](https://github.com/directus/directus/pull/7893) fix readme emoji ([@azrikahar](https://github.com/azrikahar))
 - [#7892](https://github.com/directus/directus/pull/7892) fix readme filename in sync-dockerhub-readme.yml ([@azrikahar](https://github.com/azrikahar))
 - [#7889](https://github.com/directus/directus/pull/7889) Add github action for syncing readme to Docker Hub ([@azrikahar](https://github.com/azrikahar))
 - [#7831](https://github.com/directus/directus/pull/7831) fix url format for Azure storage endpoint ([@azrikahar](https://github.com/azrikahar))
 - [#7821](https://github.com/directus/directus/pull/7821) fix minor typo in api-hooks.md ([@azrikahar](https://github.com/azrikahar))
+- [#7798](https://github.com/directus/directus/pull/7798) Fix incorrect database exclude tables environment variable in docs. ([@licitdev](https://github.com/licitdev))
+- [#7795](https://github.com/directus/directus/pull/7795) Update modules docs  ([@HarunKilic](https://github.com/HarunKilic))
 
 ### :package: Dependency Updates
 
@@ -117,6 +138,8 @@ _Changes marked with a :warning: contain potential breaking changes depending on
 - [#7842](https://github.com/directus/directus/pull/7842) Update vue monorepo to v3.2.9 ([@renovate[bot]](https://github.com/apps/renovate))
 - [#7835](https://github.com/directus/directus/pull/7835) Update dependency tedious to v12.2.0 ([@renovate[bot]](https://github.com/apps/renovate))
 - [#7829](https://github.com/directus/directus/pull/7829) Update dependency axios to v0.21.3 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7819](https://github.com/directus/directus/pull/7819) Update dependency knex to v0.95.11 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7817](https://github.com/directus/directus/pull/7817) Update dependency pinia to v2.0.0-rc.7 ([@renovate[bot]](https://github.com/apps/renovate))
 
 ## v9.0.0-rc.92 (September 2, 2021)
 

From 3c9d84319e2c416e51ee3010dcee53d2176413e9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 15:58:53 -0400
Subject: [PATCH 33/45] Update dependency eslint-plugin-vue to v7.18.0 (#8112)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 46cccddc2b..6f81953941 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
 				"eslint": "7.32.0",
 				"eslint-config-prettier": "8.3.0",
 				"eslint-plugin-prettier": "4.0.0",
-				"eslint-plugin-vue": "7.17.0",
+				"eslint-plugin-vue": "7.18.0",
 				"globby": "11.0.4",
 				"jest": "27.2.0",
 				"knex": "0.95.11",
@@ -18940,9 +18940,9 @@
 			}
 		},
 		"node_modules/eslint-plugin-vue": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.17.0.tgz",
-			"integrity": "sha512-Rq5R2QetDCgC+kBFQw1+aJ5B93tQ4xqZvoCUxuIzwTonngNArsdP8ChM8PowIzsJvRtWl4ltGh/bZcN3xhFWSw==",
+			"version": "7.18.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.18.0.tgz",
+			"integrity": "sha512-ceDXlXYMMPMSXw7tdKUR42w9jlzthJGJ3Kvm3YrZ0zuQfvAySNxe8sm6VHuksBW0+060GzYXhHJG6IHVOfF83Q==",
 			"dev": true,
 			"dependencies": {
 				"eslint-utils": "^2.1.0",
@@ -66342,9 +66342,9 @@
 			"requires": {}
 		},
 		"eslint-plugin-vue": {
-			"version": "7.17.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.17.0.tgz",
-			"integrity": "sha512-Rq5R2QetDCgC+kBFQw1+aJ5B93tQ4xqZvoCUxuIzwTonngNArsdP8ChM8PowIzsJvRtWl4ltGh/bZcN3xhFWSw==",
+			"version": "7.18.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.18.0.tgz",
+			"integrity": "sha512-ceDXlXYMMPMSXw7tdKUR42w9jlzthJGJ3Kvm3YrZ0zuQfvAySNxe8sm6VHuksBW0+060GzYXhHJG6IHVOfF83Q==",
 			"dev": true,
 			"requires": {
 				"eslint-utils": "^2.1.0",
diff --git a/package.json b/package.json
index d9e481523b..9cbf0de1fe 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
 		"eslint": "7.32.0",
 		"eslint-config-prettier": "8.3.0",
 		"eslint-plugin-prettier": "4.0.0",
-		"eslint-plugin-vue": "7.17.0",
+		"eslint-plugin-vue": "7.18.0",
 		"globby": "11.0.4",
 		"jest": "27.2.0",
 		"knex": "0.95.11",

From 05eeb9a08583de8f808054d8683fd6302f3456a3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 20:08:19 +0000
Subject: [PATCH 34/45] Update gatsby monorepo to v3.14.0 (#8126)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 package-lock.json                            | 384 ++++++++++++-------
 packages/gatsby-source-directus/package.json |   4 +-
 2 files changed, 239 insertions(+), 149 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6f81953941..553e40a948 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7006,7 +7006,6 @@
 			"version": "4.0.6",
 			"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
 			"integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-			"dev": true,
 			"dependencies": {
 				"defer-to-connect": "^2.0.0"
 			},
@@ -7196,7 +7195,6 @@
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
 			"integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-			"dev": true,
 			"dependencies": {
 				"@types/http-cache-semantics": "*",
 				"@types/keyv": "*",
@@ -7485,8 +7483,7 @@
 		"node_modules/@types/http-cache-semantics": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-			"integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-			"dev": true
+			"integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
 		},
 		"node_modules/@types/http-proxy": {
 			"version": "1.17.7",
@@ -7598,7 +7595,6 @@
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz",
 			"integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -7973,7 +7969,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
 			"integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-			"dev": true,
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -13368,6 +13363,7 @@
 			"version": "3.8.10",
 			"resolved": "https://registry.npmjs.org/better-queue/-/better-queue-3.8.10.tgz",
 			"integrity": "sha512-e3gwNZgDCnNWl0An0Tz6sUjKDV9m6aB+K9Xg//vYeo8+KiH8pWhLFxkawcXhm6FpM//GfD9IQv/kmvWCAVVpKA==",
+			"peer": true,
 			"dependencies": {
 				"better-queue-memory": "^1.0.1",
 				"node-eta": "^0.9.0",
@@ -13377,7 +13373,8 @@
 		"node_modules/better-queue-memory": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/better-queue-memory/-/better-queue-memory-1.0.4.tgz",
-			"integrity": "sha512-SWg5wFIShYffEmJpI6LgbL8/3Dqhku7xI1oEiy6FroP9DbcZlG0ZDjxvPdP9t7hTGW40IpIcC6zVoGT1oxjOuA=="
+			"integrity": "sha512-SWg5wFIShYffEmJpI6LgbL8/3Dqhku7xI1oEiy6FroP9DbcZlG0ZDjxvPdP9t7hTGW40IpIcC6zVoGT1oxjOuA==",
+			"peer": true
 		},
 		"node_modules/bfj": {
 			"version": "6.1.2",
@@ -14016,7 +14013,6 @@
 			"version": "7.0.2",
 			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
 			"integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-			"dev": true,
 			"dependencies": {
 				"clone-response": "^1.0.2",
 				"get-stream": "^5.1.0",
@@ -14034,7 +14030,6 @@
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
 			"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-			"dev": true,
 			"dependencies": {
 				"pump": "^3.0.0"
 			},
@@ -17151,7 +17146,6 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
 			"integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-			"dev": true,
 			"engines": {
 				"node": ">=10"
 			}
@@ -21445,15 +21439,17 @@
 			}
 		},
 		"node_modules/gatsby-core-utils": {
-			"version": "2.13.0",
-			"resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.13.0.tgz",
-			"integrity": "sha512-fkMAxiWFY8N26Iui/Wq8yfE2FY2b31bGJVtlIlSwLgfsoO7fpta64lxeivRtfpNLbAoywmWY/L8TC74GFlnuWg==",
+			"version": "2.14.0",
+			"resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.14.0.tgz",
+			"integrity": "sha512-HDMb1XMqysup9raLYWB0wIQU568R9qPounF7iAwjf2esFUVV5mdBTvxEpune/7yG0RmwhNPhgrEZo2rBHeJf7A==",
 			"dependencies": {
+				"@babel/runtime": "^7.15.4",
 				"ci-info": "2.0.0",
 				"configstore": "^5.0.1",
 				"file-type": "^16.5.3",
-				"fs-extra": "^8.1.0",
-				"node-object-hash": "^2.3.8",
+				"fs-extra": "^10.0.0",
+				"got": "^11.8.2",
+				"node-object-hash": "^2.3.9",
 				"proper-lockfile": "^4.1.2",
 				"tmp": "^0.2.1",
 				"xdg-basedir": "^4.0.0"
@@ -21462,30 +21458,90 @@
 				"node": ">=12.13.0"
 			}
 		},
+		"node_modules/gatsby-core-utils/node_modules/@sindresorhus/is": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
+			"integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/is?sponsor=1"
+			}
+		},
+		"node_modules/gatsby-core-utils/node_modules/cacheable-lookup": {
+			"version": "5.0.4",
+			"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+			"integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+			"engines": {
+				"node": ">=10.6.0"
+			}
+		},
 		"node_modules/gatsby-core-utils/node_modules/ci-info": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
 			"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
 		},
-		"node_modules/gatsby-core-utils/node_modules/fs-extra": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+		"node_modules/gatsby-core-utils/node_modules/decompress-response": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+			"integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
 			"dependencies": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
+				"mimic-response": "^3.1.0"
 			},
 			"engines": {
-				"node": ">=6 <7 || >=8"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/gatsby-core-utils/node_modules/jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-			"optionalDependencies": {
-				"graceful-fs": "^4.1.6"
+		"node_modules/gatsby-core-utils/node_modules/fs-extra": {
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+			"integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+			"dependencies": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/gatsby-core-utils/node_modules/got": {
+			"version": "11.8.2",
+			"resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
+			"integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
+			"dependencies": {
+				"@sindresorhus/is": "^4.0.0",
+				"@szmarczak/http-timer": "^4.0.5",
+				"@types/cacheable-request": "^6.0.1",
+				"@types/responselike": "^1.0.0",
+				"cacheable-lookup": "^5.0.3",
+				"cacheable-request": "^7.0.1",
+				"decompress-response": "^6.0.0",
+				"http2-wrapper": "^1.0.0-beta.5.2",
+				"lowercase-keys": "^2.0.0",
+				"p-cancelable": "^2.0.0",
+				"responselike": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=10.19.0"
+			},
+			"funding": {
+				"url": "https://github.com/sindresorhus/got?sponsor=1"
+			}
+		},
+		"node_modules/gatsby-core-utils/node_modules/mimic-response": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+			"integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/gatsby-core-utils/node_modules/tmp": {
@@ -21499,14 +21555,6 @@
 				"node": ">=8.17.0"
 			}
 		},
-		"node_modules/gatsby-core-utils/node_modules/universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-			"engines": {
-				"node": ">= 4.0.0"
-			}
-		},
 		"node_modules/gatsby-graphiql-explorer": {
 			"version": "1.13.0",
 			"resolved": "https://registry.npmjs.org/gatsby-graphiql-explorer/-/gatsby-graphiql-explorer-1.13.0.tgz",
@@ -22123,16 +22171,16 @@
 			}
 		},
 		"node_modules/gatsby-source-filesystem": {
-			"version": "3.13.0",
-			"resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-3.13.0.tgz",
-			"integrity": "sha512-SR0OFKunE4OtsZ0E7kpX6kipQcbrw3jTfROuhqD6EJPM5hkTxeEI/6I2r/bUo4ZS1rpwrEYd3UF89Q0YdAhLqQ==",
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-3.14.0.tgz",
+			"integrity": "sha512-Gg5GGxiWXhjapWMYdXOGk7zp+ajYowS+xNmaDUkL1gH+IQLvE18XbvKh00B/HiFaHm4azJfS2QRrRI/mPTZX+w==",
 			"dependencies": {
-				"@babel/runtime": "^7.14.8",
-				"better-queue": "^3.8.10",
-				"chokidar": "^3.4.3",
-				"file-type": "^16.0.0",
-				"fs-extra": "^8.1.0",
-				"gatsby-core-utils": "^2.13.0",
+				"@babel/runtime": "^7.15.4",
+				"chokidar": "^3.5.2",
+				"fastq": "^1.11.1",
+				"file-type": "^16.5.3",
+				"fs-extra": "^10.0.0",
+				"gatsby-core-utils": "^2.14.0",
 				"got": "^9.6.0",
 				"md5-file": "^5.0.0",
 				"mime": "^2.5.2",
@@ -22215,16 +22263,16 @@
 			"integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
 		},
 		"node_modules/gatsby-source-filesystem/node_modules/fs-extra": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+			"version": "10.0.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+			"integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
 			"dependencies": {
 				"graceful-fs": "^4.2.0",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=6 <7 || >=8"
+				"node": ">=12"
 			}
 		},
 		"node_modules/gatsby-source-filesystem/node_modules/get-stream": {
@@ -22272,14 +22320,6 @@
 			"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
 			"integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
 		},
-		"node_modules/gatsby-source-filesystem/node_modules/jsonfile": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-			"optionalDependencies": {
-				"graceful-fs": "^4.1.6"
-			}
-		},
 		"node_modules/gatsby-source-filesystem/node_modules/keyv": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
@@ -22336,20 +22376,12 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/gatsby-source-filesystem/node_modules/universalify": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-			"engines": {
-				"node": ">= 4.0.0"
-			}
-		},
 		"node_modules/gatsby-source-graphql": {
-			"version": "3.13.0",
-			"resolved": "https://registry.npmjs.org/gatsby-source-graphql/-/gatsby-source-graphql-3.13.0.tgz",
-			"integrity": "sha512-ckH0G94GwWXaTJWdXR4dbxm8OsWDyz/Wu4SB7L0CXurxoVePAzmkoduefVPnmq3y/CZbDv6iO3SwKYPybmtANA==",
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/gatsby-source-graphql/-/gatsby-source-graphql-3.14.0.tgz",
+			"integrity": "sha512-Tsi3CvczlwWaDpDlCTc4GgZC8hlNfEL3/0wGCQ61ygW7/2B77hvnCZxR1HlYjUKRn7S19T4G5hi4ZykPi3PFBw==",
 			"dependencies": {
-				"@babel/runtime": "^7.14.8",
+				"@babel/runtime": "^7.15.4",
 				"@graphql-tools/links": "^7.1.0",
 				"@graphql-tools/utils": "^7.7.3",
 				"@graphql-tools/wrap": "^7.0.8",
@@ -26274,6 +26306,29 @@
 				"npm": ">=1.3.7"
 			}
 		},
+		"node_modules/http2-wrapper": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+			"integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+			"dependencies": {
+				"quick-lru": "^5.1.1",
+				"resolve-alpn": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=10.19.0"
+			}
+		},
+		"node_modules/http2-wrapper/node_modules/quick-lru": {
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+			"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+			"engines": {
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -33050,7 +33105,8 @@
 		"node_modules/node-eta": {
 			"version": "0.9.0",
 			"resolved": "https://registry.npmjs.org/node-eta/-/node-eta-0.9.0.tgz",
-			"integrity": "sha1-n7CwmbzSoCGUDmA8ZCVNwAPZp6g="
+			"integrity": "sha1-n7CwmbzSoCGUDmA8ZCVNwAPZp6g=",
+			"peer": true
 		},
 		"node_modules/node-exceptions": {
 			"version": "4.0.1",
@@ -34788,7 +34844,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
 			"integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-			"dev": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -39707,6 +39762,11 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/resolve-alpn": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+			"integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
+		},
 		"node_modules/resolve-cwd": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
@@ -39808,7 +39868,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
 			"integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
-			"dev": true,
 			"dependencies": {
 				"lowercase-keys": "^2.0.0"
 			}
@@ -50495,8 +50554,8 @@
 			"dependencies": {
 				"@directus/sdk": "9.0.0-rc.93",
 				"chalk": "4.1.2",
-				"gatsby-source-filesystem": "3.13.0",
-				"gatsby-source-graphql": "3.13.0",
+				"gatsby-source-filesystem": "3.14.0",
+				"gatsby-source-graphql": "3.14.0",
 				"invariant": "2.2.4",
 				"ms": "2.1.3"
 			}
@@ -53066,8 +53125,8 @@
 			"requires": {
 				"@directus/sdk": "9.0.0-rc.93",
 				"chalk": "4.1.2",
-				"gatsby-source-filesystem": "3.13.0",
-				"gatsby-source-graphql": "3.13.0",
+				"gatsby-source-filesystem": "3.14.0",
+				"gatsby-source-graphql": "3.14.0",
 				"invariant": "2.2.4",
 				"ms": "2.1.3"
 			},
@@ -56253,7 +56312,6 @@
 			"version": "4.0.6",
 			"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
 			"integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-			"dev": true,
 			"requires": {
 				"defer-to-connect": "^2.0.0"
 			}
@@ -56423,7 +56481,6 @@
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
 			"integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-			"dev": true,
 			"requires": {
 				"@types/http-cache-semantics": "*",
 				"@types/keyv": "*",
@@ -56712,8 +56769,7 @@
 		"@types/http-cache-semantics": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-			"integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-			"dev": true
+			"integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
 		},
 		"@types/http-proxy": {
 			"version": "1.17.7",
@@ -56827,7 +56883,6 @@
 			"version": "3.1.3",
 			"resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz",
 			"integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==",
-			"dev": true,
 			"requires": {
 				"@types/node": "*"
 			}
@@ -57189,7 +57244,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
 			"integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-			"dev": true,
 			"requires": {
 				"@types/node": "*"
 			}
@@ -61616,6 +61670,7 @@
 			"version": "3.8.10",
 			"resolved": "https://registry.npmjs.org/better-queue/-/better-queue-3.8.10.tgz",
 			"integrity": "sha512-e3gwNZgDCnNWl0An0Tz6sUjKDV9m6aB+K9Xg//vYeo8+KiH8pWhLFxkawcXhm6FpM//GfD9IQv/kmvWCAVVpKA==",
+			"peer": true,
 			"requires": {
 				"better-queue-memory": "^1.0.1",
 				"node-eta": "^0.9.0",
@@ -61625,7 +61680,8 @@
 		"better-queue-memory": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/better-queue-memory/-/better-queue-memory-1.0.4.tgz",
-			"integrity": "sha512-SWg5wFIShYffEmJpI6LgbL8/3Dqhku7xI1oEiy6FroP9DbcZlG0ZDjxvPdP9t7hTGW40IpIcC6zVoGT1oxjOuA=="
+			"integrity": "sha512-SWg5wFIShYffEmJpI6LgbL8/3Dqhku7xI1oEiy6FroP9DbcZlG0ZDjxvPdP9t7hTGW40IpIcC6zVoGT1oxjOuA==",
+			"peer": true
 		},
 		"bfj": {
 			"version": "6.1.2",
@@ -62159,7 +62215,6 @@
 			"version": "7.0.2",
 			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
 			"integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-			"dev": true,
 			"requires": {
 				"clone-response": "^1.0.2",
 				"get-stream": "^5.1.0",
@@ -62174,7 +62229,6 @@
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
 					"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-					"dev": true,
 					"requires": {
 						"pump": "^3.0.0"
 					}
@@ -64692,8 +64746,7 @@
 		"defer-to-connect": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-			"integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-			"dev": true
+			"integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="
 		},
 		"define-lazy-prop": {
 			"version": "2.0.0",
@@ -69600,43 +69653,78 @@
 			}
 		},
 		"gatsby-core-utils": {
-			"version": "2.13.0",
-			"resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.13.0.tgz",
-			"integrity": "sha512-fkMAxiWFY8N26Iui/Wq8yfE2FY2b31bGJVtlIlSwLgfsoO7fpta64lxeivRtfpNLbAoywmWY/L8TC74GFlnuWg==",
+			"version": "2.14.0",
+			"resolved": "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.14.0.tgz",
+			"integrity": "sha512-HDMb1XMqysup9raLYWB0wIQU568R9qPounF7iAwjf2esFUVV5mdBTvxEpune/7yG0RmwhNPhgrEZo2rBHeJf7A==",
 			"requires": {
+				"@babel/runtime": "^7.15.4",
 				"ci-info": "2.0.0",
 				"configstore": "^5.0.1",
 				"file-type": "^16.5.3",
-				"fs-extra": "^8.1.0",
-				"node-object-hash": "^2.3.8",
+				"fs-extra": "^10.0.0",
+				"got": "^11.8.2",
+				"node-object-hash": "^2.3.9",
 				"proper-lockfile": "^4.1.2",
 				"tmp": "^0.2.1",
 				"xdg-basedir": "^4.0.0"
 			},
 			"dependencies": {
+				"@sindresorhus/is": {
+					"version": "4.2.0",
+					"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
+					"integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw=="
+				},
+				"cacheable-lookup": {
+					"version": "5.0.4",
+					"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
+					"integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="
+				},
 				"ci-info": {
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
 					"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
 				},
-				"fs-extra": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-					"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+				"decompress-response": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+					"integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
 					"requires": {
-						"graceful-fs": "^4.2.0",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
+						"mimic-response": "^3.1.0"
 					}
 				},
-				"jsonfile": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-					"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+				"fs-extra": {
+					"version": "10.0.0",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+					"integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
 					"requires": {
-						"graceful-fs": "^4.1.6"
+						"graceful-fs": "^4.2.0",
+						"jsonfile": "^6.0.1",
+						"universalify": "^2.0.0"
 					}
 				},
+				"got": {
+					"version": "11.8.2",
+					"resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz",
+					"integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==",
+					"requires": {
+						"@sindresorhus/is": "^4.0.0",
+						"@szmarczak/http-timer": "^4.0.5",
+						"@types/cacheable-request": "^6.0.1",
+						"@types/responselike": "^1.0.0",
+						"cacheable-lookup": "^5.0.3",
+						"cacheable-request": "^7.0.1",
+						"decompress-response": "^6.0.0",
+						"http2-wrapper": "^1.0.0-beta.5.2",
+						"lowercase-keys": "^2.0.0",
+						"p-cancelable": "^2.0.0",
+						"responselike": "^2.0.0"
+					}
+				},
+				"mimic-response": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+					"integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
+				},
 				"tmp": {
 					"version": "0.2.1",
 					"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
@@ -69644,11 +69732,6 @@
 					"requires": {
 						"rimraf": "^3.0.0"
 					}
-				},
-				"universalify": {
-					"version": "0.1.2",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-					"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
 				}
 			}
 		},
@@ -70146,16 +70229,16 @@
 			}
 		},
 		"gatsby-source-filesystem": {
-			"version": "3.13.0",
-			"resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-3.13.0.tgz",
-			"integrity": "sha512-SR0OFKunE4OtsZ0E7kpX6kipQcbrw3jTfROuhqD6EJPM5hkTxeEI/6I2r/bUo4ZS1rpwrEYd3UF89Q0YdAhLqQ==",
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/gatsby-source-filesystem/-/gatsby-source-filesystem-3.14.0.tgz",
+			"integrity": "sha512-Gg5GGxiWXhjapWMYdXOGk7zp+ajYowS+xNmaDUkL1gH+IQLvE18XbvKh00B/HiFaHm4azJfS2QRrRI/mPTZX+w==",
 			"requires": {
-				"@babel/runtime": "^7.14.8",
-				"better-queue": "^3.8.10",
-				"chokidar": "^3.4.3",
-				"file-type": "^16.0.0",
-				"fs-extra": "^8.1.0",
-				"gatsby-core-utils": "^2.13.0",
+				"@babel/runtime": "^7.15.4",
+				"chokidar": "^3.5.2",
+				"fastq": "^1.11.1",
+				"file-type": "^16.5.3",
+				"fs-extra": "^10.0.0",
+				"gatsby-core-utils": "^2.14.0",
 				"got": "^9.6.0",
 				"md5-file": "^5.0.0",
 				"mime": "^2.5.2",
@@ -70216,13 +70299,13 @@
 					"integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="
 				},
 				"fs-extra": {
-					"version": "8.1.0",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-					"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+					"version": "10.0.0",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+					"integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
 					"requires": {
 						"graceful-fs": "^4.2.0",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
+						"jsonfile": "^6.0.1",
+						"universalify": "^2.0.0"
 					}
 				},
 				"get-stream": {
@@ -70263,14 +70346,6 @@
 					"resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
 					"integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
 				},
-				"jsonfile": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-					"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-					"requires": {
-						"graceful-fs": "^4.1.6"
-					}
-				},
 				"keyv": {
 					"version": "3.1.0",
 					"resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
@@ -70313,20 +70388,15 @@
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
 					"integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
-				},
-				"universalify": {
-					"version": "0.1.2",
-					"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-					"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
 				}
 			}
 		},
 		"gatsby-source-graphql": {
-			"version": "3.13.0",
-			"resolved": "https://registry.npmjs.org/gatsby-source-graphql/-/gatsby-source-graphql-3.13.0.tgz",
-			"integrity": "sha512-ckH0G94GwWXaTJWdXR4dbxm8OsWDyz/Wu4SB7L0CXurxoVePAzmkoduefVPnmq3y/CZbDv6iO3SwKYPybmtANA==",
+			"version": "3.14.0",
+			"resolved": "https://registry.npmjs.org/gatsby-source-graphql/-/gatsby-source-graphql-3.14.0.tgz",
+			"integrity": "sha512-Tsi3CvczlwWaDpDlCTc4GgZC8hlNfEL3/0wGCQ61ygW7/2B77hvnCZxR1HlYjUKRn7S19T4G5hi4ZykPi3PFBw==",
 			"requires": {
-				"@babel/runtime": "^7.14.8",
+				"@babel/runtime": "^7.15.4",
 				"@graphql-tools/links": "^7.1.0",
 				"@graphql-tools/utils": "^7.7.3",
 				"@graphql-tools/wrap": "^7.0.8",
@@ -71987,6 +72057,22 @@
 				"sshpk": "^1.7.0"
 			}
 		},
+		"http2-wrapper": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
+			"integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+			"requires": {
+				"quick-lru": "^5.1.1",
+				"resolve-alpn": "^1.0.0"
+			},
+			"dependencies": {
+				"quick-lru": {
+					"version": "5.1.1",
+					"resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+					"integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
+				}
+			}
+		},
 		"https-browserify": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -77213,7 +77299,8 @@
 		"node-eta": {
 			"version": "0.9.0",
 			"resolved": "https://registry.npmjs.org/node-eta/-/node-eta-0.9.0.tgz",
-			"integrity": "sha1-n7CwmbzSoCGUDmA8ZCVNwAPZp6g="
+			"integrity": "sha1-n7CwmbzSoCGUDmA8ZCVNwAPZp6g=",
+			"peer": true
 		},
 		"node-exceptions": {
 			"version": "4.0.1",
@@ -78582,8 +78669,7 @@
 		"p-cancelable": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-			"integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-			"dev": true
+			"integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="
 		},
 		"p-defer": {
 			"version": "3.0.0",
@@ -82510,6 +82596,11 @@
 				"path-parse": "^1.0.6"
 			}
 		},
+		"resolve-alpn": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
+			"integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
+		},
 		"resolve-cwd": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
@@ -82593,7 +82684,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
 			"integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
-			"dev": true,
 			"requires": {
 				"lowercase-keys": "^2.0.0"
 			}
diff --git a/packages/gatsby-source-directus/package.json b/packages/gatsby-source-directus/package.json
index a676f0a0f3..d9f39b5ed7 100644
--- a/packages/gatsby-source-directus/package.json
+++ b/packages/gatsby-source-directus/package.json
@@ -12,8 +12,8 @@
 	"dependencies": {
 		"@directus/sdk": "9.0.0-rc.93",
 		"chalk": "4.1.2",
-		"gatsby-source-filesystem": "3.13.0",
-		"gatsby-source-graphql": "3.13.0",
+		"gatsby-source-filesystem": "3.14.0",
+		"gatsby-source-graphql": "3.14.0",
 		"invariant": "2.2.4",
 		"ms": "2.1.3"
 	},

From f7954a1650b3b0d5e846330c9395ad7276a56577 Mon Sep 17 00:00:00 2001
From: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Date: Sat, 18 Sep 2021 04:38:24 +0800
Subject: [PATCH 35/45] add error handling for image component (#8097)

---
 app/src/displays/image/image.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/displays/image/image.vue b/app/src/displays/image/image.vue
index 34dab4a194..7f3ade5a94 100644
--- a/app/src/displays/image/image.vue
+++ b/app/src/displays/image/image.vue
@@ -1,6 +1,13 @@
 <template>
-	<v-icon v-if="imgError" name="" />
-	<img v-else-if="src" :src="src" role="presentation" :alt="value && value.title" :class="{ circle }" />
+	<v-icon v-if="imageError" name="image" />
+	<img
+		v-else-if="src"
+		:src="src"
+		role="presentation"
+		:alt="value && value.title"
+		:class="{ circle }"
+		@error="imageError = true"
+	/>
 	<value-null v-else />
 </template>
 
@@ -29,7 +36,7 @@ export default defineComponent({
 		},
 	},
 	setup(props) {
-		const imgError = ref(false);
+		const imageError = ref(false);
 
 		const src = computed(() => {
 			if (props.value === null) return null;
@@ -37,7 +44,7 @@ export default defineComponent({
 			return addTokenToURL(url);
 		});
 
-		return { src, imgError };
+		return { src, imageError };
 	},
 });
 </script>

From 8e8e67a2382cd4f205b4d08e14fe6cc24962f663 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 16:38:51 -0400
Subject: [PATCH 36/45] Update dependency vite to v2.5.8 (#8095)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 app/package.json  |  2 +-
 package-lock.json | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/package.json b/app/package.json
index ad9768a047..60602001e5 100644
--- a/app/package.json
+++ b/app/package.json
@@ -95,7 +95,7 @@
 		"sass": "1.41.0",
 		"tinymce": "5.9.2",
 		"typescript": "4.4.3",
-		"vite": "2.5.7",
+		"vite": "2.5.8",
 		"vue": "3.2.12",
 		"vue-i18n": "9.1.7",
 		"vue-router": "4.0.11",
diff --git a/package-lock.json b/package-lock.json
index 553e40a948..96c985435c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -385,7 +385,7 @@
 				"sass": "1.41.0",
 				"tinymce": "5.9.2",
 				"typescript": "4.4.3",
-				"vite": "2.5.7",
+				"vite": "2.5.8",
 				"vue": "3.2.12",
 				"vue-i18n": "9.1.7",
 				"vue-router": "4.0.11",
@@ -46528,9 +46528,9 @@
 			}
 		},
 		"node_modules/vite": {
-			"version": "2.5.7",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-2.5.7.tgz",
-			"integrity": "sha512-hyUoWmRPhjN1aI+ZSBqDINKdIq7aokHE2ZXiztOg4YlmtpeQtMwMeyxv6X9YxHZmvGzg/js/eATM9Z1nwyakxg==",
+			"version": "2.5.8",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-2.5.8.tgz",
+			"integrity": "sha512-2GRsLrmMsFI0u31WTtkGbKvEIJO4I9qDltma3QiyDJEk14IzjM35OCElAFHFs2VlL7h2qX5AdHbwfEhnmwhQgw==",
 			"dev": true,
 			"dependencies": {
 				"esbuild": "^0.12.17",
@@ -52652,7 +52652,7 @@
 				"sass": "1.41.0",
 				"tinymce": "5.9.2",
 				"typescript": "4.4.3",
-				"vite": "2.5.7",
+				"vite": "2.5.8",
 				"vue": "3.2.12",
 				"vue-i18n": "9.1.7",
 				"vue-router": "4.0.11",
@@ -87948,9 +87948,9 @@
 			}
 		},
 		"vite": {
-			"version": "2.5.7",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-2.5.7.tgz",
-			"integrity": "sha512-hyUoWmRPhjN1aI+ZSBqDINKdIq7aokHE2ZXiztOg4YlmtpeQtMwMeyxv6X9YxHZmvGzg/js/eATM9Z1nwyakxg==",
+			"version": "2.5.8",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-2.5.8.tgz",
+			"integrity": "sha512-2GRsLrmMsFI0u31WTtkGbKvEIJO4I9qDltma3QiyDJEk14IzjM35OCElAFHFs2VlL7h2qX5AdHbwfEhnmwhQgw==",
 			"dev": true,
 			"requires": {
 				"esbuild": "^0.12.17",

From f712670eea898ae304e1094fe769c4c385e5825d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 16:39:09 -0400
Subject: [PATCH 37/45] Update dependency sass to v1.41.1 (#8093)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 app/package.json  |  2 +-
 package-lock.json | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/package.json b/app/package.json
index 60602001e5..4596e27be1 100644
--- a/app/package.json
+++ b/app/package.json
@@ -92,7 +92,7 @@
 		"pretty-ms": "7.0.1",
 		"qrcode": "1.4.4",
 		"rimraf": "3.0.2",
-		"sass": "1.41.0",
+		"sass": "1.41.1",
 		"tinymce": "5.9.2",
 		"typescript": "4.4.3",
 		"vite": "2.5.8",
diff --git a/package-lock.json b/package-lock.json
index 96c985435c..c149214391 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -382,7 +382,7 @@
 				"pretty-ms": "7.0.1",
 				"qrcode": "1.4.4",
 				"rimraf": "3.0.2",
-				"sass": "1.41.0",
+				"sass": "1.41.1",
 				"tinymce": "5.9.2",
 				"typescript": "4.4.3",
 				"vite": "2.5.8",
@@ -40427,9 +40427,9 @@
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"node_modules/sass": {
-			"version": "1.41.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.41.0.tgz",
-			"integrity": "sha512-wb8nT60cjo9ZZMcHzG7TzdbFtCAmHEKWrH+zAdScPb4ZxL64WQBnGdbp5nwlenW5wJPcHva1JWmVa0h6iqA5eg==",
+			"version": "1.41.1",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.41.1.tgz",
+			"integrity": "sha512-vIjX7izRxw3Wsiez7SX7D+j76v7tenfO18P59nonjr/nzCkZuoHuF7I/Fo0ZRZPKr88v29ivIdE9BqGDgQD/Nw==",
 			"dev": true,
 			"dependencies": {
 				"chokidar": ">=3.0.0 <4.0.0"
@@ -52649,7 +52649,7 @@
 				"pretty-ms": "7.0.1",
 				"qrcode": "1.4.4",
 				"rimraf": "3.0.2",
-				"sass": "1.41.0",
+				"sass": "1.41.1",
 				"tinymce": "5.9.2",
 				"typescript": "4.4.3",
 				"vite": "2.5.8",
@@ -83110,9 +83110,9 @@
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"sass": {
-			"version": "1.41.0",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.41.0.tgz",
-			"integrity": "sha512-wb8nT60cjo9ZZMcHzG7TzdbFtCAmHEKWrH+zAdScPb4ZxL64WQBnGdbp5nwlenW5wJPcHva1JWmVa0h6iqA5eg==",
+			"version": "1.41.1",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.41.1.tgz",
+			"integrity": "sha512-vIjX7izRxw3Wsiez7SX7D+j76v7tenfO18P59nonjr/nzCkZuoHuF7I/Fo0ZRZPKr88v29ivIdE9BqGDgQD/Nw==",
 			"dev": true,
 			"requires": {
 				"chokidar": ">=3.0.0 <4.0.0"

From 9fa79dd2e7d96919f37f0e0893c2d18dcf2fe2c3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 16:39:31 -0400
Subject: [PATCH 38/45] Update dependency npm to v7.24.0 (#8094)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9cbf0de1fe..ab847e496e 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,6 @@
 	},
 	"volta": {
 		"node": "16.5.0",
-		"npm": "7.23.0"
+		"npm": "7.24.0"
 	}
 }

From 09c54034f8218bce1635be72f3ffc8346f1ea1ec Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Fri, 17 Sep 2021 16:57:31 -0400
Subject: [PATCH 39/45] Update changelog.md

---
 changelog.md | 299 +++++++++++++++++++++------------------------------
 1 file changed, 120 insertions(+), 179 deletions(-)

diff --git a/changelog.md b/changelog.md
index 6c8f620976..b517c36b72 100644
--- a/changelog.md
+++ b/changelog.md
@@ -76,6 +76,22 @@ _Changes marked with a :warning: contain potential breaking changes depending on
 - **Docker**
   - [#7892](https://github.com/directus/directus/pull/7892) fix readme filename in sync-dockerhub-readme.yml ([@azrikahar](https://github.com/azrikahar))
 
+### :sponge: Optimizations
+
+- **App**
+  - [#8078](https://github.com/directus/directus/pull/8078) make i18n shared ([@Nitwel](https://github.com/Nitwel))
+  - [#8059](https://github.com/directus/directus/pull/8059) Move some compositons, utils and types to shared ([@Nitwel](https://github.com/Nitwel))
+- **Misc.**
+  - [#8062](https://github.com/directus/directus/pull/8062) Add return type to useFilterFields ([@nickrum](https://github.com/nickrum))
+- **API**
+  - [#8008](https://github.com/directus/directus/pull/8008) Fix type issue in getCacheKey ([@nickrum](https://github.com/nickrum))
+  - [#8005](https://github.com/directus/directus/pull/8005) Replace require.main check with start script ([@nickrum](https://github.com/nickrum))
+  - [#7841](https://github.com/directus/directus/pull/7841) Use node promisify in sqlite database initialization. ([@Oreilles](https://github.com/Oreilles))
+- **shared**
+  - [#7971](https://github.com/directus/directus/pull/7971) Remove unused LAYOUT_SYMBOL constant ([@nickrum](https://github.com/nickrum))
+- **Docker**
+  - [#7889](https://github.com/directus/directus/pull/7889) Add github action for syncing readme to Docker Hub ([@azrikahar](https://github.com/azrikahar))
+
 ### :memo: Documentation
 
 - [#8067](https://github.com/directus/directus/pull/8067) Make default values have consistent formatting ([@azrikahar](https://github.com/azrikahar))
@@ -141,209 +157,134 @@ _Changes marked with a :warning: contain potential breaking changes depending on
 - [#7819](https://github.com/directus/directus/pull/7819) Update dependency knex to v0.95.11 ([@renovate[bot]](https://github.com/apps/renovate))
 - [#7817](https://github.com/directus/directus/pull/7817) Update dependency pinia to v2.0.0-rc.7 ([@renovate[bot]](https://github.com/apps/renovate))
 
-## v9.0.0-rc.92 (September 2, 2021)
-
-### ⚠️ Potential Breaking Changes
-
-- Custom API endpoints no longer use a `/custom` prefix. Please update your usage of custom endpoints to drop the
-  `/custom` prefix See [#7695](https://github.com/directus/directus/pull/7695)
-- Layouts use a revised setup that relies on props instead of `useState`. See
-  [#7489](https://github.com/directus/directus/pull/7489)
+## v9.0.0-rc.92 (September 17, 2021)
 
 ### :sparkles: New Features
 
 - **API**
-  - [#7789](https://github.com/directus/directus/pull/7789) Add environment variable to force-exclude tables from
-    Directus ([@rijkvanzanten](https://github.com/rijkvanzanten))
-  - [#7777](https://github.com/directus/directus/pull/7777) Expose logger through ExtensionContext
-    ([@Moeriki](https://github.com/Moeriki))
-  - [#7759](https://github.com/directus/directus/pull/7759) Show a warning if PostGIS is missing
-    ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7789](https://github.com/directus/directus/pull/7789) Add environment variable to force-exclude tables from Directus ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7777](https://github.com/directus/directus/pull/7777) Expose logger through ExtensionContext ([@Moeriki](https://github.com/Moeriki))
+  - [#7759](https://github.com/directus/directus/pull/7759) Show a warning if PostGIS is missing ([@rijkvanzanten](https://github.com/rijkvanzanten))
 - **App**
-  - [#7605](https://github.com/directus/directus/pull/7605) Add search result highlighting to tree-view interface
-    ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7605](https://github.com/directus/directus/pull/7605) Add search result highlighting to tree-view interface ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#6643](https://github.com/directus/directus/pull/6643) Add "Edit Collection" link to Left Nav context menu ([@Kematia](https://github.com/Kematia))
+- **Extensions**
+  - [#6881](https://github.com/directus/directus/pull/6881) Add support for typescript extensions to extension-sdk ([@nickrum](https://github.com/nickrum))
 
 ### :rocket: Improvements
 
 - **App**
-  - [#7749](https://github.com/directus/directus/pull/7749) Disable attribute inheritance for all layout components
-    ([@nickrum](https://github.com/nickrum))
-  - [#7738](https://github.com/directus/directus/pull/7738) Warn the user when a collapsed group field had an error
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7687](https://github.com/directus/directus/pull/7687) Resolve editor/type warnings
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7668](https://github.com/directus/directus/pull/7668) Replace system provide with composables
-    ([@nickrum](https://github.com/nickrum))
-  - [#7650](https://github.com/directus/directus/pull/7650) Allow to select system collections in m2a
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7583](https://github.com/directus/directus/pull/7583) Display private images in WYSIWYG editor
-    ([@jaycammarano](https://github.com/jaycammarano))
-  - [#7578](https://github.com/directus/directus/pull/7578) Add `search this area` button to map layout.
-    ([@Oreilles](https://github.com/Oreilles))
-  - [#7563](https://github.com/directus/directus/pull/7563) Move basemap input higher in sidebar options. Keep map
-    interactive under v-info ([@Oreilles](https://github.com/Oreilles))
-  - [#7535](https://github.com/directus/directus/pull/7535) Allow using regular input interface on TEXT type fields
-    ([@alexkharech](https://github.com/alexkharech))
+  - [#7749](https://github.com/directus/directus/pull/7749) Disable attribute inheritance for all layout components ([@nickrum](https://github.com/nickrum))
+  - [#7738](https://github.com/directus/directus/pull/7738) Warn the user when a collapsed group field had an error ([@Nitwel](https://github.com/Nitwel))
+  - [#7687](https://github.com/directus/directus/pull/7687) Resolve editor/type warnings ([@Nitwel](https://github.com/Nitwel))
+  - [#7668](https://github.com/directus/directus/pull/7668) Replace system provide with composables ([@nickrum](https://github.com/nickrum))
+  - [#7650](https://github.com/directus/directus/pull/7650) Allow to select system collections in m2a ([@Nitwel](https://github.com/Nitwel))
+  - [#7583](https://github.com/directus/directus/pull/7583) Display private images in WYSIWYG editor ([@jaycammarano](https://github.com/jaycammarano))
+  - [#7578](https://github.com/directus/directus/pull/7578) Add `search this area` button to map layout.  ([@Oreilles](https://github.com/Oreilles))
+  - [#7563](https://github.com/directus/directus/pull/7563) Move basemap input higher in sidebar options. Keep map interactive under v-info ([@Oreilles](https://github.com/Oreilles))
+  - [#7535](https://github.com/directus/directus/pull/7535) Allow using regular input interface on TEXT type fields ([@alexkharech](https://github.com/alexkharech))
 - **Extensions**
-  - [#7714](https://github.com/directus/directus/pull/7714) Improve API extension context types
-    ([@nickrum](https://github.com/nickrum))
-  - :warning: [#7695](https://github.com/directus/directus/pull/7695) Remove /custom subpath for endpoints and add a way
-    to customize the endpoint subpath ([@nickrum](https://github.com/nickrum))
-  - [#7668](https://github.com/directus/directus/pull/7668) Replace system provide with composables
-    ([@nickrum](https://github.com/nickrum))
-  - [#7629](https://github.com/directus/directus/pull/7629) Share vue-router between App and extensions
-    ([@nickrum](https://github.com/nickrum))
-  - [#7627](https://github.com/directus/directus/pull/7627) Allow json imports and replace NODE_ENV env var when
-    building extensions ([@nickrum](https://github.com/nickrum))
+  - [#7714](https://github.com/directus/directus/pull/7714) Improve API extension context types ([@nickrum](https://github.com/nickrum))
+  - :warning: [#7695](https://github.com/directus/directus/pull/7695) Remove /custom subpath for endpoints and add a way to customize the endpoint subpath ([@nickrum](https://github.com/nickrum))
+  - [#7668](https://github.com/directus/directus/pull/7668) Replace system provide with composables ([@nickrum](https://github.com/nickrum))
+  - [#7629](https://github.com/directus/directus/pull/7629) Share vue-router between App and extensions ([@nickrum](https://github.com/nickrum))
+  - [#7627](https://github.com/directus/directus/pull/7627) Allow json imports and replace NODE_ENV env var when building extensions ([@nickrum](https://github.com/nickrum))
 - **API**
-  - [#7711](https://github.com/directus/directus/pull/7711) Remove permission.limit
-    ([@Nitwel](https://github.com/Nitwel))
-  - :warning: [#7695](https://github.com/directus/directus/pull/7695) Remove /custom subpath for endpoints and add a way
-    to customize the endpoint subpath ([@nickrum](https://github.com/nickrum))
-  - [#7604](https://github.com/directus/directus/pull/7604) Log localhost url on startup so it's clickable in terminals
-    ([@zebapy](https://github.com/zebapy))
+  - [#7711](https://github.com/directus/directus/pull/7711) Remove permission.limit ([@Nitwel](https://github.com/Nitwel))
+  - :warning: [#7695](https://github.com/directus/directus/pull/7695) Remove /custom subpath for endpoints and add a way to customize the endpoint subpath ([@nickrum](https://github.com/nickrum))
+  - [#7604](https://github.com/directus/directus/pull/7604) Log localhost url on startup so it's clickable in terminals ([@zebapy](https://github.com/zebapy))
+  - [#6923](https://github.com/directus/directus/pull/6923) Use root-relative base url for app and extensions ([@nickrum](https://github.com/nickrum))
 
 ### :bug: Bug Fixes
 
 - **App**
-  - [#7780](https://github.com/directus/directus/pull/7780) Use OpenMapTiles font instead of ArcGIS
-    ([@Oreilles](https://github.com/Oreilles))
-  - [#7778](https://github.com/directus/directus/pull/7778) Fixes bug when trying to edit geometry in code interface.
-    ([@Oreilles](https://github.com/Oreilles))
-  - [#7768](https://github.com/directus/directus/pull/7768) Fix hash link in docs module
-    ([@rijkvanzanten](https://github.com/rijkvanzanten))
-  - [#7763](https://github.com/directus/directus/pull/7763) Fix branch emitter logic from grand-to-child
-    ([@rijkvanzanten](https://github.com/rijkvanzanten))
-  - [#7760](https://github.com/directus/directus/pull/7760) Fix 'Inactive' to 'Invited' translations on user status
-    ([@joselcvarela](https://github.com/joselcvarela))
-  - [#7756](https://github.com/directus/directus/pull/7756) fix WYSIWYG field focus event
-    ([@azrikahar](https://github.com/azrikahar))
-  - [#7716](https://github.com/directus/directus/pull/7716) Fix input-code component lint style
-    ([@azrikahar](https://github.com/azrikahar))
-  - [#7712](https://github.com/directus/directus/pull/7712) Prevent generated columns edition
-    ([@Oreilles](https://github.com/Oreilles))
-  - [#7703](https://github.com/directus/directus/pull/7703) Fix alignment of collection nav grouping
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7698](https://github.com/directus/directus/pull/7698) Add permission prop check
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7697](https://github.com/directus/directus/pull/7697) Add upload event for file imports
-    ([@azrikahar](https://github.com/azrikahar))
-  - [#7684](https://github.com/directus/directus/pull/7684) Add missing translations
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7683](https://github.com/directus/directus/pull/7683) Move related values link to icon
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7682](https://github.com/directus/directus/pull/7682) Fix firefox being buggy with numbers as value inputs
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7669](https://github.com/directus/directus/pull/7669) Add missing translations
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7666](https://github.com/directus/directus/pull/7666) Fix items not getting matched properly
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7635](https://github.com/directus/directus/pull/7635) Prevent collection from crashing on unknown layout
-    ([@rijkvanzanten](https://github.com/rijkvanzanten))
-  - [#7632](https://github.com/directus/directus/pull/7632) Assign edits instead of merge
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7631](https://github.com/directus/directus/pull/7631) Fix o2m flashing / reloading when typing
-    ([@Nitwel](https://github.com/Nitwel))
+  - [#7780](https://github.com/directus/directus/pull/7780) Use OpenMapTiles font instead of ArcGIS ([@Oreilles](https://github.com/Oreilles))
+  - [#7778](https://github.com/directus/directus/pull/7778) Fixes bug when trying to edit geometry in code interface. ([@Oreilles](https://github.com/Oreilles))
+  - [#7768](https://github.com/directus/directus/pull/7768) Fix hash link in docs module ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7763](https://github.com/directus/directus/pull/7763) Fix branch emitter logic from grand-to-child ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7760](https://github.com/directus/directus/pull/7760) Fix 'Inactive' to 'Invited' translations on user status ([@joselcvarela](https://github.com/joselcvarela))
+  - [#7756](https://github.com/directus/directus/pull/7756) fix WYSIWYG field focus event ([@azrikahar](https://github.com/azrikahar))
+  - [#7716](https://github.com/directus/directus/pull/7716) Fix input-code component lint style ([@azrikahar](https://github.com/azrikahar))
+  - [#7712](https://github.com/directus/directus/pull/7712) Prevent generated columns edition ([@Oreilles](https://github.com/Oreilles))
+  - [#7703](https://github.com/directus/directus/pull/7703) Fix alignment of collection nav grouping ([@Nitwel](https://github.com/Nitwel))
+  - [#7698](https://github.com/directus/directus/pull/7698) Add permission prop check ([@Nitwel](https://github.com/Nitwel))
+  - [#7697](https://github.com/directus/directus/pull/7697) Add upload event for file imports ([@azrikahar](https://github.com/azrikahar))
+  - [#7684](https://github.com/directus/directus/pull/7684) Add missing translations ([@Nitwel](https://github.com/Nitwel))
+  - [#7683](https://github.com/directus/directus/pull/7683) Move related values link to icon ([@Nitwel](https://github.com/Nitwel))
+  - [#7682](https://github.com/directus/directus/pull/7682) Fix firefox being buggy with numbers as value inputs ([@Nitwel](https://github.com/Nitwel))
+  - [#7669](https://github.com/directus/directus/pull/7669) Add missing translations ([@Nitwel](https://github.com/Nitwel))
+  - [#7666](https://github.com/directus/directus/pull/7666) Fix items not getting matched properly ([@Nitwel](https://github.com/Nitwel))
+  - [#7635](https://github.com/directus/directus/pull/7635) Prevent collection from crashing on unknown layout ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7632](https://github.com/directus/directus/pull/7632) Assign edits instead of merge ([@Nitwel](https://github.com/Nitwel))
+  - [#7631](https://github.com/directus/directus/pull/7631) Fix o2m flashing / reloading when typing ([@Nitwel](https://github.com/Nitwel))
   - [#7628](https://github.com/directus/directus/pull/7628) Truely unref item ([@Nitwel](https://github.com/Nitwel))
-  - [#7602](https://github.com/directus/directus/pull/7602) Add mapbox-key to map interface initialization
-    ([@Oreilles](https://github.com/Oreilles))
-  - [#7599](https://github.com/directus/directus/pull/7599) Check if perms have edits
-    ([@Nitwel](https://github.com/Nitwel))
-  - [#7562](https://github.com/directus/directus/pull/7562) Fix calendar layout not opening detail pages for system
-    collections ([@azrikahar](https://github.com/azrikahar))
-  - :warning: [#7489](https://github.com/directus/directus/pull/7489) Rework layout extension component management
-    ([@nickrum](https://github.com/nickrum))
-  - Update WYSIWYG styling ([@benhaynes](https://github.com/benhaynes))
+  - [#7602](https://github.com/directus/directus/pull/7602) Add mapbox-key to map interface initialization ([@Oreilles](https://github.com/Oreilles))
+  - [#7599](https://github.com/directus/directus/pull/7599) Check if perms have edits ([@Nitwel](https://github.com/Nitwel))
+  - [#7562](https://github.com/directus/directus/pull/7562) Fix calendar layout not opening detail pages for system collections ([@azrikahar](https://github.com/azrikahar))
+  - :warning: [#7489](https://github.com/directus/directus/pull/7489) Rework layout extension component management ([@nickrum](https://github.com/nickrum))
 - **Extensions**
-  - [#7624](https://github.com/directus/directus/pull/7624) Enable browser module resolution when building app
-    extensions ([@nickrum](https://github.com/nickrum))
+  - [#7624](https://github.com/directus/directus/pull/7624) Enable browser module resolution when building app extensions ([@nickrum](https://github.com/nickrum))
 - **API**
-  - [#7581](https://github.com/directus/directus/pull/7581) Fix uploaded_by not always setting user
-    ([@rijkvanzanten](https://github.com/rijkvanzanten))
-  - [#7568](https://github.com/directus/directus/pull/7568) fix(api): merge original user object into payload from auth
-    hook ([@azrikahar](https://github.com/azrikahar))
-  - [#7561](https://github.com/directus/directus/pull/7561) Handle difference between `pg` and `postgres` as db client
-    in geometry helper ([@Oreilles](https://github.com/Oreilles))
-  - [#7553](https://github.com/directus/directus/pull/7553) Fix asset transformation `withEnlargement` type
-    ([@azrikahar](https://github.com/azrikahar))
+  - [#7581](https://github.com/directus/directus/pull/7581) Fix uploaded_by not always setting user ([@rijkvanzanten](https://github.com/rijkvanzanten))
+  - [#7568](https://github.com/directus/directus/pull/7568) fix(api): merge original user object into payload from auth hook ([@azrikahar](https://github.com/azrikahar))
+  - [#7561](https://github.com/directus/directus/pull/7561) Handle difference between `pg` and `postgres` as db client in geometry helper ([@Oreilles](https://github.com/Oreilles))
+  - [#7553](https://github.com/directus/directus/pull/7553) Fix asset transformation `withEnlargement` type ([@azrikahar](https://github.com/azrikahar))
+
+### :sponge: Optimizations
+
+- **App**
+  - [#7717](https://github.com/directus/directus/pull/7717) Use self-closing slot tags everywhere ([@nickrum](https://github.com/nickrum))
+  - [#7603](https://github.com/directus/directus/pull/7603) Make the asset url regex unambiguous ([@nickrum](https://github.com/nickrum))
+  - :warning: [#7489](https://github.com/directus/directus/pull/7489) Rework layout extension component management ([@nickrum](https://github.com/nickrum))
+- **Misc.**
+  - [#7713](https://github.com/directus/directus/pull/7713) Expose package.json from shared and extensions-sdk ([@nickrum](https://github.com/nickrum))
+  - [#7654](https://github.com/directus/directus/pull/7654) Explicitly set catch parameters to any type ([@nickrum](https://github.com/nickrum))
+  - [#7640](https://github.com/directus/directus/pull/7640) Fix typescript issues ([@nickrum](https://github.com/nickrum))
+  - [#7617](https://github.com/directus/directus/pull/7617) Fix lint warnings ([@nickrum](https://github.com/nickrum))
+- **Extensions**
+  - :warning: [#7282](https://github.com/directus/directus/pull/7282) Rename extension-sdk to extensions-sdk ([@nickrum](https://github.com/nickrum))
 
 ### :memo: Documentation
 
-- [#7771](https://github.com/directus/directus/pull/7771) tiny rewrite of operator descriptions in
-  docs/reference/filter-rules ([@definiteIymaybe](https://github.com/definiteIymaybe))
-- [#7757](https://github.com/directus/directus/pull/7757) Document usage of custom reset URL in request password in the
-  SDK ([@joselcvarela](https://github.com/joselcvarela))
-- [#7750](https://github.com/directus/directus/pull/7750) Update layout docs to new layouts system
-  ([@nickrum](https://github.com/nickrum))
-- [#7648](https://github.com/directus/directus/pull/7648) Update mentions of Vue 2 to Vue 3 in codebase-overview.md
-  ([@azrikahar](https://github.com/azrikahar))
-- [#7586](https://github.com/directus/directus/pull/7586) Add installation guide for plesk/shared hosting
-  ([@Tummerhore](https://github.com/Tummerhore))
+- [#7771](https://github.com/directus/directus/pull/7771) tiny rewrite of operator descriptions in docs/reference/filter-rules ([@definiteIymaybe](https://github.com/definiteIymaybe))
+- [#7757](https://github.com/directus/directus/pull/7757) Document usage of custom reset URL in request password in the SDK ([@joselcvarela](https://github.com/joselcvarela))
+- [#7750](https://github.com/directus/directus/pull/7750) Update layout docs to new layouts system ([@nickrum](https://github.com/nickrum))
+- [#7648](https://github.com/directus/directus/pull/7648) Update mentions of Vue 2 to Vue 3 in codebase-overview.md ([@azrikahar](https://github.com/azrikahar))
+- [#7586](https://github.com/directus/directus/pull/7586) Add installation guide for plesk/shared hosting ([@Tummerhore](https://github.com/Tummerhore))
 
 ### :package: Dependency Updates
 
-- [#7786](https://github.com/directus/directus/pull/7786) Update dependency npm to v7.22.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7785](https://github.com/directus/directus/pull/7785) Update vue monorepo to v3.2.8
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7770](https://github.com/directus/directus/pull/7770) Update dependency sass to v1.39.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7769](https://github.com/directus/directus/pull/7769) Update dependency knex-schema-inspector to v1.6.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7766](https://github.com/directus/directus/pull/7766) Update vue monorepo to v3.2.7
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7752](https://github.com/directus/directus/pull/7752) Update dependency vite to v2.5.3
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7742](https://github.com/directus/directus/pull/7742) Update dependency @types/sharp to v0.28.6
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7728](https://github.com/directus/directus/pull/7728) Update gatsby monorepo to v3.13.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7718](https://github.com/directus/directus/pull/7718) Update dependency knex-schema-inspector to v1.5.15
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7715](https://github.com/directus/directus/pull/7715) Update dependency vite to v2.5.2
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7708](https://github.com/directus/directus/pull/7708) Update dependency knex-schema-inspector to v1.5.14
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7705](https://github.com/directus/directus/pull/7705) Update dependency eslint-plugin-prettier to v4
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7704](https://github.com/directus/directus/pull/7704) Update typescript-eslint monorepo to v4.30.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7690](https://github.com/directus/directus/pull/7690) Update dependency micromark to v3
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7672](https://github.com/directus/directus/pull/7672) Update dependency sass to v1.38.2
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7656](https://github.com/directus/directus/pull/7656) update jest monorepo to v27.1.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7655](https://github.com/directus/directus/pull/7655) update dependency @types/markdown-it to v12.2.1
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7646](https://github.com/directus/directus/pull/7646) update dependency tinymce to v5.9.1
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7643](https://github.com/directus/directus/pull/7643) update dependency eslint-plugin-vue to v7.17.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7638](https://github.com/directus/directus/pull/7638) update dependency typescript to v4.4.2
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7614](https://github.com/directus/directus/pull/7614) update dependency tinymce to v5.9.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7606](https://github.com/directus/directus/pull/7606) pin dependencies
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7595](https://github.com/directus/directus/pull/7595) update dependency nock to v13.1.3
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7582](https://github.com/directus/directus/pull/7582) pin dependency @types/supertest to 2.0.11
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7580](https://github.com/directus/directus/pull/7580) update dependency @vitejs/plugin-vue to v1.6.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7579](https://github.com/directus/directus/pull/7579) update vue monorepo to v3.2.6
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7576](https://github.com/directus/directus/pull/7576) update vue monorepo to v3.2.5
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7571](https://github.com/directus/directus/pull/7571) update dependency @vitejs/plugin-vue to v1.5.0
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7570](https://github.com/directus/directus/pull/7570) update dependency vite to v2.5.1
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7558](https://github.com/directus/directus/pull/7558) update dependency sass to v1.38.1
-  ([@renovate[bot]](https://github.com/apps/renovate))
-- [#7556](https://github.com/directus/directus/pull/7556) update dependency @types/marked to v2.0.5
-  ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7786](https://github.com/directus/directus/pull/7786) Update dependency npm to v7.22.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7785](https://github.com/directus/directus/pull/7785) Update vue monorepo to v3.2.8 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7770](https://github.com/directus/directus/pull/7770) Update dependency sass to v1.39.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7769](https://github.com/directus/directus/pull/7769) Update dependency knex-schema-inspector to v1.6.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7766](https://github.com/directus/directus/pull/7766) Update vue monorepo to v3.2.7 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7752](https://github.com/directus/directus/pull/7752) Update dependency vite to v2.5.3 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7742](https://github.com/directus/directus/pull/7742) Update dependency @types/sharp to v0.28.6 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7728](https://github.com/directus/directus/pull/7728) Update gatsby monorepo to v3.13.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7718](https://github.com/directus/directus/pull/7718) Update dependency knex-schema-inspector to v1.5.15 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7715](https://github.com/directus/directus/pull/7715) Update dependency vite to v2.5.2 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7708](https://github.com/directus/directus/pull/7708) Update dependency knex-schema-inspector to v1.5.14 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7705](https://github.com/directus/directus/pull/7705) Update dependency eslint-plugin-prettier to v4 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7704](https://github.com/directus/directus/pull/7704) Update typescript-eslint monorepo to v4.30.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7690](https://github.com/directus/directus/pull/7690) Update dependency micromark to v3 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7672](https://github.com/directus/directus/pull/7672) Update dependency sass to v1.38.2 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7656](https://github.com/directus/directus/pull/7656) update jest monorepo to v27.1.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7655](https://github.com/directus/directus/pull/7655) update dependency @types/markdown-it to v12.2.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7646](https://github.com/directus/directus/pull/7646) update dependency tinymce to v5.9.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7643](https://github.com/directus/directus/pull/7643) update dependency eslint-plugin-vue to v7.17.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7638](https://github.com/directus/directus/pull/7638) update dependency typescript to v4.4.2 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7614](https://github.com/directus/directus/pull/7614) update dependency tinymce to v5.9.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7606](https://github.com/directus/directus/pull/7606) pin dependencies ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7595](https://github.com/directus/directus/pull/7595) update dependency nock to v13.1.3 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7582](https://github.com/directus/directus/pull/7582) pin dependency @types/supertest to 2.0.11 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7580](https://github.com/directus/directus/pull/7580) update dependency @vitejs/plugin-vue to v1.6.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7579](https://github.com/directus/directus/pull/7579) update vue monorepo to v3.2.6 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7576](https://github.com/directus/directus/pull/7576) update vue monorepo to v3.2.5 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7571](https://github.com/directus/directus/pull/7571) update dependency @vitejs/plugin-vue to v1.5.0 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7570](https://github.com/directus/directus/pull/7570) update dependency vite to v2.5.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7558](https://github.com/directus/directus/pull/7558) update dependency sass to v1.38.1 ([@renovate[bot]](https://github.com/apps/renovate))
+- [#7556](https://github.com/directus/directus/pull/7556) update dependency @types/marked to v2.0.5 ([@renovate[bot]](https://github.com/apps/renovate))
 
 ## v9.0.0-rc.91 (August 23, 2021)
 

From 76ce24b65e934a1870c5c2b601cda601aed1e27d Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Fri, 17 Sep 2021 16:59:50 -0400
Subject: [PATCH 40/45] New Crowdin updates (#8105)

* New translations en-US.yaml (Italian)

* New translations en-US.yaml (Italian)

* New translations en-US.yaml (Italian)
---
 app/src/lang/translations/it-IT.yaml | 40 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/src/lang/translations/it-IT.yaml b/app/src/lang/translations/it-IT.yaml
index 66c7286f86..487e55356f 100644
--- a/app/src/lang/translations/it-IT.yaml
+++ b/app/src/lang/translations/it-IT.yaml
@@ -146,7 +146,7 @@ field_validation: Convalida di Campo
 field_presets: Preset di Campo
 permissions_for_role: 'Campi che il ruolo {role} può {action}.'
 fields_for_role: 'Campi che il ruolo {role} può {action}.'
-validation_for_role: 'Regole per il campo {action} che il ruolo {role} deve rispettare.'
+validation_for_role: 'Regole per il campo che il ruolo {role} deve rispettare alla {action}.'
 presets_for_role: 'Valore predefinito del campo per il ruolo {role}.'
 presentation_and_aliases: Presentazione e Alias
 revision_post_update: Ecco come appariva questo elemento dopo l'aggiornamento.
@@ -378,7 +378,7 @@ search_items: Ricerca elementi...
 disabled: Disabilitato
 information: Informazioni
 report_bug: Segnala un Bug
-request_feature: Richiesta caratteristica
+request_feature: Richiesta funzionalità
 interface_not_found: 'Interfaccia "{interface}" non trovata.'
 reset_interface: '"Reimposta interfaccia"'
 display_not_found: 'Display "{display}" non trovato.'
@@ -398,7 +398,7 @@ csv: CSV
 no_collections: Nessuna Raccolta
 create_collection: Crea Raccolta
 no_collections_copy_admin: Non hai ancora nessuna Raccolta. Clicca sul pulsante qui sotto per iniziare.
-no_collections_copy: Non hai ancora nessuna Raccolta. Contatta il tuo l'amministratore di sistema.
+no_collections_copy: Non hai ancora nessuna Raccolta. Contatta il tuo amministratore di sistema.
 relationship_not_setup: La relazione non è stata configurata correttamente
 display_template_not_setup: L'opzione del modello di visualizzazione non è configurata correttamente
 collection_field_not_setup: L'opzione del campo della raccolta non è configurato correttamente
@@ -564,7 +564,7 @@ value_unique: Il valore deve essere unico
 all_activity: Tutte le Attività
 create_item: Crea Elemento
 display_template: Display Template
-language_display_template: Modello Visualizzazione Lingua
+language_display_template: Modello di visualizzazione della lingua
 translations_display_template: Modello Visualizzazione Traduzioni
 n_items_selected: 'Nessun Elemento Selezionato | 1 Elemento Selezionato | {n} Elementi Selezionati'
 per_page: Per Pagina
@@ -586,11 +586,11 @@ no_presets: Nessuna Preset
 no_presets_copy: Nessun preset o segnalibro sono stati ancora salvati.
 no_presets_cta: Aggiungi Preset
 presets_only: Solo Preset
-create: Creare
-on_create: Alla Creazione
-on_update: In aggiornamento
-read: Leggere
-update: Aggiornare
+create: Creazione
+on_create: Alla creazione
+on_update: Alla modifica
+read: Lettura
+update: Modifica
 select_fields: Seleziona campi
 format_text: Formato testo
 bold: Grassetto
@@ -677,7 +677,7 @@ editing_in_batch: 'Modifica batch {count} Articoli'
 no_options_available: Nessuna opzione disponibile
 settings_data_model: Modello dei dati
 settings_permissions: Ruoli e permessi
-settings_project: Impostazioni del progetto
+settings_project: Impostazioni progetto
 settings_webhooks: Webhooks
 settings_presets: Preset & Segnalibri
 one_or_more_options_are_missing: Mancano una o più opzioni
@@ -784,7 +784,7 @@ fields:
     title: Titolo
     description: Descrizione
     tags: Tag
-    location: Percorso
+    location: Posizione
     storage: Archiviazione
     filename_disk: Nome File (Disco)
     filename_download: Nome File (Download)
@@ -809,7 +809,7 @@ fields:
     email: E-mail
     password: Password
     avatar: Avatar
-    location: Percorso
+    location: Posizione
     title: Titolo
     description: Descrizione
     tags: Tag
@@ -852,7 +852,7 @@ fields:
     public_foreground: Primo Piano Pubblico
     public_background: Sfondo Pubblico
     public_note: Nota Pubblica
-    auth_password_policy: Criteri Password di accesso
+    auth_password_policy: Sicurezza della password
     auth_login_attempts: Tentativi di accesso
     files_and_thumbnails: File e miniature
     storage_default_folder: Cartella predefinita di archiviazione
@@ -914,9 +914,9 @@ field_options:
     overrides_divider_title: Personalizzazioni App
   directus_activity:
     login: Accedi
-    create: Creare
-    update: Aggiornare
-    delete: Elimina
+    create: Creazione
+    update: Modifica
+    delete: Cancellazione
   directus_collections:
     track_activity_revisions: Traccia Attività e Revisioni
     only_track_activity: Traccia solo Attività
@@ -980,9 +980,9 @@ field_options:
     status_options_inactive: Disattivato
     data_label: Invia dati evento
     triggers_divider: Trigger
-    actions_create: Creare
-    actions_update: Aggiornare
-    actions_delete: Elimina
+    actions_create: Creazione
+    actions_update: Modifica
+    actions_delete: Cancellazione
     actions_login: Accedi
 no_fields_in_collection: 'Non ci sono ancora campi in "{collection}"'
 no_value: Nessun valore
@@ -1008,7 +1008,7 @@ continue_as: >-
 editing_role: '{role} Ruolo'
 creating_webhook: Creazione Webhook
 default_label: Predefinito
-delete_label: Elimina
+delete_label: Cancellazione
 delete_are_you_sure: >-
   Questa azione è permanente e non può essere annullata. Sei sicuro di voler procedere?
 delete_field_are_you_sure: >-

From cc7394bf1d8b0ea411952127884c65871e7f6f97 Mon Sep 17 00:00:00 2001
From: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Date: Sat, 18 Sep 2021 07:16:11 +0800
Subject: [PATCH 41/45] Prevent null being converted to empty object in deepMap
 utility function (#8103)

* prevent null to empty object conversion in deepmap

* Use isObjectLike instead of explicit null check

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
---
 packages/shared/src/utils/deep-map.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/shared/src/utils/deep-map.ts b/packages/shared/src/utils/deep-map.ts
index f3b8d1070d..8741643a96 100644
--- a/packages/shared/src/utils/deep-map.ts
+++ b/packages/shared/src/utils/deep-map.ts
@@ -1,20 +1,22 @@
+import { isObjectLike } from 'lodash';
+
 export function deepMap(
-	object: Record<string, any>,
+	object: any,
 	iterator: (value: any, key: string | number) => any,
 	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	context?: any
 ): any {
 	if (Array.isArray(object)) {
 		return object.map(function (val, key) {
-			return typeof val === 'object' ? deepMap(val, iterator, context) : iterator.call(context, val, key);
+			return isObjectLike(val) ? deepMap(val, iterator, context) : iterator.call(context, val, key);
 		});
-	} else if (typeof object === 'object') {
+	} else if (isObjectLike(object)) {
 		const res: Record<string, any> = {};
 
 		for (const key in object) {
 			const val = object[key];
 
-			if (typeof val === 'object') {
+			if (isObjectLike(val)) {
 				res[key] = deepMap(val, iterator, context);
 			} else {
 				res[key] = iterator.call(context, val, key);

From 497f9cef19ab8b050cc5cb97b0ab5f7d45d8a2b8 Mon Sep 17 00:00:00 2001
From: Azri Kahar <42867097+azrikahar@users.noreply.github.com>
Date: Sat, 18 Sep 2021 07:41:44 +0800
Subject: [PATCH 42/45] Display error when image exceeds
 `ASSETS_TRANSFORM_IMAGE_MAX_DIMENSION` limit (#8069)

* display error when image exceeds transform limit

* use img error event handler

* Use generic error translations

* Fix unknown translation check

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
---
 app/src/interfaces/file-image/file-image.vue | 48 +++++++++++++++++++-
 app/src/lang/translations/en-US.yaml         |  3 +-
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/app/src/interfaces/file-image/file-image.vue b/app/src/interfaces/file-image/file-image.vue
index fb86ca50ff..a84cb550f8 100644
--- a/app/src/interfaces/file-image/file-image.vue
+++ b/app/src/interfaces/file-image/file-image.vue
@@ -7,7 +7,14 @@
 		</v-notice>
 
 		<div v-else-if="image" class="image-preview" :class="{ 'is-svg': image.type && image.type.includes('svg') }">
-			<img :src="src" alt="" role="presentation" />
+			<div v-if="imageError" class="image-error">
+				<v-icon large :name="imageError === 'UNKNOWN' ? 'error_outline' : 'info_outline'" />
+
+				<span class="message">
+					{{ t(`errors.${imageError}`) }}
+				</span>
+			</div>
+			<img v-else :src="src" alt="" role="presentation" @error="imageErrorHandler" />
 
 			<div class="shadow" />
 
@@ -85,12 +92,13 @@ export default defineComponent({
 	},
 	emits: ['input'],
 	setup(props, { emit }) {
-		const { t, n } = useI18n();
+		const { t, n, te } = useI18n();
 
 		const loading = ref(false);
 		const image = ref<Image | null>(null);
 		const lightboxActive = ref(false);
 		const editDrawerActive = ref(false);
+		const imageError = ref<string | null>(null);
 
 		const cacheBuster = ref(nanoid());
 
@@ -147,6 +155,8 @@ export default defineComponent({
 			loading,
 			image,
 			src,
+			imageError,
+			imageErrorHandler,
 			meta,
 			lightboxActive,
 			editDrawerActive,
@@ -185,6 +195,19 @@ export default defineComponent({
 			}
 		}
 
+		async function imageErrorHandler() {
+			if (!src.value) return;
+			try {
+				await api.get(src.value);
+			} catch (err: any) {
+				imageError.value = err.response?.data?.errors[0]?.extensions?.code;
+
+				if (!imageError.value || !te('errors.' + imageError.value)) {
+					imageError.value = 'UNKNOWN';
+				}
+			}
+		}
+
 		function changeCacheBuster() {
 			cacheBuster.value = nanoid();
 		}
@@ -255,6 +278,27 @@ img {
 	}
 }
 
+.image-error {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	// width: 100%;
+	height: 100%;
+	color: var(--foreground-subdued);
+	background-color: var(--background-normal);
+
+	.v-icon {
+		margin-bottom: 6px;
+	}
+
+	.message {
+		max-width: 300px;
+		padding: 0 16px;
+		text-align: center;
+	}
+}
+
 .shadow {
 	position: absolute;
 	bottom: 0;
diff --git a/app/src/lang/translations/en-US.yaml b/app/src/lang/translations/en-US.yaml
index 789a739fb5..4b0f713897 100644
--- a/app/src/lang/translations/en-US.yaml
+++ b/app/src/lang/translations/en-US.yaml
@@ -461,10 +461,11 @@ errors:
   RECORD_NOT_UNIQUE: Duplicate value detected
   USER_SUSPENDED: User Suspended
   CONTAINS_NULL_VALUES: Field contains null values
-  UNKNOWN: Unexpected Error
   UNPROCESSABLE_ENTITY: Unprocessable entity
   INTERNAL_SERVER_ERROR: Unexpected Error
   NOT_NULL_VIOLATION: Value can't be null
+  ILLEGAL_ASSET_TRANSFORMATION: Image source too large to preview
+  UNKNOWN: Unexpected Error
 security: Security
 value_hashed: Value Securely Hashed
 bookmark_name: Bookmark name...

From 89e7ee83f4d332be902d188e5dc02dab304100d4 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 17 Sep 2021 19:42:20 -0400
Subject: [PATCH 43/45] Fix linter warning

---
 packages/shared/src/utils/deep-map.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/shared/src/utils/deep-map.ts b/packages/shared/src/utils/deep-map.ts
index 8741643a96..c1ca7f13f9 100644
--- a/packages/shared/src/utils/deep-map.ts
+++ b/packages/shared/src/utils/deep-map.ts
@@ -1,6 +1,7 @@
 import { isObjectLike } from 'lodash';
 
 export function deepMap(
+	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	object: any,
 	iterator: (value: any, key: string | number) => any,
 	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types

From 4e042c641825056d381b250926089be465e8b890 Mon Sep 17 00:00:00 2001
From: Joel Bohorquez <19965325+joelbqz@users.noreply.github.com>
Date: Fri, 17 Sep 2021 20:25:46 -0500
Subject: [PATCH 44/45] Add support for custom claims before issuing a JWT.
 (#7906)

* add event auth.jwt.before

* document event auth.jwt.before

* fix event auth.jwt.before

Co-authored-by: Rijk van Zanten <rijkvanzanten@me.com>
---
 api/src/services/authentication.ts | 17 ++++++++++++++++-
 docs/guides/api-hooks.md           |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/api/src/services/authentication.ts b/api/src/services/authentication.ts
index 5f50c56951..57d703a2f5 100644
--- a/api/src/services/authentication.ts
+++ b/api/src/services/authentication.ts
@@ -160,10 +160,25 @@ export class AuthenticationService {
 			}
 		}
 
-		const payload = {
+		let payload = {
 			id: user.id,
 		};
 
+		const customClaims = await emitter.emitAsync('auth.jwt.before', payload, {
+			event: 'auth.jwt.before',
+			action: 'jwt',
+			schema: this.schema,
+			payload: payload,
+			accountability: this.accountability,
+			status: 'pending',
+			user: user?.id,
+			database: this.knex,
+		});
+
+		if (customClaims) {
+			payload = customClaims.length > 0 ? customClaims.reduce((acc, val) => merge(acc, val), payload) : payload;
+		}
+
 		/**
 		 * @TODO
 		 * Sign token with combination of server secret + user password hash
diff --git a/docs/guides/api-hooks.md b/docs/guides/api-hooks.md
index 1402449916..9493d49473 100644
--- a/docs/guides/api-hooks.md
+++ b/docs/guides/api-hooks.md
@@ -85,7 +85,7 @@ module.exports = function registerHook({ exceptions }) {
 | `response`                      |                                                             | No<sup>[1]</sup> |
 | `database.error`                | When a database error is thrown                             | No               |
 | `error`                         |                                                             | No               |
-| `auth`                          | `login`, `logout`<sup>[1]</sup> and `refresh`<sup>[1]</sup> | Optional         |
+| `auth`                          | `login`, `logout`<sup>[1]</sup>, `jwt` and `refresh`<sup>[1]</sup> | Optional         |
 | `oauth.:provider`<sup>[2]</sup> | `login` and `redirect`                                      | Optional         |
 | `items`                         | `read`<sup>[3]</sup>, `create`, `update` and `delete`       | Optional         |
 | `activity`                      | `create`, `update` and `delete`                             | Optional         |

From 5e4e96f3cde3f5f4930c9dd339365e23a2dbd569 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Fri, 17 Sep 2021 21:26:26 -0400
Subject: [PATCH 45/45] New Crowdin updates (#8128)

---
 app/src/lang/translations/ar-SA.yaml  | 2 +-
 app/src/lang/translations/bg-BG.yaml  | 2 +-
 app/src/lang/translations/ca-ES.yaml  | 2 +-
 app/src/lang/translations/de-DE.yaml  | 3 +--
 app/src/lang/translations/es-419.yaml | 2 +-
 app/src/lang/translations/es-CL.yaml  | 2 +-
 app/src/lang/translations/es-ES.yaml  | 2 +-
 app/src/lang/translations/et-EE.yaml  | 2 +-
 app/src/lang/translations/fi-FI.yaml  | 2 +-
 app/src/lang/translations/fr-FR.yaml  | 2 +-
 app/src/lang/translations/hu-HU.yaml  | 2 +-
 app/src/lang/translations/id-ID.yaml  | 2 +-
 app/src/lang/translations/it-IT.yaml  | 3 +--
 app/src/lang/translations/ja-JP.yaml  | 2 +-
 app/src/lang/translations/lt-LT.yaml  | 2 +-
 app/src/lang/translations/nl-NL.yaml  | 2 +-
 app/src/lang/translations/pl-PL.yaml  | 2 +-
 app/src/lang/translations/pt-BR.yaml  | 2 +-
 app/src/lang/translations/ru-RU.yaml  | 2 +-
 app/src/lang/translations/sl-SI.yaml  | 2 +-
 app/src/lang/translations/sr-CS.yaml  | 2 +-
 app/src/lang/translations/sv-SE.yaml  | 2 +-
 app/src/lang/translations/th-TH.yaml  | 2 +-
 app/src/lang/translations/tr-TR.yaml  | 2 +-
 app/src/lang/translations/vi-VN.yaml  | 2 +-
 app/src/lang/translations/zh-CN.yaml  | 2 +-
 app/src/lang/translations/zh-TW.yaml  | 2 +-
 27 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/app/src/lang/translations/ar-SA.yaml b/app/src/lang/translations/ar-SA.yaml
index 7b8ec80593..d6b8d1f4af 100644
--- a/app/src/lang/translations/ar-SA.yaml
+++ b/app/src/lang/translations/ar-SA.yaml
@@ -419,9 +419,9 @@ errors:
   RECORD_NOT_UNIQUE: تم اكتشاف تكرار القيمة
   USER_SUSPENDED: المستخدم موقوف
   CONTAINS_NULL_VALUES: الحقل يحتوي على قيم فارغة
-  UNKNOWN: خطأ غير متوقع
   INTERNAL_SERVER_ERROR: خطأ غير متوقع
   NOT_NULL_VIOLATION: لا يمكن أن تكون القيمة فارغة
+  UNKNOWN: خطأ غير متوقع
 security: الأمان
 value_hashed: تم تجزئة القيمة بشكل آمن
 bookmark_name: اسم الإشارة المرجعية...
diff --git a/app/src/lang/translations/bg-BG.yaml b/app/src/lang/translations/bg-BG.yaml
index 308605ad27..d39be4721f 100644
--- a/app/src/lang/translations/bg-BG.yaml
+++ b/app/src/lang/translations/bg-BG.yaml
@@ -424,10 +424,10 @@ errors:
   RECORD_NOT_UNIQUE: Вече съществува такава стойност
   USER_SUSPENDED: Потребителя е деактивиран
   CONTAINS_NULL_VALUES: Полето съдържа null стойност
-  UNKNOWN: Неочаквана грешка
   UNPROCESSABLE_ENTITY: Необработен обект
   INTERNAL_SERVER_ERROR: Неочаквана грешка
   NOT_NULL_VIOLATION: Стойността не трябва да е null
+  UNKNOWN: Неочаквана грешка
 security: Сигурност
 value_hashed: Хеширана стойност
 bookmark_name: Име на отметка...
diff --git a/app/src/lang/translations/ca-ES.yaml b/app/src/lang/translations/ca-ES.yaml
index e6d807a34e..733a1df3e4 100644
--- a/app/src/lang/translations/ca-ES.yaml
+++ b/app/src/lang/translations/ca-ES.yaml
@@ -423,10 +423,10 @@ errors:
   RECORD_NOT_UNIQUE: Valor duplicat detectat
   USER_SUSPENDED: Usuari suspès
   CONTAINS_NULL_VALUES: El camp conté valors nuls
-  UNKNOWN: Error inesperat
   UNPROCESSABLE_ENTITY: Entitat no processable
   INTERNAL_SERVER_ERROR: Error inesperat
   NOT_NULL_VIOLATION: El valor no pot ser null
+  UNKNOWN: Error inesperat
 security: Seguretat
 value_hashed: Aplicat hash segur al valor
 bookmark_name: Nom del marcador...
diff --git a/app/src/lang/translations/de-DE.yaml b/app/src/lang/translations/de-DE.yaml
index f3f6da9baa..5911a57831 100644
--- a/app/src/lang/translations/de-DE.yaml
+++ b/app/src/lang/translations/de-DE.yaml
@@ -455,10 +455,10 @@ errors:
   RECORD_NOT_UNIQUE: Doppelter Wert erkannt
   USER_SUSPENDED: Benutzer gesperrt
   CONTAINS_NULL_VALUES: Feld enthält NULL-Werte
-  UNKNOWN: Unerwarteter Fehler
   UNPROCESSABLE_ENTITY: Unverarbeitbares Objekt
   INTERNAL_SERVER_ERROR: Unerwarteter Fehler
   NOT_NULL_VIOLATION: Der Wert darf nicht leer sein
+  UNKNOWN: Unerwarteter Fehler
 security: Sicherheit
 value_hashed: Wert sicher gehashed
 bookmark_name: Name des Lesezeichens...
@@ -1064,7 +1064,6 @@ require_value_to_be_set: Wert muss gesetzt werden
 translation: Übersetzung
 value: Wert
 view_project: Projekt anzeigen
-weeks: { }
 report_error: Fehler melden
 start: Start
 interfaces:
diff --git a/app/src/lang/translations/es-419.yaml b/app/src/lang/translations/es-419.yaml
index 3cc5314c46..c2b6772d99 100644
--- a/app/src/lang/translations/es-419.yaml
+++ b/app/src/lang/translations/es-419.yaml
@@ -413,10 +413,10 @@ errors:
   RECORD_NOT_UNIQUE: Se ha detectado un valor duplicado
   USER_SUSPENDED: Usuario Suspendido
   CONTAINS_NULL_VALUES: El campo contiene valores nulos
-  UNKNOWN: Error Inesperado
   UNPROCESSABLE_ENTITY: Entidad no procesable
   INTERNAL_SERVER_ERROR: Error Inesperado
   NOT_NULL_VIOLATION: El valor no puede ser nulo
+  UNKNOWN: Error Inesperado
 value_hashed: Valor Hasheado de Manera Segura
 bookmark_name: Nombre del Marcador...
 create_bookmark: Crear Marcador
diff --git a/app/src/lang/translations/es-CL.yaml b/app/src/lang/translations/es-CL.yaml
index d375d639fc..37a4f32785 100644
--- a/app/src/lang/translations/es-CL.yaml
+++ b/app/src/lang/translations/es-CL.yaml
@@ -413,10 +413,10 @@ errors:
   RECORD_NOT_UNIQUE: Se ha detectado un valor duplicado
   USER_SUSPENDED: Usuario Suspendido
   CONTAINS_NULL_VALUES: El campo contiene valores nulos
-  UNKNOWN: Error Inesperado
   UNPROCESSABLE_ENTITY: Entidad no procesable
   INTERNAL_SERVER_ERROR: Error Inesperado
   NOT_NULL_VIOLATION: El valor no puede ser nulo
+  UNKNOWN: Error Inesperado
 value_hashed: Valor Hasheado de Manera Segura
 bookmark_name: Nombre del Marcador...
 create_bookmark: Crear Marcador
diff --git a/app/src/lang/translations/es-ES.yaml b/app/src/lang/translations/es-ES.yaml
index 259a1c24c5..84c71786fd 100644
--- a/app/src/lang/translations/es-ES.yaml
+++ b/app/src/lang/translations/es-ES.yaml
@@ -412,10 +412,10 @@ errors:
   RECORD_NOT_UNIQUE: Se ha detectado un valor duplicado
   USER_SUSPENDED: Usuario Suspendido
   CONTAINS_NULL_VALUES: El campo contiene valores nulos
-  UNKNOWN: Error Inesperado
   UNPROCESSABLE_ENTITY: Entidad no procesable
   INTERNAL_SERVER_ERROR: Error Inesperado
   NOT_NULL_VIOLATION: El valor no puede ser nulo
+  UNKNOWN: Error Inesperado
 value_hashed: Valor Hasheado de Manera Segura
 bookmark_name: Nombre del Marcador...
 create_bookmark: Crear Marcador
diff --git a/app/src/lang/translations/et-EE.yaml b/app/src/lang/translations/et-EE.yaml
index e5a40bf0f9..c305bf1963 100644
--- a/app/src/lang/translations/et-EE.yaml
+++ b/app/src/lang/translations/et-EE.yaml
@@ -401,9 +401,9 @@ errors:
   RECORD_NOT_UNIQUE: Kirje pole unikaalne
   USER_SUSPENDED: Kasutajakonto on suletud
   CONTAINS_NULL_VALUES: Väli sisaldab tühje väärtusi
-  UNKNOWN: Ootamatu viga
   INTERNAL_SERVER_ERROR: Ootamatu viga
   NOT_NULL_VIOLATION: Väärtus ei saa olla null
+  UNKNOWN: Ootamatu viga
 value_hashed: Väärtus salastati
 bookmark_name: Järjehoidja nimi...
 create_bookmark: Loo järjehoidja
diff --git a/app/src/lang/translations/fi-FI.yaml b/app/src/lang/translations/fi-FI.yaml
index 08e22b8877..c42eebc0cb 100644
--- a/app/src/lang/translations/fi-FI.yaml
+++ b/app/src/lang/translations/fi-FI.yaml
@@ -400,9 +400,9 @@ errors:
   RECORD_NOT_UNIQUE: Duplikaattiarvo havaittu
   USER_SUSPENDED: Käyttäjä jäädytetty
   CONTAINS_NULL_VALUES: Kenttä sisältää null-arvoja
-  UNKNOWN: Odottamaton virhe
   INTERNAL_SERVER_ERROR: Odottamaton virhe
   NOT_NULL_VIOLATION: Arvo ei voi olla null
+  UNKNOWN: Odottamaton virhe
 value_hashed: Arvo tiivistetty turvallisesti
 bookmark_name: Kirjanmerkin nimi...
 create_bookmark: Luo kirjanmerkki
diff --git a/app/src/lang/translations/fr-FR.yaml b/app/src/lang/translations/fr-FR.yaml
index 093360d027..e869238bbf 100644
--- a/app/src/lang/translations/fr-FR.yaml
+++ b/app/src/lang/translations/fr-FR.yaml
@@ -449,10 +449,10 @@ errors:
   RECORD_NOT_UNIQUE: Valeur dupliquée détecté
   USER_SUSPENDED: Utilisateur suspendu
   CONTAINS_NULL_VALUES: Le champ contient des valeurs nulles
-  UNKNOWN: Erreur inconnue
   UNPROCESSABLE_ENTITY: Cette entité ne peut être traitée
   INTERNAL_SERVER_ERROR: Erreur inconnue
   NOT_NULL_VIOLATION: La valeur ne peut pas être nulle
+  UNKNOWN: Erreur inconnue
 security: Sécurité
 value_hashed: Valeur hashée de manière sûre
 bookmark_name: Nom du favori...
diff --git a/app/src/lang/translations/hu-HU.yaml b/app/src/lang/translations/hu-HU.yaml
index b9d921528d..fbc3983512 100644
--- a/app/src/lang/translations/hu-HU.yaml
+++ b/app/src/lang/translations/hu-HU.yaml
@@ -423,10 +423,10 @@ errors:
   RECORD_NOT_UNIQUE: Ismétlődő értéket észleltem
   USER_SUSPENDED: Felhasználó felfüggesztve
   CONTAINS_NULL_VALUES: A mező null értékeket tartalmaz
-  UNKNOWN: Váratlan hiba történt
   UNPROCESSABLE_ENTITY: Feldolgozhatatlan entitás
   INTERNAL_SERVER_ERROR: Váratlan hiba történt
   NOT_NULL_VIOLATION: Az érték nem lehet null
+  UNKNOWN: Váratlan hiba történt
 security: Biztonság
 value_hashed: Biztonságosan hashelt érték
 bookmark_name: Könyvjelző neve...
diff --git a/app/src/lang/translations/id-ID.yaml b/app/src/lang/translations/id-ID.yaml
index 81229cb76d..ef02b0c5d1 100644
--- a/app/src/lang/translations/id-ID.yaml
+++ b/app/src/lang/translations/id-ID.yaml
@@ -398,9 +398,9 @@ errors:
   ITEM_NOT_FOUND: Item tidak ditemukan
   ROUTE_NOT_FOUND: Tidak ditemukan
   RECORD_NOT_UNIQUE: Nilai duplikat terdeteksi
-  UNKNOWN: Kesalahan Tidak Terduga
   INTERNAL_SERVER_ERROR: Kesalahan Tidak Terduga
   NOT_NULL_VIOLATION: Nilai tidak boleh kosong
+  UNKNOWN: Kesalahan Tidak Terduga
 value_hashed: Nilai telah Di-hash secara Aman
 bookmark_name: Nama bookmark...
 create_bookmark: Buat Bookmark
diff --git a/app/src/lang/translations/it-IT.yaml b/app/src/lang/translations/it-IT.yaml
index 487e55356f..a6adcbe0b8 100644
--- a/app/src/lang/translations/it-IT.yaml
+++ b/app/src/lang/translations/it-IT.yaml
@@ -455,10 +455,10 @@ errors:
   RECORD_NOT_UNIQUE: Rilevato valore duplicato
   USER_SUSPENDED: Utente sospeso
   CONTAINS_NULL_VALUES: Il campo contiene valori nulli
-  UNKNOWN: Errore Imprevisto
   UNPROCESSABLE_ENTITY: Entità non elaborabile
   INTERNAL_SERVER_ERROR: Errore Imprevisto
   NOT_NULL_VIOLATION: Il valore non può essere nullo
+  UNKNOWN: Errore Imprevisto
 security: Sicurezza
 value_hashed: Valore cifrato in sicurezza
 bookmark_name: Nome segnalibro...
@@ -1064,7 +1064,6 @@ require_value_to_be_set: Richiedi di impostare il valore
 translation: Traduzione
 value: Valore
 view_project: Visualizza Progetto
-weeks: { }
 report_error: Segnala l'errore
 start: Inizio
 interfaces:
diff --git a/app/src/lang/translations/ja-JP.yaml b/app/src/lang/translations/ja-JP.yaml
index 2a421e798c..a36f79eefe 100644
--- a/app/src/lang/translations/ja-JP.yaml
+++ b/app/src/lang/translations/ja-JP.yaml
@@ -201,8 +201,8 @@ errors:
   ITEM_NOT_FOUND: アイテムが見つかりませんでした。
   ROUTE_NOT_FOUND: 見つかりません
   RECORD_NOT_UNIQUE: 重複値が検出されました
-  UNKNOWN: 予期しないエラーが発生しました
   INTERNAL_SERVER_ERROR: 予期しないエラーが発生しました
+  UNKNOWN: 予期しないエラーが発生しました
 bookmark_name: ブックマーク名
 create_bookmark: ブックマークを作成
 edit_bookmark: ブックマークを編集
diff --git a/app/src/lang/translations/lt-LT.yaml b/app/src/lang/translations/lt-LT.yaml
index c796cf7cd7..4931ed0d19 100644
--- a/app/src/lang/translations/lt-LT.yaml
+++ b/app/src/lang/translations/lt-LT.yaml
@@ -391,9 +391,9 @@ errors:
   ITEM_LIMIT_REACHED: Pasiektas elementų limitas
   ITEM_NOT_FOUND: Elementas nerastas
   ROUTE_NOT_FOUND: Nerasta
-  UNKNOWN: Nenumatyta klaida
   INTERNAL_SERVER_ERROR: Nenumatyta klaida
   NOT_NULL_VIOLATION: Reikšmė negali būti null
+  UNKNOWN: Nenumatyta klaida
 value_hashed: Reikšmė saugiai išsaugota
 bookmark_name: Žymės pavadinimas...
 create_bookmark: Kurti žymę
diff --git a/app/src/lang/translations/nl-NL.yaml b/app/src/lang/translations/nl-NL.yaml
index acde4a6b2f..c92eba57a1 100644
--- a/app/src/lang/translations/nl-NL.yaml
+++ b/app/src/lang/translations/nl-NL.yaml
@@ -413,10 +413,10 @@ errors:
   RECORD_NOT_UNIQUE: Verdubbelde waarde gedetecteerd
   USER_SUSPENDED: Gebruiker geschorst
   CONTAINS_NULL_VALUES: Veld bevat NULL waarden
-  UNKNOWN: Onverwachte fout
   UNPROCESSABLE_ENTITY: Onverwerkbare entiteit
   INTERNAL_SERVER_ERROR: Onverwachte fout
   NOT_NULL_VIOLATION: Waarde kan niet "null" zijn
+  UNKNOWN: Onverwachte fout
 value_hashed: Waarde veilig opgeslagen
 bookmark_name: Bladwijzer naam...
 create_bookmark: Bladwijzer aanmaken
diff --git a/app/src/lang/translations/pl-PL.yaml b/app/src/lang/translations/pl-PL.yaml
index b06c29cdc0..67a27c3993 100644
--- a/app/src/lang/translations/pl-PL.yaml
+++ b/app/src/lang/translations/pl-PL.yaml
@@ -420,9 +420,9 @@ errors:
   RECORD_NOT_UNIQUE: Wykryto zduplikowaną wartość
   USER_SUSPENDED: Użytkownik zawieszony
   CONTAINS_NULL_VALUES: Pole zawiera pustą wartość (Null)
-  UNKNOWN: Nieoczekiwany błąd
   INTERNAL_SERVER_ERROR: Nieoczekiwany błąd
   NOT_NULL_VIOLATION: Wartość nie może być pusta
+  UNKNOWN: Nieoczekiwany błąd
 value_hashed: Wartość bezpiecznie zakodowana
 bookmark_name: Nazwa zakładki...
 create_bookmark: Utwórz zakładkę
diff --git a/app/src/lang/translations/pt-BR.yaml b/app/src/lang/translations/pt-BR.yaml
index 08b13d2460..65f588a309 100644
--- a/app/src/lang/translations/pt-BR.yaml
+++ b/app/src/lang/translations/pt-BR.yaml
@@ -424,10 +424,10 @@ errors:
   RECORD_NOT_UNIQUE: Valor duplicado detectado
   USER_SUSPENDED: Usuário suspenso
   CONTAINS_NULL_VALUES: O campo contém valores nulos
-  UNKNOWN: Erro inesperado
   UNPROCESSABLE_ENTITY: Entidade não processável
   INTERNAL_SERVER_ERROR: Erro inesperado
   NOT_NULL_VIOLATION: Valor não pode ser nulo
+  UNKNOWN: Erro inesperado
 security: Segurança
 value_hashed: Valor secretamente salvo em hash
 bookmark_name: Nome do marcador...
diff --git a/app/src/lang/translations/ru-RU.yaml b/app/src/lang/translations/ru-RU.yaml
index 8907ba6810..be20055bfa 100644
--- a/app/src/lang/translations/ru-RU.yaml
+++ b/app/src/lang/translations/ru-RU.yaml
@@ -455,10 +455,10 @@ errors:
   RECORD_NOT_UNIQUE: Обнаружен дубликат значения
   USER_SUSPENDED: Пользователь заблокирован
   CONTAINS_NULL_VALUES: Поле содержит значения null
-  UNKNOWN: Неожиданная Ошибка
   UNPROCESSABLE_ENTITY: Необрабатываемый объект
   INTERNAL_SERVER_ERROR: Неожиданная Ошибка
   NOT_NULL_VIOLATION: Значение не может быть null
+  UNKNOWN: Неожиданная Ошибка
 security: Безопасность
 value_hashed: Значение Безопасно Хэшировано
 bookmark_name: Название закладки...
diff --git a/app/src/lang/translations/sl-SI.yaml b/app/src/lang/translations/sl-SI.yaml
index ce989cd837..55e7cacf17 100644
--- a/app/src/lang/translations/sl-SI.yaml
+++ b/app/src/lang/translations/sl-SI.yaml
@@ -424,10 +424,10 @@ errors:
   RECORD_NOT_UNIQUE: Vrednost ni edinstvena (že obstaja)
   USER_SUSPENDED: Uporabnik suspendiran
   CONTAINS_NULL_VALUES: Polje vsebuje nične vrednosti
-  UNKNOWN: Nepričakovana napaka
   UNPROCESSABLE_ENTITY: Obdelava nemogoča
   INTERNAL_SERVER_ERROR: Nepričakovana napaka
   NOT_NULL_VIOLATION: Vrednost ne sme biti nična
+  UNKNOWN: Nepričakovana napaka
 security: Varnost
 value_hashed: Vrednost varno zgoščena
 bookmark_name: Ime zaznamka ...
diff --git a/app/src/lang/translations/sr-CS.yaml b/app/src/lang/translations/sr-CS.yaml
index 1dc680808a..90aebd226c 100644
--- a/app/src/lang/translations/sr-CS.yaml
+++ b/app/src/lang/translations/sr-CS.yaml
@@ -401,9 +401,9 @@ errors:
   RECORD_NOT_UNIQUE: Detektovana je dupla vrijednost
   USER_SUSPENDED: Suspendovan Korisnik
   CONTAINS_NULL_VALUES: Polje sadrži null vrijednosti
-  UNKNOWN: Neočekivana greška
   INTERNAL_SERVER_ERROR: Neočekivana greška
   NOT_NULL_VIOLATION: Vrijednost ne može biti null
+  UNKNOWN: Neočekivana greška
 value_hashed: Vrijednost je Sigurno Skladištena
 bookmark_name: Naziv oznake...
 create_bookmark: Napravi Oznaku
diff --git a/app/src/lang/translations/sv-SE.yaml b/app/src/lang/translations/sv-SE.yaml
index 4ff52c33ef..7a3ba0ca32 100644
--- a/app/src/lang/translations/sv-SE.yaml
+++ b/app/src/lang/translations/sv-SE.yaml
@@ -388,9 +388,9 @@ errors:
   ROUTE_NOT_FOUND: Hittades inte
   RECORD_NOT_UNIQUE: Duplicerat värde upptäckt
   USER_SUSPENDED: Användare avstängd
-  UNKNOWN: Oväntat fel
   INTERNAL_SERVER_ERROR: Oväntat fel
   NOT_NULL_VIOLATION: Värdet kan inte vara null
+  UNKNOWN: Oväntat fel
 value_hashed: Värde säkert hashat
 bookmark_name: Bokmärkesnamn...
 create_bookmark: Skapa bokmärke
diff --git a/app/src/lang/translations/th-TH.yaml b/app/src/lang/translations/th-TH.yaml
index ed68eb2e56..2f953663a0 100644
--- a/app/src/lang/translations/th-TH.yaml
+++ b/app/src/lang/translations/th-TH.yaml
@@ -447,10 +447,10 @@ errors:
   RECORD_NOT_UNIQUE: พบค่าที่ซ้ำกัน
   USER_SUSPENDED: ผู้ใช้ถูกระงับ
   CONTAINS_NULL_VALUES: ฟิลด์มีค่าว่าง
-  UNKNOWN: พบข้อผิดพลาดบางอย่างที่ไม่คาดคิด
   UNPROCESSABLE_ENTITY: เอ็นติตี้ที่ประมวลผลไม่ได้
   INTERNAL_SERVER_ERROR: พบข้อผิดพลาดบางอย่างที่ไม่คาดคิด
   NOT_NULL_VIOLATION: ต้องไม่เป็นค่า null
+  UNKNOWN: พบข้อผิดพลาดบางอย่างที่ไม่คาดคิด
 security: ความปลอดภัย
 value_hashed: ข้อมูลถูกเข้ารหัสไว้อย่างปลอดภัย
 bookmark_name: ชื่อบุ๊กมาร์ก...
diff --git a/app/src/lang/translations/tr-TR.yaml b/app/src/lang/translations/tr-TR.yaml
index 84e3cdc47f..630dbe07a1 100644
--- a/app/src/lang/translations/tr-TR.yaml
+++ b/app/src/lang/translations/tr-TR.yaml
@@ -377,9 +377,9 @@ errors:
   RECORD_NOT_UNIQUE: Kopya değer tespit edildi
   USER_SUSPENDED: Kullanıcı Askıya Alındı
   CONTAINS_NULL_VALUES: Alan null değer içeriyor
-  UNKNOWN: Beklenmeyen hata
   INTERNAL_SERVER_ERROR: Beklenmeyen hata
   NOT_NULL_VIOLATION: Değer null olamaz
+  UNKNOWN: Beklenmeyen hata
 value_hashed: Değer Güvenli Şekilde Hashlendi
 bookmark_name: Yer imi adı...
 create_bookmark: Yer imi oluştur
diff --git a/app/src/lang/translations/vi-VN.yaml b/app/src/lang/translations/vi-VN.yaml
index 0160e08aac..6c92ceb124 100644
--- a/app/src/lang/translations/vi-VN.yaml
+++ b/app/src/lang/translations/vi-VN.yaml
@@ -327,9 +327,9 @@ errors:
   ITEM_LIMIT_REACHED: Đạt mức giới hạn của bản ghi
   ITEM_NOT_FOUND: Bản ghi không tồn tại
   ROUTE_NOT_FOUND: Không tìm thấy
-  UNKNOWN: Lỗi Bất Thường
   INTERNAL_SERVER_ERROR: Lỗi Bất Thường
   NOT_NULL_VIOLATION: Dữ liệu không thể là null
+  UNKNOWN: Lỗi Bất Thường
 value_hashed: Dữ Liệu Mã Hóa An Toàn
 bookmark_name: Tên Dấu trang...
 create_bookmark: Tạo Dấu trang
diff --git a/app/src/lang/translations/zh-CN.yaml b/app/src/lang/translations/zh-CN.yaml
index 2506a68c2e..342314c886 100644
--- a/app/src/lang/translations/zh-CN.yaml
+++ b/app/src/lang/translations/zh-CN.yaml
@@ -445,10 +445,10 @@ errors:
   RECORD_NOT_UNIQUE: 检测到重复的值
   USER_SUSPENDED: 用户已禁用
   CONTAINS_NULL_VALUES: 字段包含空值
-  UNKNOWN: 未知错误
   UNPROCESSABLE_ENTITY: 不可处理的实体
   INTERNAL_SERVER_ERROR: 未知错误
   NOT_NULL_VIOLATION: 值不能为null
+  UNKNOWN: 未知错误
 security: 安全
 value_hashed: 哈希值
 bookmark_name: 书签名称
diff --git a/app/src/lang/translations/zh-TW.yaml b/app/src/lang/translations/zh-TW.yaml
index 807923e800..448164667f 100644
--- a/app/src/lang/translations/zh-TW.yaml
+++ b/app/src/lang/translations/zh-TW.yaml
@@ -303,9 +303,9 @@ errors:
   INVALID_QUERY: 無效的查詢
   ITEM_NOT_FOUND: 找不到項目
   ROUTE_NOT_FOUND: 找不到
-  UNKNOWN: 未預期的錯誤
   INTERNAL_SERVER_ERROR: 未預期的錯誤
   NOT_NULL_VIOLATION: 值不能為null
+  UNKNOWN: 未預期的錯誤
 bookmark_name: 書籤名稱...
 create_bookmark: 建立書籤
 edit_bookmark: 編輯書籤