From 0c1f1efb4a56e94dc227d78df27d4cdcb96de4e3 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 7 Aug 2024 12:51:25 +0200 Subject: [PATCH] temp solution: move manifest viewer files to the blocks package --- src/Umbraco.Web.UI.Client/src/packages/block/manifests.ts | 2 ++ .../modals/manifest-viewer/index.ts | 0 .../modals/manifest-viewer/manifest-viewer-modal.element.ts | 0 .../modals/manifest-viewer/manifest-viewer-modal.token.ts | 2 ++ .../modals/manifest-viewer/manifest.ts | 0 .../src/packages/core/extension-registry/index.ts | 1 - .../src/packages/core/extension-registry/manifests.ts | 2 -- 7 files changed, 4 insertions(+), 3 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => block}/modals/manifest-viewer/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => block}/modals/manifest-viewer/manifest-viewer-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => block}/modals/manifest-viewer/manifest-viewer-modal.token.ts (72%) rename src/Umbraco.Web.UI.Client/src/packages/{core/extension-registry => block}/modals/manifest-viewer/manifest.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/block/manifests.ts index 7427ab0b53..ddb46b7ac8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/manifests.ts +++ b/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 = [ ...blockListManifests, ...blockGridManifests, ...blockRteManifests, + modalManifest, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/modals/manifest-viewer/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/modals/manifest-viewer/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/modals/manifest-viewer/manifest-viewer-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest-viewer-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/modals/manifest-viewer/manifest-viewer-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest-viewer-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/modals/manifest-viewer/manifest-viewer-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest-viewer-modal.token.ts similarity index 72% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/modals/manifest-viewer/manifest-viewer-modal.token.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest-viewer-modal.token.ts index 96fb68b015..f7e99096ab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/modals/manifest-viewer/manifest-viewer-modal.token.ts +++ b/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( 'Umb.Modal.ManifestViewer', { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/modals/manifest-viewer/manifest.ts b/src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/modals/manifest-viewer/manifest.ts rename to src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts index 4987fe24c9..017d4122e2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/index.ts +++ b/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'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/manifests.ts index 7025355d5b..dd1a2d6e84 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/manifests.ts +++ b/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 = [ @@ -12,5 +11,4 @@ export const manifests: Array = [ ...workspaceManifests, ...collectionManifests, ...entityActionManifests, - modalManifest, ];