The Great TypeScript Modernization Program Season 3 Episode 6: The Big One (#18014)

* Step 1 * Step 2 * False sense of confidence * Couple more before dinner * Update schema package * Update format-title * Upgrade specs file * Close * Replace ts-node-dev with tsx, and various others * Replace lodash with lodash-es * Add lodash-es types * Update knex import * More fun is had * FSE * Consolidate repos * Various tweaks and fixes * Fix specs * Remove dependency on knex-schema-inspector * Fix wrong imports of inspector * Move shared exceptions to new package * Move constants to separate module * Move types to new types package * Use directus/types * I believe this is no longer needed * [WIP] Start moving utils to esm * ESMify Shared * Move shared utils to @directus/utils * Use @directus/utils instead of @directus/shared/utils * It runs! * Use correct schemaoverview type * Fix imports * Fix the thing * Start on new update-checker lib * Use new update-check package * Swap out directus/shared in app * Pushing through the last bits now * Dangerously make extensions SDK ESM * Use @directus/types in tests * Copy util function to test * Fix linter config * Add missing import * Hot takes * Fix build * Curse these default exports * No tests in constants * Add tests * Remove tests from types * Add tests for exceptions * Fix test * Fix app tests * Fix import in test * Fix various tests * Fix specs export * Some more tests * Remove broken integration tests These were broken beyond repair.. They were also written before we really knew what we we're doing with tests, so I think it's better to say goodbye and start over with these * Regenerate lockfile * Fix imports from merge * I create my own problems * Make sharp play nice * Add vitest config * Install missing blackbox dep * Consts shouldn't be in types tsk tsk tsk tsk * Fix type/const usage in extensions-sdk * cursed.default * Reduce circular deps * Fix circular dep in items service * vvv * Trigger testing for all vendors * Add workaround for rollup * Prepend the file protocol for the ESM loader to be compatible with Windows "WARN: Only URLs with a scheme in: file and data are supported by the default ESM loader. On Windows, absolute paths must be valid file:// URLs. Received protocol 'c:'" * Fix postgres * Schema package updates Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> * Resolve cjs/mjs extensions * Clean-up eslint config * fixed extension concatination * using string interpolation for consistency * Revert MySQL optimisation * Revert testing for all vendors * Replace tsx with esbuild-kit/esm-loader Is a bit faster and we can rely on the built-in `watch` and `inspect` functionalities of Node.js Note: The possibility to watch other files (.env in our case) might be added in the future, see https://github.com/nodejs/node/issues/45467 * Use exact version for esbuild-kit/esm-loader * Fix import --------- Co-authored-by: ian <licitdev@gmail.com> Co-authored-by: Brainslug <tim@brainslug.nl> Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> Co-authored-by: Pascal Jufer <pascal-jufer@bluewin.ch>
2026-02-11 18:24:56 -05:00 · 2023-04-04 17:41:56 -04:00
parent 517e7cb55c
commit 2983e61870
1006 changed files with 6366 additions and 7082 deletions
--- a/app/src/modules/activity/components/navigation.vue
+++ b/app/src/modules/activity/components/navigation.vue
@@ -95,7 +95,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, PropType } from 'vue';
 import { useUserStore } from '@/stores/user';
