Skip to content

Commit 55afa8a

Browse files
Merge branch 'main' into v15/feature/validate-specific-cultures
2 parents cd44bc6 + 4729d3b commit 55afa8a

Some content is hidden

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

47 files changed

+136
-88
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"./context-api": "./dist-cms/libs/context-api/index.js",
1111
"./controller-api": "./dist-cms/libs/controller-api/index.js",
1212
"./element-api": "./dist-cms/libs/element-api/index.js",
13+
"./embedded-media": "./dist-cms/packages/embedded-media/index.js",
1314
"./extension-api": "./dist-cms/libs/extension-api/index.js",
1415
"./formatting-api": "./dist-cms/libs/formatting-api/index.js",
1516
"./localization-api": "./dist-cms/libs/localization-api/index.js",
@@ -93,6 +94,7 @@
9394
"./tiny-mce": "./dist-cms/packages/tiny-mce/index.js",
9495
"./tree": "./dist-cms/packages/core/tree/index.js",
9596
"./ufm": "./dist-cms/packages/ufm/index.js",
97+
"./user-change-password": "./dist-cms/packages/user/change-password/index.js",
9698
"./user-group": "./dist-cms/packages/user/user-group/index.js",
9799
"./user-permission": "./dist-cms/packages/user/user-permission/index.js",
98100
"./user": "./dist-cms/packages/user/user/index.js",

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/embedded-media/umbraco-package.js'),
2021
import('../../packages/extension-insights/umbraco-package.js'),
2122
import('../../packages/health-check/umbraco-package.js'),
2223
import('../../packages/help/umbraco-package.js'),

src/packages/code-editor/code-editor-modal/code-editor-modal.stories.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import '../confirm/confirm-modal.element.js';
2-
31
import type { UmbCodeEditorModalData } from './code-editor-modal.token.js';
42
import type { Meta, Story } from '@storybook/web-components';
53
import { html } from '@umbraco-cms/backoffice/external/lit';

src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.stories.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import '../../../components/body-layout/body-layout.element.js';
21
import './icon-picker-modal.element.js';
32

43
import type { UmbIconPickerModalElement } from './icon-picker-modal.element.js';

src/packages/core/manifests.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { manifests as menuManifests } from './menu/manifests.js';
1313
import { manifests as modalManifests } from './modal/manifests.js';
1414
import { manifests as pickerManifests } from './picker/manifests.js';
1515
import { manifests as propertyActionManifests } from './property-action/manifests.js';
16+
import { manifests as propertyEditorManifests } from './property-editor/manifests.js';
1617
import { manifests as propertyManifests } from './property/manifests.js';
1718
import { manifests as propertyTypeManifests } from './property-type/manifests.js';
1819
import { manifests as recycleBinManifests } from './recycle-bin/manifests.js';
@@ -40,6 +41,7 @@ export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> =
4041
...modalManifests,
4142
...pickerManifests,
4243
...propertyActionManifests,
44+
...propertyEditorManifests,
4345
...propertyManifests,
4446
...propertyTypeManifests,
4547
...recycleBinManifests,

src/packages/core/modal/common/embedded-media/manifests.ts

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/packages/core/modal/common/embedded-media/repository/index.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
export * from './embedded-media/index.js';
21
export * from './confirm/index.js';
32
export * from './item-picker/index.js';
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
import { manifests as confirmManifests } from './confirm/manifests.js';
22
import { manifests as itemPickerManifests } from './item-picker/manifests.js';
33

4-
export const manifests: Array<UmbExtensionManifest> = [
5-
{
6-
type: 'modal',
7-
alias: 'Umb.Modal.EmbeddedMedia',
8-
name: 'Embedded Media Modal',
9-
element: () => import('./embedded-media/embedded-media-modal.element.js'),
10-
},
11-
...confirmManifests,
12-
...itemPickerManifests,
13-
];
4+
export const manifests: Array<UmbExtensionManifest> = [...confirmManifests, ...itemPickerManifests];

0 commit comments

Comments
 (0)