Merge remote-tracking branch 'origin/main' into v14/chore/bundle-models-builder

src/Umbraco.Web.UI.Client/src/packages/block/block-type/components/block-type-custom-view-guide/block-type-custom-view-guide.element.ts

@@ -1,11 +1,8 @@
+import { UMB_MANIFEST_VIEWER_MODAL } from '../../../modals/manifest-viewer/index.js';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { html, customElement, state, property, css } from '@umbraco-cms/backoffice/external/lit';
 import { UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
-import {
-	UMB_MANIFEST_VIEWER_MODAL,
-	umbExtensionsRegistry,
-	type ManifestBlockEditorCustomView,
-} from '@umbraco-cms/backoffice/extension-registry';
+import { umbExtensionsRegistry, type ManifestBlockEditorCustomView } from '@umbraco-cms/backoffice/extension-registry';
 import { stringOrStringArrayContains } from '@umbraco-cms/backoffice/utils';
 import { UmbExtensionsManifestInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { UmbDocumentTypeDetailRepository } from '@umbraco-cms/backoffice/document-type';

src/Umbraco.Web.UI.Client/src/packages/block/manifests.ts

@@ -3,6 +3,7 @@ import { manifests as blockGridManifests } from './block-grid/manifests.js';
 import { manifests as blockListManifests } from './block-list/manifests.js';
 import { manifests as blockRteManifests } from './block-rte/manifests.js';
 import { manifests as blockTypeManifests } from './block-type/manifests.js';
+import { manifest as modalManifest } from './modals/manifest-viewer/manifest.js';
 import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 // TODO: Remove test custom view, or transfer to test or similar?
 //import { manifest } from './custom-view/manifest.js';
@@ -14,4 +15,5 @@ export const manifests: Array<ManifestTypes> = [
 	...blockListManifests,
 	...blockGridManifests,
 	...blockRteManifests,
+	modalManifest,
 ];

src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest-viewer-modal.token.ts

@@ -5,6 +5,8 @@ export interface UmbManifestViewerModalData extends ManifestBase {}
 
 export type UmbManifestViewerModalValue = undefined;
 
+/* TODO: This is a temporary location for the manifest viewer files.They are located here because of build issues. 
+Please don't export this token from the block package. [MR] */
 export const UMB_MANIFEST_VIEWER_MODAL = new UmbModalToken<UmbManifestViewerModalData, UmbManifestViewerModalValue>(
 	'Umb.Modal.ManifestViewer',
 	{

src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts

@@ -1,6 +1,5 @@
 export * from './conditions/index.js';
 export * from './initializers/index.js';
-export * from './modals/manifest-viewer/index.js';
 export * from './registry.js';
 export * from './utils/index.js';
 export type * from './interfaces/index.js';

src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/manifests.ts

@@ -3,7 +3,6 @@ import { manifests as menuItemManifests } from './menu-item/manifests.js';
 import { manifests as workspaceManifests } from './workspace/manifests.js';
 import { manifests as collectionManifests } from './collection/manifests.js';
 import { manifests as entityActionManifests } from './entity-actions/manifests.js';
-import { manifest as modalManifest } from './modals/manifest-viewer/manifest.js';
 import type { ManifestTypes } from './models/index.js';
 
 export const manifests: Array<ManifestTypes> = [
@@ -12,5 +11,4 @@ export const manifests: Array<ManifestTypes> = [
 	...workspaceManifests,
 	...collectionManifests,
 	...entityActionManifests,
-	modalManifest,
 ];