-import { Filter } from '@directus/shared/types';
+import { Filter } from '@directus/types';

 export default defineComponent({
 	props: {
--- a/app/src/modules/activity/index.ts
+++ b/app/src/modules/activity/index.ts
@@ -1,4 +1,4 @@
-import { defineModule } from '@directus/shared/utils';
+import { defineModule } from '@directus/utils';
 import ActivityCollection from './routes/collection.vue';
 import ActivityItem from './routes/item.vue';

--- a/app/src/modules/activity/routes/collection.vue
+++ b/app/src/modules/activity/routes/collection.vue
@@ -64,11 +64,11 @@ import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, ref } from 'vue';
 import ActivityNavigation from '../components/navigation.vue';
 import { usePreset } from '@/composables/use-preset';
-import { useLayout } from '@directus/shared/composables';
+import { useLayout } from '@directus/composables';
 import LayoutSidebarDetail from '@/views/private/components/layout-sidebar-detail.vue';
 import SearchInput from '@/views/private/components/search-input.vue';
-import { Filter } from '@directus/shared/types';
-import { mergeFilters } from '@directus/shared/utils';
+import { Filter } from '@directus/types';
+import { mergeFilters } from '@directus/utils';

 export default defineComponent({
 	name: 'ActivityCollection',
--- a/app/src/modules/content/components/navigation-bookmark.vue
+++ b/app/src/modules/content/components/navigation-bookmark.vue
@@ -90,7 +90,7 @@ import { usePresetsStore } from '@/stores/presets';
 import { useUserStore } from '@/stores/user';
 import { translate } from '@/utils/translate-literal';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { Preset } from '@directus/shared/types';
+import { Preset } from '@directus/types';
 import { computed, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
--- a/app/src/modules/content/components/navigation-item.vue
+++ b/app/src/modules/content/components/navigation-item.vue
@@ -60,7 +60,7 @@
 <script lang="ts">
 import { defineComponent, PropType, computed } from 'vue';
 import { Collection } from '@/types/collections';
-import { Preset } from '@directus/shared/types';
+import { Preset } from '@directus/types';
 import { useUserStore } from '@/stores/user';
 import { useCollectionsStore } from '@/stores/collections';
 import { usePresetsStore } from '@/stores/presets';
--- a/app/src/modules/content/index.ts
+++ b/app/src/modules/content/index.ts
@@ -1,4 +1,4 @@
-import { defineModule } from '@directus/shared/utils';
+import { defineModule } from '@directus/utils';
 import { addQueryToPath } from '@/utils/add-query-to-path';
 import RouterPass from '@/utils/router-passthrough';
 import { LocationQuery, NavigationGuard } from 'vue-router';
@@ -7,7 +7,7 @@ import Item from './routes/item.vue';
 import ItemNotFound from './routes/not-found.vue';
 import NoCollections from './routes/no-collections.vue';
 import { useCollectionsStore } from '@/stores/collections';
-import { Collection } from '@directus/shared/types';
+import { Collection } from '@directus/types';
 import { orderBy, isNil } from 'lodash';
 import { useNavigation } from './composables/use-navigation';
 import { useLocalStorage } from '@/composables/use-local-storage';
--- a/app/src/modules/content/routes/collection.vue
+++ b/app/src/modules/content/routes/collection.vue
@@ -281,7 +281,7 @@ import { defineComponent, computed, ref, watch, toRefs } from 'vue';
 import ContentNavigation from '../components/navigation.vue';
 import api from '@/api';
 import ContentNotFound from './not-found.vue';
-import { useCollection, useLayout } from '@directus/shared/composables';
+import { useCollection, useLayout } from '@directus/composables';
 import { usePreset } from '@/composables/use-preset';
 import LayoutSidebarDetail from '@/views/private/components/layout-sidebar-detail.vue';
 import ArchiveSidebarDetail from '@/views/private/components/archive-sidebar-detail.vue';
@@ -295,8 +295,8 @@ import { usePermissionsStore } from '@/stores/permissions';
 import { useUserStore } from '@/stores/user';
 import DrawerBatch from '@/views/private/components/drawer-batch.vue';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { mergeFilters } from '@directus/shared/utils';
-import { Filter } from '@directus/shared/types';
+import { mergeFilters } from '@directus/utils';
+import { Filter } from '@directus/types';
 import { useExtension } from '@/composables/use-extension';

 type Item = {
--- a/app/src/modules/content/routes/item.vue
+++ b/app/src/modules/content/routes/item.vue
@@ -231,7 +231,7 @@ import FlowSidebarDetail from '@/views/private/components/flow-sidebar-detail.vu
 import RevisionsDrawerDetail from '@/views/private/components/revisions-drawer-detail.vue';
 import SaveOptions from '@/views/private/components/save-options.vue';
 import SharesSidebarDetail from '@/views/private/components/shares-sidebar-detail.vue';
-import { useCollection } from '@directus/shared/composables';
+import { useCollection } from '@directus/composables';
 import { useRouter } from 'vue-router';
 import ContentNavigation from '../components/navigation.vue';
 import ContentNotFound from './not-found.vue';
--- a/app/src/modules/files/index.ts
+++ b/app/src/modules/files/index.ts
@@ -1,4 +1,4 @@
-import { defineModule } from '@directus/shared/utils';
+import { defineModule } from '@directus/utils';
 import AddNew from './routes/add-new.vue';
 import Collection from './routes/collection.vue';
 import Item from './routes/item.vue';
--- a/app/src/modules/files/routes/collection.vue
+++ b/app/src/modules/files/routes/collection.vue
@@ -202,12 +202,12 @@ import { usePermissionsStore } from '@/stores/permissions';
 import { subDays } from 'date-fns';
 import { useFolders, Folder } from '@/composables/use-folders';
 import { useEventListener } from '@/composables/use-event-listener';
-import { useLayout } from '@directus/shared/composables';
+import { useLayout } from '@directus/composables';
 import { uploadFiles } from '@/utils/upload-files';
 import { unexpectedError } from '@/utils/unexpected-error';
 import DrawerBatch from '@/views/private/components/drawer-batch.vue';
-import { Filter } from '@directus/shared/types';
-import { mergeFilters } from '@directus/shared/utils';
+import { Filter } from '@directus/types';
+import { mergeFilters } from '@directus/utils';

 type Item = {
 	[field: string]: any;
--- a/app/src/modules/files/routes/item.vue
+++ b/app/src/modules/files/routes/item.vue
@@ -196,7 +196,7 @@ import FolderPicker from '@/views/private/components/folder-picker.vue';
 import ImageEditor from '@/views/private/components/image-editor.vue';
 import RevisionsDrawerDetail from '@/views/private/components/revisions-drawer-detail.vue';
 import SaveOptions from '@/views/private/components/save-options.vue';
-import { Field } from '@directus/shared/types';
+import { Field } from '@directus/types';
 import { computed, ref, toRefs, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
--- a/app/src/modules/index.ts
+++ b/app/src/modules/index.ts
@@ -2,7 +2,7 @@ import { router } from '@/router';
 import { usePermissionsStore } from '@/stores/permissions';
 import { useUserStore } from '@/stores/user';
 import RouterPass from '@/utils/router-passthrough';
-import { ModuleConfig } from '@directus/shared/types';
+import { ModuleConfig } from '@directus/types';
 import { ShallowRef, shallowRef } from 'vue';
 import { sortBy } from 'lodash';

--- a/app/src/modules/insights/index.ts
+++ b/app/src/modules/insights/index.ts
@@ -1,7 +1,7 @@
 import InsightsOverview from './routes/overview.vue';
 import InsightsDashboard from './routes/dashboard.vue';
 import InsightsPanelConfiguration from './routes/panel-configuration.vue';
-import { defineModule } from '@directus/shared/utils';
+import { defineModule } from '@directus/utils';
 import { useInsightsStore } from '@/stores/insights';

 export default defineModule({
--- a/app/src/modules/insights/routes/dashboard.vue
+++ b/app/src/modules/insights/routes/dashboard.vue
@@ -210,7 +210,7 @@ import { useInsightsStore } from '@/stores/insights';
 import { usePermissionsStore } from '@/stores/permissions';
 import { pointOnLine } from '@/utils/point-on-line';
 import RefreshSidebarDetail from '@/views/private/components/refresh-sidebar-detail.vue';
-import { applyOptionsData } from '@directus/shared/utils';
+import { applyOptionsData } from '@directus/utils';
 import { assign, isEmpty } from 'lodash';
 import { computed, ref, toRefs, unref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
--- a/app/src/modules/insights/routes/panel-configuration.vue
+++ b/app/src/modules/insights/routes/panel-configuration.vue
@@ -99,7 +99,7 @@ import { useExtension } from '@/composables/use-extension';
 import { useExtensions } from '@/extensions';
 import { useInsightsStore } from '@/stores/insights';
 import { CreatePanel } from '@/stores/insights';
-import { Panel } from '@directus/shared/types';
+import { Panel } from '@directus/types';
 import { assign, clone, omitBy, isUndefined } from 'lodash';
 import { nanoid } from 'nanoid/non-secure';
 import { storeToRefs } from 'pinia';
--- a/app/src/modules/settings/index.ts
+++ b/app/src/modules/settings/index.ts
@@ -1,5 +1,5 @@
 import api from '@/api';
-import { defineModule } from '@directus/shared/utils';
+import { defineModule } from '@directus/utils';
 import { useCollectionsStore } from '@/stores/collections';
 import { useFieldsStore } from '@/stores/fields';
 import { useFlowsStore } from '@/stores/flows';
--- a/app/src/modules/settings/routes/data-model/collections/components/collection-item.vue
+++ b/app/src/modules/settings/routes/data-model/collections/components/collection-item.vue
@@ -62,7 +62,7 @@ import CollectionOptions from './collection-options.vue';
 import { Collection } from '@/types/collections';
 import Draggable from 'vuedraggable';
 import { useCollectionsStore } from '@/stores/collections';
-import { DeepPartial } from '@directus/shared/types';
+import { DeepPartial } from '@directus/types';
 import { useI18n } from 'vue-i18n';
 import { unexpectedError } from '@/utils/unexpected-error';

--- a/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-conditions.vue
@@ -6,7 +6,7 @@

 <script setup lang="ts">
 import { computed, unref } from 'vue';
-import { Field, DeepPartial } from '@directus/shared/types';
+import { Field, DeepPartial } from '@directus/types';
 import { useI18n } from 'vue-i18n';
 import { useFieldDetailStore, syncFieldDetailStoreProperty } from '../store';
 import { storeToRefs } from 'pinia';
--- a/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-schema.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-schema.vue
@@ -135,9 +135,9 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed } from 'vue';
-import { GEOMETRY_TYPES } from '@directus/shared/constants';
+import { GEOMETRY_TYPES } from '@directus/constants';
 import { translate } from '@/utils/translate-object-values';
-import { Type } from '@directus/shared/types';
+import { Type } from '@directus/types';
 import { TranslateResult } from 'vue-i18n';
 import { useFieldDetailStore, syncFieldDetailStoreProperty } from '../store';
 import { storeToRefs } from 'pinia';
--- a/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-tabs.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail-advanced/field-detail-advanced-tabs.vue
@@ -9,7 +9,7 @@
 <script lang="ts">
 import { defineComponent, PropType, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useSync } from '@directus/shared/composables';
+import { useSync } from '@directus/composables';
 import { useFieldDetailStore } from '../store';
 import { storeToRefs } from 'pinia';

--- a/app/src/modules/settings/routes/data-model/field-detail/field-detail-simple/field-detail-simple.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail-simple/field-detail-simple.vue
@@ -40,7 +40,7 @@

 <script lang="ts">
 import { defineComponent, PropType, computed, toRefs, watch } from 'vue';
-import { Collection } from '@directus/shared/types';
+import { Collection } from '@directus/types';
 import { useI18n } from 'vue-i18n';
 import { orderBy } from 'lodash';
 import { useFieldDetailStore, syncFieldDetailStoreProperty } from '../store/';
--- a/app/src/modules/settings/routes/data-model/field-detail/field-detail-simple/relationship-configuration.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail-simple/relationship-configuration.vue
@@ -69,7 +69,7 @@

 <script lang="ts">
 import { defineComponent, PropType, computed } from 'vue';
-import { LOCAL_TYPES } from '@directus/shared/constants';
+import { LOCAL_TYPES } from '@directus/constants';
 import { syncFieldDetailStoreProperty } from '../store';
 import { useI18n } from 'vue-i18n';
 import RelatedCollectionSelect from '../shared/related-collection-select.vue';
--- 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
@@ -40,7 +40,7 @@

 <script lang="ts">
 import { defineComponent, PropType, ref, computed, toRefs, watch } from 'vue';
-import { LocalType } from '@directus/shared/types';
+import { LocalType } from '@directus/types';
 import { useFieldDetailStore } from './store/';
 import FieldDetailSimple from './field-detail-simple/field-detail-simple.vue';
 import FieldDetailAdvanced from './field-detail-advanced/field-detail-advanced.vue';
--- a/app/src/modules/settings/routes/data-model/field-detail/store/index.ts
+++ b/app/src/modules/settings/routes/data-model/field-detail/store/index.ts
@@ -1,15 +1,7 @@
 import { defineStore } from 'pinia';
 import { has, isEmpty, orderBy, cloneDeep } from 'lodash';
-import {
-	InterfaceConfig,
-	DisplayConfig,
-	DeepPartial,
-	Field,
-	Relation,
-	Collection,
-	LocalType,
-} from '@directus/shared/types';
-import { LOCAL_TYPES } from '@directus/shared/constants';
+import { InterfaceConfig, DisplayConfig, DeepPartial, Field, Relation, Collection, LocalType } from '@directus/types';
+import { LOCAL_TYPES } from '@directus/constants';
 import { computed } from 'vue';
 import { get, set } from 'lodash';
 import { unexpectedError } from '@/utils/unexpected-error';
--- a/app/src/modules/settings/routes/data-model/field-detail/store/types.ts
+++ b/app/src/modules/settings/routes/data-model/field-detail/store/types.ts
@@ -1,5 +1,5 @@
 import { useFieldDetailStore } from './index';
-import { DeepPartial } from '@directus/shared/types';
+import { DeepPartial } from '@directus/types';

 export type StateUpdates = DeepPartial<ReturnType<typeof useFieldDetailStore>['$state']>;
 export type State = ReturnType<typeof useFieldDetailStore>['$state'];
--- a/app/src/modules/settings/routes/data-model/fields/components/field-select-menu.vue
+++ b/app/src/modules/settings/routes/data-model/fields/components/field-select-menu.vue
@@ -78,7 +78,7 @@

 <script lang="ts">
 import { computed, defineComponent, PropType } from 'vue';
-import { Field } from '@directus/shared/types';
+import { Field } from '@directus/types';
 import { useI18n } from 'vue-i18n';
 import { getLocalTypeForField } from '@/utils/get-local-type';

--- 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
@@ -154,7 +154,7 @@ import { getLocalTypeForField } from '@/utils/get-local-type';
 import { getSpecialForType } from '@/utils/get-special-for-type';
 import { notify } from '@/utils/notify';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { Field } from '@directus/shared/types';
+import { Field } from '@directus/types';
 import FieldSelectMenu from './field-select-menu.vue';
 import { hideDragImage } from '@/utils/hide-drag-image';
 import Draggable from 'vuedraggable';
--- 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
@@ -52,14 +52,14 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, toRefs } from 'vue';
-import { useCollection } from '@directus/shared/composables';
+import { useCollection } from '@directus/composables';
 import Draggable from 'vuedraggable';
-import { Field } from '@directus/shared/types';
+import { Field } from '@directus/types';
 import { useFieldsStore } from '@/stores/fields';
 import FieldSelect from './field-select.vue';
 import { hideDragImage } from '@/utils/hide-drag-image';
 import { orderBy, isNil } from 'lodash';
-import { LocalType } from '@directus/shared/types';
+import { LocalType } from '@directus/types';

 export default defineComponent({
 	name: 'FieldsManagement',
--- a/app/src/modules/settings/routes/data-model/fields/fields.vue
+++ b/app/src/modules/settings/routes/data-model/fields/fields.vue
@@ -103,7 +103,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, computed, toRefs, ref } from 'vue';
 import SettingsNavigation from '../../../components/navigation.vue';
-import { useCollection } from '@directus/shared/composables';
+import { useCollection } from '@directus/composables';
 import FieldsManagement from './components/fields-management.vue';

 import { useItem } from '@/composables/use-item';
--- a/app/src/modules/settings/routes/data-model/new-collection.vue
+++ b/app/src/modules/settings/routes/data-model/new-collection.vue
@@ -131,7 +131,7 @@ import { useI18n } from 'vue-i18n';
 import { cloneDeep } from 'lodash';
 import { defineComponent, ref, reactive, watch } from 'vue';
 import api from '@/api';
-import { Field, Relation } from '@directus/shared/types';
+import { Field, Relation } from '@directus/types';
 import { useFieldsStore } from '@/stores/fields';
 import { useCollectionsStore } from '@/stores/collections';
 import { useRelationsStore } from '@/stores/relations';
@@ -139,7 +139,7 @@ import { notify } from '@/utils/notify';
 import { useDialogRoute } from '@/composables/use-dialog-route';
 import { useRouter } from 'vue-router';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { DeepPartial } from '@directus/shared/types';
+import { DeepPartial } from '@directus/types';

 const defaultSystemFields = {
 	status: {
--- a/app/src/modules/settings/routes/flows/components/flow-dialog.vue
+++ b/app/src/modules/settings/routes/flows/components/flow-dialog.vue
@@ -32,7 +32,7 @@
 import api from '@/api';
 import { unexpectedError } from '@/utils/unexpected-error';
 import { ref, reactive, watch } from 'vue';
-import { FlowRaw } from '@directus/shared/types';
+import { FlowRaw } from '@directus/types';
 import { useI18n } from 'vue-i18n';
 import { isEqual } from 'lodash';
 import { useFlowsStore } from '@/stores/flows';
--- a/app/src/modules/settings/routes/flows/components/logs-sidebar-detail.vue
+++ b/app/src/modules/settings/routes/flows/components/logs-sidebar-detail.vue
@@ -80,7 +80,7 @@
 <script lang="ts" setup>
 import { useRevisions } from '@/composables/use-revisions';
 import { useExtensions } from '@/extensions';
-import { Action, FlowRaw } from '@directus/shared/types';
+import { Action, FlowRaw } from '@directus/types';
 import { computed, ref, toRefs, unref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { getTriggers } from '../triggers';
--- a/app/src/modules/settings/routes/flows/components/operation-detail.vue
+++ b/app/src/modules/settings/routes/flows/components/operation-detail.vue
@@ -69,7 +69,7 @@
 import { useDialogRoute } from '@/composables/use-dialog-route';
 import ExtensionOptions from '@/modules/settings/routes/data-model/field-detail/shared/extension-options.vue';
 import { translate } from '@/utils/translate-object-values';
-import { FlowRaw } from '@directus/shared/types';
+import { FlowRaw } from '@directus/types';
 import slugify from '@sindresorhus/slugify';
 import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
--- a/app/src/modules/settings/routes/flows/components/operation.vue
+++ b/app/src/modules/settings/routes/flows/components/operation.vue
@@ -140,7 +140,7 @@
 <script lang="ts" setup>
 import { useExtensions } from '@/extensions';
 import { Vector2 } from '@/utils/vector2';
-import { FlowRaw } from '@directus/shared/types';
+import { FlowRaw } from '@directus/types';
 import { computed, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { ATTACHMENT_OFFSET, REJECT_OFFSET, RESOLVE_OFFSET } from '../constants';
--- a/app/src/modules/settings/routes/flows/components/options-overview.vue
+++ b/app/src/modules/settings/routes/flows/components/options-overview.vue
@@ -24,7 +24,7 @@
 <script setup lang="ts">
 import { useClipboard } from '@/composables/use-clipboard';
 import { translate } from '@/utils/translate-object-values';
-import { FlowRaw } from '@directus/shared/types';
+import { FlowRaw } from '@directus/types';
 import { useI18n } from 'vue-i18n';

 defineProps<{
--- a/app/src/modules/settings/routes/flows/components/trigger-detail.vue
+++ b/app/src/modules/settings/routes/flows/components/trigger-detail.vue
@@ -29,7 +29,7 @@
 </template>

 <script setup lang="ts">
-import { FlowRaw, TriggerType } from '@directus/shared/types';
+import { FlowRaw, TriggerType } from '@directus/types';
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { getTriggers } from '../triggers';
--- a/app/src/modules/settings/routes/flows/flow-drawer.vue
+++ b/app/src/modules/settings/routes/flows/flow-drawer.vue
@@ -122,7 +122,7 @@
 import api from '@/api';
 import { useFlowsStore } from '@/stores/flows';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { TriggerType } from '@directus/shared/types';
+import { TriggerType } from '@directus/types';
 import { computed, reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { getTriggers } from './triggers';
--- a/app/src/modules/settings/routes/flows/flow.vue
+++ b/app/src/modules/settings/routes/flows/flow.vue
@@ -182,7 +182,7 @@
 </template>

 <script setup lang="ts">
-import { FlowRaw, OperationRaw } from '@directus/shared/types';
+import { FlowRaw, OperationRaw } from '@directus/types';
 import { useI18n } from 'vue-i18n';

 import { computed, ref, watch } from 'vue';
--- a/app/src/modules/settings/routes/flows/overview.vue
+++ b/app/src/modules/settings/routes/flows/overview.vue
@@ -136,7 +136,7 @@ import { router } from '@/router';
 import { useFlowsStore } from '@/stores/flows';
 import { usePermissionsStore } from '@/stores/permissions';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { FlowRaw } from '@directus/shared/types';
+import { FlowRaw } from '@directus/types';
 import { sortBy } from 'lodash';
 import { computed, ref, Ref } from 'vue';
 import { useI18n } from 'vue-i18n';
--- a/app/src/modules/settings/routes/flows/triggers.ts
+++ b/app/src/modules/settings/routes/flows/triggers.ts
@@ -1,5 +1,5 @@
-import { DeepPartial, Field, FlowRaw, TriggerType, Width } from '@directus/shared/types';
-import { toArray } from '@directus/shared/utils';
+import { DeepPartial, Field, FlowRaw, TriggerType, Width } from '@directus/types';
+import { toArray } from '@directus/utils';
 import { useI18n } from 'vue-i18n';
 import { getPublicURL } from '../../../../utils/get-root-path';

--- a/app/src/modules/settings/routes/presets/collection/collection.vue
+++ b/app/src/modules/settings/routes/presets/collection/collection.vue
@@ -147,7 +147,7 @@ import { defineComponent, computed, ref } from 'vue';
 import SettingsNavigation from '../../../components/navigation.vue';
 import PresetsInfoSidebarDetail from './components/presets-info-sidebar-detail.vue';

-import { useCollection, useLayout } from '@directus/shared/composables';
+import { useCollection, useLayout } from '@directus/composables';
 import LayoutSidebarDetail from '@/views/private/components/layout-sidebar-detail.vue';
 import RefreshSidebarDetail from '@/views/private/components/refresh-sidebar-detail.vue';
 import SearchInput from '@/views/private/components/search-input.vue';
--- a/app/src/modules/settings/routes/presets/item.vue
+++ b/app/src/modules/settings/routes/presets/item.vue
@@ -134,13 +134,13 @@ import { useI18n } from 'vue-i18n';
 import { computed, ref } from 'vue';

 import SettingsNavigation from '../../components/navigation.vue';
-import { Preset, Filter } from '@directus/shared/types';
+import { Preset, Filter } from '@directus/types';
 import api from '@/api';
 import { useCollectionsStore } from '@/stores/collections';
 import { usePresetsStore } from '@/stores/presets';
 import { useRouter } from 'vue-router';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { useLayout } from '@directus/shared/composables';
+import { useLayout } from '@directus/composables';
 import { useShortcut } from '@/composables/use-shortcut';
 import { useEditsGuard } from '@/composables/use-edits-guard';
 import { isEqual } from 'lodash';
--- a/app/src/modules/settings/routes/project/project.vue
+++ b/app/src/modules/settings/routes/project/project.vue
@@ -44,7 +44,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, ref, computed } from 'vue';
 import SettingsNavigation from '../../components/navigation.vue';
-import { useCollection } from '@directus/shared/composables';
+import { useCollection } from '@directus/composables';
 import { useSettingsStore } from '@/stores/settings';
 import { useServerStore } from '@/stores/server';
 import ProjectInfoSidebarDetail from './components/project-info-sidebar-detail.vue';
--- a/app/src/modules/settings/routes/roles/app-permissions.ts
+++ b/app/src/modules/settings/routes/roles/app-permissions.ts
@@ -1,4 +1,4 @@
-import { Permission } from '@directus/shared/types';
+import { Permission } from '@directus/types';

 export const appRecommendedPermissions: Partial<Permission>[] = [
 	{
--- a/app/src/modules/settings/routes/roles/collection.vue
+++ b/app/src/modules/settings/routes/roles/collection.vue
@@ -65,7 +65,7 @@ import { Header as TableHeader } from '@/components/v-table/types';
 import { useRouter } from 'vue-router';
 import { unexpectedError } from '@/utils/unexpected-error';
 import { translate } from '@/utils/translate-object-values';
-import { Role } from '@directus/shared/types';
+import { Role } from '@directus/types';

 type RoleItem = Partial<Role> & {
 	count?: number;
--- 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
@@ -55,7 +55,7 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, toRefs } from 'vue';
-import { Permission, Collection } from '@directus/shared/types';
+import { Permission, Collection } from '@directus/types';
 import PermissionsOverviewToggle from './permissions-overview-toggle.vue';
 import useUpdatePermissions from '../composables/use-update-permissions';

--- 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,7 +66,7 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed, inject, ref, toRefs } from 'vue';
-import { Permission, Collection } from '@directus/shared/types';
+import { Permission, Collection } from '@directus/types';
 import api from '@/api';
 import { useRouter } from 'vue-router';
 import useUpdatePermissions from '../composables/use-update-permissions';
--- a/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue
+++ b/app/src/modules/settings/routes/roles/item/components/permissions-overview.vue
@@ -68,7 +68,7 @@ import { defineComponent, computed, ref, provide, watch } from 'vue';
 import { useCollectionsStore } from '@/stores/collections';
 import PermissionsOverviewHeader from './permissions-overview-header.vue';
 import PermissionsOverviewRow from './permissions-overview-row.vue';
-import { Permission } from '@directus/shared/types';
+import { Permission } from '@directus/types';
 import api from '@/api';
 import { appRecommendedPermissions, appMinimalPermissions } from '../../app-permissions';
 import { unexpectedError } from '@/utils/unexpected-error';
--- a/app/src/modules/settings/routes/roles/item/composables/use-permissions.ts
+++ b/app/src/modules/settings/routes/roles/item/composables/use-permissions.ts
@@ -1,5 +1,5 @@
 import api from '@/api';
-import { Permission } from '@directus/shared/types';
+import { Permission } from '@directus/types';
 import { ref, Ref, watch } from 'vue';

 type UsablePermissions = {
--- 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,5 +1,5 @@
 import api from '@/api';
-import { Permission, Collection } from '@directus/shared/types';
+import { Permission, Collection } from '@directus/types';
 import { unexpectedError } from '@/utils/unexpected-error';
 import { inject, ref, Ref } from 'vue';

--- a/app/src/modules/settings/routes/roles/permissions-detail/components/actions.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/actions.vue
@@ -9,7 +9,7 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, ref } from 'vue';
-import { Permission } from '@directus/shared/types';
+import { Permission } from '@directus/types';
 import api from '@/api';
 import { useRouter } from 'vue-router';
 import { unexpectedError } from '@/utils/unexpected-error';
--- a/app/src/modules/settings/routes/roles/permissions-detail/components/fields.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/fields.vue
@@ -28,9 +28,9 @@
 <script lang="ts">
 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 '@directus/shared/composables';
+import { Permission, Role } from '@directus/types';
+import { Field } from '@directus/types';
+import { useSync } from '@directus/composables';
 import { useFieldsStore } from '@/stores/fields';

 export default defineComponent({
--- a/app/src/modules/settings/routes/roles/permissions-detail/components/permissions.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/permissions.vue
@@ -22,8 +22,8 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed } from 'vue';
-import { Permission, Role } from '@directus/shared/types';
-import { useSync } from '@directus/shared/composables';
+import { Permission, Role } from '@directus/types';
+import { useSync } from '@directus/composables';

 export default defineComponent({
 	props: {
--- a/app/src/modules/settings/routes/roles/permissions-detail/components/presets.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/presets.vue
@@ -15,8 +15,8 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed } from 'vue';
-import { Permission, Role } from '@directus/shared/types';
-import { useSync } from '@directus/shared/composables';
+import { Permission, Role } from '@directus/types';
+import { useSync } from '@directus/composables';

 export default defineComponent({
 	props: {
--- 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 '@directus/shared/composables';
+import { useSync } from '@directus/composables';

 export default defineComponent({
 	props: {
--- a/app/src/modules/settings/routes/roles/permissions-detail/components/validation.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/components/validation.vue
@@ -16,8 +16,8 @@
 <script lang="ts">
 import { useI18n } from 'vue-i18n';
 import { defineComponent, PropType, computed } from 'vue';
-import { Permission, Role } from '@directus/shared/types';
-import { useSync } from '@directus/shared/composables';
+import { Permission, Role } from '@directus/types';
+import { useSync } from '@directus/composables';

 export default defineComponent({
 	props: {
--- a/app/src/modules/settings/routes/roles/permissions-detail/permissions-detail.vue
+++ b/app/src/modules/settings/routes/roles/permissions-detail/permissions-detail.vue
@@ -48,7 +48,7 @@
 import { useI18n } from 'vue-i18n';
 import { defineComponent, ref, computed, watch } from 'vue';
 import api from '@/api';
-import { Permission, Role } from '@directus/shared/types';
+import { Permission, Role } from '@directus/types';
 import { useCollectionsStore } from '@/stores/collections';
 import { useRouter } from 'vue-router';
 import Actions from './components/actions.vue';
--- a/app/src/modules/settings/routes/translation-strings/translation-strings-drawer.vue
+++ b/app/src/modules/settings/routes/translation-strings/translation-strings-drawer.vue
@@ -50,7 +50,7 @@
 import { ref, computed, watch, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { isEqual } from 'lodash';
-import { Field, DeepPartial } from '@directus/shared/types';
+import { Field, DeepPartial } from '@directus/types';
 import { useTranslationStrings, TranslationString } from '@/composables/use-translation-strings';

 interface Props {
--- a/app/src/modules/settings/routes/webhooks/collection.vue
+++ b/app/src/modules/settings/routes/webhooks/collection.vue
@@ -97,7 +97,7 @@ import { defineComponent, computed, ref } from 'vue';
 import SettingsNavigation from '../../components/navigation.vue';
 import LayoutSidebarDetail from '@/views/private/components/layout-sidebar-detail.vue';
 import { usePreset } from '@/composables/use-preset';
-import { useLayout } from '@directus/shared/composables';
+import { useLayout } from '@directus/composables';
 import api from '@/api';
 import SearchInput from '@/views/private/components/search-input.vue';

--- a/app/src/modules/users/composables/use-navigation.ts
+++ b/app/src/modules/users/composables/use-navigation.ts
@@ -1,6 +1,6 @@
 import api from '@/api';
 import { unexpectedError } from '@/utils/unexpected-error';
-import { Role } from '@directus/shared/types';
+import { Role } from '@directus/types';
 import { ref, Ref } from 'vue';

 let roles: Ref<BasicRole[] | null> | null = null;
--- a/app/src/modules/users/index.ts
+++ b/app/src/modules/users/index.ts
@@ -1,4 +1,4 @@
-import { defineModule } from '@directus/shared/utils';
+import { defineModule } from '@directus/utils';
 import Collection from './routes/collection.vue';
 import Item from './routes/item.vue';

--- a/app/src/modules/users/routes/collection.vue
+++ b/app/src/modules/users/routes/collection.vue
@@ -176,9 +176,9 @@ import { unexpectedError } from '@/utils/unexpected-error';
 import DrawerBatch from '@/views/private/components/drawer-batch.vue';
 import LayoutSidebarDetail from '@/views/private/components/layout-sidebar-detail.vue';
 import SearchInput from '@/views/private/components/search-input.vue';
-import { useLayout } from '@directus/shared/composables';
-import { Role } from '@directus/shared/types';
-import { mergeFilters } from '@directus/shared/utils';
+import { useLayout } from '@directus/composables';
+import { Role } from '@directus/types';
+import { mergeFilters } from '@directus/utils';
 import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router';
 import useNavigation from '../composables/use-navigation';

--- a/app/src/modules/users/routes/item.vue
+++ b/app/src/modules/users/routes/item.vue
@@ -201,8 +201,8 @@ import { userName } from '@/utils/user-name';
 import CommentsSidebarDetail from '@/views/private/components/comments-sidebar-detail.vue';
 import RevisionsDrawerDetail from '@/views/private/components/revisions-drawer-detail.vue';
 import SaveOptions from '@/views/private/components/save-options.vue';
-import { useCollection } from '@directus/shared/composables';
-import { Field } from '@directus/shared/types';
+import { useCollection } from '@directus/composables';
+import { Field } from '@directus/types';
 import { useRouter } from 'vue-router';
 import UsersNavigation from '../components/navigation.vue';
 import UserInfoSidebarDetail from '../components/user-info-sidebar-detail.vue';