From d91292267d5fa47ecc1f887fa0dd4cc374572927 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 7 Nov 2024 11:20:01 +0100 Subject: [PATCH] remove circular dependency + deprecate export --- .../src/packages/core/content-type/index.ts | 7 ++++++- .../core/{content-type => content}/components/index.ts | 0 .../components/property-type-based-property/index.ts | 0 .../property-type-based-property.element.ts | 6 +++--- .../src/packages/core/content/index.ts | 2 ++ 5 files changed, 11 insertions(+), 4 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/{content-type => content}/components/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{content-type => content}/components/property-type-based-property/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{content-type => content}/components/property-type-based-property/property-type-based-property.element.ts (95%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts index 79f883296b..2a3cd65724 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/index.ts @@ -1,7 +1,12 @@ -export * from './components/index.js'; export * from './composition/index.js'; export * from './modals/index.js'; export * from './repository/index.js'; export * from './structure/index.js'; export * from './workspace/index.js'; export type * from './types.js'; + +/** + * @deprecated Use `UmbPropertyTypeBasedPropertyElement` from `@umbraco-cms/backoffice/content` instead. + * Export will be removed in version 17. + */ +export { UmbPropertyTypeBasedPropertyElement } from '../content/components/property-type-based-property/property-type-based-property.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/components/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/content/components/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/property-type-based-property/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/components/property-type-based-property/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/property-type-based-property/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/content/components/property-type-based-property/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/property-type-based-property/property-type-based-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/components/property-type-based-property/property-type-based-property.element.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/property-type-based-property/property-type-based-property.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/content/components/property-type-based-property/property-type-based-property.element.ts index 475188cd24..745b97c7c0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/components/property-type-based-property/property-type-based-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content/components/property-type-based-property/property-type-based-property.element.ts @@ -1,7 +1,6 @@ -import type { UmbPropertyEditorConfig } from '../../../property-editor/index.js'; -import type { UmbPropertyTypeModel } from '../../types.js'; +import { UmbContentPropertyContext } from '../../content-property.context.js'; +import type { UmbPropertyEditorConfig } from '@umbraco-cms/backoffice/property-editor'; import { css, customElement, html, ifDefined, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbContentPropertyContext } from '@umbraco-cms/backoffice/content'; import { UmbDataTypeDetailRepository } from '@umbraco-cms/backoffice/data-type'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @@ -9,6 +8,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UmbDataTypeDetailModel } from '@umbraco-cms/backoffice/data-type'; import type { UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; import { UMB_UNSUPPORTED_EDITOR_SCHEMA_ALIASES } from '@umbraco-cms/backoffice/property'; +import type { UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type'; @customElement('umb-property-type-based-property') export class UmbPropertyTypeBasedPropertyElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/index.ts index f1bd92d5c0..338c9631c1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content/index.ts @@ -1,6 +1,8 @@ export { UMB_CONTENT_PROPERTY_CONTEXT } from './content-property.context-token.js'; export { UmbContentPropertyContext } from './content-property.context.js'; + export * from './collection/index.js'; +export * from './components/index.js'; export * from './constants.js'; export * from './controller/merge-content-variant-data.controller.js'; export * from './manager/index.js';