From 8f9bfb4143566d01dcd5363fb8a66a73ffd0f726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 9 Jan 2025 08:43:38 +0100 Subject: [PATCH] move router-slot component --- .../collection-view-bundle.element.ts | 2 +- .../core/modal/context/modal.context.ts | 2 +- .../router/components/router-slot/index.ts | 5 +++++ .../router-slot}/route.context.ts | 4 ++-- .../router-slot}/route.interface.ts | 0 .../router-slot}/router-slot-change.event.ts | 0 .../router-slot}/router-slot-init.event.ts | 0 .../router-slot}/router-slot.element.ts | 0 .../src/packages/core/router/index.ts | 18 +++++++----------- .../modal-route-registration.controller.ts | 2 +- 10 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/index.ts rename src/Umbraco.Web.UI.Client/src/packages/core/router/{ => components/router-slot}/route.context.ts (96%) rename src/Umbraco.Web.UI.Client/src/packages/core/router/{ => components/router-slot}/route.interface.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/router/{ => components/router-slot}/router-slot-change.event.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/router/{ => components/router-slot}/router-slot-init.event.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/router/{ => components/router-slot}/router-slot.element.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts index bc0007a73a..b43a9597a5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-view-bundle.element.ts @@ -1,7 +1,7 @@ import { UMB_COLLECTION_CONTEXT } from '../default/index.js'; import type { ManifestCollectionView } from '../extensions/types.js'; import type { UmbCollectionLayoutConfiguration } from '../types.js'; -import { UMB_ROUTE_CONTEXT } from '../../router/route.context.js'; +import { UMB_ROUTE_CONTEXT } from '../../router/components/router-slot/route.context.js'; import { css, customElement, html, nothing, query, repeat, state } from '@umbraco-cms/backoffice/external/lit'; import { observeMultiple } from '@umbraco-cms/backoffice/observable-api'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/context/modal.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/context/modal.context.ts index 991bbddf86..d515bd7a64 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/context/modal.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/context/modal.context.ts @@ -1,5 +1,5 @@ import { UmbModalToken } from '../token/modal-token.js'; -import { UMB_ROUTE_CONTEXT } from '../../router/route.context.js'; +import { UMB_ROUTE_CONTEXT } from '../../router/components/router-slot/route.context.js'; import type { UmbModalConfig, UmbModalType } from '../types.js'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/index.ts new file mode 100644 index 0000000000..ed32035358 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/index.ts @@ -0,0 +1,5 @@ +export * from './route.context.js'; +export * from './router-slot-change.event.js'; +export * from './router-slot-init.event.js'; +export * from './router-slot.element.js'; +export type * from './route.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/route.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.context.ts similarity index 96% rename from src/Umbraco.Web.UI.Client/src/packages/core/router/route.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.context.ts index a5ed6a86c7..d73ac118f9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/router/route.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.context.ts @@ -1,6 +1,6 @@ +import { umbGenerateRoutePathBuilder } from '../../generate-route-path-builder.function.js'; +import type { UmbModalRouteRegistration } from '../../modal-registration/modal-route-registration.interface.js'; import type { UmbRoute } from './route.interface.js'; -import { umbGenerateRoutePathBuilder } from './generate-route-path-builder.function.js'; -import type { UmbModalRouteRegistration } from './modal-registration/modal-route-registration.interface.js'; import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/route.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/router/route.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/route.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot-change.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot-change.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot-change.event.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot-change.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot-init.event.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot-init.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot-init.event.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot-init.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/router/components/router-slot/router-slot.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts index dd68049a6a..db089ddfa6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/index.ts @@ -1,12 +1,8 @@ -export * from '@umbraco-cms/backoffice/external/router-slot'; -export * from './encode-folder-name.function.js'; -export * from './route.context.js'; -export type * from './route.interface.js'; -export * from './router-slot-change.event.js'; -export * from './router-slot-init.event.js'; -export * from './router-slot.element.js'; -export * from './path-pattern.class.js'; -export type * from './modal-registration/modal-route-registration.interface.js'; -export * from './modal-registration/modal-route-registration.controller.js'; -export type * from './types.js'; export * from './components/not-found/route-not-found.element.js'; +export * from './components/router-slot/index.js'; +export * from './encode-folder-name.function.js'; +export * from './modal-registration/modal-route-registration.controller.js'; +export * from './path-pattern.class.js'; +export * from '@umbraco-cms/backoffice/external/router-slot'; +export type * from './modal-registration/modal-route-registration.interface.js'; +export type * from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts index 1ee307a27a..d247147c62 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/modal-registration/modal-route-registration.controller.ts @@ -1,4 +1,4 @@ -import { UMB_ROUTE_CONTEXT } from '../route.context.js'; +import { UMB_ROUTE_CONTEXT } from '../index.js'; import { encodeFolderName } from '../encode-folder-name.function.js'; import type { UmbModalRouteRegistration } from './modal-route-registration.interface.js'; import type {