From 72a83370f346a6679dae0f4e33f5b15750f123ef Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 10 May 2024 15:14:36 +0200 Subject: [PATCH 1/2] move extension components --- src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts | 2 -- src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts | 1 + .../components/extension-slot/extension-slot.element.ts | 2 +- .../components/extension-slot/extension-slot.test.ts | 0 .../{ => extension-registry}/components/extension-slot/index.ts | 0 .../extension-with-api-slot/extension-with-api-slot.element.ts | 2 +- .../extension-with-api-slot/extension-with-api-slot.test.ts | 0 .../components/extension-with-api-slot/index.ts | 0 .../src/packages/core/extension-registry/components/index.ts | 2 ++ .../src/packages/core/property/property/property.element.ts | 2 +- 10 files changed, 6 insertions(+), 5 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/{ => extension-registry}/components/extension-slot/extension-slot.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/packages/core/{ => extension-registry}/components/extension-slot/extension-slot.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{ => extension-registry}/components/extension-slot/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{ => extension-registry}/components/extension-with-api-slot/extension-with-api-slot.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/packages/core/{ => extension-registry}/components/extension-with-api-slot/extension-with-api-slot.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{ => extension-registry}/components/extension-with-api-slot/index.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts index 789608dba4..7d6646a4f4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/index.ts @@ -6,8 +6,6 @@ export * from './body-layout/body-layout.element.js'; export * from './code-block/index.js'; export * from './dropdown/index.js'; export * from './entity-actions-bundle/index.js'; -export * from './extension-slot/index.js'; -export * from './extension-with-api-slot/index.js'; export * from './footer-layout/index.js'; export * from './header-app/index.js'; export * from './history/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts index 1f88e46d6a..912cee601d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts @@ -8,6 +8,7 @@ import { UmbExtensionsApiInitializer, type UmbEntryPointOnInit } from '@umbraco- // TODO temp relative import until modules ship a component sub module import './menu/components/index.js'; +import './extension-registry/components/index.js'; export const onInit: UmbEntryPointOnInit = (host, extensionRegistry) => { new UmbExtensionsApiInitializer(host, extensionRegistry, 'globalContext', [host]); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-slot/extension-slot.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-slot/extension-slot.element.ts index a09e8f9bf0..303a5d397a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-slot/extension-slot.element.ts @@ -1,4 +1,4 @@ -import { umbExtensionsRegistry } from '../../extension-registry/index.js'; +import { umbExtensionsRegistry } from '../../registry.js'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { TemplateResult } from '@umbraco-cms/backoffice/external/lit'; import { css, repeat, customElement, property, state, html } from '@umbraco-cms/backoffice/external/lit'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-slot/extension-slot.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/extension-slot.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-slot/extension-slot.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-slot/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/extension-slot/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-slot/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/extension-with-api-slot.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-with-api-slot/extension-with-api-slot.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/extension-with-api-slot.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-with-api-slot/extension-with-api-slot.element.ts index e056b60241..45199b6099 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/extension-with-api-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-with-api-slot/extension-with-api-slot.element.ts @@ -1,4 +1,4 @@ -import { umbExtensionsRegistry } from '../../extension-registry/index.js'; +import { umbExtensionsRegistry } from '../../registry.js'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { TemplateResult } from '@umbraco-cms/backoffice/external/lit'; import { css, repeat, customElement, property, state, html } from '@umbraco-cms/backoffice/external/lit'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/extension-with-api-slot.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-with-api-slot/extension-with-api-slot.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/extension-with-api-slot.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-with-api-slot/extension-with-api-slot.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-with-api-slot/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/extension-with-api-slot/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/index.ts new file mode 100644 index 0000000000..4f454594ee --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/components/index.ts @@ -0,0 +1,2 @@ +export * from './extension-slot/index.js'; +export * from './extension-with-api-slot/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts index e6397911a7..3c780449af 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts @@ -1,5 +1,5 @@ -import { umbExtensionsRegistry, type ManifestPropertyEditorUi } from '../../extension-registry/index.js'; import { UmbPropertyContext } from './property.context.js'; +import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit'; import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api'; From 041582bd7151ba82f9899fed9b9044a68cd2ad91 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 15 May 2024 08:09:46 +0200 Subject: [PATCH 2/2] add missing import --- .../src/packages/core/property/property/property.element.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts index 3c780449af..920b36a841 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.element.ts @@ -1,4 +1,5 @@ import { UmbPropertyContext } from './property.context.js'; +import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension-registry'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { css, html, customElement, property, state, ifDefined, nothing } from '@umbraco-cms/backoffice/external/lit';