From d0d6508b70feec11a7ad5875cde8ca4db78f534d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 23 May 2023 21:07:39 +0200 Subject: [PATCH] eliminate internal router alias --- .../src/packages/core/modal/modal-handler.ts | 2 +- .../property-editor-ui-block-grid-inner-test.element.ts | 2 +- .../workspace-editor/workspace-editor.element.ts | 3 +-- .../workspace/document-workspace-editor.element.ts | 6 ++---- .../views/edit/document-workspace-view-edit.element.ts | 9 ++++++--- .../dashboard-examine-management.element.ts | 4 +--- .../workspace/language/language-workspace.element.ts | 5 ++--- .../logviewer-root/logviewer-root-workspace.element.ts | 3 +-- .../workspace/relation-type-workspace.element.ts | 3 +-- .../workspace/partial-views-workspace.element.ts | 3 +-- .../templates/workspace/template-workspace.element.ts | 3 +-- src/Umbraco.Web.UI.Client/tsconfig.json | 1 - src/Umbraco.Web.UI.Client/web-test-runner.config.mjs | 1 - 13 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts index 12b028c89b..f64d56e80c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts @@ -7,7 +7,7 @@ import type { UUIModalSidebarSize, } from '@umbraco-ui/uui'; import { BehaviorSubject } from 'rxjs'; -import type { UmbRouterSlotElement } from '@umbraco-cms/internal/router'; +import type { UmbRouterSlotElement } from '@umbraco-cms/backoffice/router'; import { ManifestModal, umbExtensionsRegistry } from '../extension-registry'; import { UmbModalConfig, UmbModalType } from './modal.context'; import { UmbModalToken } from './token/modal-token'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts index da7ccdf0c8..e52bb0416b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/block-grid/property-editor-ui-block-grid-inner-test.element.ts @@ -3,7 +3,7 @@ import { customElement, property, state } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css'; import type { UmbRoute } from '@umbraco-cms/backoffice/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; +import type { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; /** * @element umb-property-editor-ui-block-grid-inner-test diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts index 8f888d1e76..4ae997d728 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-editor/workspace-editor.element.ts @@ -3,8 +3,7 @@ import { css, html, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { map } from 'rxjs'; import { repeat } from 'lit/directives/repeat.js'; -import type { PageComponent, UmbRoute } from '@umbraco-cms/backoffice/router'; -import type { UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent } from '@umbraco-cms/internal/router'; +import type { PageComponent, UmbRoute, UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent } from '@umbraco-cms/backoffice/router'; import { ManifestWorkspaceEditorView, ManifestWorkspaceViewCollection, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts index 3b233ae690..f7f12e4886 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace-editor.element.ts @@ -4,12 +4,10 @@ import { customElement, state } from 'lit/decorators.js'; import { UmbDocumentWorkspaceContext } from './document-workspace.context'; import { UmbDocumentWorkspaceSplitViewElement } from './document-workspace-split-view.element'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; -import { ActiveVariant } from '@umbraco-cms/backoffice/workspace'; -import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import type { UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; +import type { UmbRoute, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { VariantModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; -import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; +import { UMB_ENTITY_WORKSPACE_CONTEXT, ActiveVariant } from '@umbraco-cms/backoffice/workspace'; @customElement('umb-document-workspace-editor') export class UmbDocumentWorkspaceEditorElement extends UmbLitElement { //private _defaultVariant?: VariantViewModelBaseModel; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts index 12ae4178c0..95815ede1e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts @@ -4,12 +4,15 @@ import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; import { UmbDocumentWorkspaceContext } from '../../document-workspace.context'; import { UmbContentTypeContainerStructureHelper } from '@umbraco-cms/backoffice/content-type'; -import { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; -import { encodeFolderName } from '@umbraco-cms/backoffice/router'; +import { + encodeFolderName, + UmbRoute, + UmbRouterSlotChangeEvent, + UmbRouterSlotInitEvent, +} from '@umbraco-cms/backoffice/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { PropertyTypeContainerResponseModelBaseModel } from '@umbraco-cms/backoffice/backend-api'; import { UMB_ENTITY_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/workspace'; -import { UmbRoute } from '@umbraco-cms/backoffice/router'; import { UmbWorkspaceEditorViewExtensionElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-document-workspace-view-edit') diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/dashboard-examine-management.element.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/dashboard-examine-management.element.ts index f36768b6d0..7f72c7a53b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/dashboard-examine-management.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/dashboard-examine-management.element.ts @@ -1,10 +1,8 @@ import { html, css, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; - import { UmbDashboardExamineIndexElement } from './views/section-view-examine-indexers'; import { UmbDashboardExamineSearcherElement } from './views/section-view-examine-searchers'; -import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import type { UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; +import type { UmbRoute, UmbRouterSlotChangeEvent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/language-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/language-workspace.element.ts index 04adbc7341..2125a1dd9a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/language-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/languages/workspace/language/language-workspace.element.ts @@ -2,12 +2,11 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbLanguageWorkspaceContext } from './language-workspace.context'; -import type { UmbRoute } from '@umbraco-cms/backoffice/router'; -import { UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; +import type { UmbRoute, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; +import { generateRoutePathBuilder } from '@umbraco-cms/backoffice/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import './language-workspace-edit.element'; -import { generateRoutePathBuilder } from '@umbraco-cms/backoffice/router'; @customElement('umb-language-workspace') export class UmbLanguageWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts index 5444a96174..ed10355089 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/logviewer-root/logviewer-root-workspace.element.ts @@ -12,8 +12,7 @@ import { ManifestWorkspaceViewCollection, umbExtensionsRegistry, } from '@umbraco-cms/backoffice/extension-registry'; -import type { UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent } from '@umbraco-cms/internal/router'; -import type { UmbRoute } from '@umbraco-cms/backoffice/router'; +import type { UmbRouterSlotInitEvent, UmbRouterSlotChangeEvent, UmbRoute } from '@umbraco-cms/backoffice/router'; //TODO make uui-input accept min and max values @customElement('umb-logviewer-workspace') diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/relation-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/relation-type-workspace.element.ts index 152b0370e3..02e0512841 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/relation-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/relation-types/workspace/relation-type-workspace.element.ts @@ -3,8 +3,7 @@ import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbRelationTypeWorkspaceContext } from './relation-type-workspace.context'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import type { UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; -import type { UmbRoute } from '@umbraco-cms/backoffice/router'; +import type { UmbRouterSlotInitEvent, UmbRoute } from '@umbraco-cms/backoffice/router'; import './relation-type-workspace-edit.element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-views-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-views-workspace.element.ts index f314361b77..6c9ae42872 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-views-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-views-workspace.element.ts @@ -2,11 +2,10 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbPartialViewsWorkspaceContext } from './partial-views-workspace.context'; -import { UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; +import { UmbRoute, IRoutingInfo, PageComponent, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import './partial-views-workspace-edit.element'; -import { UmbRoute, IRoutingInfo, PageComponent } from '@umbraco-cms/backoffice/router'; @customElement('umb-partial-views-workspace') export class UmbPartialViewsWorkspaceElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts index 4c6afaa6a8..b4001a6b92 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.element.ts @@ -2,8 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbTemplateWorkspaceContext } from './template-workspace.context'; -import { UmbRouterSlotInitEvent } from '@umbraco-cms/internal/router'; -import type { IRoutingInfo, PageComponent, UmbRoute } from '@umbraco-cms/backoffice/router'; +import type { IRoutingInfo, PageComponent, UmbRoute, UmbRouterSlotInitEvent } from '@umbraco-cms/backoffice/router'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import './template-workspace-edit.element'; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 97e76d9756..242e59744b 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -69,7 +69,6 @@ "@umbraco-cms/internal/lit-element": ["src/shared/lit-element"], "@umbraco-cms/internal/modal": ["src/shared/modal"], - "@umbraco-cms/internal/router": ["src/shared/router"], "@umbraco-cms/internal/test-utils": ["utils/test-utils.ts"] } }, 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 176052d971..51b1bdf2a6 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -70,7 +70,6 @@ export default { // SHARED '@umbraco-cms/internal/lit-element': './src/shared/lit-element/index.ts', '@umbraco-cms/internal/modal': './src/shared/modal/index.ts', - '@umbraco-cms/internal/router': './src/shared/router/index.ts', '@umbraco-cms/internal/test-utils': './utils/test-utils.ts', }, },