diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/router-slot/index.ts b/src/Umbraco.Web.UI.Client/libs/router/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/router-slot/index.ts rename to src/Umbraco.Web.UI.Client/libs/router/index.ts diff --git a/src/Umbraco.Web.UI.Client/libs/router/rollup.config.js b/src/Umbraco.Web.UI.Client/libs/router/rollup.config.js new file mode 100644 index 0000000000..945c0afe88 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/libs/router/rollup.config.js @@ -0,0 +1,4 @@ +import config from '../../utils/rollup.config.js'; +export default { + ...config, +}; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/router-slot/router-slot-change.event.ts b/src/Umbraco.Web.UI.Client/libs/router/router-slot-change.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/router-slot/router-slot-change.event.ts rename to src/Umbraco.Web.UI.Client/libs/router/router-slot-change.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/router-slot/router-slot-init.event.ts b/src/Umbraco.Web.UI.Client/libs/router/router-slot-init.event.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/router-slot/router-slot-init.event.ts rename to src/Umbraco.Web.UI.Client/libs/router/router-slot-init.event.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/router-slot/router-slot.element.ts b/src/Umbraco.Web.UI.Client/libs/router/router-slot.element.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/components/router-slot/router-slot.element.ts rename to src/Umbraco.Web.UI.Client/libs/router/router-slot.element.ts index bc30cbf18d..26fbbfd9bb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/router-slot/router-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/libs/router/router-slot.element.ts @@ -1,8 +1,7 @@ import { LitElement, PropertyValueMap } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { IRoute, RouterSlot } from 'router-slot'; -import { UmbRouterSlotChangeEvent } from './router-slot-change.event'; -import { UmbRouterSlotInitEvent } from './router-slot-init.event'; +import { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/router'; /** * @element umb-router-slot-element diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts index 19f2210e8e..5f32294c97 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -37,6 +37,8 @@ import { UmbLanguageStore } from './settings/languages/language.store'; import { UmbThemeService, UMB_THEME_SERVICE_CONTEXT_TOKEN } from './themes/theme.service'; import { UmbNotificationService, UMB_NOTIFICATION_SERVICE_CONTEXT_TOKEN } from '@umbraco-cms/notification'; +import '@umbraco-cms/router'; + // Domains import './settings'; import './documents'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts index c7769c8009..d4aaf7fac5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/index.ts @@ -4,7 +4,6 @@ import './backoffice-frame/backoffice-main.element'; import './backoffice-frame/backoffice-modal-container.element'; import './backoffice-frame/backoffice-notification-container.element'; import './ref-property-editor-ui/ref-property-editor-ui.element'; -import './router-slot/router-slot.element'; import './content-property/content-property.element'; import './table/table.element'; import './code-block/code-block.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts index 9dcbd069e3..94db156702 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-layout/workspace-layout.element.ts @@ -5,7 +5,7 @@ import { IRoutingInfo } from 'router-slot'; import { map } from 'rxjs'; import { repeat } from 'lit/directives/repeat.js'; -import type { UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent } from '../../router-slot'; +import type { UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent } from '@umbraco-cms/router'; import { createExtensionElement, umbExtensionsRegistry } from '@umbraco-cms/extensions-api'; import type { ManifestWorkspaceAction, diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 3a3e9d3560..3404ae3701 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -32,6 +32,7 @@ "@umbraco-cms/notification": ["libs/notification"], "@umbraco-cms/observable-api": ["libs/observable-api"], "@umbraco-cms/utils": ["libs/utils"], + "@umbraco-cms/router": ["libs/router"], "@umbraco-cms/test-utils": ["libs/test-utils"], "@umbraco-cms/resources": ["libs/resources"], "@umbraco-cms/store": ["libs/store"], diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index b71228b062..c2af3f5141 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -25,7 +25,8 @@ export default { '@umbraco-cms/store': './libs/store/index.ts', '@umbraco-cms/utils': './libs/utils/index.ts', '@umbraco-cms/test-utils': './libs/test-utils/index.ts', - '@umbraco-cms/resources': './libs/resources/index.ts' + '@umbraco-cms/resources': './libs/resources/index.ts', + '@umbraco-cms/router': './libs/router/index.ts' }, }, },