Skip to content

Commit 2d8ccdc

Browse files
authored
Merge branch 'v15/dev' into v15/feature/emm-remove-dashboard-collection-manifest-type
2 parents f222f95 + 7b61c9c commit 2d8ccdc

File tree

139 files changed

+335
-304
lines changed

Some content is hidden

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

139 files changed

+335
-304
lines changed

package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/apps/backoffice/backoffice.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const CORE_PACKAGES = [
1717
import('../../packages/data-type/umbraco-package.js'),
1818
import('../../packages/dictionary/umbraco-package.js'),
1919
import('../../packages/documents/umbraco-package.js'),
20+
import('../../packages/extension-insights/umbraco-package.js'),
2021
import('../../packages/health-check/umbraco-package.js'),
2122
import('../../packages/help/umbraco-package.js'),
2223
import('../../packages/language/umbraco-package.js'),

src/packages/core/collection/action/collection-action-button.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { html, customElement, property, state, ifDefined } from '@umbraco-cms/ba
44
import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
55
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
66
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
7-
import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
7+
import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
88
import type { ManifestCollectionAction } from '@umbraco-cms/backoffice/collection';
99
import { createExtensionApi } from '@umbraco-cms/backoffice/extension-api';
1010

11-
const manifest: UmbBackofficeManifestKind = {
11+
const manifest: UmbExtensionManifestKind = {
1212
type: 'kind',
1313
alias: 'Umb.Kind.CollectionAction.Button',
1414
matchKind: 'button',

src/packages/core/collection/default/collection-default.element.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import { css, html, customElement, state } from '@umbraco-cms/backoffice/externa
44
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
55
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
66
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
7-
import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
7+
import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
88
import type { UmbRoute } from '@umbraco-cms/backoffice/router';
99

10-
const manifest: UmbBackofficeManifestKind = {
10+
const manifest: UmbExtensionManifestKind = {
1111
type: 'kind',
1212
alias: 'Umb.Kind.Collection.Default',
1313
matchKind: 'default',

src/packages/core/components/header-app/header-app-button.element.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
22
import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
33
import { css, html, customElement, ifDefined } from '@umbraco-cms/backoffice/external/lit';
4-
import type {
5-
ManifestHeaderAppButtonKind,
6-
UmbBackofficeManifestKind,
7-
} from '@umbraco-cms/backoffice/extension-registry';
4+
import type { ManifestHeaderAppButtonKind, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
85
import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
96
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
107

11-
const manifest: UmbBackofficeManifestKind = {
8+
const manifest: UmbExtensionManifestKind = {
129
type: 'kind',
1310
alias: 'Umb.Kind.Button',
1411
matchKind: 'button',

src/packages/core/content-type/workspace/views/design/manifest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
1+
import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
22

3-
export const contentTypeDesignEditorManifest: UmbBackofficeManifestKind = {
3+
export const contentTypeDesignEditorManifest: UmbExtensionManifestKind = {
44
type: 'kind',
55
alias: 'Umb.Kind.WorkspaceView.ContentTypeDesignEditor',
66
matchKind: 'contentTypeDesignEditor',

src/packages/core/content/workspace/views/edit/manifests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { manifests as conditionsManifests } from './conditions/manifests.js';
2-
import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
2+
import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
33

4-
const contentEditorManifest: UmbBackofficeManifestKind = {
4+
const contentEditorManifest: UmbExtensionManifestKind = {
55
type: 'kind',
66
alias: 'Umb.Kind.WorkspaceView.ContentEditor',
77
matchKind: 'contentEditor',

src/packages/core/entity-action/common/delete/delete.action.kind.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../default/default.action.kind.js';
2-
import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
2+
import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
33

4-
export const manifest: UmbBackofficeManifestKind = {
4+
export const manifest: UmbExtensionManifestKind = {
55
type: 'kind',
66
alias: 'Umb.Kind.EntityAction.Delete',
77
matchKind: 'delete',

src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../default/default.action.kind.js';
2-
import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
2+
import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
33

4-
export const manifest: UmbBackofficeManifestKind = {
4+
export const manifest: UmbExtensionManifestKind = {
55
type: 'kind',
66
alias: 'Umb.Kind.EntityAction.Duplicate',
77
matchKind: 'duplicate',
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import { manifest as duplicateKindManifest } from './duplicate.action.kind.js';
2-
import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry';
2+
import type { ManifestTypes, UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
33

4-
export const manifests: Array<ManifestTypes | UmbBackofficeManifestKind> = [duplicateKindManifest];
4+
export const manifests: Array<ManifestTypes | UmbExtensionManifestKind> = [duplicateKindManifest];

0 commit comments

Comments
 (0)