diff --git a/src/Umbraco.Web.UI.Client/eslint-local-rules.cjs b/src/Umbraco.Web.UI.Client/eslint-local-rules.cjs index 0bd5d759ae..2a50f6a70a 100644 --- a/src/Umbraco.Web.UI.Client/eslint-local-rules.cjs +++ b/src/Umbraco.Web.UI.Client/eslint-local-rules.cjs @@ -128,7 +128,6 @@ module.exports = { const sourceValue = node.source.value; if (sourceValue.startsWith('libs/') || libsRegex.test(sourceValue)) { const importPath = sourceValue.replace(libsRegex, (match, p1, p2) => { - const levels = p1.match(/\.\.\//g) || []; return `@umbraco-cms/backoffice/${p2}`; }); context.report({ diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/media.repository.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/media.repository.ts index ab2d992be6..0c17a6e36a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/media.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/repository/media.repository.ts @@ -1,3 +1,4 @@ +import type { UmbTreeRepository } from '@umbraco-cms/backoffice/repository/tree-repository.interface'; import type { MediaDetails } from '../'; import { MediaTreeServerDataSource } from './sources/media.tree.server.data'; import { UmbMediaTreeStore, UMB_MEDIA_TREE_STORE_CONTEXT_TOKEN } from './media.tree.store'; @@ -9,7 +10,6 @@ import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-ap import { ProblemDetailsModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbDetailRepository } from '@umbraco-cms/backoffice/repository'; import { UmbNotificationContext, UMB_NOTIFICATION_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/notification'; -import type { UmbTreeRepository } from 'libs/repository/tree-repository.interface'; type ItemDetailType = MediaDetails; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts index 7216fb0683..8afb5da7cb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item-base/tree-item-base.context.ts @@ -1,4 +1,5 @@ import { map } from 'rxjs'; +import { ManifestEntityAction } from '@umbraco-cms/backoffice/extensions-registry/entity-action.models'; import { UmbSectionSidebarContext, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, @@ -15,7 +16,6 @@ import { } from '@umbraco-cms/backoffice/context-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api'; import type { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; -import { ManifestEntityAction } from 'libs/extensions-registry/entity-action.models'; // add type for unique function export type UmbTreeItemUniqueFunction = (x: T) => string | null | undefined; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.context.interface.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.context.interface.ts index 0144422f76..7f78041319 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item.context.interface.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; +import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller/controller-host.mixin'; import { ProblemDetailsModel, TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; -import { UmbControllerHostInterface } from 'libs/controller/controller-host.mixin'; // TODO: temp type. Add paged response type to the repository interface interface PagedResponse { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item/tree-item.element.ts index 9cecba3412..da60d3d1f0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item/tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/tree/tree-item/tree-item.element.ts @@ -1,9 +1,9 @@ import { css, html, nothing } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; +import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api/src'; +import { ManifestTreeItem } from '@umbraco-cms/backoffice/extensions-registry/tree-item.models'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { TreeItemPresentationModel } from 'libs/backend-api/src'; -import { ManifestTreeItem } from 'libs/extensions-registry/tree-item.models'; @customElement('umb-tree-item') export class UmbTreeItemElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts index 57086d24eb..8e3c73dcb9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts @@ -3,11 +3,11 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, query, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; import { UUIInputEvent } from '@umbraco-ui/uui'; +import { UmbInputEvent } from '@umbraco-cms/backoffice/umb-events/input.event'; +import { TemplateResource, TemplateResponseModel } from '@umbraco-cms/backoffice/backend-api/src'; import { UmbCodeEditor } from '../../components/code-editor'; import { UmbTemplateModalData, UmbTemplateModalResult } from '.'; import { UmbModalBaseElement } from '@umbraco-cms/internal/modal'; -import { UmbInputEvent } from 'libs/umb-events/input.event'; -import { TemplateResource, TemplateResponseModel } from 'libs/backend-api/src'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; //TODO: make a default tree-picker that can be used across multiple pickers diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/repository/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/repository/manifests.ts index 34225d54b8..31a346ebde 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/repository/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/templating/stylesheets/repository/manifests.ts @@ -1,6 +1,6 @@ +import { ManifestRepository } from '@umbraco-cms/backoffice/extensions-registry/repository.models'; import { UmbStylesheetRepository } from './stylesheet.repository'; import { UmbStylesheetTreeStore } from './stylesheet.tree.store'; -import { ManifestRepository } from 'libs/extensions-registry/repository.models'; import { ManifestTreeStore } from '@umbraco-cms/backoffice/extensions-registry'; export const STYLESHEET_REPOSITORY_ALIAS = 'Umb.Repository.Stylesheet';