Merge branch 'main' into v15/feature/discard-changes

Author: madsrasmussen

package-lock.json

@@ -10,6 +10,7 @@
 		"./context-api": "./dist-cms/libs/context-api/index.js",
 		"./controller-api": "./dist-cms/libs/controller-api/index.js",
 		"./element-api": "./dist-cms/libs/element-api/index.js",
+		"./embedded-media": "./dist-cms/packages/embedded-media/index.js",
 		"./extension-api": "./dist-cms/libs/extension-api/index.js",
 		"./formatting-api": "./dist-cms/libs/formatting-api/index.js",
 		"./localization-api": "./dist-cms/libs/localization-api/index.js",
@@ -93,6 +94,7 @@
 		"./tiny-mce": "./dist-cms/packages/tiny-mce/index.js",
 		"./tree": "./dist-cms/packages/core/tree/index.js",
 		"./ufm": "./dist-cms/packages/ufm/index.js",
+		"./user-change-password": "./dist-cms/packages/user/change-password/index.js",
 		"./user-group": "./dist-cms/packages/user/user-group/index.js",
 		"./user-permission": "./dist-cms/packages/user/user-permission/index.js",
 		"./user": "./dist-cms/packages/user/user/index.js",
@@ -250,7 +252,7 @@
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"remark-gfm": "^3.0.1",
-		"rollup": "^4.21.0",
+		"rollup": "^4.22.4",
 		"rollup-plugin-esbuild": "^6.1.1",
 		"rollup-plugin-import-css": "^3.5.0",
 		"rollup-plugin-web-worker-loader": "^1.6.1",

package.json

@@ -17,6 +17,7 @@ const CORE_PACKAGES = [
 	import('../../packages/data-type/umbraco-package.js'),
 	import('../../packages/dictionary/umbraco-package.js'),
 	import('../../packages/documents/umbraco-package.js'),
+	import('../../packages/embedded-media/umbraco-package.js'),
 	import('../../packages/extension-insights/umbraco-package.js'),
 	import('../../packages/health-check/umbraco-package.js'),
 	import('../../packages/help/umbraco-package.js'),

src/apps/backoffice/backoffice.element.ts

@@ -1,5 +1,3 @@
-import '../confirm/confirm-modal.element.js';
-
 import type { UmbCodeEditorModalData } from './code-editor-modal.token.js';
 import type { Meta, Story } from '@storybook/web-components';
 import { html } from '@umbraco-cms/backoffice/external/lit';

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

@@ -1,7 +1,7 @@
+import type { UmbContextDebuggerModalData } from './debug-modal.token.js';
 import { css, customElement, html } from '@umbraco-cms/backoffice/external/lit';
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
-import type { UmbContextDebuggerModalData } from '@umbraco-cms/backoffice/modal';
 
 @customElement('umb-context-debugger-modal')
 export default class UmbContextDebuggerModalElement extends UmbModalBaseElement<UmbContextDebuggerModalData> {

src/packages/core/debug/modals/debug/debug-modal.element.ts renamed to src/packages/core/debug/debug-modal/debug-modal.element.ts

@@ -1,4 +1,4 @@
-import { UmbModalToken } from './modal-token.js';
+import { UmbModalToken } from '../../modal/token/modal-token.js';
 import type { TemplateResult } from '@umbraco-cms/backoffice/external/lit';
 
 export interface UmbContextDebuggerModalData {

src/packages/core/modal/token/debug-modal.token.ts renamed to src/packages/core/debug/debug-modal/debug-modal.token.ts

@@ -0,0 +1 @@
+export * from './debug-modal.token.js';

src/packages/core/debug/debug-modal/index.ts

@@ -0,0 +1,8 @@
+export const manifests: Array<UmbExtensionManifest> = [
+	{
+		type: 'modal',
+		alias: 'Umb.Modal.ContextDebugger',
+		name: 'Context Debugger Modal',
+		element: () => import('./debug-modal.element.js'),
+	},
+];

src/packages/core/debug/debug-modal/manifests.ts

@@ -1,7 +1,8 @@
+import { UMB_CONTEXT_DEBUGGER_MODAL } from './debug-modal/index.js';
 import { css, customElement, html, map, nothing, property, state, when } from '@umbraco-cms/backoffice/external/lit';
 import { contextData, UmbContextDebugRequest } from '@umbraco-cms/backoffice/context-api';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import { UMB_CONTEXT_DEBUGGER_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
+import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import type { UmbDebugContextData, UmbDebugContextItemData } from '@umbraco-cms/backoffice/context-api';
 import type { UmbModalManagerContext } from '@umbraco-cms/backoffice/modal';
 

src/packages/core/debug/debug.element.ts

@@ -1,3 +1,4 @@
-export * from './debug.element.js';
 export * from './context-debug.controller.js';
+export * from './debug-modal/index.js';
+export * from './debug.element.js';
 export * from './manifests.js';