Skip to content

Commit 923e951

Browse files
committed
Merge branch 'main' into v15/feature/emm-icons
2 parents d2d4bd2 + 774eb1f commit 923e951

File tree

184 files changed

+246
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+246
-270
lines changed

examples/property-editor/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/extension-registry';
1+
import type { ManifestPropertyEditorUi } from '@umbraco-cms/backoffice/property-editor';
22

33
export const manifests: Array<ManifestPropertyEditorUi> = [
44
{

src/apps/backoffice/backoffice.context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
55
import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
66
import { UmbExtensionsManifestInitializer } from '@umbraco-cms/backoffice/extension-api';
77
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
8-
import type { ManifestSection } from '@umbraco-cms/backoffice/extension-registry';
8+
import type { ManifestSection } from '@umbraco-cms/backoffice/section';
99
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
1010
import type { UmbExtensionManifestInitializer } from '@umbraco-cms/backoffice/extension-api';
1111
import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';

src/apps/backoffice/components/backoffice-header-sections.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UMB_BACKOFFICE_CONTEXT } from '../backoffice.context.js';
22
import type { UmbBackofficeContext } from '../backoffice.context.js';
33
import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
44
import { css, html, customElement, state, repeat, ifDefined } from '@umbraco-cms/backoffice/external/lit';
5-
import type { ManifestSection } from '@umbraco-cms/backoffice/extension-registry';
5+
import type { ManifestSection } from '@umbraco-cms/backoffice/section';
66
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
77
import type { UmbExtensionManifestInitializer } from '@umbraco-cms/backoffice/extension-api';
88

src/apps/backoffice/components/backoffice-main.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { UMB_BACKOFFICE_CONTEXT } from '../backoffice.context.js';
33
import { css, html, customElement, state, nothing } from '@umbraco-cms/backoffice/external/lit';
44
import { UmbSectionContext, UMB_SECTION_CONTEXT, UMB_SECTION_PATH_PATTERN } from '@umbraco-cms/backoffice/section';
55
import type { PageComponent, UmbRoute, UmbRouterSlotChangeEvent } from '@umbraco-cms/backoffice/router';
6-
import type { ManifestSection, UmbSectionElement } from '@umbraco-cms/backoffice/extension-registry';
6+
import type { ManifestSection, UmbSectionElement } from '@umbraco-cms/backoffice/section';
77
import type { UmbExtensionManifestInitializer } from '@umbraco-cms/backoffice/extension-api';
88
import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
99
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';

src/libs/extension-api/controller/extension-api-initializer.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import { UmbControllerBase } from '@umbraco-cms/backoffice/class-api';
66
import { UmbControllerHostElementMixin } from '@umbraco-cms/backoffice/controller-api';
77
import type { UmbControllerHostElement, UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
88
import { customElement, html } from '@umbraco-cms/backoffice/external/lit';
9-
import { type ManifestSection, UmbSwitchCondition } from '@umbraco-cms/backoffice/extension-registry';
9+
import { UmbSwitchCondition } from '@umbraco-cms/backoffice/extension-registry';
10+
import type { ManifestSection } from '@umbraco-cms/backoffice/section';
1011

1112
@customElement('umb-test-controller-host')
1213
// Element is used in tests

src/libs/extension-api/controller/extension-element-initializer.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import { UmbExtensionElementInitializer } from './index.js';
33
import { expect, fixture } from '@open-wc/testing';
44
import { UmbControllerHostElementMixin, type UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
55
import { customElement, html } from '@umbraco-cms/backoffice/external/lit';
6-
import { type ManifestSection, UmbSwitchCondition } from '@umbraco-cms/backoffice/extension-registry';
6+
import { UmbSwitchCondition } from '@umbraco-cms/backoffice/extension-registry';
7+
import type { ManifestSection } from '@umbraco-cms/backoffice/section';
78

89
@customElement('umb-test-controller-host')
910
class UmbTestControllerHostElement extends UmbControllerHostElementMixin(HTMLElement) {}

src/packages/block/block-grid/components/block-grid-area-config-entry/block-grid-area-config-entry.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { UmbBlockGridAreaConfigEntryContext } from './block-grid-area-config-entry.context.js';
22
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
33
import { html, css, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
4-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
4+
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
55
import '../block-grid-block/index.js';
66
import '../block-scale-handler/index.js';
77

src/packages/block/block-grid/components/block-grid-area-config-entry/workspace/block-grid-area-type-workspace.context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
import { UmbArrayState, UmbObjectState, appendToFrozenArray } from '@umbraco-cms/backoffice/observable-api';
1515
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
1616
import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
17-
import type { PropertyEditorSettingsProperty } from '@umbraco-cms/backoffice/extension-registry';
17+
import type { PropertyEditorSettingsProperty } from '@umbraco-cms/backoffice/property-editor';
1818
import { UmbId } from '@umbraco-cms/backoffice/id';
1919

2020
export class UmbBlockGridAreaTypeWorkspaceContext

src/packages/block/block-grid/components/block-grid-entry/block-grid-entry.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UmbBlockGridEntryContext } from '../../context/block-grid-entry.context
22
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
33
import { html, css, customElement, property, state, nothing } from '@umbraco-cms/backoffice/external/lit';
44
import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
5-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
5+
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
66
import { stringOrStringArrayContains } from '@umbraco-cms/backoffice/utils';
77
import { UMB_BLOCK_GRID, type UmbBlockGridLayoutModel } from '@umbraco-cms/backoffice/block-grid';
88

src/packages/block/block-grid/components/block-scale-handler/block-scale-handler.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
22
import { html, css, customElement } from '@umbraco-cms/backoffice/external/lit';
3-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
3+
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
44
import '../block-grid-block/index.js';
55

66
/**

0 commit comments

Comments
 (0)